Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 3 Jan 2017 18:12:13 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r430490 - in head: audio/asterisk-espeak audio/puddletag biology/fastool biology/p5-transdecoder cad/linuxcnc-devel cad/openvsp databases/postgresql-plv8js devel/dbus-sharp-glib devel/i...
Message-ID:  <201701031812.v03ICDHl023299@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mat
Date: Tue Jan  3 18:12:13 2017
New Revision: 430490
URL: https://svnweb.freebsd.org/changeset/ports/430490

Log:
  Never set WRKSRC when using USE_GITHUB.
  
  If you want to set WRKSRC, set GH_PROJECT instead.
  - The GitHub URLs are case insensitive, but the distribution files you
    get out of them are not.
  - If the repository was renamed, the old URL will still work, but the
    distribution name will be ith the new name.
  
  Sponsored by:	Absolight

Modified:
  head/audio/asterisk-espeak/Makefile   (contents, props changed)
  head/audio/asterisk-espeak/distinfo   (contents, props changed)
  head/audio/puddletag/Makefile   (contents, props changed)
  head/biology/fastool/Makefile   (contents, props changed)
  head/biology/p5-transdecoder/Makefile   (contents, props changed)
  head/cad/linuxcnc-devel/Makefile   (contents, props changed)
  head/cad/openvsp/Makefile   (contents, props changed)
  head/databases/postgresql-plv8js/Makefile   (contents, props changed)
  head/databases/postgresql-plv8js/distinfo   (contents, props changed)
  head/devel/dbus-sharp-glib/Makefile   (contents, props changed)
  head/devel/ice/Makefile   (contents, props changed)
  head/devel/ice/distinfo   (contents, props changed)
  head/devel/lua-alien/Makefile   (contents, props changed)
  head/devel/monodevelop/Makefile   (contents, props changed)
  head/devel/py-protobuf/Makefile   (contents, props changed)
  head/devel/tcllib/Makefile   (contents, props changed)
  head/games/pyfa/Makefile   (contents, props changed)
  head/games/pyfa/distinfo   (contents, props changed)
  head/graphics/iiview/Makefile   (contents, props changed)
  head/graphics/qtawesome/Makefile   (contents, props changed)
  head/lang/micropython/Makefile   (contents, props changed)
  head/math/arpack-ng/Makefile   (contents, props changed)
  head/misc/bdelta/Makefile   (contents, props changed)
  head/multimedia/plexhometheater/Makefile   (contents, props changed)
  head/multimedia/zoneminder-h264/Makefile   (contents, props changed)
  head/multimedia/zoneminder-h264/distinfo   (contents, props changed)
  head/multimedia/zoneminder/Makefile   (contents, props changed)
  head/multimedia/zoneminder/distinfo   (contents, props changed)
  head/net-im/openfire/Makefile   (contents, props changed)
  head/net-im/openfire/distinfo   (contents, props changed)
  head/net-mgmt/glpi-plugins-fusioninventory-server/Makefile   (contents, props changed)
  head/net/dgd/Makefile   (contents, props changed)
  head/net/dhcpd/Makefile   (contents, props changed)
  head/net/google-daemon/Makefile   (contents, props changed)
  head/net/google-startup-scripts/Makefile   (contents, props changed)
  head/net/xorp/Makefile   (contents, props changed)
  head/science/py-pydicom/Makefile   (contents, props changed)
  head/security/easy-rsa2/Makefile   (contents, props changed)
  head/sysutils/fusefs-s3fs/Makefile   (contents, props changed)
  head/sysutils/fusefs-s3fs/distinfo   (contents, props changed)
  head/sysutils/hfsexplorer/Makefile   (contents, props changed)
  head/sysutils/qtpass/Makefile   (contents, props changed)
  head/sysutils/qtpass/distinfo   (contents, props changed)
  head/textproc/libfo/Makefile   (contents, props changed)
  head/textproc/py-ucl/Makefile   (contents, props changed)
  head/textproc/xmlroff/Makefile   (contents, props changed)
  head/www/ach/Makefile   (contents, props changed)
  head/www/codeigniter/Makefile   (contents, props changed)
  head/www/codeigniter/distinfo   (contents, props changed)
  head/www/ilias/Makefile   (contents, props changed)
  head/www/mod_webkit/Makefile   (contents, props changed)
  head/www/obhttpd/Makefile   (contents, props changed)
  head/www/py-WebTest/Makefile   (contents, props changed)
  head/www/py-WebTest/distinfo   (contents, props changed)
  head/www/slowcgi/Makefile   (contents, props changed)
  head/www/smarty3/Makefile   (contents, props changed)
  head/x11/cinnamon/Makefile   (contents, props changed)
  head/x11/cinnamon/distinfo   (contents, props changed)

Modified: head/audio/asterisk-espeak/Makefile
==============================================================================
--- head/audio/asterisk-espeak/Makefile	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/audio/asterisk-espeak/Makefile	Tue Jan  3 18:12:13 2017	(r430490)
@@ -15,11 +15,10 @@ LIB_DEPENDS=	libespeak.so:audio/espeak \
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	zaf
-GH_PROJECT=	Asterisk-Espeak
+GH_PROJECT=	Asterisk-eSpeak
 
 USES=		compiler gmake localbase
 INSTALL_TARGET=	install samples
-WRKSRC=		${WRKDIR}/Asterisk-eSpeak-${PORTVERSION}
 
 OPTIONS_SINGLE=		ASTVER
 OPTIONS_SINGLE_ASTVER=	ASTERISK11 ASTERISK13

Modified: head/audio/asterisk-espeak/distinfo
==============================================================================
--- head/audio/asterisk-espeak/distinfo	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/audio/asterisk-espeak/distinfo	Tue Jan  3 18:12:13 2017	(r430490)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1474384491
-SHA256 (zaf-Asterisk-Espeak-v3.0_GH0.tar.gz) = 47c7629853ad54a2f3b50a5407db356ab7806f5fa40f9811a129208d6eeec398
-SIZE (zaf-Asterisk-Espeak-v3.0_GH0.tar.gz) = 13758
+TIMESTAMP = 1483464333
+SHA256 (zaf-Asterisk-eSpeak-v3.0_GH0.tar.gz) = 47c7629853ad54a2f3b50a5407db356ab7806f5fa40f9811a129208d6eeec398
+SIZE (zaf-Asterisk-eSpeak-v3.0_GH0.tar.gz) = 13758

Modified: head/audio/puddletag/Makefile
==============================================================================
--- head/audio/puddletag/Makefile	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/audio/puddletag/Makefile	Tue Jan  3 18:12:13 2017	(r430490)
@@ -23,7 +23,7 @@ GH_ACCOUNT=	keithgg
 USES=		python:2 pyqt:4
 USE_PYTHON=	autoplist distutils
 USE_PYQT=	gui_run svg_run
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/source
+WRKSRC_SUBDIR=	source
 NO_BUILD=	yes
 NO_ARCH=	yes
 

Modified: head/biology/fastool/Makefile
==============================================================================
--- head/biology/fastool/Makefile	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/biology/fastool/Makefile	Tue Jan  3 18:12:13 2017	(r430490)
@@ -14,8 +14,6 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	fstrozzi
 GH_PROJECT=	Fastool
 
-WRKSRC=		${WRKDIR}/Fastool-${PORTVERSION}
-
 PLIST_FILES=	bin/fastool
 
 CFLAGS+=	-std=c99

Modified: head/biology/p5-transdecoder/Makefile
==============================================================================
--- head/biology/p5-transdecoder/Makefile	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/biology/p5-transdecoder/Makefile	Tue Jan  3 18:12:13 2017	(r430490)
@@ -26,8 +26,6 @@ SHEBANG_FILES=	sample_data/cufflinks_exa
 USE_GITHUB=	yes
 GH_PROJECT=	TransDecoder
 
-WRKSRC=		${WRKDIR}/${GH_PROJECT}-${PORTVERSION}
-
 PERL_MOD_DIR=	${PREFIX}/${SITE_PERL_REL}/${PORTNAME}
 PERL_UTIL_DIR=	${PREFIX}/libexec/${PORTNAME}
 

Modified: head/cad/linuxcnc-devel/Makefile
==============================================================================
--- head/cad/linuxcnc-devel/Makefile	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/cad/linuxcnc-devel/Makefile	Tue Jan  3 18:12:13 2017	(r430490)
@@ -1,10 +1,11 @@
 # Created by: Edward Tomasz Napierala <trasz@FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=	linuxcnc-devel
+PORTNAME=	linuxcnc
 PORTVERSION=	20160626
 PORTREVISION=	1
 CATEGORIES=	cad
+PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	trasz@FreeBSD.org
 COMMENT=	Open Source CNC machine controller
@@ -30,7 +31,7 @@ BUILD_DEPENDS=	${RUN_DEPENDS}
 
 NO_PACKAGE=	Licensing conflict between LinuxCNC (GPL2) and readline (GPL3)
 
-WRKSRC=		${WRKDIR}/linuxcnc-${GH_TAGNAME}/src
+WRKSRC_SUBDIR=		src
 PATCH_WRKSRC=	${WRKDIR}/linuxcnc-${GH_TAGNAME}
 ALL_TARGET=	default
 
@@ -47,7 +48,6 @@ USE_XORG=	ice sm x11 xext xft xinerama x
 USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	LinuxCNC
-GH_PROJECT=	linuxcnc
 GH_TAGNAME=	fe7b155c03fe77d6eb301bcfdc3d7c1acdea73e4
 
 post-patch:

Modified: head/cad/openvsp/Makefile
==============================================================================
--- head/cad/openvsp/Makefile	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/cad/openvsp/Makefile	Tue Jan  3 18:12:13 2017	(r430490)
@@ -33,8 +33,6 @@ USE_GITHUB=	yes
 GH_PROJECT=	OpenVSP
 GH_ACCOUNT=	${GH_PROJECT}
 
-WRKSRC=		${WRKDIR}/${GH_PROJECT}-${GH_PROJECT}_${PORTVERSION}
-
 CMAKE_SOURCE_PATH=	${WRKSRC}/SuperProject
 CMAKE_INSTALL_PREFIX=	${STAGEDIR}${PREFIX}
 USES=		cmake:outsource compiler:gcc-c++11-lib jpeg

Modified: head/databases/postgresql-plv8js/Makefile
==============================================================================
--- head/databases/postgresql-plv8js/Makefile	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/databases/postgresql-plv8js/Makefile	Tue Jan  3 18:12:13 2017	(r430490)
@@ -1,11 +1,12 @@
 # Created by: vanilla@
 # $FreeBSD$
 
-PORTNAME=	plv8js
+PORTNAME=	plv8
 PORTVERSION=	1.4.8
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 PKGNAMEPREFIX=	postgresql${PGSQL_VER:S/.//}-
+PKGNAMESUFFIX=	js
 
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	PL/v8js procedural language for PostgreSQL database
@@ -14,11 +15,9 @@ LICENSE=	PostgreSQL
 
 LIB_DEPENDS+=	libv8.so:lang/v8
 
-WRKSRC=		${WRKDIR}/plv8-${PORTVERSION}
 USES=		compiler:c++11-lang gmake perl5 pgsql:9.1+
 USE_PERL5=	build
 USE_GITHUB=	yes
-GH_ACCOUNT=	plv8
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
 .include <bsd.port.mk>

Modified: head/databases/postgresql-plv8js/distinfo
==============================================================================
--- head/databases/postgresql-plv8js/distinfo	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/databases/postgresql-plv8js/distinfo	Tue Jan  3 18:12:13 2017	(r430490)
@@ -1,2 +1,3 @@
-SHA256 (plv8-plv8js-v1.4.8_GH0.tar.gz) = 485c4bb02cc4e7300d249d9ec0dc2be8f7f6b69ded0fd91ba4f7a4ed90ad384a
-SIZE (plv8-plv8js-v1.4.8_GH0.tar.gz) = 155736
+TIMESTAMP = 1483464767
+SHA256 (plv8-plv8-v1.4.8_GH0.tar.gz) = 485c4bb02cc4e7300d249d9ec0dc2be8f7f6b69ded0fd91ba4f7a4ed90ad384a
+SIZE (plv8-plv8-v1.4.8_GH0.tar.gz) = 155736

Modified: head/devel/dbus-sharp-glib/Makefile
==============================================================================
--- head/devel/dbus-sharp-glib/Makefile	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/devel/dbus-sharp-glib/Makefile	Tue Jan  3 18:12:13 2017	(r430490)
@@ -14,10 +14,8 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgcon
 USES=		gmake pathfix pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	mono
-GH_PROJECT=	dbus-sharp
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_path_GMCS=${LOCALBASE}/bin/mcs
-WRKSRC=		${WRKDIR}/${DISTNAME}
 
 .include <bsd.port.mk>

Modified: head/devel/ice/Makefile
==============================================================================
--- head/devel/ice/Makefile	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/devel/ice/Makefile	Tue Jan  3 18:12:13 2017	(r430490)
@@ -35,8 +35,6 @@ USES+=			python:build
 BUILD_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}passlib>0:security/py-passlib
 .endif
 
-WRKSRC=			${WRKDIR}/ice-${PORTVERSION}
-
 USES+=			bdb:5
 INVALID_BDB_VER=	48 6
 USE_LDCONFIG=		yes
@@ -44,7 +42,7 @@ BUILD_WRKSRC?=		${WRKSRC}/cpp
 INSTALL_WRKSRC?=	${WRKSRC}/cpp
 USE_GITHUB=		yes
 GH_ACCOUNT=		zeroc-ice
-
+GH_PROJECT=		ice
 
 CFLAGS+=		-ftemplate-depth-128 -fPIC -DPIC -Wall -D_REENTRANT -I${LOCALBASE}/include
 

Modified: head/devel/ice/distinfo
==============================================================================
--- head/devel/ice/distinfo	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/devel/ice/distinfo	Tue Jan  3 18:12:13 2017	(r430490)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1476218141
-SHA256 (zeroc-ice-Ice-v3.6.3_GH0.tar.gz) = 82ff74e6d24d9fa396dbb4d9697dc183b17bc9c3f6f076fecdc05632be80a2dc
-SIZE (zeroc-ice-Ice-v3.6.3_GH0.tar.gz) = 5512741
+TIMESTAMP = 1483464992
+SHA256 (zeroc-ice-ice-v3.6.3_GH0.tar.gz) = 82ff74e6d24d9fa396dbb4d9697dc183b17bc9c3f6f076fecdc05632be80a2dc
+SIZE (zeroc-ice-ice-v3.6.3_GH0.tar.gz) = 5512741

Modified: head/devel/lua-alien/Makefile
==============================================================================
--- head/devel/lua-alien/Makefile	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/devel/lua-alien/Makefile	Tue Jan  3 18:12:13 2017	(r430490)
@@ -14,8 +14,6 @@ LICENSE=	MIT
 
 LIB_DEPENDS=	libffi.so:devel/libffi
 
-WRKSRC=		${WRKDIR}/${DISTNAME}
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	mascarenhas
 

Modified: head/devel/monodevelop/Makefile
==============================================================================
--- head/devel/monodevelop/Makefile	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/devel/monodevelop/Makefile	Tue Jan  3 18:12:13 2017	(r430490)
@@ -63,7 +63,7 @@ INSTALLS_ICONS=	yes
 
 INSTALL_TARGET=	install-strip
 MAKE_JOBS_UNSAFE=	Build parallelization not implemented
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTNAME}-${PORTVERSION}/main
+WRKSRC_SUBDIR=		main
 PORTSCOUT=	limit:^\d+\.\d+\.[1-9]\d*
 
 post-extract:

Modified: head/devel/py-protobuf/Makefile
==============================================================================
--- head/devel/py-protobuf/Makefile	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/devel/py-protobuf/Makefile	Tue Jan  3 18:12:13 2017	(r430490)
@@ -21,7 +21,7 @@ NO_ARCH=	yes
 TEST_TARGET=	test
 USE_PYTHON=	autoplist distutils
 USES=		python
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/python
+WRKSRC_SUBDIR=	python
 
 GH_ACCOUNT=	google
 USE_GITHUB=	yes

Modified: head/devel/tcllib/Makefile
==============================================================================
--- head/devel/tcllib/Makefile	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/devel/tcllib/Makefile	Tue Jan  3 18:12:13 2017	(r430490)
@@ -18,7 +18,6 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg
 OPTIONS_DEFINE?=DOCS MANPAGES
 OPTIONS_SUB=	yes
 
-WRKSRC=		${WRKDIR}/tcllib-tcllib_${DISTVERSION}
 USE_GITHUB=	yes
 GH_ACCOUNT=	tcltk
 USES+=		tcl

Modified: head/games/pyfa/Makefile
==============================================================================
--- head/games/pyfa/Makefile	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/games/pyfa/Makefile	Tue Jan  3 18:12:13 2017	(r430490)
@@ -19,11 +19,11 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}date
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	pyfa-org
+GH_PROJECT=	Pyfa
 
 USES=		python:2 dos2unix
 DOS2UNIX_GLOB=	*.py
 NO_ARCH=	yes
-WRKSRC=		${WRKDIR}/Pyfa-${PORTVERSION}
 
 PLIST_FILES=	bin/pyfa
 PORTDATA=	*

Modified: head/games/pyfa/distinfo
==============================================================================
--- head/games/pyfa/distinfo	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/games/pyfa/distinfo	Tue Jan  3 18:12:13 2017	(r430490)
@@ -1,2 +1,3 @@
-SHA256 (pyfa-org-pyfa-v1.19.1_GH0.tar.gz) = f597019117b335971287fd47c1faa5be049f8a6879d4144b6c8a0039f35cea98
-SIZE (pyfa-org-pyfa-v1.19.1_GH0.tar.gz) = 6688136
+TIMESTAMP = 1483465523
+SHA256 (pyfa-org-Pyfa-v1.19.1_GH0.tar.gz) = f597019117b335971287fd47c1faa5be049f8a6879d4144b6c8a0039f35cea98
+SIZE (pyfa-org-Pyfa-v1.19.1_GH0.tar.gz) = 6688136

Modified: head/graphics/iiview/Makefile
==============================================================================
--- head/graphics/iiview/Makefile	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/graphics/iiview/Makefile	Tue Jan  3 18:12:13 2017	(r430490)
@@ -19,7 +19,6 @@ USE_XORG=	xpm x11
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	nakal
-WRKSRC=		${WRKDIR}/iiview-${PORTVERSION}
 
 PLIST_FILES=	bin/iiview man/man1/iiview.1.gz
 

Modified: head/graphics/qtawesome/Makefile
==============================================================================
--- head/graphics/qtawesome/Makefile	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/graphics/qtawesome/Makefile	Tue Jan  3 18:12:13 2017	(r430490)
@@ -25,7 +25,7 @@ QT4_USE=	qt4=corelib,gui,qmake_build,moc
 QT5_USE=	qt5=core,gui,qmake_build,buildtools_build
 MAKE_ARGS+=	${PORT_OPTIONS:MQT*:S/QT/QT=/}
 
-WRKSRC=	${WRKDIR}/QtAwesome-${GH_TAGNAME}/QtAwesome
+WRKSRC_SUBDIR=	QtAwesome
 #MAKEFILE=	${FILESDIR}/BSDmakefile
 EXTRACT_AFTER_ARGS=--no-same-owner --no-same-permissions	\
 		--exclude QtAwesomeSample --exclude fonts

Modified: head/lang/micropython/Makefile
==============================================================================
--- head/lang/micropython/Makefile	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/lang/micropython/Makefile	Tue Jan  3 18:12:13 2017	(r430490)
@@ -19,7 +19,7 @@ USE_GITHUB=	yes
 
 PLIST_FILES=	bin/micropython
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/unix
+WRKSRC_SUBDIR=	unix
 
 SHEBANG_FILES=	../tools/make-frozen.py
 MAKE_ARGS+=	V=1

Modified: head/math/arpack-ng/Makefile
==============================================================================
--- head/math/arpack-ng/Makefile	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/math/arpack-ng/Makefile	Tue Jan  3 18:12:13 2017	(r430490)
@@ -31,8 +31,6 @@ CONFLICTS=	arpack-[0-9]*
 CONFLICTS_INSTALL?=	arpack-ng-mpich-3.*
 SLAVEDIRS=	math/arpack-ng-mpich
 
-WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 OPTIONS_DEFINE=	DOCS EXAMPLES
 OPTIONS_SUB=	yes
 

Modified: head/misc/bdelta/Makefile
==============================================================================
--- head/misc/bdelta/Makefile	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/misc/bdelta/Makefile	Tue Jan  3 18:12:13 2017	(r430490)
@@ -11,7 +11,7 @@ COMMENT=	Advanced delta creator, patcher
 
 LICENSE=	MPL
 
-WRKSRC=		${WRKDIR}/BDelta-${PORTVERSION}/src
+WRKSRC_SUBDIR=	src
 
 USES=		gmake
 USE_LDCONFIG=	yes

Modified: head/multimedia/plexhometheater/Makefile
==============================================================================
--- head/multimedia/plexhometheater/Makefile	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/multimedia/plexhometheater/Makefile	Tue Jan  3 18:12:13 2017	(r430490)
@@ -86,8 +86,6 @@ ONLY_FOR_ARCHS=	i386 amd64
 PLEX_ARCH_i386=	x86
 PLEX_ARCH_amd64=x86_64
 
-WRKSRC=		${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME_EXTRACT}
-
 SUB_FILES=	${PORTNAME}.sh pkg-message
 PLIST_SUB=	ARCH=${PLEX_ARCH_${ARCH}}
 

Modified: head/multimedia/zoneminder-h264/Makefile
==============================================================================
--- head/multimedia/zoneminder-h264/Makefile	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/multimedia/zoneminder-h264/Makefile	Tue Jan  3 18:12:13 2017	(r430490)
@@ -2,7 +2,6 @@
 
 PORTNAME=	zoneminder-h264
 PORTVERSION=	1.30.20161104
-DISTVERSIONSUFFIX=	a2f782d
 PORTREVISION=	1
 CATEGORIES=	multimedia
 
@@ -36,11 +35,9 @@ RUN_DEPENDS=	${ZM_DEPENDS} \
 		zip:archivers/zip
 
 USE_GITHUB=	yes
-GH_TUPLE=	zoneminder:zoneminder:a2f782d \
+GH_TUPLE=	zoneminder:ZoneMinder:a2f782d \
 		FriendsOfCake:crud:c3976f1:crud
 
-WRKSRC=		${WRKDIR}/ZoneMinder-${DISTVERSIONSUFFIX}
-
 USES=		cmake jpeg mysql perl5 php shebangfix ssl
 USE_RC_SUBR=	zoneminder
 USE_PHP=	json pdo_mysql session gd sockets

Modified: head/multimedia/zoneminder-h264/distinfo
==============================================================================
--- head/multimedia/zoneminder-h264/distinfo	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/multimedia/zoneminder-h264/distinfo	Tue Jan  3 18:12:13 2017	(r430490)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1478964450
-SHA256 (zoneminder-zoneminder-1.30.20161104a2f782d-a2f782d_GH0.tar.gz) = 8d5cca78c934833c2f62efa451dc3127af2add7d2947b56a0ff37501dc1b8a32
-SIZE (zoneminder-zoneminder-1.30.20161104a2f782d-a2f782d_GH0.tar.gz) = 9794587
+TIMESTAMP = 1483465799
+SHA256 (zoneminder-ZoneMinder-1.30.20161104-a2f782d_GH0.tar.gz) = 8d5cca78c934833c2f62efa451dc3127af2add7d2947b56a0ff37501dc1b8a32
+SIZE (zoneminder-ZoneMinder-1.30.20161104-a2f782d_GH0.tar.gz) = 9794587
 SHA256 (FriendsOfCake-crud-c3976f1_GH0.tar.gz) = 7dfa29dd6dd95f05bca61bb05033f813828b7ab66f9d8793d306df0dd72471ce
 SIZE (FriendsOfCake-crud-c3976f1_GH0.tar.gz) = 72961

Modified: head/multimedia/zoneminder/Makefile
==============================================================================
--- head/multimedia/zoneminder/Makefile	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/multimedia/zoneminder/Makefile	Tue Jan  3 18:12:13 2017	(r430490)
@@ -30,10 +30,8 @@ RUN_DEPENDS=	${ZM_DEPENDS} \
 		zip:archivers/zip
 
 USE_GITHUB=	yes
-GH_TUPLE=	zoneminder:zoneminder:${DISTVERSIONPREFIX}${PORTVERSION}${DISTVERSIONSUFFIX} \
-		FriendsOfCake:crud:c3976f1:crud
-
-WRKSRC=		${WRKDIR}/ZoneMinder-${DISTVERSION}${DISTVERSIONSUFFIX}
+GH_PROJECT=	ZoneMinder
+GH_TUPLE=	FriendsOfCake:crud:c3976f1:crud
 
 USES=		cmake jpeg mysql perl5 php shebangfix ssl
 USE_RC_SUBR=	zoneminder

Modified: head/multimedia/zoneminder/distinfo
==============================================================================
--- head/multimedia/zoneminder/distinfo	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/multimedia/zoneminder/distinfo	Tue Jan  3 18:12:13 2017	(r430490)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1470703313
-SHA256 (zoneminder-zoneminder-v1.30.0_GH0.tar.gz) = e7c964c339305f42a044ca8e34fa4e6a33c452fdaf33642458735daf8b864325
-SIZE (zoneminder-zoneminder-v1.30.0_GH0.tar.gz) = 9757409
+TIMESTAMP = 1483465871
+SHA256 (zoneminder-ZoneMinder-v1.30.0_GH0.tar.gz) = e7c964c339305f42a044ca8e34fa4e6a33c452fdaf33642458735daf8b864325
+SIZE (zoneminder-ZoneMinder-v1.30.0_GH0.tar.gz) = 9757409
 SHA256 (FriendsOfCake-crud-c3976f1_GH0.tar.gz) = 7dfa29dd6dd95f05bca61bb05033f813828b7ab66f9d8793d306df0dd72471ce
 SIZE (FriendsOfCake-crud-c3976f1_GH0.tar.gz) = 72961

Modified: head/net-im/openfire/Makefile
==============================================================================
--- head/net-im/openfire/Makefile	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/net-im/openfire/Makefile	Tue Jan  3 18:12:13 2017	(r430490)
@@ -17,6 +17,7 @@ RUN_DEPENDS=	slf4j>=1.7.7:devel/slf4j
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	igniterealtime
+GH_PROJECT=	Openfire
 
 OPTIONS_DEFINE=	DOCS PLUGINS
 OPTIONS_DEFAULT=PLUGINS
@@ -37,7 +38,6 @@ ALL_TARGET=	openfire
 USE_RC_SUBR=	openfire
 SUB_FILES+=	pkg-message
 
-WRKSRC=		${WRKDIR}/Openfire-${PORTVERSION}
 BUILD_WRKSRC=	${WRKSRC}/build
 INSTALL_WRKSRC=	${WRKSRC}/target/openfire
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}

Modified: head/net-im/openfire/distinfo
==============================================================================
--- head/net-im/openfire/distinfo	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/net-im/openfire/distinfo	Tue Jan  3 18:12:13 2017	(r430490)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1483374593
-SHA256 (igniterealtime-openfire-v4.1.1_GH0.tar.gz) = b597756f7edf41384e6875d638af30dce7fcb726b04812abc4f93703b6ddf6c9
-SIZE (igniterealtime-openfire-v4.1.1_GH0.tar.gz) = 100915344
+TIMESTAMP = 1483465979
+SHA256 (igniterealtime-Openfire-v4.1.1_GH0.tar.gz) = b597756f7edf41384e6875d638af30dce7fcb726b04812abc4f93703b6ddf6c9
+SIZE (igniterealtime-Openfire-v4.1.1_GH0.tar.gz) = 100915344

Modified: head/net-mgmt/glpi-plugins-fusioninventory-server/Makefile
==============================================================================
--- head/net-mgmt/glpi-plugins-fusioninventory-server/Makefile	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/net-mgmt/glpi-plugins-fusioninventory-server/Makefile	Tue Jan  3 18:12:13 2017	(r430490)
@@ -17,12 +17,11 @@ RUN_DEPENDS=	glpi>=0.90:www/glpi
 USE_GITHUB=	yes
 GH_ACCOUNT=	fusioninventory
 GH_PROJECT=	fusioninventory-for-glpi
-GH_TAGNAME=	glpi090+1.3
+GH_TAGNAME=	glpi090+${FUN_VER}
 
 USES=		gettext php:fileinfo php:simplexml php:wddx shebangfix
 GLPI_VER=	0.90
 FUNV_VER=	1.3
-WRKSRC=		${WRKDIR}/${GH_PROJECT}-glpi090-${FUNV_VER}
 NO_BUILD=	yes
 NO_ARCH=	yes
 

Modified: head/net/dgd/Makefile
==============================================================================
--- head/net/dgd/Makefile	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/net/dgd/Makefile	Tue Jan  3 18:12:13 2017	(r430490)
@@ -21,9 +21,8 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	dworkin
 
 DIST_SUBDIR=	dgd
-BASE_WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
-WRKSRC=		${BASE_WRKSRC}/src
-PATCH_WRKSRC=	${BASE_WRKSRC}
+WRKSRC_SUBDIR=	src
+PATCH_WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 ALL_TARGET=	install
 MAKE_JOBS_UNSAFE=	yes
 MAKE_ENV+=	EXTRA_DEFINES="${EXTRA_DEFINES}"

Modified: head/net/dhcpd/Makefile
==============================================================================
--- head/net/dhcpd/Makefile	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/net/dhcpd/Makefile	Tue Jan  3 18:12:13 2017	(r430490)
@@ -9,7 +9,7 @@ COMMENT=	OpenBSD dhcp daemon
 
 LICENSE=	BSD3CLAUSE
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src/usr.sbin/${PORTNAME}
+WRKSRC_SUBDIR=	src/usr.sbin/${PORTNAME}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	koue

Modified: head/net/google-daemon/Makefile
==============================================================================
--- head/net/google-daemon/Makefile	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/net/google-daemon/Makefile	Tue Jan  3 18:12:13 2017	(r430490)
@@ -18,7 +18,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	GoogleCloudPlatform
 GH_PROJECT=	compute-image-packages
 USE_RC_SUBR=	google-accounts-manager
-WRKSRC=		${WRKDIR}/${GH_PROJECT}-${PORTVERSION}/${PORTNAME}
+WRKSRC_SUBDIR=	${PORTNAME}
 
 SHEBANG_FILES=	usr/share/google/google_daemon/accounts.py \
 		usr/share/google/google_daemon/accounts_manager.py \

Modified: head/net/google-startup-scripts/Makefile
==============================================================================
--- head/net/google-startup-scripts/Makefile	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/net/google-startup-scripts/Makefile	Tue Jan  3 18:12:13 2017	(r430490)
@@ -19,7 +19,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	GoogleCloudPlatform
 GH_PROJECT=	compute-image-packages
 USE_RC_SUBR=	google-startup
-WRKSRC=		${WRKDIR}/${GH_PROJECT}-${PORTVERSION}/${PORTNAME}
+WRKSRC_SUBDIR=	${PORTNAME}
 
 SHEBANG_FILES= usr/share/google/fetch_script \
 		usr/share/google/first-boot \

Modified: head/net/xorp/Makefile
==============================================================================
--- head/net/xorp/Makefile	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/net/xorp/Makefile	Tue Jan  3 18:12:13 2017	(r430490)
@@ -22,7 +22,7 @@ GH_ACCOUNT=	greearb
 GH_PROJECT=	${PORTNAME}.ct
 SHEBANG_FILES=	xrl/scripts/clnt-gen xrl/scripts/tgt-gen
 python_OLD_CMD=	.*python
-WRKSRC=		${WRKDIR}/${GH_PROJECT}-${DISTVERSIONPREFIX}${DISTVERSION}/${PORTNAME}
+WRKSRC_SUBDIR=	${PORTNAME}
 MAKE_ARGS=	prefix=${PREFIX} enable_boost=1
 SUB_FILES=	pkg-message
 GROUPS=		xorp

Modified: head/science/py-pydicom/Makefile
==============================================================================
--- head/science/py-pydicom/Makefile	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/science/py-pydicom/Makefile	Tue Jan  3 18:12:13 2017	(r430490)
@@ -12,7 +12,7 @@ COMMENT=	Read, modify, and write DICOM f
 
 LICENSE=	MIT
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/source
+WRKSRC_SUBDIR=	source
 
 USES=		python shebangfix
 USE_GITHUB=	yes

Modified: head/security/easy-rsa2/Makefile
==============================================================================
--- head/security/easy-rsa2/Makefile	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/security/easy-rsa2/Makefile	Tue Jan  3 18:12:13 2017	(r430490)
@@ -20,6 +20,4 @@ GH_ACCOUNT=	OpenVPN
 GNU_CONFIGURE=	yes
 USES=		autoreconf
 
-WRKSRC=		${WRKDIR}/easy-rsa-${DISTVERSION}
-
 .include <bsd.port.mk>

Modified: head/sysutils/fusefs-s3fs/Makefile
==============================================================================
--- head/sysutils/fusefs-s3fs/Makefile	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/sysutils/fusefs-s3fs/Makefile	Tue Jan  3 18:12:13 2017	(r430490)
@@ -17,13 +17,12 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	s3fs-fuse
+GH_PROJECT=	s3fs-fuse
 
 USES=		autoreconf fuse pkgconfig
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
 
-WRKSRC=		${WRKDIR}/${GH_ACCOUNT}-${PORTVERSION}
-
 PLIST_FILES=	bin/s3fs man/man1/s3fs.1.gz
 
 post-patch:

Modified: head/sysutils/fusefs-s3fs/distinfo
==============================================================================
--- head/sysutils/fusefs-s3fs/distinfo	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/sysutils/fusefs-s3fs/distinfo	Tue Jan  3 18:12:13 2017	(r430490)
@@ -1,2 +1,3 @@
-SHA256 (s3fs-fuse-s3fs-v1.78_GH0.tar.gz) = 36c0b00a294d9676c462985c0c3f1362540e8ebc61c15bacb45e28a2f00297f5
-SIZE (s3fs-fuse-s3fs-v1.78_GH0.tar.gz) = 99538
+TIMESTAMP = 1483466309
+SHA256 (s3fs-fuse-s3fs-fuse-v1.78_GH0.tar.gz) = 36c0b00a294d9676c462985c0c3f1362540e8ebc61c15bacb45e28a2f00297f5
+SIZE (s3fs-fuse-s3fs-fuse-v1.78_GH0.tar.gz) = 99538

Modified: head/sysutils/hfsexplorer/Makefile
==============================================================================
--- head/sysutils/hfsexplorer/Makefile	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/sysutils/hfsexplorer/Makefile	Tue Jan  3 18:12:13 2017	(r430490)
@@ -25,7 +25,6 @@ USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 OPTIONS_DEFINE= DOCS
 NO_ARCH=	yes
-WRKSRC=		${WRKDIR}/${GH_PROJECT}-${GH_PROJECT}-${DISTVERSION}
 
 do-configure:
 	@cd ${WRKSRC}/dist/bin && ${REINPLACE_CMD} -e 's|BASEDIR=".*"|BASEDIR="${DATADIR}/lib"|g' \

Modified: head/sysutils/qtpass/Makefile
==============================================================================
--- head/sysutils/qtpass/Makefile	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/sysutils/qtpass/Makefile	Tue Jan  3 18:12:13 2017	(r430490)
@@ -16,6 +16,8 @@ RUN_DEPENDS=	pass:sysutils/password-stor
 USES=		qmake:outsource
 USE_GITHUB=	yes
 GH_ACCOUNT=	IJhack
+GH_PROJECT=	QtPass
+
 USE_QT5=	buildtools_build core gui linguisttools_build network widgets
 USE_GL=		gl
 
@@ -28,8 +30,6 @@ DESKTOP_ENTRIES=	"QtPass" "" \
 			"${PREFIX}/bin/qtpass" \
 			"Security;Utility;" true
 
-WRKSRC=		${WRKDIR}/QtPass-${PORTVERSION}
-
 # Install the icon of the port.
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/artwork/icon.png \

Modified: head/sysutils/qtpass/distinfo
==============================================================================
--- head/sysutils/qtpass/distinfo	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/sysutils/qtpass/distinfo	Tue Jan  3 18:12:13 2017	(r430490)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1481543540
-SHA256 (IJhack-qtpass-v1.1.6_GH0.tar.gz) = d24d95de129ce716b9b0fde6114407f860ce8c77106bd0ee6a12e8e4e0deb42b
-SIZE (IJhack-qtpass-v1.1.6_GH0.tar.gz) = 325329
+TIMESTAMP = 1483466358
+SHA256 (IJhack-QtPass-v1.1.6_GH0.tar.gz) = d24d95de129ce716b9b0fde6114407f860ce8c77106bd0ee6a12e8e4e0deb42b
+SIZE (IJhack-QtPass-v1.1.6_GH0.tar.gz) = 325329

Modified: head/textproc/libfo/Makefile
==============================================================================
--- head/textproc/libfo/Makefile	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/textproc/libfo/Makefile	Tue Jan  3 18:12:13 2017	(r430490)
@@ -26,7 +26,7 @@ USE_GITHUB=	yes
 GH_PROJECT=	xmlroff
 GH_ACCOUNT=	xmlroff
 USE_LDCONFIG=	yes
-WRKSRC=		${WRKDIR}/xmlroff-${PORTVERSION}/xmlroff
+WRKSRC_SUBDIR=	xmlroff
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --disable-gtk-doc
 CPPFLAGS+=	-I${LOCALBASE}/include

Modified: head/textproc/py-ucl/Makefile
==============================================================================
--- head/textproc/py-ucl/Makefile	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/textproc/py-ucl/Makefile	Tue Jan  3 18:12:13 2017	(r430490)
@@ -20,6 +20,6 @@ USE_PYTHON=	autoplist concurrent distuti
 GH_ACCOUNT=	vstakhov
 GH_PROJECT=	libucl
 
-WRKSRC=		${WRKDIR}/libucl-${PORTVERSION}/python
+WRKSRC_SUBDIR=	python
 
 .include <bsd.port.mk>

Modified: head/textproc/xmlroff/Makefile
==============================================================================
--- head/textproc/xmlroff/Makefile	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/textproc/xmlroff/Makefile	Tue Jan  3 18:12:13 2017	(r430490)
@@ -22,7 +22,7 @@ USE_GNOME=	libgnomeprint libartlgpl2 pan
 		libxslt libxml2 gdkpixbuf2
 GH_ACCOUNT=	xmlroff
 GH_PROJECT=	xmlroff
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/${PORTNAME}
+WRKSRC_SUBDIR=	${PORTNAME}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc
 INSTALL_TARGET=	install-strip

Modified: head/www/ach/Makefile
==============================================================================
--- head/www/ach/Makefile	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/www/ach/Makefile	Tue Jan  3 18:12:13 2017	(r430490)
@@ -3,9 +3,9 @@
 
 PORTNAME=	ACH
 PORTVERSION=	1.0.3
+DISTVERSIONSUFFIX=	-alpha
 CATEGORIES=	www
 MASTER_SITES=	GHC
-EXTRACT_SUFX=	-alpha.tar
 
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Free, open source tool for complex research problems
@@ -13,12 +13,12 @@ COMMENT=	Free, open source tool for comp
 LICENSE=	GPLv3
 
 USE_MYSQL=	yes
-USES=		php
+USES=		php tar
 USE_GITHUB=	yes
 GH_ACCOUNT=	Burton
 GH_PROJECT=	Analysis-of-Competing-Hypotheses
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-alpha
+WRKSRC=		${WRKDIR}/${DISTNAME}
 NO_BUILD=	yes
 SUB_FILES+=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message

Modified: head/www/codeigniter/Makefile
==============================================================================
--- head/www/codeigniter/Makefile	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/www/codeigniter/Makefile	Tue Jan  3 18:12:13 2017	(r430490)
@@ -13,6 +13,7 @@ LICENSE_FILE=	${WRKSRC}/license.txt
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	bcit-ci
+GH_PROJECT=	CodeIgniter
 
 CONFLICTS=	codeigniter-1.[0-9]* codeigniter22-2.[0-9]*
 
@@ -24,7 +25,6 @@ PLIST_SUB=	WWWOWN=${WWWOWN} WWWGRP=${WWW
 
 CI_SYS_DIR=	system
 CI_CONF_DIR=	application/config
-WRKSRC=		${WRKDIR}/CodeIgniter-${PORTVERSION}
 PORTDOCS=	*
 
 # These are all user-configurable files that we'll install

Modified: head/www/codeigniter/distinfo
==============================================================================
--- head/www/codeigniter/distinfo	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/www/codeigniter/distinfo	Tue Jan  3 18:12:13 2017	(r430490)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1465044613
-SHA256 (bcit-ci-codeigniter-3.0.6_GH0.tar.gz) = 6cdd736e53614762887d352fcd977d5bf4eea24e7f562a42e7ae11a8b53cc461
-SIZE (bcit-ci-codeigniter-3.0.6_GH0.tar.gz) = 2048373
+TIMESTAMP = 1483466577
+SHA256 (bcit-ci-CodeIgniter-3.0.6_GH0.tar.gz) = 6cdd736e53614762887d352fcd977d5bf4eea24e7f562a42e7ae11a8b53cc461
+SIZE (bcit-ci-CodeIgniter-3.0.6_GH0.tar.gz) = 2048373

Modified: head/www/ilias/Makefile
==============================================================================
--- head/www/ilias/Makefile	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/www/ilias/Makefile	Tue Jan  3 18:12:13 2017	(r430490)
@@ -29,7 +29,6 @@ NO_BUILD=	yes
 PLIST=		${WRKDIR}/plist
 SUB_FILES=	pkg-message
 USE_PHP=	mysql session zlib gd pdf dom xsl pcre
-WRKSRC=		${WRKDIR}/ILIAS-${PORTVERSION}
 ILIASDIR=	www/ilias
 ILIASDATADIR=	www/iliasdata
 PLIST_SUB=	ILIASDATADIR=${ILIASDATADIR}

Modified: head/www/mod_webkit/Makefile
==============================================================================
--- head/www/mod_webkit/Makefile	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/www/mod_webkit/Makefile	Tue Jan  3 18:12:13 2017	(r430490)
@@ -19,7 +19,7 @@ AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 AP_EXTRAS=	marshal.c
 
-WRKSRC=		${WRKDIR}/w4py-${PORTVERSION}/WebKit/Adapters/${PORTNAME}2
+WRKSRC_SUBDIR=		WebKit/Adapters/${PORTNAME}2
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/sbin/apxs|${APXS}|' ${WRKSRC}/Makefile

Modified: head/www/obhttpd/Makefile
==============================================================================
--- head/www/obhttpd/Makefile	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/www/obhttpd/Makefile	Tue Jan  3 18:12:13 2017	(r430490)
@@ -9,7 +9,7 @@ COMMENT=	OpenBSD http server
 
 LICENSE=	BSD3CLAUSE
 
-WRKSRC=		${WRKDIR}/${GH_PROJECT}-${PORTVERSION}/src/usr.sbin/${GH_PROJECT}
+WRKSRC_SUBDIR=		src/usr.sbin/${GH_PROJECT}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	koue

Modified: head/www/py-WebTest/Makefile
==============================================================================
--- head/www/py-WebTest/Makefile	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/www/py-WebTest/Makefile	Tue Jan  3 18:12:13 2017	(r430490)
@@ -23,8 +23,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>
 USE_GITHUB=	yes
 
 GH_ACCOUNT=	Pylons
+GH_PROJECT=	webtest
 USES=		python
 USE_PYTHON=	autoplist distutils
-WRKSRC=		${WRKDIR}/webtest-${PORTVERSION}
 
 .include <bsd.port.mk>

Modified: head/www/py-WebTest/distinfo
==============================================================================
--- head/www/py-WebTest/distinfo	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/www/py-WebTest/distinfo	Tue Jan  3 18:12:13 2017	(r430490)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1470257289
-SHA256 (Pylons-WebTest-2.0.23_GH0.tar.gz) = 385d5e7506fee4b91ea38ef37ebcef815fca9c03a8e9d299458eec365a36b95f
-SIZE (Pylons-WebTest-2.0.23_GH0.tar.gz) = 66480
+TIMESTAMP = 1483466783
+SHA256 (Pylons-webtest-2.0.23_GH0.tar.gz) = 385d5e7506fee4b91ea38ef37ebcef815fca9c03a8e9d299458eec365a36b95f
+SIZE (Pylons-webtest-2.0.23_GH0.tar.gz) = 66480

Modified: head/www/slowcgi/Makefile
==============================================================================
--- head/www/slowcgi/Makefile	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/www/slowcgi/Makefile	Tue Jan  3 18:12:13 2017	(r430490)
@@ -11,7 +11,7 @@ LICENSE=	BSD3CLAUSE
 
 LIB_DEPENDS=	libevent.so:devel/libevent2
 
-WRKSRC=		${WRKDIR}/${GH_PROJECT}-${PORTVERSION}/src/usr.sbin/${GH_PROJECT}
+WRKSRC_SUBDIR=	src/usr.sbin/${GH_PROJECT}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	koue

Modified: head/www/smarty3/Makefile
==============================================================================
--- head/www/smarty3/Makefile	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/www/smarty3/Makefile	Tue Jan  3 18:12:13 2017	(r430490)
@@ -1,18 +1,17 @@
 # Created by: Michael Fausten <ports@michael-fausten.de>
 # $FreeBSD$
 
-PORTNAME=	smarty3
+PORTNAME=	smarty
 PORTVERSION=	3.1.29
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
+PKGNAMESUFFIX=	3
 
 MAINTAINER=	ports@michael-fausten.de
 COMMENT=	PHP compiling template engine
 
 LICENSE=	LGPL3
 
-WRKSRC=		${WRKDIR}/smarty-${PORTVERSION}
-
 NO_BUILD=	yes
 USE_PHP=	pcre
 WANT_PHP_WEB=	yes
@@ -22,7 +21,6 @@ SUB_FILES=	pkg-message
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	smarty-php
-GH_PROJECT=	smarty
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}

Modified: head/x11/cinnamon/Makefile
==============================================================================
--- head/x11/cinnamon/Makefile	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/x11/cinnamon/Makefile	Tue Jan  3 18:12:13 2017	(r430490)
@@ -35,14 +35,15 @@ RUN_DEPENDS=	py*-dbus>=0:devel/py-dbus \
 		py*-pillow>=0:graphics/py-pillow \
 		py*-lxml>=0:devel/py-lxml
 
-WRKSRC=		${WRKDIR}/Cinnamon-${PORTVERSION}
-
 USES=		autoreconf compiler:c11 gettext gmake libtool \
 		pathfix pkgconfig python shebangfix
 USE_GNOME=	evolutiondataserver3 gconf2 gnomedesktop3 \
 		gnomeprefix gtk30 intlhack introspection:build
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	linuxmint
+GH_PROJECT=	Cinnamon
+
 # this happens before moving the file to ${PREFIX} (which then will be copied to ${STAGEDIR}${PREFIX})
 SHEBANG_FILES=	files/usr/bin/cinnamon2d
 USE_XORG=	x11 xfixes sm

Modified: head/x11/cinnamon/distinfo
==============================================================================
--- head/x11/cinnamon/distinfo	Tue Jan  3 17:59:45 2017	(r430489)
+++ head/x11/cinnamon/distinfo	Tue Jan  3 18:12:13 2017	(r430490)
@@ -1,2 +1,3 @@
-SHA256 (gnome3/linuxmint-cinnamon-2.4.6_GH0.tar.gz) = f0f8b0c56e8c6ee53daa06bea28c04967960eefed601db2f0ae745ca2abe78e1
-SIZE (gnome3/linuxmint-cinnamon-2.4.6_GH0.tar.gz) = 2813177
+TIMESTAMP = 1483466871
+SHA256 (gnome3/linuxmint-Cinnamon-2.4.6_GH0.tar.gz) = f0f8b0c56e8c6ee53daa06bea28c04967960eefed601db2f0ae745ca2abe78e1
+SIZE (gnome3/linuxmint-Cinnamon-2.4.6_GH0.tar.gz) = 2813177



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