Update objc to version 3.1.5

4 files changed, 12 insertions, 36 deletions

diff --git a/lang/objc/Makefile b/lang/objc/Makefile
index a940b4e0ab30..821f08f9b9b8 100644
--- a/lang/objc/Makefile
+++ b/lang/objc/Makefile
@@ -6,11 +6,11 @@
 # $FreeBSD$
 #
 
-DISTNAME=       objc-2.2.15
+DISTNAME=       objc-3.1.5
 CATEGORIES=     lang
 MASTER_SITES=   http://metalab.unc.edu/pub/Linux/devel/lang/objc/ \
 		http://www.freebsd.org/~chuckr/
-DISTFILES=	objc-2.2.15-bootstrap.tar.gz objc-2.2.15.tar.gz
+DISTFILES=	objc-3.1.5-bootstrap.tar.gz objc-3.1.5.tar.gz
 
 MAINTAINER=     chuckr@freebsd.org
 
@@ -20,7 +20,7 @@ HAS_CONFIGURE=	yes
 MAN1=		cvtimport.1 objc.1 postlink.1
 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\
+		BigInt.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
@@ -28,7 +28,8 @@ MAN3=		Array.3 AsciiFiler.3 Bag.3 Block.3 CAObject.3 Cltn.3 \
 ALL_TARGET=	compiler
 MAKE_ENV=	PATH=$(WRKDIR)/bin:$(PATH)
 CONFIGURE_ENV=	PATH=$(WRKDIR)/bin:$(PATH)
-CONFIGURE_ARGS=	--prefix=$(PREFIX) --gcprefix=$(PREFIX)
+CONFIGURE_ARGS=	--prefix=$(PREFIX)
+#CONFIGURE_ARGS=	--prefix=$(PREFIX) --gcprefix=$(PREFIX)
 
 .include <bsd.port.pre.mk>
 
diff --git a/lang/objc/distinfo b/lang/objc/distinfo
index e6417ae595a3..9814a0578600 100644
--- a/lang/objc/distinfo
+++ b/lang/objc/distinfo
@@ -1,2 +1,2 @@
-MD5 (objc-2.2.15.tar.gz) = 2ddcd88a998e5c16149b9b9aa3fdc4a7
-MD5 (objc-2.2.15-bootstrap.tar.gz) = 4440d82bfa62e70808e1ec8317860b88
+MD5 (objc-3.1.5-bootstrap.tar.gz) = 9b479decd381417040962ec0d88d0819
+MD5 (objc-3.1.5.tar.gz) = 8418333a97a3ab2ed42cdb0e93804489
diff --git a/lang/objc/files/patch-ab b/lang/objc/files/patch-ab
index bd75281ccd97..0a82a7deb112 100644
--- a/lang/objc/files/patch-ab
+++ b/lang/objc/files/patch-ab
@@ -1,36 +1,11 @@
---- configure.orig	Sat Mar 20 22:27:54 1999
-+++ configure	Sat Mar 20 22:35:53 1999
-@@ -730,7 +730,7 @@
+--- configure.orig	Sat Jan  8 00:59:34 2000
++++ configure	Sat Jan  8 00:59:44 2000
+@@ -1779,7 +1779,7 @@
  	*mwc*)
  		DOTSHLIBSUFFIX=".o";;
  	*freebsd*)
 -		DOTSHLIBSUFFIX=".so.2.1";;
-+		DOTSHLIBSUFFIX=".So.2";;
++		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 0596ea9e5641..56aa24666f9e 100644
--- a/lang/objc/pkg-plist
+++ b/lang/objc/pkg-plist
@@ -95,11 +95,11 @@ 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
 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