Date: Fri, 20 Mar 2015 07:25:44 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r381715 - in head: Mk net/libilbc net/libsrtp net/syncthing security/libzrtpcppcore Message-ID: <201503200725.t2K7PiVj067543@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Fri Mar 20 07:25:43 2015 New Revision: 381715 URL: https://svnweb.freebsd.org/changeset/ports/381715 QAT: https://qat.redports.org/buildarchive/r381715/ Log: Default the WRKSRC to the proper extracted name for USE_GITHUB when GH_TAGNAME is defaulted to the new DISTVERSIONPREFIX/DISTVERSION/DISTVERSIONSUFFIX change in r381689. This actually fixes the build for sysutils/zfstools, broken in r381704. With hat: portmgr Modified: head/Mk/bsd.port.mk head/net/libilbc/Makefile head/net/libsrtp/Makefile head/net/syncthing/Makefile head/security/libzrtpcppcore/Makefile Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Fri Mar 20 07:21:20 2015 (r381714) +++ head/Mk/bsd.port.mk Fri Mar 20 07:25:43 2015 (r381715) @@ -1554,7 +1554,11 @@ WRKDIR?= ${WRKDIRPREFIX}${.CURDIR}/work . if defined(GH_COMMIT) WRKSRC?= ${WRKDIR}/${GH_ACCOUNT}-${GH_PROJECT}-${GH_COMMIT} . else +. if defined(GH_TAGNAME) WRKSRC?= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME} +. else +WRKSRC?= ${WRKDIR}/${GH_PROJECT}-${DISTVERSION} +. endif . endif .endif .if defined(NO_WRKSUBDIR) Modified: head/net/libilbc/Makefile ============================================================================== --- head/net/libilbc/Makefile Fri Mar 20 07:21:20 2015 (r381714) +++ head/net/libilbc/Makefile Fri Mar 20 07:25:43 2015 (r381715) @@ -15,7 +15,6 @@ CONFLICTS= ilbc-r[0-9]* USE_GITHUB= yes GH_ACCOUNT= TimothyGu -WRKSRC= ${WRKDIR}/${GH_PROJECT}-${DISTVERSION} USES= cmake USE_LDCONFIG= yes Modified: head/net/libsrtp/Makefile ============================================================================== --- head/net/libsrtp/Makefile Fri Mar 20 07:21:20 2015 (r381714) +++ head/net/libsrtp/Makefile Fri Mar 20 07:25:43 2015 (r381715) @@ -15,7 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USE_GITHUB= yes GH_ACCOUNT= cisco -WRKSRC= ${WRKDIR}/${GH_PROJECT}-${DISTVERSION} GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-openssl Modified: head/net/syncthing/Makefile ============================================================================== --- head/net/syncthing/Makefile Fri Mar 20 07:21:20 2015 (r381714) +++ head/net/syncthing/Makefile Fri Mar 20 07:25:43 2015 (r381715) @@ -19,8 +19,6 @@ PORTDOCS= * USERS= syncthing GROUPS= syncthing -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} - STRIP= # stripping can break go binaries post-patch: Modified: head/security/libzrtpcppcore/Makefile ============================================================================== --- head/security/libzrtpcppcore/Makefile Fri Mar 20 07:21:20 2015 (r381714) +++ head/security/libzrtpcppcore/Makefile Fri Mar 20 07:25:43 2015 (r381715) @@ -15,7 +15,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING USE_GITHUB= yes GH_ACCOUNT= wernerd GH_PROJECT= ZRTPCPP -WRKSRC= ${WRKDIR}/${GH_PROJECT}-${DISTVERSION} USES= cmake:outsource CMAKE_ARGS= -DCORE_LIB=true
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503200725.t2K7PiVj067543>