Remove useless WRKSRC definitions.

While there, correct DEV_WARNINGS when they occur.

Sponsored by:	Absolight

83 files changed, 5 insertions, 118 deletions

diff --git a/astro/gpsman/Makefile b/astro/gpsman/Makefile
index 65ad50b..41b41fb 100644
--- a/astro/gpsman/Makefile
+++ b/astro/gpsman/Makefile
@@ -13,7 +13,6 @@ OPTIONS_DEFINE=	DOCS
 
 USES+=		tk:wrapper,run tar:tgz
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 GPSMANDIR=	${PREFIX}/lib/${PORTNAME}
 PLIST_SUB+=	GPSMANDIR=${GPSMANDIR:S/${PREFIX}\///}
 NO_BUILD=	yes
diff --git a/astro/gpxloggerd/Makefile b/astro/gpxloggerd/Makefile
index 28607ae..2752726 100644
--- a/astro/gpxloggerd/Makefile
+++ b/astro/gpxloggerd/Makefile
@@ -17,7 +17,6 @@ PLIST_FILES=	sbin/${PORTNAME} \
 		man/man8/${PORTNAME}.8.gz
 
 LDFLAGS+=	-lm
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 MAKE_ARGS=	NO_WERROR=yes
 
 do-install:
diff --git a/astro/libnova/Makefile b/astro/libnova/Makefile
index d488088..0a7bc45 100644
--- a/astro/libnova/Makefile
+++ b/astro/libnova/Makefile
@@ -15,8 +15,6 @@ GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|^CFLAGS=|#CFLAGS=|g' ${WRKSRC}/configure
 
diff --git a/audio/audiotag/Makefile b/audio/audiotag/Makefile
index a1e00cd4..9189975 100644
--- a/audio/audiotag/Makefile
+++ b/audio/audiotag/Makefile
@@ -17,7 +17,6 @@ GH_ACCOUNT=	Daenyth
 
 USES=		tar:bzip2 shebangfix perl5
 USE_PERL5=	run
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/audio/exaile/Makefile b/audio/exaile/Makefile
index 87d9fcc..b49dfb7 100644
--- a/audio/exaile/Makefile
+++ b/audio/exaile/Makefile
@@ -18,7 +18,6 @@ MAKE_ENV+=	PYTHON2_CMD=${PYTHON_CMD} XDGCONFDIR=${PREFIX}/etc/xdg
 USES=		desktop-file-utils gmake python:2
 USE_GNOME=	pygtk2 librsvg2
 USE_GSTREAMER=	good faad python
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 OPTIONS_DEFINE=		BAD CDDB DBUS HAL NOTIFY NLS SEXY
 OPTIONS_DEFAULT=	BAD CDDB DBUS HAL NOTIFY SEXY
diff --git a/audio/flac123/Makefile b/audio/flac123/Makefile
index 06a30eb..0643193 100644
--- a/audio/flac123/Makefile
+++ b/audio/flac123/Makefile
@@ -19,7 +19,6 @@ OPTIONS_DEFINE=	DOCS
 
 GNU_CONFIGURE=	yes
 USES=		autoreconf gmake
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 PORTDOCS=	README.remote
 PLIST_FILES=	bin/flac123
diff --git a/audio/smasher/Makefile b/audio/smasher/Makefile
index 87458d7..17496c5 100644
--- a/audio/smasher/Makefile
+++ b/audio/smasher/Makefile
@@ -23,7 +23,6 @@ USE_GCC=	yes
 USE_WX=		2.8
 WX_CONF_ARGS=	absolute
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
diff --git a/biology/clustalw/Makefile b/biology/clustalw/Makefile
index d9aa9cc..a5ed160 100644
--- a/biology/clustalw/Makefile
+++ b/biology/clustalw/Makefile
@@ -13,8 +13,6 @@ COMMENT=	Multiple alignment program for DNA or proteins
 
 RESTRICTED=	No commercial use.
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 GNU_CONFIGURE=	yes
 
 PLIST_FILES=	bin/clustalw bin/clustalw2
diff --git a/chinese/fcitx-libpinyin/Makefile b/chinese/fcitx-libpinyin/Makefile
index 3aa3323..a5ec9d3 100644
--- a/chinese/fcitx-libpinyin/Makefile
+++ b/chinese/fcitx-libpinyin/Makefile
@@ -22,7 +22,6 @@ LIB_DEPENDS=	libfcitx-config.so:chinese/fcitx \
 USES=		tar:xz cmake gettext pkgconfig
 INSTALLS_ICONS=	yes
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 _MODEL_VER=	20130308
 
 OPTIONS_DEFINE=	QT4
diff --git a/chinese/ibus-chewing/Makefile b/chinese/ibus-chewing/Makefile
index 4d2aac7..577ddd2 100644
--- a/chinese/ibus-chewing/Makefile
+++ b/chinese/ibus-chewing/Makefile
@@ -23,7 +23,6 @@ GLIB_SCHEMAS=	org.freedesktop.IBus.Chewing.gschema.xml
 USES=		cmake gettext pkgconfig
 USE_GNOME=	gtk20
 USE_XORG=	xtst
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
diff --git a/converters/ascii2binary/Makefile b/converters/ascii2binary/Makefile
index c061362..e8bff91 100644
--- a/converters/ascii2binary/Makefile
+++ b/converters/ascii2binary/Makefile
@@ -16,7 +16,6 @@ USES=		gettext tar:bzip2
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 PLIST_FILES=	bin/ascii2binary bin/binary2ascii \
 		man/man1/ascii2binary.1.gz \
diff --git a/converters/lua-iconv/Makefile b/converters/lua-iconv/Makefile
index d36e58c..7e03055 100644
--- a/converters/lua-iconv/Makefile
+++ b/converters/lua-iconv/Makefile
@@ -11,7 +11,6 @@ DISTNAME=	lua-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	Iconv binding for Lua 5
 
-WRKSRC=		${WRKDIR}/lua-${PORTNAME}-${PORTVERSION}
 USES=		pkgconfig iconv lua
 
 USE_GITHUB=	yes
diff --git a/converters/mpack/Makefile b/converters/mpack/Makefile
index 2ed83b2..899eafc 100644
--- a/converters/mpack/Makefile
+++ b/converters/mpack/Makefile
@@ -10,7 +10,6 @@ MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/mpack/
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	External MIME packer/unpacker
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 GNU_CONFIGURE=	yes
 
 PLIST_FILES=	bin/mpack bin/munpack \
diff --git a/databases/akonadi/Makefile b/databases/akonadi/Makefile
index 664cbb1..c775274 100644
--- a/databases/akonadi/Makefile
+++ b/databases/akonadi/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	1.13.0
 CATEGORIES=	databases kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/src
 DIST_SUBDIR=	KDE
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Storage server for KDE-Pim
@@ -31,7 +30,8 @@ OPTIONS_MULTI_DB=	MYSQL PGSQL SQLITE
 OPTIONS_SUB=	yes # SQLITE
 
 MYSQL_DESC=	Install MySQL Qt plugin and server
-MYSQL_USE=	MYSQL=server QT4=sql-mysql_run
+MYSQL_USE=	QT4=sql-mysql_run
+MYSQL_USES=	mysql:server
 
 PGSQL_DESC=	Install PostgreSQL Qt plugin
 # Do not add a dependency on PostgreSQL server as someone preferring
diff --git a/databases/mdbtools/Makefile b/databases/mdbtools/Makefile
index 91dd2ac..7690c8b 100644
--- a/databases/mdbtools/Makefile
+++ b/databases/mdbtools/Makefile
@@ -32,8 +32,6 @@ INSTALL_TARGET=	install-strip
 
 DOCS=		AUTHORS ChangeLog HACKING NEWS README TODO
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 GNOME_CONFIGURE_ENABLE=	gmdb2
 GNOME_USE=	GNOME=gnomeprefix GNOME=libgnomeui GNOME=gconf2 GNOME=intltool
 
diff --git a/databases/mongodb32/Makefile b/databases/mongodb32/Makefile
index 7a669a1..87b1198 100644
--- a/databases/mongodb32/Makefile
+++ b/databases/mongodb32/Makefile
@@ -61,7 +61,7 @@ IGNORE=	unsupported on FreeBSD 10.1 or older
 #  - https://jira.mongodb.org/browse/SERVER-21217
 #  - https://jira.mongodb.org/browse/SERVER-22740
 .if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 37
-BUILD_DEPENDS+=	${LOCALBASE}/bin/clang37:${PORTSDIR}/lang/clang37
+BUILD_DEPENDS+=	${LOCALBASE}/bin/clang37:lang/clang37
 CPP=	${LOCALBASE}/bin/clang-cpp37
 CC=	${LOCALBASE}/bin/clang37
 CXX=	${LOCALBASE}/bin/clang++37
diff --git a/databases/p5-DBD-Oracle/Makefile b/databases/p5-DBD-Oracle/Makefile
index 1224f00..04ec18c 100644
--- a/databases/p5-DBD-Oracle/Makefile
+++ b/databases/p5-DBD-Oracle/Makefile
@@ -27,7 +27,6 @@ SHEBANG_FILES=	Oracle.ex/*
 
 .if ${PORT_OPTIONS:MOCI8}
 PORTVERSION=	1.19
-WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 ORACLE_HOME=	${LOCALBASE}/oracle8-client
 BUILD_DEPENDS+=	${ORACLE_HOME}/lib/libclntst8.a:databases/oracle8-client
 CONFIGURE_ARGS=	-V 8.1.7
diff --git a/databases/py-MySQLdb/Makefile b/databases/py-MySQLdb/Makefile
index ab70704..4f350b9 100644
--- a/databases/py-MySQLdb/Makefile
+++ b/databases/py-MySQLdb/Makefile
@@ -10,9 +10,8 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Access a MySQL database through Python
 
-USES=		python:2
+USES=		python:2 mysql
 USE_PYTHON=	distutils autoplist
-USE_MYSQL=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	farcepest
 GH_PROJECT=	${PORTNAME}1
@@ -21,7 +20,6 @@ CONFLICTS=	py*-MySQLdb-[0-9]* py*-MySQLdb5[0-9]-[0-9]*
 
 PORTDOCS=	*
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
-WRKSRC=		${WRKDIR}/${PORTNAME}1-${PORTNAME}-${PORTVERSION}
 
 OPTIONS_DEFINE=		DOCS MYSQLCLIENT_R
 OPTIONS_DEFAULT=	MYSQLCLIENT_R
diff --git a/databases/spatialite/Makefile b/databases/spatialite/Makefile
index ac505b2..177d487 100644
--- a/databases/spatialite/Makefile
+++ b/databases/spatialite/Makefile
@@ -17,7 +17,6 @@ LIB_DEPENDS=	libgeos_c.so:graphics/geos \
 		libproj.so:graphics/proj \
 		libfreexl.so:textproc/freexl
 
-WRKSRC=		${WRKDIR}/lib${PORTNAME}-${PORTVERSION}
 GNU_CONFIGURE=	yes
 USES=		gmake iconv pathfix pkgconfig libtool sqlite
 USE_GNOME=	libxml2
diff --git a/deskutils/charmap/Makefile b/deskutils/charmap/Makefile
index 761ccdf..8ac520b 100644
--- a/deskutils/charmap/Makefile
+++ b/deskutils/charmap/Makefile
@@ -14,7 +14,6 @@ BROKEN=		unfetchable
 
 LICENSE=	GPLv2
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USES=		gnustep
 USE_GNUSTEP=	back build
 
diff --git a/deskutils/vnc2flv/Makefile b/deskutils/vnc2flv/Makefile
index c08e4fe..50e9568 100644
--- a/deskutils/vnc2flv/Makefile
+++ b/deskutils/vnc2flv/Makefile
@@ -10,7 +10,6 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Captures a VNC desktop session and saves as a flv
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USES=		python
 USE_PYTHON=	distutils autoplist
 
diff --git a/devel/abi-compliance-checker/Makefile b/devel/abi-compliance-checker/Makefile
index d6971e2..5843e13 100644
--- a/devel/abi-compliance-checker/Makefile
+++ b/devel/abi-compliance-checker/Makefile
@@ -27,7 +27,6 @@ USE_GCC=	any
 
 NO_BUILD=	yes
 PLIST_FILES=	bin/${PORTNAME}.pl
-WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/devel/acsccid/Makefile b/devel/acsccid/Makefile
index 50b21cd..af1b052 100644
--- a/devel/acsccid/Makefile
+++ b/devel/acsccid/Makefile
@@ -11,15 +11,13 @@ COMMENT=	PC/SC driver for CS CCID smart card readers
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpcsclite.so:${PORTSDIR}/devel/pcsc-lite
+LIB_DEPENDS=	libpcsclite.so:devel/pcsc-lite
 
 USES=	perl5 pkgconfig tar:bz2
 
 PLIST_FILES=	lib/pcsc/drivers/ifd-acsccid.bundle/Contents/FreeBSD/libacsccid.so \
 		lib/pcsc/drivers/ifd-acsccid.bundle/Contents/Info.plist
 
-WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.pre.mk>
diff --git a/devel/apache-ant/Makefile b/devel/apache-ant/Makefile
index 178aa20..d4f0607 100644
--- a/devel/apache-ant/Makefile
+++ b/devel/apache-ant/Makefile
@@ -36,8 +36,6 @@ MASTER_SITES+=	APACHE/ant/manual/:doc
 PORTDOCS=	*
 .endif
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 MANPAGE_SUBDIR=	apache-ant-manpage
 MANPAGE_WRKSRC=	${WRKSRC}/${MANPAGE_SUBDIR}
 
diff --git a/devel/api-sanity-autotest/Makefile b/devel/api-sanity-autotest/Makefile
index 40d4d19..0f17b52 100644
--- a/devel/api-sanity-autotest/Makefile
+++ b/devel/api-sanity-autotest/Makefile
@@ -28,7 +28,6 @@ USE_GCC=	any
 
 NO_BUILD=	yes
 PLIST_FILES=	bin/${PORTNAME}.pl
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/devel/bzr-builder/Makefile b/devel/bzr-builder/Makefile
index f344fbc..f2fa26d 100644
--- a/devel/bzr-builder/Makefile
+++ b/devel/bzr-builder/Makefile
@@ -16,8 +16,6 @@ LICENSE=	GPLv3
 BUILD_DEPENDS=	bzr:devel/bzr
 RUN_DEPENDS=	bzr:devel/bzr
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 USES=		python
 USE_PYTHON=	distutils autoplist
 
diff --git a/devel/bzr-colo/Makefile b/devel/bzr-colo/Makefile
index 589434a..3356d80 100644
--- a/devel/bzr-colo/Makefile
+++ b/devel/bzr-colo/Makefile
@@ -16,7 +16,6 @@ LICENSE=	GPLv2
 BUILD_DEPENDS=	bzr:devel/bzr
 RUN_DEPENDS=	bzr:devel/bzr
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USES=		python
 USE_PYTHON=	distutils autoplist
 
diff --git a/devel/bzr-fastimport/Makefile b/devel/bzr-fastimport/Makefile
index 6cbec84..8a579ef 100644
--- a/devel/bzr-fastimport/Makefile
+++ b/devel/bzr-fastimport/Makefile
@@ -16,8 +16,6 @@ BUILD_DEPENDS=	bzr:devel/bzr
 RUN_DEPENDS=	bzr:devel/bzr \
 		${PYTHON_SITELIBDIR}/fastimport/__init__.py:devel/py-fastimport
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 USES=		python
 USE_PYTHON=	distutils autoplist
 
diff --git a/devel/bzr-git/Makefile b/devel/bzr-git/Makefile
index 87a40b2..26c49b5 100644
--- a/devel/bzr-git/Makefile
+++ b/devel/bzr-git/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS=	bzr:devel/bzr \
 		${PYTHON_PKGNAMEPREFIX}dulwich>=0.8.0:devel/dulwich \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USES=		python
 USE_PYTHON=	distutils autoplist
 
diff --git a/devel/bzr-loom/Makefile b/devel/bzr-loom/Makefile
index 54277ee..d4b6194 100644
--- a/devel/bzr-loom/Makefile
+++ b/devel/bzr-loom/Makefile
@@ -16,8 +16,6 @@ LICENSE=	GPLv2
 BUILD_DEPENDS=	bzr:devel/bzr
 RUN_DEPENDS=	bzr:devel/bzr
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 USES=		python
 USE_PYTHON=	distutils autoplist
 
diff --git a/devel/bzr-rewrite/Makefile b/devel/bzr-rewrite/Makefile
index 9f3dbc2..1063f28 100644
--- a/devel/bzr-rewrite/Makefile
+++ b/devel/bzr-rewrite/Makefile
@@ -15,8 +15,6 @@ LICENSE=	GPLv2
 BUILD_DEPENDS=	bzr:devel/bzr
 RUN_DEPENDS=	bzr:devel/bzr
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 USES=		python
 USE_PYTHON=	distutils autoplist
 
diff --git a/devel/bzr-stats/Makefile b/devel/bzr-stats/Makefile
index 8d36371..4a424f0 100644
--- a/devel/bzr-stats/Makefile
+++ b/devel/bzr-stats/Makefile
@@ -16,8 +16,6 @@ RUN_DEPENDS=	bzr:devel/bzr
 
 LICENSE=	GPLv2
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 USES=		python
 USE_PYTHON=	distutils autoplist
 
diff --git a/devel/bzr-svn/Makefile b/devel/bzr-svn/Makefile
index 5e308db..547a750 100644
--- a/devel/bzr-svn/Makefile
+++ b/devel/bzr-svn/Makefile
@@ -17,7 +17,6 @@ BUILD_DEPENDS+=	bzr:devel/bzr
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/subvertpy/__init__.py:devel/py-subvertpy \
 		bzr:devel/bzr
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USES=		python
 USE_PYTHON=	distutils autoplist
 
diff --git a/devel/bzr-upload/Makefile b/devel/bzr-upload/Makefile
index 9adeec0..f4502fd 100644
--- a/devel/bzr-upload/Makefile
+++ b/devel/bzr-upload/Makefile
@@ -16,8 +16,6 @@ LICENSE=	GPLv2
 BUILD_DEPENDS=	bzr:devel/bzr
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 USES=		python
 USE_PYTHON=	distutils autoplist
 
diff --git a/devel/c4/Makefile b/devel/c4/Makefile
index 0cfa58b..b676109 100644
--- a/devel/c4/Makefile
+++ b/devel/c4/Makefile
@@ -12,7 +12,6 @@ COMMENT=	CVS-like Frontend to Perforce
 
 BROKEN=		unfetchable
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 ALL_TARGET=	c4
 
 OPTIONS_DEFINE=	DOCS
diff --git a/devel/cvsgraph/Makefile b/devel/cvsgraph/Makefile
index 7cb4509..9f73e42 100644
--- a/devel/cvsgraph/Makefile
+++ b/devel/cvsgraph/Makefile
@@ -15,8 +15,6 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libgd.so:graphics/gd
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 SUB_FILES=	pkg-message
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gd-inc=${LOCALBASE}/include \
diff --git a/devel/editline/Makefile b/devel/editline/Makefile
index 1efbaaf..cae9323 100644
--- a/devel/editline/Makefile
+++ b/devel/editline/Makefile
@@ -12,7 +12,6 @@ LICENSE=	BSD4CLAUSE
 USES=		autoreconf libtool
 USE_GITHUB=	yes
 GH_ACCOUNT=	troglobit
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_LDCONFIG=	yes
 
diff --git a/devel/eventxx/Makefile b/devel/eventxx/Makefile
index 2b44718..a95c5fb 100644
--- a/devel/eventxx/Makefile
+++ b/devel/eventxx/Makefile
@@ -13,8 +13,6 @@ COMMENT=	C++ wrapper for libevent
 
 LIB_DEPENDS=	libevent.so:devel/libevent2
 
-WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 NO_BUILD=	yes
 
 OPTIONS_DEFINE=	EXAMPLES
diff --git a/devel/ode/Makefile b/devel/ode/Makefile
index ae44bd1..aa0cf6b 100644
--- a/devel/ode/Makefile
+++ b/devel/ode/Makefile
@@ -29,8 +29,6 @@ GIMPACT_CONFIGURE_OFF=	--with-trimesh=opcode
 DOUBLE_CONFIGURE_ENABLE=	double-precision
 OU_CONFIGURE_ENABLE=		ou
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64" || ${ARCH} == "ia64"
diff --git a/devel/py-subvertpy/Makefile b/devel/py-subvertpy/Makefile
index 9159f5d..77d12cf 100644
--- a/devel/py-subvertpy/Makefile
+++ b/devel/py-subvertpy/Makefile
@@ -14,7 +14,6 @@ LICENSE=	GPLv2
 
 BUILD_DEPENDS+=	svn:devel/subversion
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USES=		python
 USE_PYTHON=	distutils autoplist
 MAKE_ENV=	HOME=/dev/null
diff --git a/devel/thrift/Makefile b/devel/thrift/Makefile
index c8d6f8e..4d47b27 100644
--- a/devel/thrift/Makefile
+++ b/devel/thrift/Makefile
@@ -19,7 +19,6 @@ GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=	yes
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 CONFIGURE_ENV+=	${MAKE_ENV}
 
 # For C++ support, use devel/thrift-cpp
diff --git a/games/angband/Makefile b/games/angband/Makefile
index fdaa33f..c8a6598 100644
--- a/games/angband/Makefile
+++ b/games/angband/Makefile
@@ -34,8 +34,6 @@ X11_USE=		XORG=sm,x11
 X11_RUN_DEPENDS=	xorg-fonts-miscbitmaps>=0:x11-fonts/xorg-fonts-miscbitmaps
 X11_CONFIGURE_ENABLE=	x11
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|-Wno-missing-field-initializers || ; \
diff --git a/games/manaplus/Makefile b/games/manaplus/Makefile
index 069f576..0bb1b98 100644
--- a/games/manaplus/Makefile
+++ b/games/manaplus/Makefile
@@ -22,7 +22,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libintl-prefix=${LOCALBASE} --with-sdl2 \
 		--without-internalsdlgfx
 LDFLAGS+=	-L${LOCALBASE}/lib -lintl
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 OPTIONS_DEFINE=		OPENGL
 OPTIONS_DEFAULT=	OPENGL
diff --git a/games/solarus-quest-editor/Makefile b/games/solarus-quest-editor/Makefile
index bcf25c7..af1d06f 100644
--- a/games/solarus-quest-editor/Makefile
+++ b/games/solarus-quest-editor/Makefile
@@ -26,7 +26,6 @@ CMAKE_ARGS+=	-DSOLARUS_USE_LUAJIT=OFF
 USE_SDL=	sdl2 ttf2 image2
 USE_QT5=	buildtools core gui linguist qmake widgets
 USES=		cmake compiler:c++11-lib openal
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 DESKTOP_ENTRIES=	"Solarus Quest Editor" "${COMMENT}" "${PORTNAME}" "${PORTNAME}"  \
 			"Game;" false
diff --git a/games/xvier/Makefile b/games/xvier/Makefile
index 94c9c25..91cac40 100644
--- a/games/xvier/Makefile
+++ b/games/xvier/Makefile
@@ -14,7 +14,6 @@ EXTRACT_ONLY=	${PORTNAME}${EXTRACT_SUFX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Throw stones into free columns
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USES=		imake tar:Z
 USE_XORG=	x11 xext
 USE_CSTD=	gnu89
diff --git a/graphics/batik/Makefile b/graphics/batik/Makefile
index c35a513..1993d95 100644
--- a/graphics/batik/Makefile
+++ b/graphics/batik/Makefile
@@ -23,7 +23,6 @@ ALL_TARGET=	jars all-jar
 MAKE_ENV+=	"ANT_OPTS=-Xmx512m"
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-INSTALL_WRKSRC=	${WRKSRC}/${PORTNAME}-${PORTVERSION}
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
 PORTDOCS=	*
diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index 91f1a5b..a0d456e 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -32,7 +32,6 @@ SHEBANG_FILES=	release/bin/blender-thumbnailer.py \
 		release/scripts/modules/blend_render_info.py
 
 BL_VERSION=	2.76
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 OUTDIR=		${INSTALL_WRKSRC}/bin/${BL_VERSION}
 
 PLIST_SUB+=	VER=${BL_VERSION}
diff --git a/graphics/fotoxx/Makefile b/graphics/fotoxx/Makefile
index 456de93..8a3c183 100644
--- a/graphics/fotoxx/Makefile
+++ b/graphics/fotoxx/Makefile
@@ -18,8 +18,6 @@ RUN_DEPENDS=	xdg-open:devel/xdg-utils \
 		exiftool:graphics/p5-Image-ExifTool \
 		ufraw-batch:graphics/ufraw
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 USES=		desktop-file-utils execinfo gmake pkgconfig
 USE_GNOME=	gtk30
 ALL_TARGET=	fotoxx
diff --git a/graphics/l2p/Makefile b/graphics/l2p/Makefile
index d8a1327..6768816 100644
--- a/graphics/l2p/Makefile
+++ b/graphics/l2p/Makefile
@@ -25,8 +25,6 @@ USE_PERL5=	run
 USE_TEX=	latex dvipsk
 USES=		perl5 shebangfix zip
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/graphics/megapov/Makefile b/graphics/megapov/Makefile
index 813eebc..1a60ee5 100644
--- a/graphics/megapov/Makefile
+++ b/graphics/megapov/Makefile
@@ -16,7 +16,6 @@ LIB_DEPENDS=	libpng.so:graphics/png \
 		libtiff.so:graphics/tiff
 #RUN_DEPENDS=	povray:graphics/povray-meta
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 INSTALL_WRKSRC=	${WRKSRC}/unix
 
 USES=		gmake jpeg localbase tar:bzip2
diff --git a/irc/ninja/Makefile b/irc/ninja/Makefile
index 69ef1d2..3144c68 100644
--- a/irc/ninja/Makefile
+++ b/irc/ninja/Makefile
@@ -11,7 +11,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Another ircII based irc client
 
 USES=		ncurses
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	IRCLIB="${DATADIR}"
diff --git a/japanese/slrn/Makefile b/japanese/slrn/Makefile
index dde5726..b1b204d 100644
--- a/japanese/slrn/Makefile
+++ b/japanese/slrn/Makefile
@@ -24,7 +24,6 @@ CONFLICTS=	slrn-0.*
 
 GNU_CONFIGURE=	yes
 ALL_TARGET=	all slrnpull
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 JDOCSRC=	${WRKDIR}/${PORTNAME}-doc-j0.9.5.6-0
 
 MAKE_JOBS_UNSAFE=	yes
diff --git a/lang/p5-Data-JavaScript/Makefile b/lang/p5-Data-JavaScript/Makefile
index e5615b9..1fe4fa8 100644
--- a/lang/p5-Data-JavaScript/Makefile
+++ b/lang/p5-Data-JavaScript/Makefile
@@ -11,7 +11,6 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Data::JavaScript - Dump perl structures to JavaScript code
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USES=		perl5 tar:tgz
 USE_PERL5=	configure
 
diff --git a/lang/see/Makefile b/lang/see/Makefile
index 7883c47..e4aea0e 100644
--- a/lang/see/Makefile
+++ b/lang/see/Makefile
@@ -22,8 +22,6 @@ DEBUG_DESC=	Internal SEE library debugging
 
 CONFLICTS=	see-devel-[0-9]*
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 USE_LDCONFIG=	yes
 USES=		libtool pathfix perl5
 USE_PERL5=	build
diff --git a/mail/dot-forward/Makefile b/mail/dot-forward/Makefile
index 0d92e9e..cc4ed0f 100644
--- a/mail/dot-forward/Makefile
+++ b/mail/dot-forward/Makefile
@@ -11,8 +11,6 @@ COMMENT=	Dot-forward reads sendmail's .forward files under qmail
 
 USES=	gmake
 
-WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 ALL_TARGET=	default
 
 PLIST_FILES=	bin/dot-forward \
diff --git a/mail/gubby/Makefile b/mail/gubby/Makefile
index 76fe190..eec918f 100644
--- a/mail/gubby/Makefile
+++ b/mail/gubby/Makefile
@@ -9,8 +9,6 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	mich@FreeBSD.org
 COMMENT=	Program showing where new mail has been placed
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 LDFLAGS+=	-lncurses
 CFLAGS+=	-fno-exceptions -fno-rtti
 
diff --git a/math/ump/Makefile b/math/ump/Makefile
index 5a90be7..143c1ae 100644
--- a/math/ump/Makefile
+++ b/math/ump/Makefile
@@ -18,7 +18,6 @@ USE_GNOME=	gtk20
 USE_GL=		glu
 
 ALL_TARGET=	${PORTNAME}
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 CONFLICTS=	ump-1.[0-9]*
 
diff --git a/multimedia/py-openlp/Makefile b/multimedia/py-openlp/Makefile
index 933d920..698e549 100644
--- a/multimedia/py-openlp/Makefile
+++ b/multimedia/py-openlp/Makefile
@@ -38,7 +38,6 @@ USES=		desktop-file-utils python
 USE_PYTHON=	distutils autoplist
 USE_GSTREAMER=	good bad ugly
 USE_QT4=	linguist phonon-gst
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 QT_LRELEASE=	${LOCALBASE}/bin/lrelease-qt4
 NO_ARCH=	yes
 
diff --git a/net-im/centerim/Makefile b/net-im/centerim/Makefile
index 2fcc13f..3b99db7 100644
--- a/net-im/centerim/Makefile
+++ b/net-im/centerim/Makefile
@@ -19,7 +19,6 @@ GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 CXXFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS=	--with-ssl --with-openssl
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 CONFLICTS=	centericq-[0-9]* centerim-devel-[0-9]*
 
 SHEBANG_FILES=	misc/cimformathistory misc/cimextracthistory.pl
diff --git a/net-im/tkabber-plugins/Makefile b/net-im/tkabber-plugins/Makefile
index b1c503b..dafffb2 100644
--- a/net-im/tkabber-plugins/Makefile
+++ b/net-im/tkabber-plugins/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS=	tkabber:net-im/tkabber
 USES=		tar:xz
 
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 SUBDIRS=	aniemoticons attline battleship bc browser checkers chess \
 		ctcomp custom-urls cyrillize debug ejabberd floatingcontact \
diff --git a/net/binkd/Makefile b/net/binkd/Makefile
index 8923280..d54d2f0 100644
--- a/net/binkd/Makefile
+++ b/net/binkd/Makefile
@@ -9,7 +9,6 @@ MASTER_SITES=	ftp://happy.kiev.ua/pub/fidosoft/mailer/binkd/
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	Fidonet TCP/IP mailer
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_RC_SUBR=	binkd
 GNU_CONFIGURE=	yes
 
diff --git a/net/ncp/Makefile b/net/ncp/Makefile
index 268ac81..fdccbe7 100644
--- a/net/ncp/Makefile
+++ b/net/ncp/Makefile
@@ -18,8 +18,6 @@ PLIST_FILES=	bin/ncp bin/npush bin/npoll man/man1/ncp.1.gz man/man1/npush.1.gz
 CFLAGS+=	-I${LOCALBASE}/include/libowfat -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|^CC=gcc|CC=${CC}|' \
 		${WRKSRC}/Makefile
diff --git a/net/radiusd-cistron/Makefile b/net/radiusd-cistron/Makefile
index 81221c1..1f0dba5 100644
--- a/net/radiusd-cistron/Makefile
+++ b/net/radiusd-cistron/Makefile
@@ -17,7 +17,6 @@ SHEBANG_FILES=	src/checkrad.pl
 MAKEFILE=	Makefile.BSD
 RADIUS_DIR=	${PREFIX}/etc/raddb
 MAKE_ENV+=	RADIUS_DIR="${RADIUS_DIR}" DESTROOT="${STAGEDIR}"
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 BUILD_WRKSRC=	${WRKSRC}/src
 INSTALL_WRKSRC=	${WRKSRC}/src
 MAKE_JOBS_UNSAFE=	yes
diff --git a/net/wmpiki/Makefile b/net/wmpiki/Makefile
index 4c36e50..9afbea6 100644
--- a/net/wmpiki/Makefile
+++ b/net/wmpiki/Makefile
@@ -11,8 +11,6 @@ MASTER_SITES=	http://mirror2.unixfreunde.de/ \
 MAINTAINER=	t.kempka@web.de
 COMMENT=	Multiping host checker dockapp
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 USE_XORG=	xpm
 
 OPTIONS_DEFINE=	DOCS
diff --git a/science/ecs/Makefile b/science/ecs/Makefile
index a3daddb..b76e659 100644
--- a/science/ecs/Makefile
+++ b/science/ecs/Makefile
@@ -18,8 +18,6 @@ LIB_DEPENDS=	libmed.so:french/med	\
 		libhdf5.so:science/hdf5	\
 		libcgns.so:science/cgnslib
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 USES=		gmake
 USE_TEX=	dvipsk
 GNU_CONFIGURE=	yes
diff --git a/science/fvm/Makefile b/science/fvm/Makefile
index 8a53a2a..4fcb2e9 100644
--- a/science/fvm/Makefile
+++ b/science/fvm/Makefile
@@ -17,8 +17,6 @@ LIB_DEPENDS=	libmed.so:french/med	\
 		libhdf5.so:science/hdf5	\
 		libcgns.so:science/cgnslib
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 USES=		libtool
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/science/ncs/Makefile b/science/ncs/Makefile
index ae3839c..2721965 100644
--- a/science/ncs/Makefile
+++ b/science/ncs/Makefile
@@ -23,7 +23,6 @@ RUN_DEPENDS=	xmgrace:math/grace	\
 
 USES=		fortran gettext gmake iconv libtool python shebangfix
 USE_GNOME=	libxml2
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 SHEBANG_FILES=	bin/runcase.in
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libxml2
 GNU_CONFIGURE=	yes
diff --git a/security/sshit/Makefile b/security/sshit/Makefile
index 3540786..7204d56 100644
--- a/security/sshit/Makefile
+++ b/security/sshit/Makefile
@@ -21,7 +21,6 @@ USES=		perl5 shebangfix
 USE_PERL5=	run
 SHEBANG_FILES=	sshit
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 PKGMESSAGE=	${WRKDIR}/pkg-message
 SUB_FILES=	pkg-message
 
diff --git a/sysutils/ruby-quota/Makefile b/sysutils/ruby-quota/Makefile
index 5ae5f99..0a65f6c 100644
--- a/sysutils/ruby-quota/Makefile
+++ b/sysutils/ruby-quota/Makefile
@@ -16,7 +16,6 @@ OPTIONS_DEFINE=	DOCS EXAMPLES
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 
-WRKSRC=		${WRKDIR}/ruby-${PORTNAME}-${PORTVERSION}
 MAKE_ARGS=	INSTALL_PROG="${INSTALL_PROGRAM}" \
 		INSTALL_DATA="${INSTALL_DATA}"
 INSTALL_TARGET=	site-install
diff --git a/textproc/libxdiff/Makefile b/textproc/libxdiff/Makefile
index cbfe9f5..605a30b 100644
--- a/textproc/libxdiff/Makefile
+++ b/textproc/libxdiff/Makefile
@@ -12,8 +12,6 @@ COMMENT=	Create file differences/patches to both binary and text files
 
 LICENSE=	LGPL3
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USES=		libtool
diff --git a/www/cgiwrap/Makefile b/www/cgiwrap/Makefile
index efa0a18..f9f8f33 100644
--- a/www/cgiwrap/Makefile
+++ b/www/cgiwrap/Makefile
@@ -11,7 +11,6 @@ COMMENT=	Securely execute Web CGI scripts
 
 LICENSE=	GPLv2
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 OPTIONS_DEFINE=	CGI_OWNER CGI_GROUP CGI_SETUID CGI_SETGID \
diff --git a/www/cmsmadesimple/Makefile b/www/cmsmadesimple/Makefile
index 81aa68c..de59a4b 100644
--- a/www/cmsmadesimple/Makefile
+++ b/www/cmsmadesimple/Makefile
@@ -15,7 +15,6 @@ LICENSE=	GPLv2
 BROKEN_powerpc64=	Does not build
 
 USE_PHP=	mysql tokenizer gd
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 NO_BUILD=	yes
 SUB_FILES=	pkg-message
diff --git a/www/jinzora/Makefile b/www/jinzora/Makefile
index 65fb271..b9eac54 100644
--- a/www/jinzora/Makefile
+++ b/www/jinzora/Makefile
@@ -12,7 +12,6 @@ COMMENT=	Web based media streaming and management system
 
 USE_PHP=	mysql session iconv gd pdf
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 NO_BUILD=	yes
 SUB_FILES=      pkg-message
 
diff --git a/www/mod_antiloris/Makefile b/www/mod_antiloris/Makefile
index db6c77f..e3ab906 100644
--- a/www/mod_antiloris/Makefile
+++ b/www/mod_antiloris/Makefile
@@ -21,7 +21,6 @@ MODULENAME=	mod_antiloris
 SRC_FILE=	*.c
 SUB_FILES+=	mod_antiloris.conf
 SUB_LIST+=	APACHEETCDIR="${APACHEETCDIR}"
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 .if !defined(SKIP_RULES)
 PLIST_FILES+=	${APACHEETCDIR}/Includes/mod_antiloris.conf
diff --git a/www/mod_geoip2/Makefile b/www/mod_geoip2/Makefile
index d42d8ee..02d7cb0 100644
--- a/www/mod_geoip2/Makefile
+++ b/www/mod_geoip2/Makefile
@@ -23,8 +23,6 @@ AP_GENPLIST=	yes
 AP_INC+=	${LOCALBASE}/include
 AP_LIB+=	${LOCALBASE}/lib -lGeoIP
 
-WRKSRC=		${WRKDIR}/geoip-api-${PORTNAME}-${PORTVERSION}
-
 SUB_FILES+=	pkg-message
 PORTDOCS=	Changes INSTALL.md README.md README.php
 
diff --git a/www/p5-CGI-Application-Plugin-DBH/Makefile b/www/p5-CGI-Application-Plugin-DBH/Makefile
index f80bfcd..e91ee79 100644
--- a/www/p5-CGI-Application-Plugin-DBH/Makefile
+++ b/www/p5-CGI-Application-Plugin-DBH/Makefile
@@ -19,7 +19,6 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Test-MockObject>=1.20120301:devel/p5-Test-MockObject
 
 NO_ARCH=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USES=		perl5
 USE_PERL5=	configure
 
diff --git a/www/p5-CGI-Application-Plugin-ValidateRM/Makefile b/www/p5-CGI-Application-Plugin-ValidateRM/Makefile
index c9a2499..6cb28c8 100644
--- a/www/p5-CGI-Application-Plugin-ValidateRM/Makefile
+++ b/www/p5-CGI-Application-Plugin-ValidateRM/Makefile
@@ -19,6 +19,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	modbuild
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 .include <bsd.port.mk>
diff --git a/www/tdom/Makefile b/www/tdom/Makefile
index 2147573..9616dc6 100644
--- a/www/tdom/Makefile
+++ b/www/tdom/Makefile
@@ -9,14 +9,12 @@ MASTER_SITES=	GHC http://mirrors.rit.edu/zi/
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	High performance XML data processing with Tcl (ARGS for OpenACS)
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 TDOMBASE=	${PREFIX}/lib/tdom${PORTVERSION}
 
 OPTIONS_DEFINE=	DOCS
 
 USES=		gmake tar:tgz tcl:tea
 USE_GITHUB=	yes
-GH_PROJECT=	tdom
 
 pre-configure:
 	${RM} -f ${WRKSRC}/generic/domalloc.?
diff --git a/www/trac-email2trac/Makefile b/www/trac-email2trac/Makefile
index b26b84c..c3a8e46 100644
--- a/www/trac-email2trac/Makefile
+++ b/www/trac-email2trac/Makefile
@@ -22,7 +22,6 @@ POSTFIX_DESC=	Configure suid script for postfix
 
 TRACUSER?=	${WWWOWN}
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-trac-user=${TRACUSER} --with-mta-user=${MTAUSER}
 USES=		python:2
diff --git a/www/webtrees/Makefile b/www/webtrees/Makefile
index 761f9e4..9414946 100644
--- a/www/webtrees/Makefile
+++ b/www/webtrees/Makefile
@@ -10,7 +10,6 @@ MASTER_SITES=	http://launchpad.net/${PORTNAME}/${PORTVERSION:C/\.[0-9]*$//}/${PO
 MAINTAINER=	fbsd@opal.com
 COMMENT=	Online genealogy viewer
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 EXTRACT_AFTER_ARGS=	-d ${WRKSRC}
 
 USES=		cpe shebangfix zip:infozip
diff --git a/x11-toolkits/open-motif/Makefile b/x11-toolkits/open-motif/Makefile
index f180fdf..a860906 100644
--- a/x11-toolkits/open-motif/Makefile
+++ b/x11-toolkits/open-motif/Makefile
@@ -17,8 +17,6 @@ LIB_DEPENDS=	libpng.so:graphics/png
 
 MAKE_JOBS_UNSAFE=	yes
 CONFLICTS=	lesstif-[0-9]*
-# WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-WRKSRC=		${WRKDIR}/motif-${PORTVERSION}
 
 USES=		autoreconf gmake iconv jpeg libtool:keepla pkgconfig
 USE_XORG=	x11 xaw xbitmaps xext xft xt
diff --git a/x11/wbar/Makefile b/x11/wbar/Makefile
index 3d4a7aa..02a2d76 100644
--- a/x11/wbar/Makefile
+++ b/x11/wbar/Makefile
@@ -34,8 +34,6 @@ NLS_LIBS=	-lintl
 WBARCONFIG_CONFIGURE_ENABLE=	wbar-config
 WBARCONFIG_USE=		GNOME=libglade2
 
-WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 PLIST_SUB+=	DESKTOPDIR=${DESKTOPDIR:S,${PREFIX}/,,}
 
 post-install:
diff --git a/x11/xfce4-whiskermenu-plugin/Makefile b/x11/xfce4-whiskermenu-plugin/Makefile
index dd2dfc9..f7018dc 100644
--- a/x11/xfce4-whiskermenu-plugin/Makefile
+++ b/x11/xfce4-whiskermenu-plugin/Makefile
@@ -13,8 +13,6 @@ COMMENT=	Alternate menu for the Xfce Desktop
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 USES=	cmake:outsource gettext localbase pkgconfig tar:bzip2 xfce
 USE_GNOME=	gtk20
 USE_XFCE=	panel