6 files changed, 7 insertions, 18 deletions

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