From owner-freebsd-gecko@FreeBSD.ORG Tue Jan 29 02:57:48 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 3E91B7B3 for ; Tue, 29 Jan 2013 02:57:48 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id B0E14FAB for ; Tue, 29 Jan 2013 02:57:47 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r0T2ve9r009889 for ; Tue, 29 Jan 2013 02:57:40 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r0T2vZgS009261 for freebsd-gecko@freebsd.org; Tue, 29 Jan 2013 02:57:35 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Tue, 29 Jan 2013 02:57:35 GMT Message-Id: <201301290257.r0T2vZgS009261@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1149 - in trunk/security/nss: . files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jan 2013 02:57:48 -0000 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 \