Revision: 7391
http://gar.svn.sourceforge.net/gar/?rev=7391&view=rev
Author: wahwah
Date: 2009-11-23 01:54:03 +0000 (Mon, 23 Nov 2009)
Log Message:
-----------
nss: using the Gentoo patch to create nss-config and nss.pc
Modified Paths:
--------------
csw/mgar/pkg/nss/trunk/Makefile
csw/mgar/pkg/nss/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/nss/trunk/files/csw-include.patch
csw/mgar/pkg/nss/trunk/files/gln.patch
csw/mgar/pkg/nss/trunk/files/nss-3.12.4-gentoo-fixups-1.diff
csw/mgar/pkg/nss/trunk/files/platlibs-sunos.patch
Modified: csw/mgar/pkg/nss/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nss/trunk/Makefile 2009-11-23 01:51:46 UTC (rev 7390)
+++ csw/mgar/pkg/nss/trunk/Makefile 2009-11-23 01:54:03 UTC (rev 7391)
@@ -13,7 +13,10 @@
GARFLAVOR = DBG
GARNAME = nss
-GARVERSION = 3.12.4
+MAJOR_VERSION = 3
+MINOR_VERSION = 12
+PATCHLEVEL = 4
+GARVERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(PATCHLEVEL)
CATEGORIES = lib
DESCRIPTION = Network Security Services library, implements PKI support
define BLURB
@@ -29,6 +32,9 @@
PATCHFILES += platlibs-sunos.patch
PATCHFILES += whoami.patch
PATCHFILES += runtime-search-path.patch
+PATCHFILES += nss-3.12.4-gentoo-fixups-1.diff
+PATCHFILES += csw-include.patch
+PATCHFILES += gln.patch
DIST_SUFFIX = -with-nspr-4.8
DISTFILES = $(GARNAME)-$(GARVERSION)$(DIST_SUFFIX).tar.gz
DISTNAME = $(GARNAME)-$(GARVERSION)$(DIST_SUFFIX)
@@ -41,6 +47,9 @@
TEST_SCRIPTS =
BUILD64 = 1
+install_libdir = $(prefix)/lib/nss
+includedir = $(prefix)/include/nss
+
EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
ifeq (OPT,$(GARFLAVOR))
BUILD_OPT = 1
@@ -53,7 +62,6 @@
NSDISTMODE = copy
NSS_ENABLE_ECC = 1
XCFLAGS = $(CFLAGS)
-FREEBL_NO_DEPEND = 1
LDOPTS = $(LD_OPTIONS)
ifeq ($(MODULATION),isa-sparcv9)
USE_64 = 1
@@ -64,7 +72,7 @@
export USE_64
endif
export BUILD_OPT NSS_USE_SYSTEM_SQLITE NSPR_INCLUDE_DIR NSPR_LIB_DIR
-export USE_SYSTEM_ZLIB ZLIB_LIBS NSDISTMODE NSS_ENABLE_ECC XCFLAGS
FREEBL_NO_DEPEND
+export USE_SYSTEM_ZLIB ZLIB_LIBS NSDISTMODE NSS_ENABLE_ECC XCFLAGS
include gar/category.mk
@@ -115,3 +123,23 @@
gmake -j1 CC="$(CC)")
@$(MAKECOOKIE)
+install-nss:
+ ginstall -d -m 755 $(DESTDIR)$(libdir)
+ gcp -a $(WORKSRC)/mozilla/security/dist/*/lib/*.so $(DESTDIR)$(libdir)
+ ginstall -d -m 755 $(DESTDIR)$(bindir)
+ gcp -a $(WORKSRC)/mozilla/security/dist/*/bin/nss-config
$(DESTDIR)$(bindir)
+ ginstall -d -m 755 $(DESTDIR)/lib/pkgconfig
+ ginstall -m 644 \
+ $(WORKSRC)/mozilla/security/dist/*/lib/pkgconfig/nss.pc \
+ $(DESTDIR)/lib/pkgconfig
+ ginstall -d -m 755 $(DESTDIR)$(includedir)
+ gcp -a $(WORKSRC)/mozilla/security/dist/private/nss/*.h
$(DESTDIR)$(includedir)
+ gcp -a $(WORKSRC)/mozilla/security/dist/public/nss/*.h
$(DESTDIR)$(includedir)
+ (cd $(DESTDIR)$(libdir); for file in *.so; do \
+ mv $${file} $$(file).$(MINOR_VERSION); \
+ ln -s $${file}.$(MINOR_VERSION) $${file}; \
+ done)
+ (for file in $(WORKSRC)/mozilla/security/dist/*/bin/*; do \
+ ginstall -m 755 $${file} $(DESTDIR)$(bindir)/nss$$(basename
$${file}); \
+ done)
+ @$(MAKECOOKIE)
Modified: csw/mgar/pkg/nss/trunk/checksums
===================================================================
--- csw/mgar/pkg/nss/trunk/checksums 2009-11-23 01:51:46 UTC (rev 7390)
+++ csw/mgar/pkg/nss/trunk/checksums 2009-11-23 01:54:03 UTC (rev 7391)
@@ -1,3 +1,6 @@
+a1ce38c03b142eb2bd54f1f111661e30 csw-include.patch
+7116f8de3ac8b35104365c1b3fc6aea4 gln.patch
+63476fb10c2d14f7e0585fe327ae9341 nss-3.12.4-gentoo-fixups-1.diff
8f76e381bf2339d731bfd5b8116c25a4 nss-3.12.4-with-nspr-4.8.tar.gz
39b9d2431d4ff717d103b742fcaefb81 nss-3.12.4.patch
f0f40bd021423ab1680b4d87cd19c1db platlibs-sqlite3.patch
Added: csw/mgar/pkg/nss/trunk/files/csw-include.patch
===================================================================
--- csw/mgar/pkg/nss/trunk/files/csw-include.patch
(rev 0)
+++ csw/mgar/pkg/nss/trunk/files/csw-include.patch 2009-11-23 01:54:03 UTC
(rev 7391)
@@ -0,0 +1,11 @@
+--- nss-3.12.4-with-nspr-4.8/mozilla/security/coreconf/SunOS5.mk.orig
2009-11-23 02:33:18.896095984 +0100
++++ nss-3.12.4-with-nspr-4.8/mozilla/security/coreconf/SunOS5.mk
2009-11-23 02:33:40.956347570 +0100
+@@ -104,7 +104,7 @@
+ endif
+ endif
+
+-INCLUDES += -I/usr/dt/include -I/usr/openwin/include
++INCLUDES += -I/usr/dt/include -I/usr/openwin/include -I/opt/csw/include
+
+ RANLIB = echo
+ CPU_ARCH = sparc
Added: csw/mgar/pkg/nss/trunk/files/gln.patch
===================================================================
--- csw/mgar/pkg/nss/trunk/files/gln.patch (rev 0)
+++ csw/mgar/pkg/nss/trunk/files/gln.patch 2009-11-23 01:54:03 UTC (rev
7391)
@@ -0,0 +1,35 @@
+--- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/config/Makefile.orig
2009-11-23 02:38:13.942222659 +0100
++++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/config/Makefile
2009-11-23 02:38:42.759423711 +0100
+@@ -13,7 +13,7 @@
+ export:
+ # Create the nss.pc file
+ mkdir -p $(DIST)/lib/pkgconfig
+- sed -e "s,@prefix@,$(PREFIX)," \
++ gsed -e "s,@prefix@,$(PREFIX)," \
+ -e "s,@exec_prefix@,\$${prefix}," \
+ -e "s,@libdir@,\$${prefix}/gentoo/nss," \
+ -e "s,@includedir@,\$${prefix}/include/nss," \
+@@ -21,18 +21,18 @@
+ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
+ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
+ nss.pc.in > nss.pc
+- chmod 0644 nss.pc
+- ln -sf ../../../../../security/nss/config/nss.pc $(DIST)/lib/pkgconfig
++ gchmod 0644 nss.pc
++ gln -sf ../../../../../security/nss/config/nss.pc $(DIST)/lib/pkgconfig
+
+ # Create the nss-config script
+ mkdir -p $(DIST)/bin
+- sed -e "s,@prefix@,$(PREFIX)," \
++ gsed -e "s,@prefix@,$(PREFIX)," \
+ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \
+ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
+ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
+ nss-config.in > nss-config
+- chmod 0755 nss-config
+- ln -sf ../../../../security/nss/config/nss-config $(DIST)/bin
++ gchmod 0755 nss-config
++ gln -sf ../../../../security/nss/config/nss-config $(DIST)/bin
+
+ libs:
+
Added: csw/mgar/pkg/nss/trunk/files/nss-3.12.4-gentoo-fixups-1.diff
===================================================================
--- csw/mgar/pkg/nss/trunk/files/nss-3.12.4-gentoo-fixups-1.diff
(rev 0)
+++ csw/mgar/pkg/nss/trunk/files/nss-3.12.4-gentoo-fixups-1.diff
2009-11-23 01:54:03 UTC (rev 7391)
@@ -0,0 +1,245 @@
+diff -urN nss-3.12.4-orig/mozilla/security/nss/config/Makefile
nss-3.12.4/mozilla/security/nss/config/Makefile
+--- nss-3.12.4-orig/mozilla/security/nss/config/Makefile 1969-12-31
18:00:00.000000000 -0600
++++ nss-3.12.4/mozilla/security/nss/config/Makefile 2009-09-14
21:45:45.619639265 -0500
+@@ -0,0 +1,40 @@
++CORE_DEPTH = ../..
++DEPTH = ../..
++
++include $(CORE_DEPTH)/coreconf/config.mk
++
++NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'`
++NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'`
++NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'`
++PREFIX = /usr
++
++all: export libs
++
++export:
++ # Create the nss.pc file
++ mkdir -p $(DIST)/lib/pkgconfig
++ sed -e "s,@prefix@,$(PREFIX)," \
++ -e "s,@exec_prefix@,\$${prefix}," \
++ -e "s,@libdir@,\$${prefix}/gentoo/nss," \
++ -e "s,@includedir@,\$${prefix}/include/nss," \
++ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
++ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
++ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
++ nss.pc.in > nss.pc
++ chmod 0644 nss.pc
++ ln -sf ../../../../../security/nss/config/nss.pc $(DIST)/lib/pkgconfig
++
++ # Create the nss-config script
++ mkdir -p $(DIST)/bin
++ sed -e "s,@prefix@,$(PREFIX)," \
++ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \
++ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
++ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
++ nss-config.in > nss-config
++ chmod 0755 nss-config
++ ln -sf ../../../../security/nss/config/nss-config $(DIST)/bin
++
++libs:
++
++dummy: all export libs
++
+diff -urN nss-3.12.4-orig/mozilla/security/nss/config/nss-config.in
nss-3.12.4/mozilla/security/nss/config/nss-config.in
+--- nss-3.12.4-orig/mozilla/security/nss/config/nss-config.in 1969-12-31
18:00:00.000000000 -0600
++++ nss-3.12.4/mozilla/security/nss/config/nss-config.in 2009-09-14
21:47:45.190638078 -0500
+@@ -0,0 +1,145 @@
++#!/bin/sh
++
++pref...@prefix@
++
++major_versi...@nss_major_version@
++minor_versi...@nss_minor_version@
++patch_versi...@nss_patch_version@
++
++usage()
++{
++ cat <<EOF
++Usage: nss-config [OPTIONS] [LIBRARIES]
++Options:
++ [--prefix[=DIR]]
++ [--exec-prefix[=DIR]]
++ [--includedir[=DIR]]
++ [--libdir[=DIR]]
++ [--version]
++ [--libs]
++ [--cflags]
++Dynamic Libraries:
++ nss
++ ssl
++ smime
++ nssutil
++EOF
++ exit $1
++}
++
++if test $# -eq 0; then
++ usage 1 1>&2
++fi
++
++lib_ssl=yes
++lib_smime=yes
++lib_nss=yes
++lib_nssutil=yes
++
++while test $# -gt 0; do
++ case "$1" in
++ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
++ *) optarg= ;;
++ esac
++
++ case $1 in
++ --prefix=*)
++ prefix=$optarg
++ ;;
++ --prefix)
++ echo_prefix=yes
++ ;;
++ --exec-prefix=*)
++ exec_prefix=$optarg
++ ;;
++ --exec-prefix)
++ echo_exec_prefix=yes
++ ;;
++ --includedir=*)
++ includedir=$optarg
++ ;;
++ --includedir)
++ echo_includedir=yes
++ ;;
++ --libdir=*)
++ libdir=$optarg
++ ;;
++ --libdir)
++ echo_libdir=yes
++ ;;
++ --version)
++ echo ${major_version}.${minor_version}.${patch_version}
++ ;;
++ --cflags)
++ echo_cflags=yes
++ ;;
++ --libs)
++ echo_libs=yes
++ ;;
++ ssl)
++ lib_ssl=yes
++ ;;
++ smime)
++ lib_smime=yes
++ ;;
++ nss)
++ lib_nss=yes
++ ;;
++ nssutil)
++ lib_nssutil=yes
++ ;;
++ *)
++ usage 1 1>&2
++ ;;
++ esac
++ shift
++done
++
++# Set variables that may be dependent upon other variables
++if test -z "$exec_prefix"; then
++ exec_prefix=`pkg-config --variable=exec_prefix nss`
++fi
++if test -z "$includedir"; then
++ includedir=`pkg-config --variable=includedir nss`
++fi
++if test -z "$libdir"; then
++ libdir=`pkg-config --variable=libdir nss`
++fi
++
++if test "$echo_prefix" = "yes"; then
++ echo $prefix
++fi
++
++if test "$echo_exec_prefix" = "yes"; then
++ echo $exec_prefix
++fi
++
++if test "$echo_includedir" = "yes"; then
++ echo $includedir
++fi
++
++if test "$echo_libdir" = "yes"; then
++ echo $libdir
++fi
++
++if test "$echo_cflags" = "yes"; then
++ echo -I$includedir
++fi
++
++if test "$echo_libs" = "yes"; then
++ libdirs="-Wl,-R$libdir -L$libdir"
++ if test -n "$lib_ssl"; then
++ libdirs="$libdirs -lssl${major_version}"
++ fi
++ if test -n "$lib_smime"; then
++ libdirs="$libdirs -lsmime${major_version}"
++ fi
++ if test -n "$lib_nss"; then
++ libdirs="$libdirs -lnss${major_version}"
++ fi
++ if test -n "$lib_nssutil"; then
++ libdirs="$libdirs -lnssutil${major_version}"
++ fi
++ echo $libdirs
++fi
++
+diff -urN nss-3.12.4-orig/mozilla/security/nss/config/nss.pc.in
nss-3.12.4/mozilla/security/nss/config/nss.pc.in
+--- nss-3.12.4-orig/mozilla/security/nss/config/nss.pc.in 1969-12-31
18:00:00.000000000 -0600
++++ nss-3.12.4/mozilla/security/nss/config/nss.pc.in 2009-09-14
21:45:45.653637310 -0500
+@@ -0,0 +1,12 @@
++pref...@prefix@
++exec_pref...@exec_prefix@
++libd...@libdir@
++included...@includedir@
++
++Name: NSS
++Description: Network Security Services
++Version: @nss_major_vers...@.@nss_minor_vers...@.@NSS_PATCH_VERSION@
++Requires: nspr >= 4.8
++Libs: -L${libdir} -lssl3 -lsmime3 -lnssutil3 -lnss3 -Wl,-R${libdir}
++Cflags: -I${includedir}
++
+diff -urN nss-3.12.4-orig/mozilla/security/nss/Makefile
nss-3.12.4/mozilla/security/nss/Makefile
+--- nss-3.12.4-orig/mozilla/security/nss/Makefile 2008-12-02
17:24:39.000000000 -0600
++++ nss-3.12.4/mozilla/security/nss/Makefile 2009-09-14 21:45:45.678657145
-0500
+@@ -78,7 +78,7 @@
+ # (7) Execute "local" rules. (OPTIONAL). #
+ #######################################################################
+
+-nss_build_all: build_coreconf build_nspr build_dbm all
++nss_build_all: build_coreconf build_dbm all
+
+ nss_clean_all: clobber_coreconf clobber_nspr clobber_dbm clobber
+
+@@ -140,12 +140,6 @@
+ --with-dist-prefix='$(NSPR_PREFIX)' \
+ --with-dist-includedir='$(NSPR_PREFIX)/include'
+
+-build_nspr: $(NSPR_CONFIG_STATUS)
+- cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; $(MAKE)
+-
+-clobber_nspr: $(NSPR_CONFIG_STATUS)
+- cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; $(MAKE) clobber
+-
+ build_dbm:
+ ifndef NSS_DISABLE_DBM
+ cd $(CORE_DEPTH)/dbm ; $(MAKE) export libs
+diff -urN nss-3.12.4-orig/mozilla/security/nss/manifest.mn
nss-3.12.4/mozilla/security/nss/manifest.mn
+--- nss-3.12.4-orig/mozilla/security/nss/manifest.mn 2008-04-04
15:36:59.000000000 -0500
++++ nss-3.12.4/mozilla/security/nss/manifest.mn 2009-09-14
21:45:45.703656167 -0500
+@@ -42,6 +42,6 @@
+
+ RELEASE = nss
+
+-DIRS = lib cmd
++DIRS = lib cmd config
+
+
Added: csw/mgar/pkg/nss/trunk/files/platlibs-sunos.patch
===================================================================
--- csw/mgar/pkg/nss/trunk/files/platlibs-sunos.patch
(rev 0)
+++ csw/mgar/pkg/nss/trunk/files/platlibs-sunos.patch 2009-11-23 01:54:03 UTC
(rev 7391)
@@ -0,0 +1,11 @@
+--- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk.orig
2009-11-22 14:31:53.252227901 +0100
++++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk
2009-11-22 14:32:46.536330277 +0100
+@@ -48,6 +48,8 @@
+ else
+ EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib'
+ endif
++EXTRA_SHARED_LIBS += -R/opt/csw/lib/$$ISALIST
++EXTRA_SHARED_LIBS += -R/opt/csw/lib/nspr/$$ISALIST
+ endif
+
+ ifeq ($(OS_ARCH), Linux)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
[email protected]
https://lists.opencsw.org/mailman/listinfo/devel
