4 files changed, 120 insertions, 76 deletions

diff --git a/lang/objc/Makefile b/lang/objc/Makefile
index e5acee26c384..9447e04f8b30 100644
--- a/lang/objc/Makefile
+++ b/lang/objc/Makefile
@@ -1,32 +1,41 @@
 # New ports collection makefile for:    objc compiler
-# Version required:     1.6.8
-# Date created:         16 October 1997
+# Version required:     1.8.17
+# Date created:         14 May 1998
 # Whom:                 chuckr@freebsd.org
 #
-# $Id: Makefile,v 1.4 1997/03/25 10:33:59 obrien Exp $
+# $Id: Makefile,v 1.5 1997/10/17 21:39:59 chuckr Exp $
 #
 
-
-DISTNAME=       objc1.6.8
-PKGNAME=	objc-1.6.8
+DISTNAME=       objc-1.8.17
 CATEGORIES=     lang
 MASTER_SITES=   http://www.can.nl/~stes/Software/
-DISTFILES=	objc1.6.8.tar.gz objc1.6.8-i386-unknown-freebsd-static.tar.gz
+DISTFILES=	objc-1.8.17.tar.gz bootstrap-1.8.17.tar.gz
 
 MAINTAINER=     chuckr@freebsd.org
 
 HAS_CONFIGURE=	yes
-MAN1=		objc.1 objc1.1 objcpls1.1 postlink.1
-MAN3=		AsciiFiler.3 Block.3 CAObject.3 Collection.3 \
-		Complex.3 Dictionary.3 Float.3 Fraction.3 Integer.3 \
-		IntegerModp.3 Matrix.3 Monomial.3 Object.3 Polynomial.3 \
-		Sequence.3 Set.3 String.3 Symbol.3 Term.3 Tree.3 Vector.3
-
-post-extract:
-	$(CP) -R $(WRKDIR)/objc1.6.8-i386-unknown-freebsd-static/bin $(WRKSRC)
-
-ALL_TARGET=	default
-MAKE_ENV=	env "OBJCDIR=${WRKSRC}" OBJCC=$(WRKSRC)/bin/objc CFLAGS=-O
-CONFIGURE_ENV=	OBJCC="env OBJCDIR=$(WRKSRC) $(WRKSRC)/bin/objc -q -g -noI -noLibs" CFLAGS=-O
+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)
+CONFIGURE_ARGS=	--prefix=$(PREFIX) --gcprefix=$(PREFIX)
+
+pre-configure:
+	(cd $(WRKDIR)/bootstrap;configure --prefix=$(WRKDIR)/bootstrap --gcprefix=$(PREFIX);$(MKDIR) $(WRKDIR)/bootstrap/bin;make default install)
+
+post-build:
+	(cd $(WRKSRC); env PATH=$(WRKDIR)/bootstrap/bin:$(PATH) OBJCDIR=$(WRKSRC) ./moreLibs -boehm)
+
+post-install:
+	$(MKDIR) $(PREFIX)/share/doc/objc
+	$(INSTALL_DATA) $(WRKSRC)/manual.html $(PREFIX)/share/doc/objc
 
 .include <bsd.port.mk>
diff --git a/lang/objc/distinfo b/lang/objc/distinfo
index cd808b7fadfd..5e1d73169506 100644
--- a/lang/objc/distinfo
+++ b/lang/objc/distinfo
@@ -1,2 +1,2 @@
-MD5 (objc1.6.8.tar.gz) = d87f398befb5b982b7ed43185f59179b
-MD5 (objc1.6.8-i386-unknown-freebsd-static.tar.gz) = 5b01fb279f9d31606f3c72cad7ec44b7
+MD5 (bootstrap-1.8.17.tar.gz) = 97a7971471eec95f5d11a558ed6ccd16
+MD5 (objc-1.8.17.tar.gz) = c591122ca85239ddf7fa1a8368012c3d
diff --git a/lang/objc/pkg-descr b/lang/objc/pkg-descr
index 60ca0f0b8f0e..ec73862b1d33 100644
--- a/lang/objc/pkg-descr
+++ b/lang/objc/pkg-descr
@@ -6,21 +6,3 @@ Like the GNU compiler, the "objc" grammar is written in YACC.  The lexical
 ananlyzer is written in LEX, and the compiler itself in the Bourne
 shell and in Objective C.  (the optional Objective C link editor is
 written in AWK).
-
-Includes:
-        1. "objc", the actual compiler
-        2. "objcrt", the Objective C Runtime Library for "objc"
-        3. "objpak", the "Object Pak" Objective C Collection Classes
-        4. Source of compiler and "oclib", a set of Objective C classes for
-           parsing C (and the Objective C extensions to C)
-NICE FEATURES
-        1. Easy to install or to modify.
-        2. Works on many systems with the native cc, debugger, profiler etc.
-        3. Built-in possibility of tracing Objective C messages.
-        4. Straightforward "pure C" messenger; "inline cache" messenger.
-        5. All classes get a +initialize message at start-up, rather than
-           'each class receives a +initialize before it receives its first
-            message'.
-        6. Already partial support for C++ compilers (will soon be workable)
-        7. Great system for experimentation with your own additions/extensions
-           to Objective C ! [ but beware - we are likely to oppose them ]
diff --git a/lang/objc/pkg-plist b/lang/objc/pkg-plist
index 135f68b870bb..802416888ef3 100644
--- a/lang/objc/pkg-plist
+++ b/lang/objc/pkg-plist
@@ -1,57 +1,110 @@
+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
-bin/objc1
-bin/objc
-bin/postlink.awk
-include/cakit/vector.h
-include/cakit/ccomplex.h
-include/cakit/cexprn.h
-include/cakit/cfloat.h
-include/cakit/fraction.h
-include/cakit/integer.h
-include/cakit/intmodp.h
-include/cakit/matrix.h
-include/cakit/monomial.h
-include/cakit/cobject.h
-include/cakit/cakit.h
-include/cakit/polynom.h
-include/cakit/cseq.h
-include/cakit/symbol.h
-include/cakit/term.h
-include/cakit/ccltn.h
-include/objpak/objpak.h
-include/objpak/tree.h
-include/objpak/ascfiler.h
-include/objpak/cltn.h
-include/objpak/dictnary.h
-include/objpak/sequence.h
-include/objpak/set.h
-include/objpak/ocstring.h
-include/objcrt/Block.h
-include/objcrt/objcrt.h
-include/objcrt/Object.h
+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
+man/man1/cvtimport.1.gz
+man/man1/objc.1.gz
+man/man1/postlink.1.gz
 man/man3/AsciiFiler.3.gz
-man/man3/Block.3.gz
+man/man3/Array.3.gz
 man/man3/CAObject.3.gz
-man/man3/Collection.3.gz
+man/man3/Bag.3.gz
+man/man3/Block.3.gz
 man/man3/Complex.3.gz
+man/man3/Cltn.3.gz
 man/man3/Dictionary.3.gz
 man/man3/Float.3.gz
 man/man3/Fraction.3.gz
+man/man3/IdArray.3.gz
+man/man3/IntArray.3.gz
 man/man3/Integer.3.gz
 man/man3/IntegerModp.3.gz
 man/man3/Matrix.3.gz
 man/man3/Monomial.3.gz
 man/man3/Object.3.gz
+man/man3/OrdCltn.3.gz
+man/man3/Point.3.gz
 man/man3/Polynomial.3.gz
+man/man3/Rectangle.3.gz
 man/man3/Sequence.3.gz
 man/man3/Set.3.gz
+man/man3/SortCltn.3.gz
+man/man3/Stack.3.gz
 man/man3/String.3.gz
 man/man3/Symbol.3.gz
 man/man3/Term.3.gz
-man/man3/Tree.3.gz
 man/man3/Vector.3.gz
-man/man1/objc.1.gz
-man/man1/objc1.1.gz
-man/man1/objcpls1.1.gz
-man/man1/postlink.1.gz
+include/cakit/ccomplex.h
+include/cakit/cakit.h
+include/cakit/ccltn.h
+include/cakit/cfloat.h
+include/cakit/cobject.h
+include/cakit/cseq.h
+include/cakit/fraction.h
+include/cakit/integer.h
+include/cakit/intmodp.h
+include/cakit/matrix.h
+include/cakit/monomial.h
+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/objcrt.h
+include/objcrt/objc.h
+include/objpak/ascfiler.h
+include/objpak/array.h
+include/objpak/dictnary.h
+include/objpak/bag.h
+include/objpak/cltn.h
+include/objpak/idarray.h
+include/objpak/intarray.h
+include/objpak/objpak.h
+include/objpak/ocstring.h
+include/objpak/ordcltn.h
+include/objpak/point.h
+include/objpak/rectangl.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/IPSequence.h
+include/ppi/IdArray.h
+include/ppi/IntArray.h
+include/ppi/OrdCltn.h
+include/ppi/Sequence.h
+include/ppi/SortCltn.h
+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/
+@dirrm share/doc/objc