From owner-svn-ports-head@FreeBSD.ORG Fri Mar 20 07:25:46 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 91ED07AD; Fri, 20 Mar 2015 07:25:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 72715E95; Fri, 20 Mar 2015 07:25:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2K7PkPL067553; Fri, 20 Mar 2015 07:25:46 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2K7PiVj067543; Fri, 20 Mar 2015 07:25:44 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201503200725.t2K7PiVj067543@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Fri, 20 Mar 2015 07:25:44 +0000 (UTC) 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 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Mar 2015 07:25:46 -0000 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