Don't set WRKSRC when USE_GITHUB. Use the correct GH_ACCOUNT/GH_PROJECT,

and use WRKSRC_SUBDIR.

Sponsored by:	Absolight

7 files changed, 21 insertions, 25 deletions

diff --git a/cad/repsnapper/Makefile b/cad/repsnapper/Makefile
index 3f3c437d4886..e4ae2d839bca 100644
--- a/cad/repsnapper/Makefile
+++ b/cad/repsnapper/Makefile
@@ -26,7 +26,6 @@ GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 INSTALL_TARGET=	install-strip
 
 post-install:
diff --git a/devel/papilio-loader/Makefile b/devel/papilio-loader/Makefile
index ed71392fe323..0626f49a0fdc 100644
--- a/devel/papilio-loader/Makefile
+++ b/devel/papilio-loader/Makefile
@@ -1,35 +1,35 @@
 # Created by: mr@freebsd.org
 # $FreeBSD$
 
-PORTNAME=       papilio-loader
-PORTVERSION=    2.8
+PORTNAME=	papilio-loader
+PORTVERSION=	2.8
 PORTREVISION=	1
-CATEGORIES=     devel
+CATEGORIES=	devel
 
-MAINTAINER=     mr@FreeBSD.org
-COMMENT=        Load bit files to the Open Source Papilio FPGA boards
+MAINTAINER=	mr@FreeBSD.org
+COMMENT=	Load bit files to the Open Source Papilio FPGA boards
 
-LICENSE=        GPLv2
+LICENSE=	GPLv2
 
-LIB_DEPENDS=    libftdi1.so:devel/libftdi1
+LIB_DEPENDS=	libftdi1.so:devel/libftdi1
 
-USE_GITHUB=     yes
-GH_ACCOUNT=     GadgetFactory
+USE_GITHUB=	yes
+GH_ACCOUNT=	GadgetFactory
 GH_PROJECT=	Papilio-Loader
-GH_TAGNAME=     dd111c4
-WRKSRC=         ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME}/papilio-prog
+GH_TAGNAME=	dd111c4
+WRKSRC_SUBDIR=	papilio-prog
 
-USES=           autoreconf:autoconf pkgconfig gmake
-GNU_CONFIGURE=  yes
-CONFIGURE_ENV+=       libftdi1_CFLAGS="-I ${LOCALBASE}/include/libftdi1"
-CONFIGURE_ENV+=       libftdi1_LIBS="-L ${LOCALBASE}/lib -lftdi1"
+USES=		autoreconf:autoconf pkgconfig gmake
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV+=	libftdi1_CFLAGS="-I ${LOCALBASE}/include/libftdi1"
+CONFIGURE_ENV+=	libftdi1_LIBS="-L ${LOCALBASE}/lib -lftdi1"
 
 post-patch:
 	@echo "${DATADIR}"
 	${CP} ${FILESDIR}/Papilio_Programmer.sh ${WRKSRC}
 	@${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|' ${WRKSRC}/Papilio_Programmer.sh
 
-BITFILES= bscan_spi_xc3s250e.bit bscan_spi_xc3s500e.bit bscan_spi_lx9.bit
+BITFILES=	bscan_spi_xc3s250e.bit bscan_spi_xc3s500e.bit bscan_spi_lx9.bit
 post-install:
 	${INSTALL_SCRIPT} ${INSTALL_WRKSRC}/Papilio_Programmer.sh ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${DATADIR}
diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile
index 196a8fcc8c05..793d3cba4b14 100644
--- a/emulators/open-vm-tools/Makefile
+++ b/emulators/open-vm-tools/Makefile
@@ -41,7 +41,7 @@ ICU_CONFIGURE_WITH=	icu
 ICU_LIB_DEPENDS=	libicuuc.so:devel/icu
 OPENSSL_CONFIGURE_WITH=	ssl
 
-WRKSRC=			${WRKDIR}/${PORTNAME}-stable-${RELEASE_VER}/open-vm-tools/
+WRKSRC_SUBDIR=		open-vm-tools
 
 GNU_CONFIGURE=		yes
 USE_GNOME=		glib20
diff --git a/lang/phantomjs/Makefile b/lang/phantomjs/Makefile
index d8d9a6a058c9..16ab84ff3ac8 100644
--- a/lang/phantomjs/Makefile
+++ b/lang/phantomjs/Makefile
@@ -32,7 +32,6 @@ GH_TUPLE=	Vitallium:phantomjs-3rdparty-win:19051aa:msvc2013/src/qt/3rdparty \
 		Vitallium:qtbase:b5cc008:qtbase/src/qt/qtbase \
 		Vitallium:qtwebkit:e7b7433:qtwebkit/src/qt/qtwebkit
 RUBY_NO_RUN_DEPENDS=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 PLIST_FILES=	bin/phantomjs
 NO_CCACHE=	yes
 
diff --git a/mail/mailhog/Makefile b/mail/mailhog/Makefile
index c8c8d2f6ee70..91fb4073c375 100644
--- a/mail/mailhog/Makefile
+++ b/mail/mailhog/Makefile
@@ -16,6 +16,7 @@ USES=		go
 USE_RC_SUBR=	mailhog
 USE_GITHUB=	yes
 GH_ACCOUNT=	mailhog
+GH_PROJECT=	MailHog
 GH_SUBDIR=	src/github.com/mailhog/MailHog
 GH_TUPLE=	gorilla:pat:cf955c3:pat/src/github.com/gorilla/pat \
 		gorilla:context:08b5f42:context/src/github.com/gorilla/context \
@@ -38,8 +39,6 @@ GH_TUPLE=	gorilla:pat:cf955c3:pat/src/github.com/gorilla/pat \
 		golang:crypto:eb71ad9:crypto/src/golang.org/x/crypto \
 		go-mgo:mgo:3f83fa5:mgo/src/gopkg.in/mgo.v2
 
-WRKSRC=		${WRKDIR}/MailHog-${DISTVERSION}
-
 PLIST_FILES=	bin/${PORTNAME}
 SUB_FILES=	pkg-message
 
diff --git a/mail/mailhog/distinfo b/mail/mailhog/distinfo
index 19e686b658cc..00de555c81f2 100644
--- a/mail/mailhog/distinfo
+++ b/mail/mailhog/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1503216575
-SHA256 (mailhog-mailhog-v1.0.0_GH0.tar.gz) = 472bf0895f33d49ec8f9bf665fdbda317e57855e846e38e6a6b8dcecdacd7bc5
-SIZE (mailhog-mailhog-v1.0.0_GH0.tar.gz) = 140803
+TIMESTAMP = 1503321114
+SHA256 (mailhog-MailHog-v1.0.0_GH0.tar.gz) = 472bf0895f33d49ec8f9bf665fdbda317e57855e846e38e6a6b8dcecdacd7bc5
+SIZE (mailhog-MailHog-v1.0.0_GH0.tar.gz) = 140803
 SHA256 (gorilla-pat-cf955c3_GH0.tar.gz) = 7c6dacd45161d6446496c94459398e991f3e717a479bff87c88520c4b0920840
 SIZE (gorilla-pat-cf955c3_GH0.tar.gz) = 4499
 SHA256 (gorilla-context-08b5f42_GH0.tar.gz) = 27045aa6da0128aded8e81242630f59a90e0b1840000d31a3b7c5c4e57559df6
diff --git a/security/krb5-devel/Makefile b/security/krb5-devel/Makefile
index 9dd0d9c9ef98..eabda8443fb7 100644
--- a/security/krb5-devel/Makefile
+++ b/security/krb5-devel/Makefile
@@ -64,7 +64,6 @@ LDFLAGS+=		-L${OPENSSLLIB}
 
 USE_RC_SUBR=		kpropd
 OPTIONS_SUB=		yes
-WRKSRC=			${WRKDIR}/${PORTNAME}-${HASH}
 WRKSRC_SUBDIR=		src
 PORTEXAMPLES=		kdc.conf krb5.conf services.append