From 8fa14934e711cf4c25ffb1cc21ee21fe58ef0b02 Mon Sep 17 00:00:00 2001
From: Tilman Keskinoz <arved@FreeBSD.org>
Date: Sat, 30 Nov 2002 22:34:35 +0000
Subject: [PATCH] Fix Build on -CURRENT by updating to 3.1.32 Based on

PR:		44832
Submitted by:	Miguel Mendez <flynn@energyhq.homeip.net>
---
 lang/objc/Makefile       | 16 +++++-----------
 lang/objc/distinfo       |  4 ++--
 lang/objc/files/patch-aa | 11 -----------
 lang/objc/pkg-plist      | 13 +++++++------
 4 files changed, 14 insertions(+), 30 deletions(-)
 delete mode 100644 lang/objc/files/patch-aa

diff --git a/lang/objc/Makefile b/lang/objc/Makefile
index f884ea028ce8..8bde5941c9a9 100644
--- a/lang/objc/Makefile
+++ b/lang/objc/Makefile
@@ -6,16 +6,14 @@
 #
 
 PORTNAME=	objc
-PORTVERSION=	3.1.5
+PORTVERSION=	3.1.32
 CATEGORIES=	lang
-MASTER_SITES=	${MASTER_SITE_SUNSITE} \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	devel/lang/objc chuckr
-DISTFILES=	objc-3.1.5-bootstrap.tar.gz objc-3.1.5.tar.gz
+MASTER_SITES=	http://users.pandora.be/stes/
+DISTFILES=	objc-bootstrap-${PORTVERSION}.tar.gz objc-${PORTVERSION}.tar.gz
 
 MAINTAINER=	chuckr@freebsd.org
 
-BUILD_DEPENDS=	$(PREFIX)/lib/libgc.a:$(PORTSDIR)/devel/boehm-gc
+#BUILD_DEPENDS=	$(PREFIX)/lib/libgc.a:$(PORTSDIR)/devel/boehm-gc
 
 HAS_CONFIGURE=	yes
 MAN1=		cvtimport.1 objc.1 postlink.1 vici.1
@@ -35,11 +33,7 @@ CONFIGURE_ARGS=	--prefix=$(PREFIX)
 .include <bsd.port.pre.mk>
 
 pre-configure:
-	(cd $(WRKDIR)/$(DISTNAME)-bootstrap;./configure --prefix=$(WRKDIR);${MAKE};${MAKE} install)
-
-post-build:
-	$(ECHO) "Building additional libraries (boehm-gc compatibility)"
-	(cd $(WRKSRC); ${SETENV} PATH=$(WRKDIR)/bin:$(PATH) ./makeLibs)
+	(cd $(WRKDIR)/${PORTNAME}-bootstrap-$(PORTVERSION);./configure --prefix=$(WRKDIR);${MAKE};${MAKE} install)
 
 pre-install:
 	$(MKDIR) $(PREFIX)/share/doc/objc
diff --git a/lang/objc/distinfo b/lang/objc/distinfo
index 9814a0578600..00aa30400e10 100644
--- a/lang/objc/distinfo
+++ b/lang/objc/distinfo
@@ -1,2 +1,2 @@
-MD5 (objc-3.1.5-bootstrap.tar.gz) = 9b479decd381417040962ec0d88d0819
-MD5 (objc-3.1.5.tar.gz) = 8418333a97a3ab2ed42cdb0e93804489
+MD5 (objc-bootstrap-3.1.32.tar.gz) = 62fe18ed5caf288c4e73b115e81e6367
+MD5 (objc-3.1.32.tar.gz) = ee713974b44d6bf8894b4ce8e8db914e
diff --git a/lang/objc/files/patch-aa b/lang/objc/files/patch-aa
deleted file mode 100644
index be85cfb56455..000000000000
--- a/lang/objc/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- makeLibs.in.orig	Sat Mar 20 22:24:17 1999
-+++ makeLibs.in	Sat Mar 20 22:26:18 1999
-@@ -23,7 +23,7 @@
- # runtime library for -gc option
- if [ -f $GCPREF/include/gc.h ]; then
- cat >$T <<EOF
--OTHER_MFLAGS="-q -gc -DOBJCRT_BOEHM"
-+OTHER_MFLAGS="-q -gc -DOBJCRT_BOEHM -I/usr/local/include"
- EOF
- 
- $CF -f $T
diff --git a/lang/objc/pkg-plist b/lang/objc/pkg-plist
index bd21711defe8..ca1e20e5e0b8 100644
--- a/lang/objc/pkg-plist
+++ b/lang/objc/pkg-plist
@@ -1,10 +1,11 @@
 bin/objc
+bin/objc1
+bin/postlink
 bin/cvtimport
-lib/objcrtgc.a
-lib/objcrt_g.a
-lib/objpak_g.a
-lib/objcrtr.a
-lib/objpakr.a
+lib/objcrt.a
+lib/objpak.a
+lib/_prelink.o
+lib/_predll.o
 lib/objchelp.txt
 lib/objcdlso.ld
 include/cakit/cakit.h
@@ -156,6 +157,7 @@ share/doc/objc/examples/dlopen.m
 share/doc/objc/examples/during.h
 share/doc/objc/examples/during.m
 share/doc/objc/examples/dynclass.m
+share/doc/objc/examples/esql.em
 share/doc/objc/examples/except.m
 share/doc/objc/examples/gdb.m
 share/doc/objc/examples/howmany.m
@@ -171,7 +173,6 @@ share/doc/objc/examples/super.m
 share/doc/objc/examples/tail.m
 share/doc/objc/examples/timeblock.m
 share/doc/objc/examples/varscope.m
-share/doc/objc/examples/postlink.map
 share/doc/objc/examples/Makefile
 share/doc/objc/html/cakit/BigInt.html
 share/doc/objc/html/cakit/CAObject.html