diff options
| author | Li-Wen Hsu <lwhsu@FreeBSD.org> | 2020-02-07 13:33:36 +0000 |
|---|---|---|
| committer | Li-Wen Hsu <lwhsu@FreeBSD.org> | 2020-02-07 13:33:36 +0000 |
| commit | c94236cf7e4f6f687cdf7fb58c7b9a4279684bb7 (patch) | |
| tree | bd3bf7fa20d55e961f2514bf2eb875195cb55e07 | |
| parent | Reduce the duplicated 'nss' in include and lib path (diff) | |
Followup security/nss installation path modification in r525484
PR: 243835
Notes
Notes:
svn path=/head/; revision=525485
| -rw-r--r-- | net-im/libpurple/Makefile | 6 | ||||
| -rw-r--r-- | security/pidgin-encryption/Makefile | 6 | ||||
| -rw-r--r-- | security/py-python-nss/Makefile | 7 |
3 files changed, 8 insertions, 11 deletions
diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile index 84ca73468845..15f03796f8ab 100644 --- a/net-im/libpurple/Makefile +++ b/net-im/libpurple/Makefile @@ -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 diff --git a/security/pidgin-encryption/Makefile b/security/pidgin-encryption/Makefile index 1fa64d4c0e20..519bbba9427f 100644 --- a/security/pidgin-encryption/Makefile +++ b/security/pidgin-encryption/Makefile @@ -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 diff --git a/security/py-python-nss/Makefile b/security/py-python-nss/Makefile index a88e2dbb7eb2..2ea51ee05cee 100644 --- a/security/py-python-nss/Makefile +++ b/security/py-python-nss/Makefile @@ -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,13 +22,10 @@ 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 DO_MAKE_TEST= ${SETENV} ${TEST_ENV} ${PYTHON_CMD} run_tests -t |