Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 7 Feb 2020 13:33:36 +0000 (UTC)
From:      Li-Wen Hsu <lwhsu@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r525485 - in head: net-im/libpurple security/pidgin-encryption security/py-python-nss
Message-ID:  <202002071333.017DXa0g007601@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: lwhsu
Date: Fri Feb  7 13:33:36 2020
New Revision: 525485
URL: https://svnweb.freebsd.org/changeset/ports/525485

Log:
  Followup security/nss installation path modification in r525484
  
  PR:		243835

Modified:
  head/net-im/libpurple/Makefile
  head/security/pidgin-encryption/Makefile
  head/security/py-python-nss/Makefile

Modified: head/net-im/libpurple/Makefile
==============================================================================
--- head/net-im/libpurple/Makefile	Fri Feb  7 13:32:00 2020	(r525484)
+++ head/net-im/libpurple/Makefile	Fri Feb  7 13:33:36 2020	(r525485)
@@ -3,7 +3,7 @@
 
 PORTNAME?=	libpurple
 PORTVERSION=	2.13.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES?=	net-im
 MASTER_SITES=	SF/pidgin/Pidgin/${PORTVERSION}
 DISTNAME=	pidgin-${PORTVERSION}
@@ -178,8 +178,8 @@ LIB_DEPENDS+=		libnss3.so:security/nss
 CONFIGURE_ARGS+=	--enable-nss=yes \
 			--with-nspr-includes=${LOCALBASE}/include/nspr \
 			--with-nspr-libs=${LOCALBASE}/lib \
-			--with-nss-includes=${LOCALBASE}/include/nss/nss \
-			--with-nss-libs=${LOCALBASE}/lib/nss
+			--with-nss-includes=${LOCALBASE}/include/nss \
+			--with-nss-libs=${LOCALBASE}/lib
 PLIST_SUB+=		NSS=""
 .else
 CONFIGURE_ARGS+=	--enable-nss=no

Modified: head/security/pidgin-encryption/Makefile
==============================================================================
--- head/security/pidgin-encryption/Makefile	Fri Feb  7 13:32:00 2020	(r525484)
+++ head/security/pidgin-encryption/Makefile	Fri Feb  7 13:33:36 2020	(r525485)
@@ -3,7 +3,7 @@
 
 PORTNAME=	pidgin
 PORTVERSION=	3.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	security
 MASTER_SITES=	SF/${PORTNAME}-encrypt/Releases/${PORTVERSION}
 PKGNAMESUFFIX=	-encryption
@@ -21,8 +21,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static \
 		--with-nspr-includes=${LOCALBASE}/include/nspr	\
 		--with-nspr-libs=${LOCALBASE}/lib	\
-		--with-nss-includes=${LOCALBASE}/include/nss/nss \
-		--with-nss-libs=${LOCALBASE}/lib/nss
+		--with-nss-includes=${LOCALBASE}/include/nss \
+		--with-nss-libs=${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip

Modified: head/security/py-python-nss/Makefile
==============================================================================
--- head/security/py-python-nss/Makefile	Fri Feb  7 13:32:00 2020	(r525484)
+++ head/security/py-python-nss/Makefile	Fri Feb  7 13:33:36 2020	(r525485)
@@ -2,7 +2,7 @@
 
 PORTNAME=	python-nss
 PORTVERSION=	1.0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -22,12 +22,9 @@ LIB_DEPENDS=	libnspr4.so:devel/nspr \
 USES=		compiler:c11 python tar:bzip2
 USE_PYTHON=	autoplist distutils
 
-PYDISTUTILS_CONFIGUREARGS=	--include-root="${LOCALBASE}/include" \
-				--include-root="${LOCALBASE}/include/nss"
+PYDISTUTILS_CONFIGUREARGS=	--include-root="${LOCALBASE}/include"
 PYDISTUTILS_BUILDARGS=		${PYDISTUTILS_CONFIGUREARGS}
 PYDISTUTILS_INSTALLARGS=	-c -O1 --prefix=${PREFIX} ${PYDISTUTILS_CONFIGUREARGS}
-
-LDFLAGS+=	-L${LOCALBASE}/lib/nss
 
 TEST_TARGET=	# empty
 TEST_WRKSRC=	${WRKSRC}/test



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002071333.017DXa0g007601>