Update to 4.2.

svn path=/head/; revision=64249
2024-10-25 21:07:40 +00:00 · 2002-08-08 19:05:53 +00:00 · 2002-08-08 19:05:53 +00:00 · 307649d633 · 2021-03-31 03:12:20 +00:00
commit 307649d633
parent 753d91cc22
7 changed files with 67 additions and 77 deletions
--- a/devel/nspr/Makefile
+++ b/devel/nspr/Makefile
@ -6,7 +6,7 @@
 #

 PORTNAME=	nspr
-PORTVERSION=	4.1.2
+PORTVERSION=	4.2
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.mozilla.org/pub/nspr/releases/v${PORTVERSION}/src/

@ -28,7 +28,7 @@ LIBS=		libnspr4.so.1 libplc4.so.1 libplds4.so.1
 do-install:
 	${MKDIR} ${PREFIX}/include/nspr
 	${TAR} -C ${WRKSRC}/dist/include --dereference -cf - . | \
-		${TAR} -C ${PREFIX}/include/nspr -xf -
+		${TAR} -C ${PREFIX}/include -xf -
 	${TAR} -C ${WRKSRC}/dist/lib --dereference -cf - . | \
 		${TAR} -C ${PREFIX}/lib -xf -
 .for lib in ${LIBS}
--- a/devel/nspr/distinfo
+++ b/devel/nspr/distinfo
@ -1 +1 @@
-MD5 (nspr-4.1.2.tar.gz) = cdbfa573242fa678766d19401f424567
+MD5 (nspr-4.2.tar.gz) = 3e5a61c2e7ec00dcc41a15c40e07978f
--- a/devel/nspr/files/patch-..::config::autoconf.mk.in
+++ b/devel/nspr/files/patch-..::config::autoconf.mk.in
@ -1,14 +1,14 @@

 $FreeBSD$

--- ../config/autoconf.mk.in.orig	Thu Feb 24 01:37:44 2000
-+++ ../config/autoconf.mk.in	Tue Dec 18 11:24:06 2001
-@@ -1,7 +1,7 @@
+--- ../config/autoconf.mk.in.orig	Wed Oct 17 02:31:02 2001
+++ ../config/autoconf.mk.in	Thu Aug  8 19:22:44 2002
+@@ -17,7 +17,7 @@
+ dist_includedir = @dist_includedir@
+ dist_libdir	= @dist_libdir@
 
- USE_AUTOCONF	= 1
- MOZILLA_CLIENT	= @MOZILLA_CLIENT@
-DIST		= @prefix@
-+DIST		?= @prefix@
- OBJDIR_NAME	= .
- OBJDIR		= .
- OBJ_SUFFIX	= @OBJ_SUFFIX@
+-DIST		= $(dist_prefix)
+DIST		?= $(dist_prefix)
+ 
+ RELEASE_OBJDIR_NAME = @RELEASE_OBJDIR_NAME@
+ OBJDIR_NAME	= @OBJDIR_NAME@
--- a/devel/nspr/files/patch-..::configure
+++ b/devel/nspr/files/patch-..::configure
@ -1,14 +1,14 @@

 $FreeBSD$

--- ../configure.orig	Sat Jul  8 14:25:25 2000
-+++ ../configure	Tue Dec 18 11:54:54 2001
-@@ -2547,15 +2547,16 @@
+--- ../configure.orig	Sat Mar 30 17:35:05 2002
+++ ../configure	Thu Aug  8 19:35:46 2002
+@@ -3290,16 +3290,17 @@
 #define HAVE_BSD_FLOCK 1
 EOF
 
-    CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall -pipe"
-+    CFLAGS="$CFLAGS $DSO_CFLAGS -ansi -Wall -pipe -DXP_UNIX"
+-    CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
+    CFLAFS="$CFLAGS $DSO_CFLAGS -ansi -Wall -pipe -DXP_UNIX"
     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
     if test "$MOZ_OBJFORMAT" = "elf"; then
 -        DLL_SUFFIX=so
@ -16,28 +16,10 @@ $FreeBSD$
     else
         DLL_SUFFIX=so.1.0
     fi
-+    MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
+     MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
     DSO_CFLAGS=-fPIC
-    DSO_LDOPTS=-Bshareable
-+    DSO_LDOPTS="-shared $BSD_PTHREAD_LIBS"
+     DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
+    DSO_LDOPTS="$DSO_LDOPTS $BSD_PTHREAD_LIBS"
     MDCPUCFG_H=_freebsd.cfg
     PR_MD_CSRCS=freebsd.c
     ;;
-@@ -3516,8 +3517,6 @@
-    if test $? -eq 0; then
- 	if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
- 	    ac_cv_have_dash_pthread=yes
-	    CFLAGS="$CFLAGS -pthread"
-	    CXXFLAGS="$CXXFLAGS -pthread"
- 	fi
-     fi
-     rm -f conftest*
-@@ -3542,7 +3541,7 @@
- EOF
- 
- 	    	    if test "$ac_cv_have_dash_pthread" = "yes"; then
-	        PTHREAD_LDFLAGS=
-+	        PTHREAD_LDFLAGS="-pthread"
- 	    fi
- 	    ;;
-     *-hpuxB.10.10*)
--- a/devel/nspr/files/patch-..::pr::include::md::_freebsd.h
+++ b/devel/nspr/files/patch-..::pr::include::md::_freebsd.h
@ -1,22 +1,13 @@

 $FreeBSD$

--- ../pr/include/md/_freebsd.h.orig	Wed Jun 21 00:22:19 2000
-+++ ../pr/include/md/_freebsd.h	Tue Dec 18 11:24:06 2001
-@@ -37,6 +37,7 @@
- 
- #include "prthread.h"
- 
+--- ../pr/include/md/_freebsd.h.orig	Sat Feb 16 09:12:55 2002
+++ ../pr/include/md/_freebsd.h	Thu Aug  8 19:31:23 2002
+@@ -40,6 +40,7 @@
+ #if __FreeBSD__ >= 2
+ #include <osreldate.h>  /* for __FreeBSD_version */
+ #endif
 +#include <sys/param.h>
 #include <sys/syscall.h>
 
 #define PR_LINKER_ARCH	"freebsd"
-@@ -65,7 +66,7 @@
- #define _PR_HAVE_SOCKADDR_LEN
- #define _PR_STAT_HAS_ST_ATIMESPEC
- #define _PR_NO_LARGE_FILES
-#if ( __FreeBSD__ > 2 )
-+#if ( __FreeBSD_version >= 220000 ) && ( __FreeBSD_version < 400008 )
- #if !defined(_PR_PTHREADS)
- /*
-  * libc_r doesn't have poll().  Although libc has poll(), it is not
--- a/devel/nspr/files/patch-..::pr::include::md::_pth.h
+++ b/devel/nspr/files/patch-..::pr::include::md::_pth.h
@ -1,23 +0,0 @@
-
-$FreeBSD$
-
--- ../pr/include/md/_pth.h.orig	Wed Jun 21 00:23:43 2000
-+++ ../pr/include/md/_pth.h	Tue Dec 18 11:24:06 2001
-@@ -199,7 +199,7 @@
- #define PT_PRIO_MAX            sched_get_priority_max(SCHED_OTHER)
- #endif /* defined(_PR_DCETHREADS) */
- 
-#elif defined(LINUX)
-+#elif defined(LINUX) || defined(FREEBSD)
- #define PT_PRIO_MIN            sched_get_priority_min(SCHED_OTHER)
- #define PT_PRIO_MAX            sched_get_priority_max(SCHED_OTHER)
- #elif defined(NTO)
-@@ -219,7 +219,7 @@
-  */
- #define PT_PRIO_MIN            1
- #define PT_PRIO_MAX            127
-#elif defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \
-+#elif defined(NETBSD) || defined(OPENBSD) \
- 	|| defined(BSDI) || defined(RHAPSODY) /* XXX */
- #define PT_PRIO_MIN            0
- #define PT_PRIO_MAX            126
--- a/devel/nspr/pkg-plist
+++ b/devel/nspr/pkg-plist
@ -1,37 +1,77 @@
+include/nspr/md/_aix.h
 include/nspr/md/_aix32.cfg
 include/nspr/md/_aix32in6.cfg
 include/nspr/md/_aix64.cfg
 include/nspr/md/_beos.cfg
+include/nspr/md/_beos.h
 include/nspr/md/_bsdi.cfg
+include/nspr/md/_bsdi.h
+include/nspr/md/_darwin.cfg
+include/nspr/md/_darwin.h
 include/nspr/md/_dgux.cfg
+include/nspr/md/_dgux.h
 include/nspr/md/_freebsd.cfg
+include/nspr/md/_freebsd.h
+include/nspr/md/_hpux.h
 include/nspr/md/_hpux32.cfg
 include/nspr/md/_hpux64.cfg
+include/nspr/md/_irix.h
 include/nspr/md/_irix32.cfg
 include/nspr/md/_irix64.cfg
 include/nspr/md/_linux.cfg
+include/nspr/md/_linux.h
+include/nspr/md/_macos.h
 include/nspr/md/_ncr.cfg
+include/nspr/md/_ncr.h
 include/nspr/md/_nec.cfg
+include/nspr/md/_nec.h
 include/nspr/md/_netbsd.cfg
+include/nspr/md/_netbsd.h
 include/nspr/md/_nextstep.cfg
+include/nspr/md/_nextstep.h
+include/nspr/md/_nspr_pthread.h
 include/nspr/md/_nto.cfg
+include/nspr/md/_nto.h
 include/nspr/md/_openbsd.cfg
+include/nspr/md/_openbsd.h
 include/nspr/md/_openvms.cfg
+include/nspr/md/_openvms.h
 include/nspr/md/_os2.cfg
+include/nspr/md/_os2.h
+include/nspr/md/_os2_errors.h
 include/nspr/md/_osf1.cfg
+include/nspr/md/_osf1.h
+include/nspr/md/_pcos.h
+include/nspr/md/_pth.h
 include/nspr/md/_qnx.cfg
+include/nspr/md/_qnx.h
 include/nspr/md/_reliantunix.cfg
+include/nspr/md/_reliantunix.h
 include/nspr/md/_rhapsody.cfg
+include/nspr/md/_rhapsody.h
 include/nspr/md/_scoos.cfg
+include/nspr/md/_scoos.h
+include/nspr/md/_solaris.h
 include/nspr/md/_solaris32.cfg
 include/nspr/md/_solaris64.cfg
 include/nspr/md/_sony.cfg
+include/nspr/md/_sony.h
 include/nspr/md/_sunos4.cfg
+include/nspr/md/_sunos4.h
+include/nspr/md/_unix_errors.h
+include/nspr/md/_unixos.h
 include/nspr/md/_unixware.cfg
+include/nspr/md/_unixware.h
 include/nspr/md/_unixware7.cfg
 include/nspr/md/_win16.cfg
+include/nspr/md/_win16.h
+include/nspr/md/_win32_errors.h
 include/nspr/md/_win95.cfg
+include/nspr/md/_win95.h
 include/nspr/md/_winnt.cfg
+include/nspr/md/_winnt.h
+include/nspr/md/prosdep.h
+include/nspr/md/sunos4.h
 include/nspr/nspr.h
 include/nspr/obsolete/pralarm.h
 include/nspr/obsolete/probslet.h