From owner-freebsd-gecko@FreeBSD.ORG  Wed Jul 10 12:19:30 2013
Return-Path: <owner-freebsd-gecko@FreeBSD.ORG>
Delivered-To: freebsd-gecko@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 355393F5
 for <freebsd-gecko@freebsd.org>; Wed, 10 Jul 2013 12:19:30 +0000 (UTC)
 (envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: from trillian.chruetertee.ch (trillian.chruetertee.ch
 [217.150.245.56])
 by mx1.freebsd.org (Postfix) with ESMTP id AAD151A00
 for <freebsd-gecko@freebsd.org>; Wed, 10 Jul 2013 12:19:29 +0000 (UTC)
Received: from trillian.chruetertee.ch (trillian [217.150.245.56])
 by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r6ACJRdl037145
 for <freebsd-gecko@freebsd.org>; Wed, 10 Jul 2013 12:19:27 GMT
 (envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: (from www@localhost)
 by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r6ACJMYu036737
 for freebsd-gecko@freebsd.org; Wed, 10 Jul 2013 12:19:22 GMT
 (envelope-from svn-freebsd-gecko@chruetertee.ch)
Date: Wed, 10 Jul 2013 12:19:22 GMT
Message-Id: <201307101219.r6ACJMYu036737@trillian.chruetertee.ch>
X-Authentication-Warning: trillian.chruetertee.ch: www set sender to
 svn-freebsd-gecko@chruetertee.ch using -f
From: svn-freebsd-gecko@chruetertee.ch
To: freebsd-gecko@freebsd.org
Subject: [SVN-Commit] r1278 - in trunk/security/nss: . files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: freebsd-gecko@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: freebsd-gecko@freebsd.org
List-Id: Gecko Rendering Engine issues <freebsd-gecko.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-gecko>,
 <mailto:freebsd-gecko-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-gecko>
List-Post: <mailto:freebsd-gecko@freebsd.org>
List-Help: <mailto:freebsd-gecko-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gecko>,
 <mailto:freebsd-gecko-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Jul 2013 12:19:30 -0000

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