Update objc to version 2.2.15. Right now is does static libs only,

but I'm still working on it, and I think I'll get it to do shared
libs soon.

5 files changed, 171 insertions, 55 deletions

diff --git a/lang/objc/Makefile b/lang/objc/Makefile
index 5932b7963102..c05e61bf45ad 100644
--- a/lang/objc/Makefile
+++ b/lang/objc/Makefile
@@ -3,41 +3,46 @@
 # Date created:         16 May 1998
 # Whom:                 chuckr@freebsd.org
 #
-# $Id: Makefile,v 1.7 1998/05/16 16:06:49 chuckr Exp $
+# $Id: Makefile,v 1.8 1998/10/14 03:22:32 jseger Exp $
 #
 
-DISTNAME=       objc-1.8.18
+DISTNAME=       objc-2.2.15
 CATEGORIES=     lang
 MASTER_SITES=   http://www.can.nl/~stes/Software/
-DISTFILES=	objc-1.8.18.tar.gz bootstrap-1.8.17.tar.gz
+DISTFILES=	objc-2.2.15-bootstrap.tar.gz objc-2.2.15.tar.gz
 
 MAINTAINER=     chuckr@freebsd.org
 
-BROKEN_ELF=	yes
+BUILD_DEPENDS=	$(PREFIX)/lib/libgc.a:$(PORTSDIR)/devel/boehm-gc
 
 HAS_CONFIGURE=	yes
 MAN1=		cvtimport.1 objc.1 postlink.1
-MAN3=		AsciiFiler.3 Array.3 CAObject.3 Bag.3 Block.3 Complex.3 \
-		Cltn.3 Dictionary.3 Float.3 Fraction.3 IdArray.3 IntArray.3 \
-		Integer.3 IntegerModp.3 Matrix.3 Monomial.3 Object.3 \
-		OrdCltn.3 Point.3 Polynomial.3 Rectangle.3 Sequence.3 Set.3 \
-		SortCltn.3 Stack.3 String.3 Symbol.3 Term.3 Vector.3
-
-BUILD_DEPENDS=	$(PREFIX)/lib/libgc.a:$(PORTSDIR)/devel/boehm-gc
-
-ALL_TARGET=	default cakit objcplus bootstrap
-MAKE_ENV=	PATH=$(WRKDIR)/bootstrap/bin:$(PATH)
-CONFIGURE_ENV=	PATH=$(WRKDIR)/bootstrap/bin:$(PATH)
+MAN3=		Array.3 AsciiFiler.3 Bag.3 Block.3 CAObject.3 Cltn.3 \
+		Complex.3 Dictionary.3 Float.3 Fraction.3 IdArray.3 IntArray.3\
+		Integer.3 IntegerModp.3 Matrix.3 Message.3 Monomial.3 Object.3\
+		OrdCltn.3 Paragraph.3 Point.3 Polynomial.3 Rectangle.3 \
+		RunArray.3 Set.3 Sequence.3 SortCltn.3 Stack.3 String.3 \
+		Symbol.3 Term.3 Text.3 TextAttribute.3 TextStyle.3 Vector.3
+
+ALL_TARGET=	compiler
+MAKE_ENV=	PATH=$(WRKDIR)/bin:$(PATH)
+CONFIGURE_ENV=	PATH=$(WRKDIR)/bin:$(PATH)
 CONFIGURE_ARGS=	--prefix=$(PREFIX) --gcprefix=$(PREFIX)
 
+.include <bsd.port.pre.mk>
+
 pre-configure:
-	(cd $(WRKDIR)/bootstrap;./configure --prefix=$(WRKDIR)/bootstrap --gcprefix=$(PREFIX);$(MKDIR) $(WRKDIR)/bootstrap/bin;make default install)
+	(cd $(WRKDIR)/$(DISTNAME)-bootstrap;./configure --prefix=$(WRKDIR);make;make install)
 
 post-build:
-	(cd $(WRKSRC); env PATH=$(WRKDIR)/bootstrap/bin:$(PATH) OBJCDIR=$(WRKSRC) ./moreLibs -boehm)
+	$(ECHO) "Building additional libraries (boehm-gc compatibility)"
+	(cd $(WRKSRC); env PATH=$(WRKDIR)/bin:$(PATH) ./makeLibs)
 
-post-install:
+pre-install:
 	$(MKDIR) $(PREFIX)/share/doc/objc
-	$(INSTALL_DATA) $(WRKSRC)/manual.html $(PREFIX)/share/doc/objc
+	$(MKDIR) $(PREFIX)/share/doc/objc/examples
+	$(MKDIR) $(PREFIX)/share/doc/objc/html
+	tar -cf - -C $(WRKSRC)/examples . | tar xpf - -C $(PREFIX)/share/doc/objc/examples
+	tar -cf - -C $(WRKSRC)/html . | tar xpf - -C $(PREFIX)/share/doc/objc/html
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/lang/objc/distinfo b/lang/objc/distinfo
index 3793bf85cbd6..e6417ae595a3 100644
--- a/lang/objc/distinfo
+++ b/lang/objc/distinfo
@@ -1,2 +1,2 @@
-MD5 (objc-1.8.18.tar.gz) = ac66b7f5b3ee44cfb36ff43fd7586fa6
-MD5 (bootstrap-1.8.17.tar.gz) = 97a7971471eec95f5d11a558ed6ccd16
+MD5 (objc-2.2.15.tar.gz) = 2ddcd88a998e5c16149b9b9aa3fdc4a7
+MD5 (objc-2.2.15-bootstrap.tar.gz) = 4440d82bfa62e70808e1ec8317860b88
diff --git a/lang/objc/files/patch-aa b/lang/objc/files/patch-aa
new file mode 100644
index 000000000000..be85cfb56455
--- /dev/null
+++ b/lang/objc/files/patch-aa
@@ -0,0 +1,11 @@
+--- 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/files/patch-ab b/lang/objc/files/patch-ab
new file mode 100644
index 000000000000..bd75281ccd97
--- /dev/null
+++ b/lang/objc/files/patch-ab
@@ -0,0 +1,36 @@
+--- configure.orig	Sat Mar 20 22:27:54 1999
++++ configure	Sat Mar 20 22:35:53 1999
+@@ -730,7 +730,7 @@
+ 	*mwc*)
+ 		DOTSHLIBSUFFIX=".o";;
+ 	*freebsd*)
+-		DOTSHLIBSUFFIX=".so.2.1";;
++		DOTSHLIBSUFFIX=".So.2";;
+ 	*hpux*)
+ 		DOTSHLIBSUFFIX=".sl";;
+ 	*)
+@@ -837,11 +837,11 @@
+ OBJC_BOOTLIBS="$OBJC_BOOTLIBS ${UP}objpak${PATHSEP}objpak.${LIBSUFFIX}"
+ OBJC_BOOTLIBS="$OBJC_BOOTLIBS ${UP}objcrt${PATHSEP}objcrt.${LIBSUFFIX}"
+ 
+-Note OBJCRT_IFLAGS = $OBJCRT_IFLAGS
+-Note OBJPAK_IFLAGS = $OBJPAK_IFLAGS
+-Note OCLIB_IFLAGS  = $OCLIB_IFLAGS
+-Note OBJC_IFLAGS   = $OBJC_IFLAGS
+-Note CAKIT_IFLAGS  = $CAKIT_IFLAGS
++Note OBJCRT_IFLAGS = -I/usr/local/include $OBJCRT_IFLAGS
++Note OBJPAK_IFLAGS = -I/usr/local/include $OBJPAK_IFLAGS
++Note OCLIB_IFLAGS  = -I/usr/local/include $OCLIB_IFLAGS
++Note OBJC_IFLAGS   = -I/usr/local/include $OBJC_IFLAGS
++Note CAKIT_IFLAGS  = -I/usr/local/include $CAKIT_IFLAGS
+ Note OBJC_BOOTLIBS = $OBJC_BOOTLIBS
+ 
+ #
+@@ -975,6 +975,7 @@
+ 	*msvc*) RM="del";;
+ 	*djgpp*) RM="del";;
+ 	*cygwin*) RM="rm -f";;
++	*freebsd*) RM="rm -f";;
+ 	*mwc*) RM="Delete";;
+ 	*ibmvac*) RM="del";;
+ 	*) RM="rm -f";;
diff --git a/lang/objc/pkg-plist b/lang/objc/pkg-plist
index 1c0f18c6387b..0596ea9e5641 100644
--- a/lang/objc/pkg-plist
+++ b/lang/objc/pkg-plist
@@ -1,28 +1,15 @@
 bin/objc
-bin/objc.exe
-bin/objc1
-bin/objcpls1
-bin/postlink
 bin/cvtimport
-lib/otbcrt.a
-lib/otbpak.a
-lib/objcrt.a
-lib/objpak.a
-lib/_prelink.o
-lib/_predll.o
-lib/objchelp.txt
-lib/objcdlso.ld
-lib/cakit.a
 lib/objcrtgc.a
 lib/objcrt_g.a
 lib/objpak_g.a
-lib/objcrt_p.a
-lib/objpak_p.a
-lib/objcrt.so.1.8
-lib/objpak.so.1.8
-include/cakit/ccomplex.h
+lib/objcrtr.a
+lib/objpakr.a
+lib/objchelp.txt
+lib/objcdlso.ld
 include/cakit/cakit.h
 include/cakit/ccltn.h
+include/cakit/ccomplex.h
 include/cakit/cfloat.h
 include/cakit/cobject.h
 include/cakit/cseq.h
@@ -35,31 +22,37 @@ include/cakit/polynom.h
 include/cakit/symbol.h
 include/cakit/term.h
 include/cakit/vector.h
-include/objcrt/Object.h
 include/objcrt/Block.h
+include/objcrt/Object.h
+include/objcrt/Message.h
 include/objcrt/objcrt.h
 include/objcrt/objc.h
 include/objpak/ascfiler.h
-include/objpak/array.h
 include/objpak/dictnary.h
-include/objpak/bag.h
+include/objpak/ocstring.h
+include/objpak/objpak.h
 include/objpak/cltn.h
+include/objpak/ordcltn.h
+include/objpak/set.h
+include/objpak/bag.h
+include/objpak/sortcltn.h
+include/objpak/stack.h
+include/objpak/runarray.h
+include/objpak/array.h
 include/objpak/idarray.h
 include/objpak/intarray.h
-include/objpak/objpak.h
-include/objpak/ocstring.h
-include/objpak/ordcltn.h
+include/objpak/txtattr.h
 include/objpak/point.h
 include/objpak/rectangl.h
+include/objpak/octext.h
+include/objpak/paragrph.h
+include/objpak/txtstyle.h
 include/objpak/sequence.h
-include/objpak/set.h
-include/objpak/sortcltn.h
-include/objpak/stack.h
-include/ppi/ICpak101.h
 include/ppi/Array.h
 include/ppi/Assoc.h
 include/ppi/Filer.h
 include/ppi/Graph.h
+include/ppi/ICpak101.h
 include/ppi/IPSequence.h
 include/ppi/IdArray.h
 include/ppi/IntArray.h
@@ -70,9 +63,80 @@ include/ppi/String.h
 include/ppi/StringCl.h
 include/ppi/mivarargs.h
 include/ppi/vectors.h
-share/doc/objc/manual.html
-@dirrm include/cakit/
-@dirrm include/objcrt/
-@dirrm include/objpak/
-@dirrm include/ppi/
+share/doc/objc/examples/Makefile.in
+share/doc/objc/examples/README
+share/doc/objc/examples/loop.m
+share/doc/objc/examples/all.m
+share/doc/objc/examples/assoc.m
+share/doc/objc/examples/become.m
+share/doc/objc/examples/block.m
+share/doc/objc/examples/blvar.m
+share/doc/objc/examples/classvars.m
+share/doc/objc/examples/blrefcnt.m
+share/doc/objc/examples/delegate.m
+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/except.m
+share/doc/objc/examples/gdb.m
+share/doc/objc/examples/howmany.m
+share/doc/objc/examples/ifExcept.m
+share/doc/objc/examples/memory.m
+share/doc/objc/examples/nextinst.m
+share/doc/objc/examples/poseAs.m
+share/doc/objc/examples/problem3n1.m
+share/doc/objc/examples/shlload.m
+share/doc/objc/examples/signal.m
+share/doc/objc/examples/sumit.m
+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/CAObject.html
+share/doc/objc/html/cakit/Complex.html
+share/doc/objc/html/cakit/Float.html
+share/doc/objc/html/cakit/Fraction.html
+share/doc/objc/html/cakit/Integer.html
+share/doc/objc/html/cakit/IntegerModp.html
+share/doc/objc/html/cakit/Matrix.html
+share/doc/objc/html/cakit/Monomial.html
+share/doc/objc/html/cakit/Polynomial.html
+share/doc/objc/html/cakit/Symbol.html
+share/doc/objc/html/cakit/Term.html
+share/doc/objc/html/cakit/Vector.html
+share/doc/objc/html/objcrt/Block.html
+share/doc/objc/html/objcrt/Message.html
+share/doc/objc/html/objcrt/Object.html
+share/doc/objc/html/objpak/Array.html
+share/doc/objc/html/objpak/AsciiFiler.html
+share/doc/objc/html/objpak/Bag.html
+share/doc/objc/html/objpak/Cltn.html
+share/doc/objc/html/objpak/Dictionary.html
+share/doc/objc/html/objpak/IdArray.html
+share/doc/objc/html/objpak/IntArray.html
+share/doc/objc/html/objpak/OrdCltn.html
+share/doc/objc/html/objpak/Paragraph.html
+share/doc/objc/html/objpak/Point.html
+share/doc/objc/html/objpak/Rectangle.html
+share/doc/objc/html/objpak/RunArray.html
+share/doc/objc/html/objpak/Sequence.html
+share/doc/objc/html/objpak/Set.html
+share/doc/objc/html/objpak/SortCltn.html
+share/doc/objc/html/objpak/Stack.html
+share/doc/objc/html/objpak/String.html
+share/doc/objc/html/objpak/Text.html
+share/doc/objc/html/objpak/TextAttribute.html
+share/doc/objc/html/objpak/TextStyle.html
+@dirrm share/doc/objc/examples
+@dirrm share/doc/objc/html/cakit
+@dirrm share/doc/objc/html/objcrt
+@dirrm share/doc/objc/html/objpak
+@dirrm share/doc/objc/html
 @dirrm share/doc/objc
+@dirrm include/cakit
+@dirrm include/objcrt
+@dirrm include/objpak
+@dirrm include/ppi