From owner-svn-ports-all@freebsd.org Fri Feb 7 13:33:37 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 27AE124CE0E; Fri, 7 Feb 2020 13:33:37 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48Dbq50CvLz4YZ5; Fri, 7 Feb 2020 13:33:37 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 02A89567C; Fri, 7 Feb 2020 13:33:37 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 017DXafp007606; Fri, 7 Feb 2020 13:33:36 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 017DXa0g007601; Fri, 7 Feb 2020 13:33:36 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <202002071333.017DXa0g007601@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Fri, 7 Feb 2020 13:33:36 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: lwhsu X-SVN-Commit-Paths: in head: net-im/libpurple security/pidgin-encryption security/py-python-nss X-SVN-Commit-Revision: 525485 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Feb 2020 13:33:37 -0000 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