nss: fix pkg-config and nss-config

srcpkgs/nss/files/nss-config.in

@@ -1,145 +0,0 @@
-#!/bin/sh
-
-prefix=@prefix@
-
-major_version=@MOD_MAJOR_VERSION@
-minor_version=@MOD_MINOR_VERSION@
-patch_version=@MOD_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
-	nssutil
-	ssl
-	smime
-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,-rpath-link,$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      
-

srcpkgs/nss/files/nss.pc.in

@@ -1,11 +0,0 @@
-prefix=%prefix%
-exec_prefix=%exec_prefix%
-libdir=%libdir%
-includedir=%includedir%
-
-Name: NSS
-Description: Network Security Services
-Version: %NSS_VERSION%
-Requires: nspr >= %NSPR_VERSION%
-Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -lnssutil3
-Cflags: -I${includedir}

srcpkgs/nss/template

@@ -4,7 +4,7 @@ _nsprver=4.30
 
 pkgname=nss
 version=3.67
-revision=1
+revision=2
 hostmakedepends="perl"
 makedepends="nspr-devel sqlite-devel zlib-devel"
 depends="nspr>=${_nsprver}"
@@ -118,26 +118,26 @@ do_install() {
 	NSS_VMINOR=$(grep "#define.*NSS_VMINOR" nss/lib/nss/nss.h | awk '{print $3}')
 	NSS_VPATCH=$(grep "#define.*NSS_VPATCH" nss/lib/nss/nss.h | awk '{print $3}')
 
-	sed ${FILESDIR}/nss.pc.in \
+	sed     -e "s,%prefix%,/usr,g" \
-		-e "s,%libdir%,/usr/lib,g" \
+		-e 's,%exec_prefix%,${prefix},g' \
-		-e "s,%prefix%,/usr,g" \
+		-e 's,%includedir%,${prefix}/include/nss,g' \
-		-e "s,%exec_prefix%,/usr/bin,g" \
+		-e 's,%libdir%,${prefix}/lib,g' \
-		-e "s,%includedir%,/usr/include/nss,g" \
 		-e "s,%NSPR_VERSION%,${_nsprver},g" \
-		-e "s,%NSS_VERSION%,${version},g" > \
+		-e "s,%NSS_VERSION%,${version},g" \
-		${DESTDIR}/usr/lib/pkgconfig/nss.pc
+		nss/pkg/pkg-config/nss.pc.in \
+		> ${DESTDIR}/usr/lib/pkgconfig/nss.pc
 
 	ln -sf nss.pc ${DESTDIR}/usr/lib/pkgconfig/mozilla-nss.pc
 	chmod 644 ${DESTDIR}/usr/lib/pkgconfig/*.pc
 
-	sed ${FILESDIR}/nss-config.in \
+	sed     -e "s,@prefix@,/usr,g" \
-		-e "s,@libdir@,/usr/lib,g" \
+		-e 's,@exec_prefix@,${prefix},g' \
-		-e "s,@prefix@,/usr/bin,g" \
+		-e 's,@includedir@,${prefix}/include/nss,g' \
-		-e "s,@exec_prefix@,/usr/bin,g" \
+		-e 's,@libdir@,${prefix}/lib,g' \
-		-e "s,@includedir@,/usr/include/nss,g" \
 		-e "s,@MOD_MAJOR_VERSION@,${NSS_VMAJOR},g" \
 		-e "s,@MOD_MINOR_VERSION@,${NSS_VMINOR},g" \
 		-e "s,@MOD_PATCH_VERSION@,${NSS_VPATCH},g" \
+		nss/pkg/pkg-config/nss-config.in \
 		> ${DESTDIR}/usr/bin/nss-config
 	chmod 755 ${DESTDIR}/usr/bin/nss-config