59 files changed, 47 insertions, 127 deletions

diff --git a/archivers/makeself/Makefile b/archivers/makeself/Makefile
index 56f96fa5768a..19c63275f30c 100644
--- a/archivers/makeself/Makefile
+++ b/archivers/makeself/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	makeself
 PORTVERSION=	1.5.3
 CATEGORIES=	archivers
 MASTER_SITES=	http://www.lokigames.com/~megastep/makeself/
-DISTNAME=	makeself
-EXTRACT_SUFX=	.gz.sh
+DISTFILES=	makeself.gz.sh
 
 MAINTAINER=	ports@FreeBSD.org
 
@@ -18,12 +17,11 @@ EXTRACT_CMD=	${CP}
 EXTRACT_BEFORE_ARGS=
 EXTRACT_AFTER_ARGS=	${WRKDIR}
 NO_BUILD=	yes
-WRKSRC=                ${WRKDIR}/${PKGNAME}
 
 # The DISPLAY thing is to prevent the script from trying to launch a xterm
 # just to extract the source.
 pre-patch:
-	(cd ${WRKDIR} && ${SETENV} DISPLAY="" ${SH} ${DISTNAME}${EXTRACT_SUFX})
+	(cd ${WRKDIR} && ${SETENV} DISPLAY="" ${SH} ${DISTFILES})
 
 do-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/makeself.sh ${PREFIX}/bin/makeself
diff --git a/astro/stars/Makefile b/astro/stars/Makefile
index 83f4cbf484b5..3046f71adc18 100644
--- a/astro/stars/Makefile
+++ b/astro/stars/Makefile
@@ -10,12 +10,11 @@ PORTVERSION=	1.0
 CATEGORIES=	astro
 MASTER_SITES=	ftp://hpux.csc.liv.ac.uk/hpux/X11/Demos/stars-1.0/ \
 		ftp://askdonald.ask.uni-karlsruhe.de/hpux/X11/Demos/stars-1.0/
-DISTNAME=	stars-1.0-ss-11.00
+DISTFILES=	stars-1.0-ss-11.00.tar.gz
 
 MAINTAINER=	jseger@FreeBSD.org
 
 USE_X_PREFIX=	yes
-WRKSRC=		$(WRKDIR)/$(PKGNAME)
 
 CC?=		cc
 CFLAGS?=	-O2
diff --git a/audio/ascd/Makefile b/audio/ascd/Makefile
index 398df0f0c47c..21f29373cdec 100644
--- a/audio/ascd/Makefile
+++ b/audio/ascd/Makefile
@@ -15,8 +15,6 @@ MAINTAINER=	jim@FreeBSD.org
 
 LIB_DEPENDS=	workman.1:${PORTSDIR}/audio/libworkman
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
-
 USE_IMAKE=	yes
 USE_XPM=	yes
 
diff --git a/audio/bladeenc/Makefile b/audio/bladeenc/Makefile
index 473233d34a47..c4f3ec71401e 100644
--- a/audio/bladeenc/Makefile
+++ b/audio/bladeenc/Makefile
@@ -14,7 +14,7 @@ EXTRACT_SUFX=	.0-src-stable.tar.gz
 
 MAINTAINER=	dirk@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/${PKGNAME}.0
+WRKSRC=		${WRKDIR}/${DISTNAME}.0
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/audio/libsidplay/Makefile b/audio/libsidplay/Makefile
index a120de316b15..f2a93e50fbfe 100644
--- a/audio/libsidplay/Makefile
+++ b/audio/libsidplay/Makefile
@@ -9,13 +9,11 @@ PORTNAME=	libsidplay
 PORTVERSION=	1.36.44
 CATEGORIES=	audio emulators
 MASTER_SITES=	http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/./_/g}
-EXTRACT_SUFX=	.tgz
+DISTFILES=	${PORTNAME}-${PORTVERSION:S/./_/g}.tgz
 
 MAINTAINER=	sec@42.org
 
 FETCH_CMD=	/usr/bin/fetch
-WRKSRC=		${WRKDIR}/${PKGNAME}
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
diff --git a/audio/libsidplay2/Makefile b/audio/libsidplay2/Makefile
index a120de316b15..f2a93e50fbfe 100644
--- a/audio/libsidplay2/Makefile
+++ b/audio/libsidplay2/Makefile
@@ -9,13 +9,11 @@ PORTNAME=	libsidplay
 PORTVERSION=	1.36.44
 CATEGORIES=	audio emulators
 MASTER_SITES=	http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/./_/g}
-EXTRACT_SUFX=	.tgz
+DISTFILES=	${PORTNAME}-${PORTVERSION:S/./_/g}.tgz
 
 MAINTAINER=	sec@42.org
 
 FETCH_CMD=	/usr/bin/fetch
-WRKSRC=		${WRKDIR}/${PKGNAME}
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
diff --git a/audio/shorten/Makefile b/audio/shorten/Makefile
index 8e578ef84753..e6f6cb65f640 100644
--- a/audio/shorten/Makefile
+++ b/audio/shorten/Makefile
@@ -10,12 +10,11 @@ PORTVERSION=	2.3a
 CATEGORIES=	audio archivers
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	fenner
-DISTNAME=	${PORTNAME}
+DISTFILES=	${PORTNAME}.tar.gz
 
 MAINTAINER=	sec@42.org
 
 RESTRICTED=	"May not be sold. May not be distributed if modified."
-WRKSRC=		${WRKDIR}/${PKGNAME}
 
 MAN1=		shorten.1
 
diff --git a/audio/xsidplay/Makefile b/audio/xsidplay/Makefile
index fa1a4c2ec5a7..2be8171cf1fd 100644
--- a/audio/xsidplay/Makefile
+++ b/audio/xsidplay/Makefile
@@ -10,8 +10,7 @@ PORTVERSION=	1.3.9
 CATEGORIES=	audio emulators
 MASTER_SITES=	http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/ \
 		http://www.freenix.no/~anders/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/./_/g}
-EXTRACT_SUFX=   .tgz
+DISTFILES=	${PORTNAME}-${PORTVERSION:S/./_/g}.tgz
 
 MAINTAINER=	anders@fix.no
 
@@ -23,8 +22,6 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
 		-I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/xsidplay ${PREFIX}/bin
 
diff --git a/benchmarks/httperf/Makefile b/benchmarks/httperf/Makefile
index ed75357898e2..98e1c4d919f1 100644
--- a/benchmarks/httperf/Makefile
+++ b/benchmarks/httperf/Makefile
@@ -12,7 +12,6 @@ MASTER_SITES=	ftp://ftp.hpl.hp.com/pub/httperf/
 
 MAINTAINER=	ports@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
 USE_GMAKE=	yes
 MAN1=		httperf.1
 
diff --git a/comms/minicom/Makefile b/comms/minicom/Makefile
index 61f993a97eb5..70429c8fe9f6 100644
--- a/comms/minicom/Makefile
+++ b/comms/minicom/Makefile
@@ -14,14 +14,13 @@ MASTER_SITES=	${MASTER_SITE_SUNSITE}  \
 		http://www.clinet.fi/~walker/  \
 		http://www.pp.clinet.fi/~walker/
 MASTER_SITE_SUBDIR=	apps/serialcomm/dialout
-DISTNAME=	${PKGNAME}.src
+DISTFILES=	${PKGNAME}.src.tar.gz
 
 MAINTAINER=	obrien@FreeBSD.org
 
 RUN_DEPENDS=	lrz:${PORTSDIR}/comms/lrzsz \
 		lsz:${PORTSDIR}/comms/lrzsz
 
-WRKSRC=		${WRKDIR}/${PKGNAME}/src
 #USE_GMAKE=	"for ``po'' dir stuff"
 MAN1=		minicom.1 runscript.1 ascii-xfr.1
 
diff --git a/devel/cdk/Makefile b/devel/cdk/Makefile
index cbc883b64fd8..a8d8e653e0d2 100644
--- a/devel/cdk/Makefile
+++ b/devel/cdk/Makefile
@@ -10,12 +10,11 @@ PORTNAME=		cdk
 PORTVERSION=		4.9.10
 PORTREVISION=		1
 CATEGORIES=		devel
-MASTER_SITES=	http://www.vexus.ca/release/
-DISTNAME=	cdk
+MASTER_SITES=		http://www.vexus.ca/release/
+DISTFILES=		cdk.tar.gz
 
 MAINTAINER=	obrien@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 ALL_TARGET=	default
diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index eca88b3bdf18..a115dac01e2a 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -9,11 +9,10 @@ PORTNAME=	doxygen
 PORTVERSION=	1.1.0
 CATEGORIES=	devel
 MASTER_SITES=	http://www.stack.nl/~dimitri/doxygen/dl/
-DISTNAME=	${PORTNAME}-${PORTVERSION}.src
+DISTFILES=	${PORTNAME}-${PORTVERSION}.src.tar.gz
 
 MAINTAINER=	joep@di.nl
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
 USE_QT=		yes
 USE_PERL5=	yes
 MAKE_ENV+=	QTDIR="${X11BASE}" PCFLAGS="${CFLAGS}" PCXXFLAGS="${CXXFLAGS}"
diff --git a/devel/flick/Makefile b/devel/flick/Makefile
index c04bd8cf7dbb..0e4348f09277 100644
--- a/devel/flick/Makefile
+++ b/devel/flick/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	flick
 PORTVERSION=	2.1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://flux.cs.utah.edu/flux/flick/2.1/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-src
+DISTFILES=	${PORTNAME}-${PORTVERSION}-src.tar.gz
 
 MAINTAINER=     ports@FreeBSD.org
 
@@ -17,8 +17,6 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 MAKEFILE=	GNUmakefile
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
-
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/flick
diff --git a/devel/ftnchek/Makefile b/devel/ftnchek/Makefile
index 9bceda74c06f..0448186c8567 100644
--- a/devel/ftnchek/Makefile
+++ b/devel/ftnchek/Makefile
@@ -8,13 +8,10 @@ PORTNAME=	ftnchek
 PORTVERSION=	2.12.2
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.netlib.org/fortran/
-DISTNAME=	${PORTNAME}
-EXTRACT_SUFX=	.tgz
+DISTFILES=	${PORTNAME}.tgz
 
 MAINTAINER=     kargl@apl.washington.edu
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
-
 MAN1=		dcl2inc.1 ftnchek.1 ftnpp.1
 
 GNU_CONFIGURE=	yes
diff --git a/devel/linuxthreads/Makefile b/devel/linuxthreads/Makefile
index 2109415b3869..f068e16947d5 100644
--- a/devel/linuxthreads/Makefile
+++ b/devel/linuxthreads/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	2.1.3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	glibc
-DISTNAME=	glibc-linuxthreads-${PORTVERSION}
+DISTFILES=	glibc-linuxthreads-${PORTVERSION}.tar.gz
 
 MAINTAINER=    jasone@freebsd.org
 
@@ -27,8 +27,6 @@ threads_files := README.FreeBSD clone.S clone.h freebsd-compat.h getgr_r.c \
 	gethostby_r.c getnetby_r.c getprotoby_r.c getpw_r.c getservby_r.c \
 	lclone.c libc_calls.c libc_thread.c sched.c uthread_file.c
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
-
 SRC_BASE=	/usr/src
 LIBSRC_BASE=	${SRC_BASE}/lib
 
diff --git a/devel/tclcl/Makefile b/devel/tclcl/Makefile
index 0f9e832a7ece..1bc510cda01e 100644
--- a/devel/tclcl/Makefile
+++ b/devel/tclcl/Makefile
@@ -9,15 +9,13 @@ PORTNAME=	tclcl
 PORTVERSION=	1.0b9
 CATEGORIES=	devel
 MASTER_SITES=	http://www-mash.cs.berkeley.edu/dist/
-DISTNAME=	tclcl-src-1.0b9
+DISTFILES=	tclcl-src-${PORTVERSION}.tar.gz
 
 MAINTAINER=	obonilla@fisicc-ufm.edu
 
 LIB_DEPENDS=    tk82.1:${PORTSDIR}/x11-toolkits/tk82 \
 		otcl.1:${PORTSDIR}/lang/otcl
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-tcl-ver=8.2 --with-tk-ver=8.2
 
diff --git a/dns/nsping/Makefile b/dns/nsping/Makefile
index 1a7ec01cb6bb..772b37792597 100644
--- a/dns/nsping/Makefile
+++ b/dns/nsping/Makefile
@@ -9,12 +9,10 @@ PORTNAME=	nsping
 PORTVERSION=	0.8
 CATEGORIES=	net
 MASTER_SITES=	http://www.enteract.com/~tqbf/
-DISTNAME=	nsping
+DISTFILES=	nsping.tar.gz
 
 MAINTAINER=	kris@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
-
 MAN8=		nsping.8
 
 do-install:
diff --git a/editors/vilearn/Makefile b/editors/vilearn/Makefile
index 6c4995c4a082..8854f297ec15 100644
--- a/editors/vilearn/Makefile
+++ b/editors/vilearn/Makefile
@@ -11,12 +11,10 @@ CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.funet.fi/pub/Linux/util/networking/util-swan/pub/misc/ \
 		ftp://ftp.mcc.ac.uk/pub/linux/fi.mirror/util/networking/util-swan/pub/misc/ \
 		ftp://ftp.tu-chemnitz.de/pub/linux/funet-mirror/util/networking/util-swan/pub/misc/
-DISTNAME=	${PORTNAME}
-EXTRACT_SUFX=	.Z
+DISTFILES=	${PORTNAME}.Z
 
 MAINTAINER=	i.vaudrey@bigfoot.com
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
 EXTRACT_CMD=	uncompress
 EXTRACT_BEFORE_ARGS=	-c
 EXTRACT_AFTER_ARGS=	| tail -n 1759 | sh
diff --git a/emulators/bsvc/Makefile b/emulators/bsvc/Makefile
index 880f2781d049..3bbb197be08b 100644
--- a/emulators/bsvc/Makefile
+++ b/emulators/bsvc/Makefile
@@ -10,13 +10,13 @@ PORTVERSION=	2.1
 CATEGORIES=	emulators tk82
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	system/emulators
-DISTNAME=	${PORTNAME}-${PORTVERSION}-src
+DISTFILES=	${DISTNAME}-src.tar.gz
 
 MAINTAINER=	jseger@FreeBSD.org
 
 RUN_DEPENDS=	wish8.2:${PORTSDIR}/x11-toolkits/tk82
 
-WRKSRC=		${WRKDIR}/${PKGNAME}/src
+WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
 MAKE_ENV=	PROJECT_BASE=${PREFIX} WRKSRC=${WRKSRC}
 
diff --git a/games/blockade/Makefile b/games/blockade/Makefile
index 21eb7b8fc3d9..d62494cca415 100644
--- a/games/blockade/Makefile
+++ b/games/blockade/Makefile
@@ -9,11 +9,10 @@ PORTNAME=	blockade
 PORTVERSION=	1.00
 CATEGORIES=	games
 MASTER_SITES=	http://www.geocities.com/TimesSquare/Zone/5267/
-DISTNAME=	blockade-1_00-linux
+DISTFILES=	blockade-1_00-linux.tar.gz
 
 MAINTAINER=	cpiazza@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
 USE_XLIB=	yes
 
 MAN6=	blockade.6
diff --git a/games/freesweep/Makefile b/games/freesweep/Makefile
index b231cba2e974..3455239b3b4c 100644
--- a/games/freesweep/Makefile
+++ b/games/freesweep/Makefile
@@ -9,11 +9,10 @@ PORTNAME=	freesweep
 PORTVERSION=	0.87
 CATEGORIES=	games
 MASTER_SITES=	http://www.upl.cs.wisc.edu/~hartmann/sweep/
-DISTNAME=	${PORTNAME}
+DISTFILES=	${PORTNAME}.tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-prefsdir=${PREFIX}/share/freesweep \
diff --git a/games/ifm/Makefile b/games/ifm/Makefile
index d969f050d809..367ac976dc57 100644
--- a/games/ifm/Makefile
+++ b/games/ifm/Makefile
@@ -15,14 +15,12 @@ MASTER_SITES=	ftp://ftp.gmd.de/if-archive/mapping-tools/ \
 		ftp://ftp.funet.fi/pub/misc/if-archive/mapping-tools/ \
 		ftp://mirror.aarnet.edu.au/pub/if-archive/mapping-tools/ \
 		ftp://ftp.nodomainname.net/pub/mirrors/if-archive/mapping-tools/
-DISTNAME=	ifm41
-EXTRACT_SUFX=	.tgz
+DISTFILES=	ifm41.tgz
 
 MAINTAINER=	dchapes@ddm.on.ca
 
 RUN_DEPENDS=	wish8.2:${PORTSDIR}/x11-toolkits/tk82
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	WISH=${LOCALBASE}/bin/wish8.2
diff --git a/games/tank/Makefile b/games/tank/Makefile
index a7af3fb41d46..dd420482d416 100644
--- a/games/tank/Makefile
+++ b/games/tank/Makefile
@@ -9,14 +9,12 @@ PORTNAME=	tank
 PORTVERSION=	0.4a
 CATEGORIES=	games
 MASTER_SITES=	http://step.polymtl.ca/~coyote/tank/
-DISTNAME=	${PKGNAME}-src
+DISTFILES=	${DISTNAME}-src.tar.gz
 
 MAINTAINER=	dburr@FreeBSD.org
 
 BROKEN=	can\'t find glaux.h
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
-
 USE_MESA=	YES
 USE_GMAKE=	YES
 ALL_TARGET=	linux-mesa-elf
diff --git a/games/xvier/Makefile b/games/xvier/Makefile
index ba4bfbc543fa..40af3ac7d450 100644
--- a/games/xvier/Makefile
+++ b/games/xvier/Makefile
@@ -14,7 +14,6 @@ DISTFILES=	xvier.tar.Z
 
 MAINTAINER=	ports@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
 USE_IMAKE=	yes
 MAN6=		xvier.6
 MANCOMPRESSED=	no
diff --git a/graphics/piddle/Makefile b/graphics/piddle/Makefile
index 6804f65506ea..87b108d21033 100644
--- a/graphics/piddle/Makefile
+++ b/graphics/piddle/Makefile
@@ -10,14 +10,12 @@ PORTVERSION=	1.0b1
 CATEGORIES=	graphics python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION}-5
-EXTRACT_SUFX=	.tgz
+DISTFILES=	${DISTNAME}-5.tgz
 
 MAINTAINER=	dom@myrddin.demon.co.uk
 
 RUN_DEPENDS=	python1.5:${PORTSDIR}/lang/python15
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
 NO_BUILD=	yes
 
 PYTHON?=	${LOCALBASE}/bin/python
diff --git a/irc/blackened/Makefile b/irc/blackened/Makefile
index f7f3afe1dacc..b67c3e223f99 100644
--- a/irc/blackened/Makefile
+++ b/irc/blackened/Makefile
@@ -13,7 +13,6 @@ MASTER_SITES=	ftp://ftp.blackened.com/pub/irc/blackened/
 MAINTAINER=	toast@blackened.com
 
 GNU_CONFIGURE=	yes
-WRKSRC=		${WRKDIR}/${PKGNAME}
 PLIST_SUB=	VERSION=${PORTVERSION}
 MAKE_ENV=	prefix=${PREFIX}
 
diff --git a/irc/ircII/Makefile b/irc/ircII/Makefile
index 6e20f17442eb..e673f67a8cc8 100644
--- a/irc/ircII/Makefile
+++ b/irc/ircII/Makefile
@@ -17,7 +17,6 @@ CONFIGURE_ENV=	IRCLIB=${PREFIX}/share/irc
 
 USE_BZIP2=	yes
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
 MAN1=		ircII.1 ircbug.1
 
 .include <bsd.port.mk>
diff --git a/irc/ninja/Makefile b/irc/ninja/Makefile
index b0c0a7c1be51..5e6950118b85 100644
--- a/irc/ninja/Makefile
+++ b/irc/ninja/Makefile
@@ -9,13 +9,12 @@ PORTNAME=	ninja
 PORTVERSION=	1.2
 CATEGORIES=	irc
 MASTER_SITES=	ftp://ninja.qoop.org/ninja/unstable/
-DISTNAME= 	${PORTNAME}-${PORTVERSION}-src
+DISTFILES= 	${DISTNAME}-src.tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
 
 GNU_CONFIGURE=	yes
 PLIST_SUB=	VERSION="${PORTVERSION}"
-WRKSRC=		${WRKDIR}/${PKGNAME}
 
 pre-patch:
 	@${CP} ${WRKSRC}/config/configure ${WRKSRC}
diff --git a/lang/mawk/Makefile b/lang/mawk/Makefile
index 31efd38bf7a4..2eb294d1ba5f 100644
--- a/lang/mawk/Makefile
+++ b/lang/mawk/Makefile
@@ -10,11 +10,10 @@ PORTNAME=	mawk
 PORTVERSION=	1.3.3
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.whidbey.net/pub/brennan/
-DISTNAME=	${PORTNAME}${PORTVERSION}
+DISTFILES=	${PORTNAME}${PORTVERSION}.tar.gz
 
 MAINTAINER=	obrien@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
 GNU_CONFIGURE=	yes
 ALL_TARGET=
 
diff --git a/lang/yabasic/Makefile b/lang/yabasic/Makefile
index fb7c4a1fc124..9b9db908b98a 100644
--- a/lang/yabasic/Makefile
+++ b/lang/yabasic/Makefile
@@ -9,14 +9,12 @@ PORTNAME=	yabasic
 PORTVERSION=	2.64
 CATEGORIES=	lang
 MASTER_SITES=	http://www.yabasic.de/download/
-DISTNAME=	yab
-EXTRACT_SUFX=	.tar.Z
+DISTFILES=	yab.tar.Z
 
 MAINTAINER=	elwood@mc5sys.in-berlin.de
 
 USE_BISON=	yes
 USE_XLIB=	yes
 GNU_CONFIGURE=	yes
-WRKSRC=		${WRKDIR}/${PKGNAME}
 
 .include <bsd.port.mk>
diff --git a/mail/junkfilter/Makefile b/mail/junkfilter/Makefile
index 8dbd66ce7c1b..828520623263 100644
--- a/mail/junkfilter/Makefile
+++ b/mail/junkfilter/Makefile
@@ -17,7 +17,6 @@ MAINTAINER=	gsutter@zer0.org
 
 RUN_DEPENDS=	procmail:${PORTSDIR}/mail/procmail
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
 NO_BUILD=	yes
 BINDIR=		${PREFIX}/etc/${PORTNAME}
 
diff --git a/mail/wmpop3/Makefile b/mail/wmpop3/Makefile
index 0b65a15328e1..314da837ebc5 100644
--- a/mail/wmpop3/Makefile
+++ b/mail/wmpop3/Makefile
@@ -9,11 +9,11 @@ PORTNAME=	wmpop3
 PORTVERSION= 	0.5.6a
 CATEGORIES=	mail windowmaker
 MASTER_SITES=	http://www.cs.mun.ca/~scotth/download/
-DISTNAME=	WMPop3-${PORTVERSION}
+DISTFILES=	WMPop3-${PORTVERSION}.tar.gz
 
 MAINTAINER=	jim@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/${PKGNAME}/wmpop3
+WRKSRC=		${WRKDIR}/${DISTNAME}/wmpop3
 
 USE_X_PREFIX=	yes
 USE_XPM=	yes
diff --git a/math/femlab/Makefile b/math/femlab/Makefile
index b1b798219d00..bfa83946d298 100644
--- a/math/femlab/Makefile
+++ b/math/femlab/Makefile
@@ -10,13 +10,12 @@ PORTVERSION=	1.1
 CATEGORIES=	math cad
 MASTER_SITES=	ftp://ftp.md.chalmers.se/pub/Femlab/	\
 		ftp://ftp.ifs.hr/pub/SciUtil/
-DISTNAME=	femlab-2d-v${PORTVERSION}
+DISTFILES=	femlab-2d-v${PORTVERSION}.tar.gz
 
 MAINTAINER=	giffunip@asme.org
 
 BUILD_DEPENDS=	${X11BASE}/lib/libsx.a:${PORTSDIR}/x11/libsx
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
 USE_X_PREFIX=	yes
 
 FEMLAB_HOME=	${PREFIX}/lib/X11/femlab
diff --git a/math/topaz/Makefile b/math/topaz/Makefile
index 4fad9c9577f8..70c6462863d4 100644
--- a/math/topaz/Makefile
+++ b/math/topaz/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	topaz
 PORTVERSION=	3.25
 CATEGORIES=	math
 MASTER_SITES=	http://hp.vector.co.jp/authors/VA007663/topaz/bin/
-DISTNAME=	topaz-3_25-src
+DISTFILES=	topaz-3_25-src.tar.gz
 
 MAINTAINER=	issei@jp.FreeBSD.ORG
 
@@ -19,7 +19,6 @@ LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
 CXX?=		c++
 MAKEFILE=	Makefile.freebsd
 USE_XLIB=	yes
-WRKSRC=		${WRKDIR}/${PKGNAME}
 
 post-install:
 		${LN} -sf ${PREFIX}/lib/topaz/topaz.sh ${PREFIX}/bin/topaz
diff --git a/net-mgmt/ipfm/Makefile b/net-mgmt/ipfm/Makefile
index 5f884fcc4d5f..0f72ee36a687 100644
--- a/net-mgmt/ipfm/Makefile
+++ b/net-mgmt/ipfm/Makefile
@@ -13,7 +13,6 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	roman@xpert.com
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
 PATCH_STRIP=	-p1
 
 GNU_CONFIGURE=	yes
diff --git a/net/ipfm/Makefile b/net/ipfm/Makefile
index 5f884fcc4d5f..0f72ee36a687 100644
--- a/net/ipfm/Makefile
+++ b/net/ipfm/Makefile
@@ -13,7 +13,6 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	roman@xpert.com
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
 PATCH_STRIP=	-p1
 
 GNU_CONFIGURE=	yes
diff --git a/net/nam/Makefile b/net/nam/Makefile
index c04443ecb71a..73f311cd4418 100644
--- a/net/nam/Makefile
+++ b/net/nam/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	nam
 PORTVERSION=	1.0a8
 CATEGORIES=	net
 MASTER_SITES=	http://www-mash.cs.berkeley.edu/dist/vint/
-DISTNAME=	nam-src-${PORTVERSION}
+DISTFILES=	nam-src-${PORTVERSION}.tar.gz
 
 MAINTAINER=	obonilla@fisicc-ufm.edu
 
@@ -18,8 +18,6 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/libtclcl.a:${PORTSDIR}/devel/tclcl
 MAN1=		nam.1
 MANCOMPRESSED=	no
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-tcl-ver=8.2 --with-tk-ver=8.2
 
diff --git a/net/nsping/Makefile b/net/nsping/Makefile
index 1a7ec01cb6bb..772b37792597 100644
--- a/net/nsping/Makefile
+++ b/net/nsping/Makefile
@@ -9,12 +9,10 @@ PORTNAME=	nsping
 PORTVERSION=	0.8
 CATEGORIES=	net
 MASTER_SITES=	http://www.enteract.com/~tqbf/
-DISTNAME=	nsping
+DISTFILES=	nsping.tar.gz
 
 MAINTAINER=	kris@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
-
 MAN8=		nsping.8
 
 do-install:
diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index 63ae1a2d9d3b..47aff5657346 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -11,14 +11,13 @@ CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.unipi.it/pub/local/ntop/source/ \
 		http://www.freenix.no/~anders/ \
 		ftp://totem.fix.no/pub/mirrors/misc/
-DISTNAME=	ntop-1.1-src
+DISTFILES=	${DISTNAME}-src.tar.gz
 
 MAINTAINER=	billf@FreeBSD.org
 
 HAS_CONFIGURE=	yes
 ALL_TARGET=
 INSTALL_TARGET=	install install-man
-WRKSRC=		${WRKDIR}/${PKGNAME}
 
 MAN8=		ntop.8
 
diff --git a/net/sendfile/Makefile b/net/sendfile/Makefile
index f8cd6247f69a..bde629cbe59a 100644
--- a/net/sendfile/Makefile
+++ b/net/sendfile/Makefile
@@ -9,11 +9,10 @@ PORTNAME=	sendfile
 PORTVERSION=	2.1
 CATEGORIES=	net
 MASTER_SITES=   ftp://ftp.belwue.de/pub/unix/sendfile/current/
-DISTNAME=	sendfile-20000102
+DISTFILES=	sendfile-20000102.tar.gz
 
 MAINTAINER=	sec@42.org
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=makeconfig
 CONFIGURE_ENV=	PREFIX="${PREFIX}"
diff --git a/news/atp/Makefile b/news/atp/Makefile
index cf76bafb5bf7..53e62285e2e8 100644
--- a/news/atp/Makefile
+++ b/news/atp/Makefile
@@ -10,15 +10,13 @@ PORTVERSION=		1.50
 CATEGORIES=		news
 MASTER_SITES=		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	system/bbs/mail
-DISTNAME=		atp-1.50-src
+DISTFILES=		${DISTNAME}-src.tar.gz
 
 MAINTAINER=		dburr@FreeBSD.org
 
 RUN_DEPENDS=		zip:${PORTSDIR}/archivers/zip \
 			unzip:${PORTSDIR}/archivers/unzip
 
-WRKSRC=			${WRKDIR}/${PKGNAME}
-
 USE_GMAKE=		YES
 GNU_CONFIGURE=		YES
 
diff --git a/print/pbm2ppa/Makefile b/print/pbm2ppa/Makefile
index a2cde0aec69b..26b34bf7752d 100644
--- a/print/pbm2ppa/Makefile
+++ b/print/pbm2ppa/Makefile
@@ -9,14 +9,13 @@ PORTNAME=	pbm2ppa
 PORTVERSION=	0.8.6
 CATEGORIES=	print
 MASTER_SITES=	http://www.httptech.com/ppa/files/
-DISTNAME=	ppa-0.8.6
+DISTFILES=	ppa-${PORTVERSION}.tar.gz
 
 MAINTAINER=	smace@freebsd.org
 
 RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript5 \
 		enscript:${PORTSDIR}/print/enscript-letter
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
 USE_GMAKE=	yes
 
 HPMODEL?=	720
diff --git a/print/pnm2ppa/Makefile b/print/pnm2ppa/Makefile
index a2cde0aec69b..26b34bf7752d 100644
--- a/print/pnm2ppa/Makefile
+++ b/print/pnm2ppa/Makefile
@@ -9,14 +9,13 @@ PORTNAME=	pbm2ppa
 PORTVERSION=	0.8.6
 CATEGORIES=	print
 MASTER_SITES=	http://www.httptech.com/ppa/files/
-DISTNAME=	ppa-0.8.6
+DISTFILES=	ppa-${PORTVERSION}.tar.gz
 
 MAINTAINER=	smace@freebsd.org
 
 RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript5 \
 		enscript:${PORTSDIR}/print/enscript-letter
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
 USE_GMAKE=	yes
 
 HPMODEL?=	720
diff --git a/print/xtem/Makefile b/print/xtem/Makefile
index 5ea8b2cfa77e..adb1363f18a9 100644
--- a/print/xtem/Makefile
+++ b/print/xtem/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	xtem
 PORTVERSION=	7.00
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.iwd.uni-bremen.de/pub/tex/xtem.v7/
-DISTNAME=	xtem_texmenu.7.00
+DISTFILES=	xtem_texmenu.${PORTVERSION}.tar.gz
 
 MAINTAINER=     ports@FreeBSD.org
 
@@ -19,7 +19,6 @@ RUN_DEPENDS+=	gv:${PORTSDIR}/print/gv \
 		tex:${PORTSDIR}/print/teTeX
 .endif
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
 MAN1=		hyphen_show.1 xtem.1
 
 pre-extract:
diff --git a/security/fakebo/Makefile b/security/fakebo/Makefile
index 90fadc3aaddb..89dd79c02f25 100644
--- a/security/fakebo/Makefile
+++ b/security/fakebo/Makefile
@@ -16,8 +16,6 @@ MASTER_SITES=	ftp://ftp.deva.net/pub/sources/networking/ids/ \
 
 MAINTAINER=	kris@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
-
 GNU_CONFIGURE=	yes
 
 MAN1=		fakebo.1
diff --git a/security/lxnb/Makefile b/security/lxnb/Makefile
index 8bdaa6ac139f..6c54e1a9ae3b 100644
--- a/security/lxnb/Makefile
+++ b/security/lxnb/Makefile
@@ -9,13 +9,10 @@ PORTNAME=	lxnb
 PORTVERSION=	0.4
 CATEGORIES=	security
 MASTER_SITES=	http://ns2.crw.se/~tm/projects/lxnb/
-DISTNAME=	linux-netbus-client-v0.4
-EXTRACT_SUFX=	.tgz
+DISTFILES=	linux-netbus-client-v${PORTVERSION}.tgz
 
 MAINTAINER=	kris@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
-
 pre-build:
 	rm -f ${WRKSRC}/lxnetbus
 
diff --git a/security/rid/Makefile b/security/rid/Makefile
index fcf60dbeccc4..53669970fe1e 100644
--- a/security/rid/Makefile
+++ b/security/rid/Makefile
@@ -11,12 +11,10 @@ PORTVERSION=	1.0
 CATEGORIES=	security
 MASTER_SITES=	http://packetstorm.securify.com/distributed/  \
 		ftp://ftp.ntua.gr/pub/security/technotronic/denial/
-DISTNAME=	${PORTNAME}-1_0
-EXTRACT_SUFX=	.tgz
+DISTFILES=	${PORTNAME}-1_0.tgz
 
 MAINTAINER=	obrien@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
 ALL_TARGET=	rid
 
 pre-configure:
diff --git a/shells/tcsh/Makefile b/shells/tcsh/Makefile
index cf9d8d5fa98e..2c4a54abdb1f 100644
--- a/shells/tcsh/Makefile
+++ b/shells/tcsh/Makefile
@@ -24,7 +24,7 @@ DISTFILES=	# empty
 do-patch:
 .else
 GNU_CONFIGURE=	yes
-WRKSRC=		${WRKDIR}/${PKGNAME}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 ALL_TARGET=	all catalogs
 INSTALL_TARGET=	install install.man
 MAN1=		tcsh.1
diff --git a/sysutils/skill/Makefile b/sysutils/skill/Makefile
index 6253df02acdd..8dfd26210951 100644
--- a/sysutils/skill/Makefile
+++ b/sysutils/skill/Makefile
@@ -15,7 +15,6 @@ MAINTAINER=	jonny@jonny.eng.br
 
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	Config
-WRKSRC=			${WRKDIR}/${PKGNAME}
 
 MAN1=		skill.1
 MLINKS=		skill.1 snice.1
diff --git a/textproc/sgmltools/Makefile b/textproc/sgmltools/Makefile
index 92af6b7f13be..b2d39d2d4e65 100644
--- a/textproc/sgmltools/Makefile
+++ b/textproc/sgmltools/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	2.0.2
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://ftp.us.sgmltools.org/pub/SGMLtools/v2.0/source/ \
 		ftp://ftp.nllgg.nl/pub/SGMLtools/v2.0/source/
-DISTNAME=	${PORTNAME}-${PORTVERSION}.base
+DISTFILES=	${DISTNAME}.base.tar.bz2
 
 MAINTAINER=	benno@netizen.com.au
 
@@ -22,7 +22,6 @@ RUN_DEPENDS+=	${LOCALBASE}/share/sgml/docbook:${PORTSDIR}/textproc/docbook \
 
 USE_BZIP2=	yes
 USE_PERL5=	yes
-WRKSRC=		${WRKDIR}/${PKGNAME}
 MAN1=		sgmltools.1
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-etcsgml=${PREFIX}/etc/sgml
diff --git a/textproc/wordnet/Makefile b/textproc/wordnet/Makefile
index 45a661f9e169..83644b3064b2 100644
--- a/textproc/wordnet/Makefile
+++ b/textproc/wordnet/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.6
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://ftp.cogsci.princeton.edu/pub/wordnet/ \
 		ftp://ftp.ims.uni-stuttgart.de/pub/WordNet/${PORTVERSION}/
-DISTNAME=	wn16.unix
+DISTFILES=	wn16.unix.tar.gz
 
 MAINTAINER=	mi@aldan.algebra.com
 
@@ -24,8 +24,6 @@ MAN7=		morphy.7 uniqbeg.7 wngloss.7 wngroups.7 wnintro.7 \
 		wnlicens.7 wnpkgs.7 wnstats.7
 MANCOMPRESSED=	maybe
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
-
 TCL_DVER=	8.2
 SCRIPTS_ENV+=	TCL_DVER=${TCL_DVER}
 MAKE_ENV+=	TCL_DVER=${TCL_DVER}
diff --git a/www/bkmrkconv/Makefile b/www/bkmrkconv/Makefile
index 95269ca78813..4ba2b64f6d88 100644
--- a/www/bkmrkconv/Makefile
+++ b/www/bkmrkconv/Makefile
@@ -9,13 +9,12 @@ PORTNAME=	bkmrkconv
 PORTVERSION= 	1.08
 CATEGORIES=	www
 MASTER_SITES=	http://www.dcs.warwick.ac.uk/~csube/bkmrkconv/
-DISTNAME=	${PORTNAME}
+DISTFILES=	${PORTNAME}.tar.gz
 
 MAINTAINER=	will@FreeBSD.org
 
 USE_PERL5=	yes
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/${PKGNAME}
 
 pre-install:
 	@${PERL} -pi -e "s:/usr/local/bin/perl:${PERL}:g" ${WRKSRC}/*.pl
diff --git a/www/httperf/Makefile b/www/httperf/Makefile
index ed75357898e2..98e1c4d919f1 100644
--- a/www/httperf/Makefile
+++ b/www/httperf/Makefile
@@ -12,7 +12,6 @@ MASTER_SITES=	ftp://ftp.hpl.hp.com/pub/httperf/
 
 MAINTAINER=	ports@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
 USE_GMAKE=	yes
 MAN1=		httperf.1
 
diff --git a/www/webcopy/Makefile b/www/webcopy/Makefile
index 27c62d14b224..5cf536deea08 100644
--- a/www/webcopy/Makefile
+++ b/www/webcopy/Makefile
@@ -15,7 +15,6 @@ MAINTAINER=	ports@FreeBSD.org
 
 NO_PACKAGE=	"This program cannot be distributed if modified in any way"
 NO_CDROM=	"Don't sell for profit without written permission"
-WRKSRC=		${WRKDIR}/${PKGNAME}
 ALL_TARGET=
 
 do-install:
diff --git a/x11-fm/xnc/Makefile b/x11-fm/xnc/Makefile
index 80a9ee63e879..0c5f5d3939aa 100644
--- a/x11-fm/xnc/Makefile
+++ b/x11-fm/xnc/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	x11-fm
 MASTER_SITES=	http://www.xnc.dubna.su/src/ \
 		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	X11/desktop
-DISTNAME=	${PKGNAME}.src
+DISTFILES=	${DISTNAME}.src.tar.gz
 
 MAINTAINER=	dima@Chg.RU
 
@@ -26,7 +26,6 @@ MAINTAINER=	dima@Chg.RU
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.4:${PORTSDIR}/graphics/png
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-toolkits/fox-devel/Makefile b/x11-toolkits/fox-devel/Makefile
index d93be9752f36..ccbdeca829ed 100644
--- a/x11-toolkits/fox-devel/Makefile
+++ b/x11-toolkits/fox-devel/Makefile
@@ -34,7 +34,6 @@ CONFIGURE_ARGS+=--enable-release
 CONFIGURE_ARGS+=--with-profiling=gprof
 .endif
 USE_LIBTOOL=	yes
-WRKSRC=		${WRKDIR}/${PKGNAME}
 SHLIB_MAJ=	1
 SHLIB_MIN=	0
 MAKE_ENV+=	LT_CURRENT="${SHLIB_MAJ}" LT_REVISION="${SHLIB_MIN}"
diff --git a/x11-toolkits/fox/Makefile b/x11-toolkits/fox/Makefile
index d93be9752f36..ccbdeca829ed 100644
--- a/x11-toolkits/fox/Makefile
+++ b/x11-toolkits/fox/Makefile
@@ -34,7 +34,6 @@ CONFIGURE_ARGS+=--enable-release
 CONFIGURE_ARGS+=--with-profiling=gprof
 .endif
 USE_LIBTOOL=	yes
-WRKSRC=		${WRKDIR}/${PKGNAME}
 SHLIB_MAJ=	1
 SHLIB_MIN=	0
 MAKE_ENV+=	LT_CURRENT="${SHLIB_MAJ}" LT_REVISION="${SHLIB_MIN}"
diff --git a/x11-toolkits/fox10/Makefile b/x11-toolkits/fox10/Makefile
index d93be9752f36..ccbdeca829ed 100644
--- a/x11-toolkits/fox10/Makefile
+++ b/x11-toolkits/fox10/Makefile
@@ -34,7 +34,6 @@ CONFIGURE_ARGS+=--enable-release
 CONFIGURE_ARGS+=--with-profiling=gprof
 .endif
 USE_LIBTOOL=	yes
-WRKSRC=		${WRKDIR}/${PKGNAME}
 SHLIB_MAJ=	1
 SHLIB_MIN=	0
 MAKE_ENV+=	LT_CURRENT="${SHLIB_MAJ}" LT_REVISION="${SHLIB_MIN}"
diff --git a/x11-toolkits/fox14/Makefile b/x11-toolkits/fox14/Makefile
index d93be9752f36..ccbdeca829ed 100644
--- a/x11-toolkits/fox14/Makefile
+++ b/x11-toolkits/fox14/Makefile
@@ -34,7 +34,6 @@ CONFIGURE_ARGS+=--enable-release
 CONFIGURE_ARGS+=--with-profiling=gprof
 .endif
 USE_LIBTOOL=	yes
-WRKSRC=		${WRKDIR}/${PKGNAME}
 SHLIB_MAJ=	1
 SHLIB_MIN=	0
 MAKE_ENV+=	LT_CURRENT="${SHLIB_MAJ}" LT_REVISION="${SHLIB_MIN}"