Update objc to 1.6.8, and fix some other smallish bugs.

Approved by: asami

4 files changed, 67 insertions, 47 deletions

diff --git a/lang/objc/Makefile b/lang/objc/Makefile
index 9897ec9812aa..e5acee26c384 100644
--- a/lang/objc/Makefile
+++ b/lang/objc/Makefile
@@ -1,36 +1,32 @@
 # New ports collection makefile for:    objc compiler
-# Version required:     1.12
-# Date created:         14 March 1997
+# Version required:     1.6.8
+# Date created:         16 October 1997
 # Whom:                 chuckr@freebsd.org
 #
-# $Id: Makefile,v 1.3 1997/03/25 10:32:44 obrien Exp $
+# $Id: Makefile,v 1.4 1997/03/25 10:33:59 obrien Exp $
 #
 
-DISTNAME=       objc
-PKGNAME=        objc-1.1.12
+
+DISTNAME=       objc1.6.8
+PKGNAME=	objc-1.6.8
 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
 
 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
 
-SYSNAME!=	uname -r | /usr/bin/sed -e 's/-.*$$//g'
-
-.if ${SYSNAME} == "3.0"
-DISTFILES=	objc1.1.12-i386-unknown-freebsd3.0.tar.gz
-WRKSRC=		$(WRKDIR)/objc1.1.12-i386-unknown-freebsd3.0
-.elif (${SYSNAME} == "2.2" || ${SYSNAME} == "2.2.1")
-DISTFILES=	objc1.1.12-i386-unknown-freebsd2.2.tar.gz
-WRKSRC=		$(WRKDIR)/objc1.1.12-i386-unknown-freebsd2.2
-.elif (${SYSNAME} == "2.1.7" || ${SYSNAME} == "2.1.6" || ${SYSNAME} == "2.1.5")
-DISTFILES=	objc1.1.12-i386-unknown-freebsd2.1.7.tar.gz
-WRKSRC=		$(WRKDIR)/objc1.1.12-i386-unknown-freebsd2.1.7
-.else
-BROKEN=		Only suppports FreeBSD current, 2.2, and 2.1.{7,6,5}.  Sorry!
-.endif
+post-extract:
+	$(CP) -R $(WRKDIR)/objc1.6.8-i386-unknown-freebsd-static/bin $(WRKSRC)
 
-MAKE_ENV=	env OBJCDIR=${WRKSRC} CFLAGS=-O
+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
 
 .include <bsd.port.mk>
diff --git a/lang/objc/distinfo b/lang/objc/distinfo
index 46b82f098de9..cd808b7fadfd 100644
--- a/lang/objc/distinfo
+++ b/lang/objc/distinfo
@@ -1,3 +1,2 @@
-MD5 (objc1.1.12-i386-unknown-freebsd2.1.7.tar.gz) = c8337c0b9be0c9f6d6eb16030b2bfc18
-MD5 (objc1.1.12-i386-unknown-freebsd2.2.tar.gz) = 19644f054186dd72069892e6cf6fa785
-MD5 (objc1.1.12-i386-unknown-freebsd3.0.tar.gz) = 8d932d7199dd1af22af1803498c4773f
+MD5 (objc1.6.8.tar.gz) = d87f398befb5b982b7ed43185f59179b
+MD5 (objc1.6.8-i386-unknown-freebsd-static.tar.gz) = 5b01fb279f9d31606f3c72cad7ec44b7
diff --git a/lang/objc/pkg-descr b/lang/objc/pkg-descr
index 05f6f35b6330..60ca0f0b8f0e 100644
--- a/lang/objc/pkg-descr
+++ b/lang/objc/pkg-descr
@@ -24,4 +24,3 @@ NICE FEATURES
         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 95ec0f767f15..135f68b870bb 100644
--- a/lang/objc/pkg-plist
+++ b/lang/objc/pkg-plist
@@ -3,29 +3,55 @@ lib/objpak.a
 bin/objc1
 bin/objc
 bin/postlink.awk
-man/man3/Set.3
-man/man3/Dictionary.3
-man/man3/Set.3
-man/man3/Sequence.3
-man/man3/Collection.3
-man/man3/Dictionary.3
-man/man3/String.3
-man/man3/Sequence.3
-man/man3/Collection.3
-man/man3/Tree.3
-man/man3/String.3
-man/man3/Object.3
-man/man3/Tree.3
-man/man3/Object.3
-man/man1/objc.1
-man/man1/objc1.1
-man/man1/objcplus1.1
-include/objpak/Sequence.h
-include/objpak/Collection.h
-include/objpak/Dictionary.h
+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/Set.h
-include/objpak/String.h
-include/objpak/Tree.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
+man/man3/AsciiFiler.3.gz
+man/man3/Block.3.gz
+man/man3/CAObject.3.gz
+man/man3/Collection.3.gz
+man/man3/Complex.3.gz
+man/man3/Dictionary.3.gz
+man/man3/Float.3.gz
+man/man3/Fraction.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/Polynomial.3.gz
+man/man3/Sequence.3.gz
+man/man3/Set.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