WRKSRC-related fixes.

12 files changed, 14 insertions, 8 deletions

diff --git a/biology/mopac/Makefile b/biology/mopac/Makefile
index 1db9eb2b4aba..b17fa95f626d 100644
--- a/biology/mopac/Makefile
+++ b/biology/mopac/Makefile
@@ -9,6 +9,7 @@ PORTNAME=	mopac
 PORTVERSION=	7.02
 CATEGORIES=	biology
 MASTER_SITES=	ftp://ftp.ccl.net/pub/chemistry/software/SOURCES/FORTRAN/mopac7_sources/
+DISTNAME=	mopac7
 DISTFILES=	mopac7.tar.Z  mopac7-man.tar.Z
 
 PATCH_SITES=   ftp://ftp.ccl.net/pub/chemistry/software/LINUX/mopac7/old-version-95.06.21/
diff --git a/games/angband/Makefile b/games/angband/Makefile
index 41ab632ac4ad..1180b0cacf71 100644
--- a/games/angband/Makefile
+++ b/games/angband/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	2.8.3
 CATEGORIES=	games
 MASTER_SITES=	ftp://export.andrew.cmu.edu/angband/Source/ \
 		http://people.FreeBSD.org/~mph/distfiles/
+DISTNAME=	angband-283
 DISTFILES=	angband-283.tar.gz ext-x11-283.tar.gz angband-data.tar.gz
 
 MAINTAINER=	mph@freebsd.org
diff --git a/games/awele/Makefile b/games/awele/Makefile
index e12a0a86da82..0cbd0948db93 100644
--- a/games/awele/Makefile
+++ b/games/awele/Makefile
@@ -9,13 +9,13 @@ PORTNAME=	awele
 PORTVERSION=	1.0
 CATEGORIES=	games tk82
 MASTER_SITES=	http://www-air.inria.fr/ftp/Jean-Paul/
-DISTNAME=	${PORTNAME}${PORTVERSION}
-EXTRACT_SUFX=	.tgz
+DISTFILES=	${PORTNAME}1.0.tgz
 
 MAINTAINER=	tg@FreeBSD.org
 
 LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
 
+WRKSRC=		${WRKDIR}/awele
 USE_IMAKE=	yes
 NO_INSTALL_MANPAGES=	yes
 MAN6=		xawele.6
diff --git a/games/imaze/Makefile b/games/imaze/Makefile
index ec844d599ae1..cbfffbe2a2d8 100644
--- a/games/imaze/Makefile
+++ b/games/imaze/Makefile
@@ -25,6 +25,7 @@ MAINTAINER=	kuehn@rz.tu-clausthal.de
 LIB_DEPENDS=	xview.3:${PORTSDIR}/x11-toolkits/xview
 .endif
 
+WRKSRC=		${WRKDIR}/imaze
 EXTRACT_ONLY=	imaze1.3.tar.Z
 USE_X_PREFIX=	yes
 MAN6=		genlab.6 imaze.6 imazesrv.6 ninja.6
diff --git a/games/pmars/Makefile b/games/pmars/Makefile
index 268fa2ec669e..64a786d64c71 100644
--- a/games/pmars/Makefile
+++ b/games/pmars/Makefile
@@ -15,6 +15,7 @@ DISTFILES=	pmars08s.tar.Z
 MAINTAINER=	gmarco@giovannelli.it
 
 USE_XLIB=	yes
+NO_WRKSUBDIR=	yes
 MAKEFILE=	makefile
 ALL_TARGET=	pmars
 MAN6=		pmars.6
diff --git a/lang/squeak1/Makefile b/lang/squeak1/Makefile
index dbaf7989e19c..5e8a1df63964 100644
--- a/lang/squeak1/Makefile
+++ b/lang/squeak1/Makefile
@@ -16,7 +16,8 @@ MASTER_SITES=	http://www.apfel.de/~jesse/squeak/ \
 		http://st-www.cs.uiuc.edu/ftp/Smalltalk/Squeak/ \
 		ftp://uiarchive.cso.uiuc.edu/pub/lang/smalltalk/smalltalk/Squeak/ \
 		http://wuarchive.wustl.edu/languages/smalltalk/smalltalk/Squeak/
-DISTFILES=	${PORTVERSION}${EXTRACT_SUFX} ${SQUEAK_SRC}
+DISTNAME=	${PORTVERSION}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${SQUEAK_SRC}
 
 MAINTAINER=	jesse@cs.uni-magdeburg.de
 
diff --git a/net-im/xicq/Makefile b/net-im/xicq/Makefile
index ab772c351d6b..40bc02653fec 100644
--- a/net-im/xicq/Makefile
+++ b/net-im/xicq/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	xicq-071298-snapshot.src
 
 MAINTAINER=	scrappy@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
+WRKSRC=		${WRKDIR}/xicq-071298
 
 USE_GMAKE=	yes
 MAKE_ENV=	OPT="${CFLAGS}"
diff --git a/net/nam/Makefile b/net/nam/Makefile
index 16fb5f1ca566..a0010f636716 100644
--- a/net/nam/Makefile
+++ b/net/nam/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/libtclcl.a:${PORTSDIR}/devel/tclcl
 MAN1=		nam.1
 MANCOMPRESSED=	no
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
+WRKSRC=		${WRKDIR}/nam-1.0a7
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-tcl-ver=8.2 --with-tk-ver=8.2
diff --git a/net/ns/Makefile b/net/ns/Makefile
index c89e355b02b0..37845457bbbe 100644
--- a/net/ns/Makefile
+++ b/net/ns/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	${PREFIX}/bin/tclsh8.2:${PORTSDIR}/lang/tcl82
 MAN1=		ns.1
 MANCOMPRESSED=	no
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
+WRKSRC=		${WRKDIR}/ns-2.1b5
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-tcl-ver=8.2 --with-tk-ver=8.2
diff --git a/net/ns2/Makefile b/net/ns2/Makefile
index c89e355b02b0..37845457bbbe 100644
--- a/net/ns2/Makefile
+++ b/net/ns2/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	${PREFIX}/bin/tclsh8.2:${PORTSDIR}/lang/tcl82
 MAN1=		ns.1
 MANCOMPRESSED=	no
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
+WRKSRC=		${WRKDIR}/ns-2.1b5
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-tcl-ver=8.2 --with-tk-ver=8.2
diff --git a/net/xicq/Makefile b/net/xicq/Makefile
index ab772c351d6b..40bc02653fec 100644
--- a/net/xicq/Makefile
+++ b/net/xicq/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	xicq-071298-snapshot.src
 
 MAINTAINER=	scrappy@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
+WRKSRC=		${WRKDIR}/xicq-071298
 
 USE_GMAKE=	yes
 MAKE_ENV=	OPT="${CFLAGS}"
diff --git a/print/tex/Makefile b/print/tex/Makefile
index 060c6bd62970..748c8418f085 100644
--- a/print/tex/Makefile
+++ b/print/tex/Makefile
@@ -9,6 +9,7 @@ PORTNAME=	tex
 PORTVERSION=	3.14159
 CATEGORIES=	print
 MASTER_SITES=   ftp://ftp.freesoftware.com/pub/tex/package/
+DISTNAME=	web2c-7.2
 DISTFILES=	web2c-7.2b.tar.gz web-7.2a.tar.gz tex_base.tar.gz cm_tfm.tar.gz \
 		mf_lib.tar.gz cm_mf.tar.gz modes.mf