[SVN-Commit] r1149 - in trunk/security/nss: . files

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Tue Jan 29 02:57:34 2013
New Revision: 1149

Log:
unbreak build with bundled sqlite3

Deleted:
   trunk/security/nss/files/patch-lib_softoken_manifest.mn
Modified:
   trunk/security/nss/Makefile

Modified: trunk/security/nss/Makefile
==============================================================================
--- trunk/security/nss/Makefile	Fri Jan 25 12:02:18 2013	(r1148)
+++ trunk/security/nss/Makefile	Tue Jan 29 02:57:34 2013	(r1149)
@@ -28,6 +28,7 @@
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 MAKE_ENV=	BSD_LDOPTS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" \
+		SQLITE_INCLUDE_DIR="${LOCALBASE}/include" \
 		NSS_ENABLE_ECC=1 NSS_USE_SYSTEM_SQLITE=1
 ALL_TARGET=	nss_build_all
 CFLAGS+=	-I${LOCALBASE}/include/nspr -L${LOCALBASE}/lib

Deleted: trunk/security/nss/files/patch-lib_softoken_manifest.mn
==============================================================================
--- trunk/security/nss/files/patch-lib_softoken_manifest.mn	Tue Jan 29 02:57:34 2013	(r1148)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,13 +0,0 @@
---- lib/softoken/manifest.mn.orig	2010-07-30 04:33:26.000000000 +0200
-+++ lib/softoken/manifest.mn	2010-10-17 12:01:04.000000000 +0200
-@@ -47,9 +47,7 @@
- 
- DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" -DSHLIB_VERSION=\"$(LIBRARY_VERSION)\"
- 
--ifdef SQLITE_INCLUDE_DIR
--INCLUDES += -I$(SQLITE_INCLUDE_DIR)
--endif
-+INCLUDES += -I$(LOCALBASE)/include
- 
- EXPORTS = \
- 	secmodt.h \