Merge branch 'master' of git+ssh://openadk.org/git/openadk

Conflicts:
	package/mpfr/Makefile

3 files changed, 171 insertions, 1 deletions

diff --git a/package/nss/Makefile b/package/nss/Makefile
index 6d6dccdf7..7455b1d37 100644
--- a/package/nss/Makefile
+++ b/package/nss/Makefile
@@ -6,6 +6,9 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		nss
 PKG_VERSION:=		3.12.9
 PKG_RELEASE:=		1
+PKG_MAJ_VERSION:=	3
+PKG_MIN_VERSION:=	12
+PKG_PATCH_VERSION:=	9
 PKG_MD5SUM:=		bd32f183ca28440c1744650be31a9ccc
 PKG_DESCR:=		Network Security Services (NSS) library
 PKG_SECTION:=		libs
@@ -37,16 +40,27 @@ TARGET_LDFLAGS+=	-ldl -pthread
 
 XAKE_FLAGS+=		SOURCE_MD_DIR=${WRKDIST}/dist DIST=${WRKDIST}/dist
 XAKE_FLAGS+=		ARCHFLAG="${TARGET_CFLAGS} ${TARGET_CPPFLAGS} ${TARGET_LDFLAGS}"
-XAKE_FLAGS+=		OS_TEST=${CPU_ARCH} NSS_DISABLE_DBM=1 OS_TARGET=Linux OS_RELEASE=2.6 OS_ARCH=Linux
+XAKE_FLAGS+=		NSS_DISABLE_DBM=1 OS_TEST=${CPU_ARCH} OS_TARGET=Linux OS_RELEASE=2.6 OS_ARCH=Linux
 XAKE_FLAGS+=		ARTOOL="${TARGET_CROSS}ar" RANLIB="${TARGET_CROSS}ranlib"
 ALL_TARGET:=		build_coreconf all
 
 post-install:
+	$(INSTALL_DIR) $(WRKINST)/usr/lib/pkgconfig
+	sed 's/@VERSION@/$(PKG_VERSION)/' ./files/nss.pc.in > $(WRKINST)/usr/lib/pkgconfig/nss.pc
+	$(INSTALL_DIR) $(WRKINST)/usr/bin
+	sed -e 's/@MOD_MAJOR_VERSION@/$(PKG_MAJ_VERSION)/' \
+		-e 's/@MOD_MINOR_VERSION@/$(PKG_MIN_VERSION)/' \
+		-e 's/@MOD_PATCH_VERSION@/$(PKG_PATCH_VERSION)/' \
+		./files/nss-config.in > $(WRKINST)/usr/bin/nss-config
 	$(INSTALL_DIR) $(IDIR_NSS)/usr/lib
 	${INSTALL_DATA} ${WRKDIST}/dist/lib/lib{ssl3,smime3,nss3,nssutil3}.so \
 		$(IDIR_NSS)/usr/lib
 	${INSTALL_DIR} ${STAGING_TARGET_DIR}/usr/include/nss
 	${INSTALL_DATA} ${WRKDIST}/mozilla/dist/public/nss/* \
 		${STAGING_TARGET_DIR}/usr/include/nss
+	# needed for firefox 4
+	${INSTALL_DIR} ${STAGING_TARGET_DIR}/usr/lib
+	$(INSTALL_DATA) ${WRKDIST}/dist/lib/libcrmf.a \
+		${STAGING_TARGET_DIR}/usr/lib
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/nss/files/nss-config.in b/package/nss/files/nss-config.in
new file mode 100644
index 000000000..d47cddc06
--- /dev/null
+++ b/package/nss/files/nss-config.in
@@ -0,0 +1,145 @@
+#!/bin/sh
+
+prefix=/usr
+
+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=${prefix}
+fi
+if test -z "$includedir"; then
+    includedir=${prefix}/include/nss
+fi
+if test -z "$libdir"; then
+    libdir=${exec_prefix}/lib
+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="-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 --git a/package/nss/files/nss.pc.in b/package/nss/files/nss.pc.in
new file mode 100644
index 000000000..e27783f64
--- /dev/null
+++ b/package/nss/files/nss.pc.in
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include/nss
+
+Name: NSS
+Description: Mozilla Network Security Services
+Version: @VERSION@
+Requires: nspr
+Libs: -L${libdir} -lnss3 -lnssutil3 -lsmime3 -lssl3
+Cflags: -I${includedir}