diff options
| author | Jeremy Messenger <mezz@FreeBSD.org> | 2007-12-11 19:27:53 +0000 |
|---|---|---|
| committer | Jeremy Messenger <mezz@FreeBSD.org> | 2007-12-11 19:27:53 +0000 |
| commit | 98e28c9f6670431877a43b43cadb82b49258486b (patch) | |
| tree | 63eb67e28d2abc6ac5e9f2db6bb21d7a3065306f /security/nss | |
| parent | 96a5012df3f8d04246fe8de0ae5702076c4df8a7 (diff) | |
| download | ports-98e28c9f6670431877a43b43cadb82b49258486b.tar.gz ports-98e28c9f6670431877a43b43cadb82b49258486b.zip | |
Notes
Diffstat (limited to 'security/nss')
| -rw-r--r-- | security/nss/Makefile | 3 | ||||
| -rw-r--r-- | security/nss/files/patch-..::coreconf::FreeBSD.mk | 13 |
2 files changed, 8 insertions, 8 deletions
diff --git a/security/nss/Makefile b/security/nss/Makefile index 1b2aac1f098e..89b3b9a68cb4 100644 --- a/security/nss/Makefile +++ b/security/nss/Makefile @@ -64,8 +64,7 @@ test: fi post-patch: - @${REINPLACE_CMD} -e "s|-pthread|${PTHREAD_LIBS}|g ; \ - s|/usr/X11R6|${X11BASE}|g" \ + @${REINPLACE_CMD} -e "s|-pthread|${PTHREAD_LIBS}|g" \ ${WRKSRC:H:H}/security/coreconf/FreeBSD.mk @${SED} -e 's|@exec_prefix@|${PREFIX}|; \ s|@includedir@|${PREFIX}/include/nss|; \ diff --git a/security/nss/files/patch-..::coreconf::FreeBSD.mk b/security/nss/files/patch-..::coreconf::FreeBSD.mk index 7a0417e0fd1a..1c308ac6c8ca 100644 --- a/security/nss/files/patch-..::coreconf::FreeBSD.mk +++ b/security/nss/files/patch-..::coreconf::FreeBSD.mk @@ -1,5 +1,5 @@ ---- ../coreconf/FreeBSD.mk.orig Sat Jan 21 03:36:11 2006 -+++ ../coreconf/FreeBSD.mk Tue Jan 30 21:13:41 2007 +--- ../coreconf/FreeBSD.mk.orig 2007-10-31 14:02:28.000000000 -0500 ++++ ../coreconf/FreeBSD.mk 2007-10-31 14:05:56.000000000 -0500 @@ -37,9 +37,9 @@ include $(CORE_DEPTH)/coreconf/UNIX.mk @@ -28,7 +28,7 @@ DSO_LDOPTS = -shared -Wl,-soname -Wl,$(notdir $@) # -@@ -60,20 +66,18 @@ +@@ -60,20 +66,19 @@ USE_PTHREADS = 1 DEFINES += -D_THREAD_SAFE -D_REENTRANT OS_LIBS += -pthread @@ -49,14 +49,15 @@ -DLL_SUFFIX = so.1.0 +MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) endif -- + -MKSHLIB = $(CC) $(DSO_LDOPTS) ifdef MAPFILE MKSHLIB += -Wl,--version-script,$(MAPFILE) endif -@@ -83,3 +87,5 @@ +@@ -82,4 +87,5 @@ + G++INCLUDES = -I/usr/include/g++ - INCLUDES += -I/usr/X11R6/include +-INCLUDES += -I/usr/X11R6/include +USE_SYSTEM_ZLIB = 1 +ZLIB_LIBS = -lz |