diff options
| author | sobomax <sobomax@FreeBSD.org> | 2002-08-08 19:05:53 +0000 |
|---|---|---|
| committer | sobomax <sobomax@FreeBSD.org> | 2002-08-08 19:05:53 +0000 |
| commit | 023ed66dadbd4c41116bed0542fca6cb97ff197b (patch) | |
| tree | e7f7c8a164b02192195782335b100bb1b701325a /devel/nspr/files | |
| parent | fed910d21f72b2902de791652dae0a2c84eb267f (diff) | |
| download | FreeBSD-ports-023ed66dadbd4c41116bed0542fca6cb97ff197b.zip FreeBSD-ports-023ed66dadbd4c41116bed0542fca6cb97ff197b.tar.gz | |
Update to 4.2.
Diffstat (limited to 'devel/nspr/files')
| -rw-r--r-- | devel/nspr/files/patch-..::config::autoconf.mk.in | 20 | ||||
| -rw-r--r-- | devel/nspr/files/patch-..::configure | 34 | ||||
| -rw-r--r-- | devel/nspr/files/patch-..::pr::include::md::_freebsd.h | 21 | ||||
| -rw-r--r-- | devel/nspr/files/patch-..::pr::include::md::_pth.h | 23 |
4 files changed, 24 insertions, 74 deletions
diff --git a/devel/nspr/files/patch-..::config::autoconf.mk.in b/devel/nspr/files/patch-..::config::autoconf.mk.in index f35630a..6500098 100644 --- 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@ diff --git a/devel/nspr/files/patch-..::configure b/devel/nspr/files/patch-..::configure index 1ba0870..b69e244 100644 --- 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*) diff --git a/devel/nspr/files/patch-..::pr::include::md::_freebsd.h b/devel/nspr/files/patch-..::pr::include::md::_freebsd.h index 10e3b37..4737e216 100644 --- 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 diff --git a/devel/nspr/files/patch-..::pr::include::md::_pth.h b/devel/nspr/files/patch-..::pr::include::md::_pth.h deleted file mode 100644 index eb03536..0000000 --- a/devel/nspr/files/patch-..::pr::include::md::_pth.h +++ /dev/null @@ -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 |
