[pkgsrc/trunk]: pkgsrc/devel/nss Disable internal sqlite3. Bump PKGREVISION

[ryoon <ryoon%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7471bf4cb1e8
branches:  trunk
changeset: 358090:7471bf4cb1e8
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Sun Feb 05 02:41:13 2017 +0000

description:
Disable internal sqlite3. Bump PKGREVISION

It is my mistake.
Builds confirmed on NetBSD/amd64 current and macOS Sierra.

diffstat:

 devel/nss/Makefile                             |   5 ++-
 devel/nss/PLIST                                |   3 +-
 devel/nss/distinfo                             |   3 +-
 devel/nss/patches/patch-nss_coreconf_Darwin.mk |  37 --------------------------
 4 files changed, 5 insertions(+), 43 deletions(-)

diffs (97 lines):

diff -r 067987ac2c8c -r 7471bf4cb1e8 devel/nss/Makefile
--- a/devel/nss/Makefile        Sun Feb 05 02:30:57 2017 +0000
+++ b/devel/nss/Makefile        Sun Feb 05 02:41:13 2017 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.127 2017/01/20 15:01:23 ryoon Exp $
+# $NetBSD: Makefile,v 1.128 2017/02/05 02:41:13 ryoon Exp $
 
 DISTNAME=              nss-${NSS_RELEASE:S/.0$//}
 NSS_RELEASE=           3.28.1
+PKGREVISION=           1
 CATEGORIES=            security
 MASTER_SITES=          ${MASTER_SITE_MOZILLA_ALL:=security/nss/releases/NSS_${NSS_DIST_DIR_VERSION:S/_0$//}_RTM/src/}
 
@@ -70,7 +71,7 @@
 MAKE_ENV+=     BUILD_OPT=1
 #MAKE_ENV+=    OPTIMIZER=${CFLAGS:Q}
 MAKE_ENV+=     INCLUDES=-I${BUILDLINK_PREFIX.nspr}/include/nspr
-#MAKE_ENV+=    NSS_USE_SYSTEM_SQLITE=1
+MAKE_ENV+=     NSS_USE_SYSTEM_SQLITE=1
 MAKE_ENV+=     ZLIB_LIBS="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.zlib}/lib -L${BUILDLINK_PREFIX.zlib}/lib -lz"
 MAKE_ENV+=     USE_SYSTEM_ZLIB=1
 MAKE_ENV+=     EXTRA_SHARED_LIBS="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.nspr}/lib/nspr ${COMPILER_RPATH_FLAG}${PREFIX}/lib/nss -L${BUILDLINK_PREFIX.nspr}/lib/nspr -lplc4 -lplds4 -lnspr4"
diff -r 067987ac2c8c -r 7471bf4cb1e8 devel/nss/PLIST
--- a/devel/nss/PLIST   Sun Feb 05 02:30:57 2017 +0000
+++ b/devel/nss/PLIST   Sun Feb 05 02:41:13 2017 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2017/01/20 15:01:23 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.21 2017/02/05 02:41:13 ryoon Exp $
 bin/certcgi
 bin/certutil
 bin/cmsutil
@@ -132,7 +132,6 @@
 lib/nss/libnssdbm3.${SO_SUFFIX}
 lib/nss/libnssutil3.${SO_SUFFIX}
 lib/nss/libsmime3.${SO_SUFFIX}
-lib/nss/libsqlite3.${SO_SUFFIX}
 lib/nss/libsoftokn3.${SO_SUFFIX}
 lib/nss/libssl3.${SO_SUFFIX}
 lib/pkgconfig/nss.pc
diff -r 067987ac2c8c -r 7471bf4cb1e8 devel/nss/distinfo
--- a/devel/nss/distinfo        Sun Feb 05 02:30:57 2017 +0000
+++ b/devel/nss/distinfo        Sun Feb 05 02:41:13 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.66 2017/02/02 07:25:44 yyamano Exp $
+$NetBSD: distinfo,v 1.67 2017/02/05 02:41:13 ryoon Exp $
 
 SHA1 (nss-3.28.1.tar.gz) = 75f220c1c20d8346cde43fb96726d3447c11cf22
 RMD160 (nss-3.28.1.tar.gz) = 816595c4005f2d2ad456946d8cb2000eca06361c
@@ -14,7 +14,6 @@
 SHA1 (patch-mj) = 08ca1a37afce99e0292a20348fc6855547f44e8a
 SHA1 (patch-mn) = 5b79783e48249044be1a904a6cfd20ba175b5fd4
 SHA1 (patch-nss_cmd_platlibs.mk) = 7dadcb72acf15714c61ae74b21c5baf45bc51d4c
-SHA1 (patch-nss_coreconf_Darwin.mk) = 4fb0d118f271d1761c22478dab5b487b0e94b645
 SHA1 (patch-nss_coreconf_OpenBSD.mk) = fccc17845c28f5b1268c96eb4e952e32dd530d1d
 SHA1 (patch-nss_coreconf_command.mk) = 008f7670f164bf19555a7691f5a59fc8bf687078
 SHA1 (patch-nss_lib_freebl_config.mk) = 1c198177da8ba7928cbfbd23e385503be99ebe27
diff -r 067987ac2c8c -r 7471bf4cb1e8 devel/nss/patches/patch-nss_coreconf_Darwin.mk
--- a/devel/nss/patches/patch-nss_coreconf_Darwin.mk    Sun Feb 05 02:30:57 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-$NetBSD: patch-nss_coreconf_Darwin.mk,v 1.1 2017/02/02 07:25:44 yyamano Exp $
-
-Always use the sqlite3 library in NSS to avoid installation error on Mac OS X.
-
---- nss/coreconf/Darwin.mk.orig        2017-01-04 14:24:24.000000000 +0000
-+++ nss/coreconf/Darwin.mk
-@@ -134,17 +134,19 @@ ZLIB_LIBS        = -lz
- # the NSS libsqlite3.dylib is used instead of the system one. So just use the
- # system sqlite library on Mac, if it's sufficiently new.
- 
--SYS_SQLITE3_VERSION_FULL := $(shell /usr/bin/sqlite3 -version | awk '{print $$1}')
--SYS_SQLITE3_VERSION_MAJOR := $(shell echo $(SYS_SQLITE3_VERSION_FULL) | awk -F. '{ print $$1 }')
--SYS_SQLITE3_VERSION_MINOR := $(shell echo $(SYS_SQLITE3_VERSION_FULL) | awk -F. '{ print $$2 }')
--
--ifeq (3,$(SYS_SQLITE3_VERSION_MAJOR))
--    ifeq (,$(filter-out 0 1 2 3 4,$(SYS_SQLITE3_VERSION_MINOR)))
--        # sqlite <= 3.4.x is too old, it doesn't provide sqlite3_file_control
--    else
--        NSS_USE_SYSTEM_SQLITE = 1
--    endif
--endif
-+# Always use the library in NSS, just like other platforms.
-+#
-+#SYS_SQLITE3_VERSION_FULL := $(shell /usr/bin/sqlite3 -version | awk '{print $$1}')
-+#SYS_SQLITE3_VERSION_MAJOR := $(shell echo $(SYS_SQLITE3_VERSION_FULL) | awk -F. '{ print $$1 }')
-+#SYS_SQLITE3_VERSION_MINOR := $(shell echo $(SYS_SQLITE3_VERSION_FULL) | awk -F. '{ print $$2 }')
-+#
-+#ifeq (3,$(SYS_SQLITE3_VERSION_MAJOR))
-+#    ifeq (,$(filter-out 0 1 2 3 4,$(SYS_SQLITE3_VERSION_MINOR)))
-+#        # sqlite <= 3.4.x is too old, it doesn't provide sqlite3_file_control
-+#    else
-+#        NSS_USE_SYSTEM_SQLITE = 1
-+#    endif
-+#endif
- 
- include $(CORE_DEPTH)/coreconf/sanitizers.mk
- DARWIN_SDK_SHLIBFLAGS += $(SANITIZER_LDFLAGS)