[SVN-Commit] r1278 - in trunk/security/nss: . files

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Wed Jul 10 12:19:22 2013
New Revision: 1278

Log:
- make nss-config provide patch version after r1155
- get rid of one more useless macro

Modified:
   trunk/security/nss/Makefile
   trunk/security/nss/files/nss-config.in

Modified: trunk/security/nss/Makefile
==============================================================================
--- trunk/security/nss/Makefile	Thu Jul  4 00:51:07 2013	(r1277)
+++ trunk/security/nss/Makefile	Wed Jul 10 12:19:22 2013	(r1278)
@@ -28,8 +28,7 @@
 CFLAGS+=	-I${LOCALBASE}/include/nspr
 
 SUB_FILES=	nss-config nss.pc
-SUB_LIST=	MAJOR_VERSION=${PORTVERSION:R:R} \
-		PORTVERSION=${PORTVERSION}
+SUB_LIST=	PORTVERSION=${PORTVERSION}
 
 DIST=		${WRKSRC:H}/dist
 

Modified: trunk/security/nss/files/nss-config.in
==============================================================================
--- trunk/security/nss/files/nss-config.in	Thu Jul  4 00:51:07 2013	(r1277)
+++ trunk/security/nss/files/nss-config.in	Wed Jul 10 12:19:22 2013	(r1278)
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 prefix=%%PREFIX%%
+version=%%PORTVERSION%%
 
 usage()
 {
@@ -64,7 +65,11 @@
       echo_libdir=yes
       ;;
     --version)
-      echo %%PORTVERSION%%
+      case $version in
+      *.*.*) echo $version ;;
+      *.*) echo $version.0 ;;
+      *) echo $version.0.0 ;;
+      esac
       ;;
     --cflags)
       echo_cflags=yes
@@ -125,16 +130,16 @@
 if test "$echo_libs" = "yes"; then
       libdirs="-L$libdir"
       if test -n "$lib_ssl"; then
-	libdirs="$libdirs -lssl%%MAJOR_VERSION%%"
+	libdirs="$libdirs -lssl3"
       fi
       if test -n "$lib_smime"; then
-	libdirs="$libdirs -lsmime%%MAJOR_VERSION%%"
+	libdirs="$libdirs -lsmime3"
       fi
       if test -n "$lib_nss"; then
-	libdirs="$libdirs -lnss%%MAJOR_VERSION%%"
+	libdirs="$libdirs -lnss3"
       fi
       if test -n "$lib_nssutil"; then
-	libdirs="$libdirs -lnssutil%%MAJOR_VERSION%%"
+	libdirs="$libdirs -lnssutil3"
       fi
       echo $libdirs
 fi