diff options
author | sobomax <sobomax@FreeBSD.org> | 2001-12-19 17:28:05 +0800 |
---|---|---|
committer | sobomax <sobomax@FreeBSD.org> | 2001-12-19 17:28:05 +0800 |
commit | e6f28a11e1ed760044378220f4413de4e5c1c18f (patch) | |
tree | 64e2d9db207b80bfae1a940d635ae0484a2f25fc /devel/nspr/files | |
parent | 4d7ece4265e64318c8221a550dc37a31ac861a87 (diff) | |
download | freebsd-ports-gnome-e6f28a11e1ed760044378220f4413de4e5c1c18f.tar.gz freebsd-ports-gnome-e6f28a11e1ed760044378220f4413de4e5c1c18f.tar.zst freebsd-ports-gnome-e6f28a11e1ed760044378220f4413de4e5c1c18f.zip |
Add nspr 4.1.2, a platform-neutral API for system level and libc
like functions. I bet Java folks would like it - because this port
is required for Mozilla's Java plugin.
Diffstat (limited to 'devel/nspr/files')
-rw-r--r-- | devel/nspr/files/patch-..::config::FreeBSD.mk | 51 | ||||
-rw-r--r-- | devel/nspr/files/patch-..::config::autoconf.mk.in | 14 | ||||
-rw-r--r-- | devel/nspr/files/patch-..::configure | 43 | ||||
-rw-r--r-- | devel/nspr/files/patch-..::pr::include::md::_freebsd.h | 22 | ||||
-rw-r--r-- | devel/nspr/files/patch-..::pr::include::md::_pth.h | 23 |
5 files changed, 153 insertions, 0 deletions
diff --git a/devel/nspr/files/patch-..::config::FreeBSD.mk b/devel/nspr/files/patch-..::config::FreeBSD.mk new file mode 100644 index 000000000000..4d81665b8aa4 --- /dev/null +++ b/devel/nspr/files/patch-..::config::FreeBSD.mk @@ -0,0 +1,51 @@ + +$FreeBSD$ + +--- ../config/FreeBSD.mk.orig Sat Jul 29 03:50:35 2000 ++++ ../config/FreeBSD.mk Tue Dec 18 11:43:06 2001 +@@ -37,19 +37,21 @@ + + include $(MOD_DEPTH)/config/UNIX.mk + +-CC = gcc +-CCC = g++ ++CCC = $(CXX) + RANLIB = ranlib + ++# During FreeBSD port build, CFLAGS contains all of the optimizations ++# flags desired... ++OPTIMIZER = $(MOZ_OPTIMIZE_FLAGS) ++ + ifeq ($(OS_TEST),alpha) + CPU_ARCH = alpha + else +-OS_REL_CFLAGS = -Di386 + CPU_ARCH = x86 + endif + CPU_ARCH_TAG = _$(CPU_ARCH) + +-OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe $(THREAD_FLAG) -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK ++OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK + + # + # The default implementation strategy for FreeBSD is pthreads. +@@ -60,8 +62,8 @@ + else + USE_PTHREADS = 1 + IMPL_STRATEGY = _PTH +-DEFINES += -D_THREAD_SAFE +-THREAD_FLAG += -pthread ++DEFINES += -D_THREAD_SAFE -D_REENTRANT ++DSO_LDOPTS += -pthread + endif + + ARCH = freebsd +@@ -75,7 +77,7 @@ + endif + + DSO_CFLAGS = -fPIC +-DSO_LDOPTS = -Bshareable ++DSO_LDOPTS += -Bshareable + + MKSHLIB = $(LD) $(DSO_LDOPTS) + diff --git a/devel/nspr/files/patch-..::config::autoconf.mk.in b/devel/nspr/files/patch-..::config::autoconf.mk.in new file mode 100644 index 000000000000..f35630a74f81 --- /dev/null +++ b/devel/nspr/files/patch-..::config::autoconf.mk.in @@ -0,0 +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 @@ + + USE_AUTOCONF = 1 + MOZILLA_CLIENT = @MOZILLA_CLIENT@ +-DIST = @prefix@ ++DIST ?= @prefix@ + OBJDIR_NAME = . + OBJDIR = . + OBJ_SUFFIX = @OBJ_SUFFIX@ diff --git a/devel/nspr/files/patch-..::configure b/devel/nspr/files/patch-..::configure new file mode 100644 index 000000000000..1ba08707ebdd --- /dev/null +++ b/devel/nspr/files/patch-..::configure @@ -0,0 +1,43 @@ + +$FreeBSD$ + +--- ../configure.orig Sat Jul 8 14:25:25 2000 ++++ ../configure Tue Dec 18 11:54:54 2001 +@@ -2547,15 +2547,16 @@ + #define HAVE_BSD_FLOCK 1 + EOF + +- CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall -pipe" ++ CFLAGS="$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 ++ DLL_SUFFIX=so.1 + else + DLL_SUFFIX=so.1.0 + fi ++ MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' + DSO_CFLAGS=-fPIC +- DSO_LDOPTS=-Bshareable ++ DSO_LDOPTS="-shared $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 new file mode 100644 index 000000000000..10e3b37b6a59 --- /dev/null +++ b/devel/nspr/files/patch-..::pr::include::md::_freebsd.h @@ -0,0 +1,22 @@ + +$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" + ++#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 new file mode 100644 index 000000000000..eb035367a56b --- /dev/null +++ b/devel/nspr/files/patch-..::pr::include::md::_pth.h @@ -0,0 +1,23 @@ + +$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 |