Move WRKSRC definition away from the first paragraph in a Makefile.

31 files changed, 64 insertions, 62 deletions

diff --git a/mail/GNUMail/Makefile b/mail/GNUMail/Makefile
index d779c7ecd79..e7a1a86f371 100644
--- a/mail/GNUMail/Makefile
+++ b/mail/GNUMail/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2004/01/03 18:49:45 reed Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:19:43 agc Exp $
 #
 
 DISTNAME=	GNUMail-1.1.1
 PKGREVISION=			1
-WRKSRC=		${WRKDIR}/GNUMail
 CATEGORIES=	mail gnustep
 MASTER_SITES=	http://debian.uni-essen.de/misc/GNUstep/Apps/GNUMail/
 
@@ -11,6 +10,7 @@ MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://www.collaboration-world.com/gnumail/
 COMMENT=	GNUstep clone of NeXT's Mail.app application
 
+WRKSRC=			${WRKDIR}/GNUMail
 USE_BUILDLINK2=		YES
 USE_GMAKE=		YES
 USE_X11=		YES
diff --git a/mail/Pantomime/Makefile b/mail/Pantomime/Makefile
index 1ae86334d6a..5253f01578b 100644
--- a/mail/Pantomime/Makefile
+++ b/mail/Pantomime/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2004/01/03 18:49:45 reed Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:19:43 agc Exp $
 #
 
 DISTNAME=	Pantomime-1.1.1
 PKGREVISION=			1
-WRKSRC=		${WRKDIR}/Pantomime
 CATEGORIES=	mail gnustep
 MASTER_SITES=	http://debian.uni-essen.de/misc/GNUstep/Apps/GNUMail/
 
@@ -11,6 +10,7 @@ MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://www.collaboration-world.com/pantomime/
 COMMENT=	Objective-C mail system class library
 
+WRKSRC=			${WRKDIR}/Pantomime
 NO_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
 USE_GMAKE=		YES
diff --git a/mail/anomy-sanitizer/Makefile b/mail/anomy-sanitizer/Makefile
index 4679cdd6d5d..5c163775790 100644
--- a/mail/anomy-sanitizer/Makefile
+++ b/mail/anomy-sanitizer/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2004/01/18 23:40:12 kim Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:19:43 agc Exp $
 #
 
 DISTNAME=	anomy-sanitizer-1.66
-WRKSRC=		${WRKDIR}/anomy
 CATEGORIES=	mail
 MASTER_SITES=	http://mailtools.anomy.net/dist/
 
@@ -17,6 +16,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 .include "../../mk/bsd.prefs.mk"
 
+WRKSRC=		${WRKDIR}/anomy
 NO_BUILDLINK=	# defined
 NO_CONFIGURE=	# defined
 USE_PERL5=	# defined
diff --git a/mail/distribute/Makefile b/mail/distribute/Makefile
index 2c77978a2bf..00004a646a9 100644
--- a/mail/distribute/Makefile
+++ b/mail/distribute/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2003/03/29 12:41:34 jmmv Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/20 12:19:43 agc Exp $
 # FreeBSD: ports/mail/distribute/Makefile,v 1.2 1999/08/25 06:50:06 obrien Exp
 #
 
 DISTNAME=	distribute-2.1-pl19
 PKGNAME=	distribute-2.1.26
-WRKSRC=		${WRKDIR}/distribute-pl19
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.foretune.co.jp/pub/network/mail/distribute/
 
@@ -17,6 +16,7 @@ MAINTAINER=	itojun@itojun.org
 HOMEPAGE=	http://www.foretune.co.jp/people/shigeya/distribute/
 COMMENT=	Mail dispatcher for mailing list.  Fits nicely with majordomo
 
+WRKSRC=		${WRKDIR}/distribute-pl19
 USE_PERL5=	YES
 
 MAN1=		distribute.1
diff --git a/mail/drac/Makefile b/mail/drac/Makefile
index 6af8267b0ed..4d31322449c 100644
--- a/mail/drac/Makefile
+++ b/mail/drac/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/07/17 21:45:53 grant Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:19:43 agc Exp $
 #
 
 DISTNAME=	drac
 PKGNAME=	drac-1.12
-WRKSRC=		${WRKDIR}
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cc.umanitoba.ca/src/
 EXTRACT_SUFX=   .tar.Z
@@ -12,6 +11,7 @@ MAINTAINER=	groo@NetBSD.org
 HOMEPAGE=	http://mail.cc.umanitoba.ca/drac/
 COMMENT=	Dynamic Relay Authorization Control
 
+WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	${PKGNAME_NOREV}
 USE_BUILDLINK2=	YES
 
diff --git a/mail/elm-me/Makefile b/mail/elm-me/Makefile
index efd2ed1905b..71fa31e54e3 100644
--- a/mail/elm-me/Makefile
+++ b/mail/elm-me/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2003/07/17 21:45:55 grant Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/20 12:19:43 agc Exp $
 # FreeBSD: Makefile,v 1.42 1997/12/24 01:21:07 alex Exp
 #
 
 DISTNAME=		elm-2.4ME+93
 PKGNAME=		elm-me-2.4.93
 PKGREVISION=				1
-WRKSRC=			${WRKDIR}/elm2.4.ME+.93
 CATEGORIES=		mail
 MASTER_SITES=		ftp://ftp.ozone.fmi.fi/KEH/ \
 			ftp://ftp.funet.fi/pub/unix/mail/elm/elm-2.4ME+/ \
@@ -17,6 +16,7 @@ COMMENT=		ELM Mail User Agent with ME extensions
 
 CONFLICTS=		elm-[0-9]*
 
+WRKSRC=			${WRKDIR}/elm2.4.ME+.93
 USE_BUILDLINK2=		YES
 USE_PKGINSTALL=		YES
 HAS_CONFIGURE=		YES
diff --git a/mail/exim/Makefile.common b/mail/exim/Makefile.common
index 7b8150feefd..02e0e6c2c85 100644
--- a/mail/exim/Makefile.common
+++ b/mail/exim/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2003/11/30 03:01:33 grant Exp $
+# $NetBSD: Makefile.common,v 1.4 2004/01/20 12:19:43 agc Exp $
 
 MASTER_SITES=	ftp://ftp.exim.org/pub/exim/exim4/ \
 		ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \
@@ -12,13 +12,13 @@ MAKE_ENV+=	SSLBASE=${SSLBASE:Q}
 
 EXIM_VERSION=	4.22
 
-WRKSRC=		${WRKDIR}/exim-${EXIM_VERSION}
 EXTRACT_SUFX=	.tar.bz2
 
 .include "../../mk/bsd.prefs.mk"
 
 BUILD_DEFS=		EXIM_USER EXIM_GROUP
 
+WRKSRC=		${WRKDIR}/exim-${EXIM_VERSION}
 PKG_SYSCONFSUBDIR?=	exim
 EXAMPLESDIR=		${PREFIX}/share/examples/exim
 CONF_FILES=		${EXAMPLESDIR}/aliases ${PKG_SYSCONFDIR}/aliases
diff --git a/mail/faces/Makefile b/mail/faces/Makefile
index 0b9e69c33a1..ff91afbf357 100644
--- a/mail/faces/Makefile
+++ b/mail/faces/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2003/07/22 14:03:23 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2004/01/20 12:19:43 agc Exp $
 
 DISTNAME=	faces-1.6.1
 PKGREVISION=	2
-WRKSRC=		${WRKDIR}/faces
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cs.indiana.edu/pub/faces/faces/faces-1.6.1/
 EXTRACT_SUFX=	.tar.Z
@@ -17,6 +16,7 @@ CONFLICTS=	compface-[0-9]*
 LICENSE=	limited-redistribution
 RESTRICTED=	"Distribution not allowed if money exchanged"
 
+WRKSRC=			${WRKDIR}/faces
 USE_BUILDLINK2=		YES
 USE_X11BASE=		YES
 USE_LIBTOOL=		YES
diff --git a/mail/fromto/Makefile b/mail/fromto/Makefile
index c16ff3a408d..562768324aa 100644
--- a/mail/fromto/Makefile
+++ b/mail/fromto/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 21:46:08 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:19:43 agc Exp $
 #
 
 DISTNAME=	fromto-1.5
-WRKSRC=		${WRKDIR}
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/lang/perl/sra-scripts/
 EXTRACT_SUFX=	#empty
@@ -12,6 +11,7 @@ COMMENT=	Sendmail logfile viewer
 
 RESTRICTED=	"Redistribution allowed for non-commercial purposes only"
 
+WRKSRC=		${WRKDIR}
 USE_PERL5=	yes
 
 do-extract:
diff --git a/mail/ifile-procmail/Makefile b/mail/ifile-procmail/Makefile
index 5d7273cd140..1ff817eef0c 100644
--- a/mail/ifile-procmail/Makefile
+++ b/mail/ifile-procmail/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/07/25 15:46:17 salo Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:19:43 agc Exp $
 #
 
 DISTNAME=	ifile.procmail-0.3
 PKGNAME=	${DISTNAME:S/./-/}
-WRKSRC=		${WRKDIR}/${DISTNAME}
 CATEGORIES=	mail
 MASTER_SITES=	http://Xtrmntr.org/ORBman/download/
 EXTRACT_SUFX=	.tgz
@@ -15,6 +14,8 @@ COMMENT=	Set of scripts for ifile used in procmail environment
 DEPENDS+=	ifile>=1.2.1:../../mail/ifile
 DEPENDS+=	procmail>=3.22:../../mail/procmail
 
+WRKSRC=		${WRKDIR}/${DISTNAME}
+
 .include "../../mk/bsd.prefs.mk"
 
 .if empty(OPSYS:M*BSD)
diff --git a/mail/imap-uw-utils/Makefile b/mail/imap-uw-utils/Makefile
index 5cb2b49d65e..4f040cc8f8e 100644
--- a/mail/imap-uw-utils/Makefile
+++ b/mail/imap-uw-utils/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2003/11/12 03:39:40 jschauma Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/20 12:19:43 agc Exp $
 
 DISTNAME=	imap-utils
 PKGNAME=	imap-uw-utils-20020102
 PKGREVISION=	2
-WRKSRC=		${WRKDIR}
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cac.washington.edu/imap/
 EXTRACT_SUFX=	.tar.Z
@@ -12,6 +11,7 @@ MAINTAINER=	jlam@NetBSD.org
 HOMEPAGE=	http://www.washington.edu/imap/
 COMMENT=	UW IMAP mailbox utilities
 
+WRKSRC=			${WRKDIR}
 DIST_SUBDIR=		${PKGNAME_NOREV}
 USE_BUILDLINK2=		# defined
 
diff --git a/mail/libsieve/Makefile b/mail/libsieve/Makefile
index 8f483235b20..505ceca8fe9 100644
--- a/mail/libsieve/Makefile
+++ b/mail/libsieve/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/07/17 21:46:21 grant Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/20 12:19:43 agc Exp $
 #
 
 DISTNAME=	cyrus-imapd-2.1.12
 PKGNAME=	${DISTNAME:S/cyrus-imapd/libsieve/}
-WRKSRC=		${WRKDIR}/${DISTNAME}/sieve
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/
 
@@ -11,6 +10,7 @@ MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://www.cyrusoft.com/sieve/
 COMMENT=	RFC3028 sieve library
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/sieve
 USE_BUILDLINK2=	YES
 USE_LIBTOOL=	YES
 CPPFLAGS+=	-I.
diff --git a/mail/mailserv/Makefile b/mail/mailserv/Makefile
index e99649426e5..c22a83499b5 100644
--- a/mail/mailserv/Makefile
+++ b/mail/mailserv/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/10/02 16:18:36 reed Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:19:43 agc Exp $
 #
 
 DISTNAME=	mailserv
 PKGNAME=	${DISTNAME}-3.29
-WRKSRC=		${WRKDIR}
 CATEGORIES=	mail
 MASTER_SITES=	http://www.csicop.org/~fitz/www/mailserv/
 
@@ -11,6 +10,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.csicop.org/~fitz/www/mailserv/
 COMMENT=	WWW interface to several types of mailing list servers
 
+WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	${PKGNAME_NOREV}
 
 USE_PERL5=	YES
diff --git a/mail/mailsync/Makefile b/mail/mailsync/Makefile
index 8c084771f74..8de63312d28 100644
--- a/mail/mailsync/Makefile
+++ b/mail/mailsync/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/11/07 15:03:34 gavan Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:19:43 agc Exp $
 #
 
 DISTNAME=	mailsync_4.3-2
 PKGNAME=	mailsync-4.3.2
-WRKSRC=		${WRKDIR}/mailsync-4.3
 CATEGORIES=	mail
 MASTER_SITES=	http://unc.dl.sourceforge.net/mailsync/
 
@@ -13,6 +12,7 @@ COMMENT=	Mailsync is a way of synchronizing a collection of mailboxes
 
 DEPENDS+=	imap-uw-[0-9]*:../../mail/imap-uw
 
+WRKSRC=		${WRKDIR}/mailsync-4.3
 USE_GMAKE=	yes
 USE_GCC_SHLIB=	yes
 ALL_TARGET=	default
diff --git a/mail/mailwrapper/Makefile b/mail/mailwrapper/Makefile
index 687bbd51d5d..2393315a2a9 100644
--- a/mail/mailwrapper/Makefile
+++ b/mail/mailwrapper/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2003/07/17 21:46:25 grant Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/20 12:19:43 agc Exp $
 
 DISTNAME=	mailwrapper-19990412
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/mailwrapper
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
@@ -11,6 +10,7 @@ COMMENT=	NetBSD 1.4's wrapper to support arbitrary Mail Transport Agents
 
 NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 
+WRKSRC=			${WRKDIR}/mailwrapper
 USE_PKGINSTALL=		yes
 NO_CONFIGURE=		yes
 MANCOMPRESSED_IF_MANZ=	yes
diff --git a/mail/mdfrm/Makefile b/mail/mdfrm/Makefile
index 829ec2fff27..37581812016 100644
--- a/mail/mdfrm/Makefile
+++ b/mail/mdfrm/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/07/21 16:56:46 martti Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:19:43 agc Exp $
 #
 
 DISTNAME=	mdfrm.pl
 PKGNAME=	mdfrm-1.0
-WRKSRC=		${WRKDIR}
 CATEGORIES=	mail
 MASTER_SITES=	http://www.goof.com/~mmead/
 EXTRACT_SUFX=	#
@@ -15,6 +14,7 @@ DEPENDS+=       p5-TimeDate-[0-9]*:../../time/p5-TimeDate
 
 EXTRACT_CMD=	${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}
 
+WRKSRC=		${WRKDIR}
 USE_PERL5=	yes
 NO_BUILD=	yes
 
diff --git a/mail/metamail/Makefile b/mail/metamail/Makefile
index 08f8dc417da..dfef6279f73 100644
--- a/mail/metamail/Makefile
+++ b/mail/metamail/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2004/01/05 12:00:10 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2004/01/20 12:19:43 agc Exp $
 
 DISTNAME=	mm2.7
 PKGNAME=	metamail-2.7
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
 CATEGORIES=	mail
 MASTER_SITES=	ftp://thumper.bellcore.com/pub/nsb/
 EXTRACT_SUFX=	.tar.Z
@@ -15,6 +14,7 @@ CONFLICTS+=	elm>=2.5.5 mm-2.7
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
+WRKSRC=			${WRKDIR}/${DISTNAME}/src
 USE_BUILDLINK3=		YES
 USE_PKGINSTALL=		YES
 USE_X11=		YES
diff --git a/mail/mush/Makefile b/mail/mush/Makefile
index c18a13e9015..4e34097fc61 100644
--- a/mail/mush/Makefile
+++ b/mail/mush/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2003/07/21 16:56:46 martti Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/20 12:19:43 agc Exp $
 
 DISTNAME=	mush-7.2.5
 PKGNAME=	mush-7.2.6.b4.pl1
-WRKSRC=		${WRKDIR}
 CATEGORIES=	mail
 MASTER_SITES=	ftp://cse.ogi.edu/pub/mush/
 EXTRACT_SUFX=	.tar.Z
@@ -24,6 +23,7 @@ LICENSE=	mush-license
 RESTRICTED=		"Can't sell the code as part of anything"
 NO_SRC_ON_CDROM=	${RESTRICTED}
 
+WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	mush
 
 pre-configure:
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 90f72d77034..8de2e80487c 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.108 2003/12/12 10:45:18 grant Exp $
+# $NetBSD: Makefile,v 1.109 2004/01/20 12:19:43 agc Exp $
 
 DISTNAME=		mutt-1.4.1i
 PKGNAME=                ${DISTNAME:C/i$//}
 PKGREVISION=		3
-WRKSRC=			${WRKDIR}/${DISTNAME:C/i$$//}
 CATEGORIES=		mail
 MASTER_SITES=		ftp://ftp.mutt.org/mutt/ \
 			ftp://ftp.stealth.net/pub/mirrors/ftp.mutt.org/pub/mutt/ \
@@ -16,6 +15,7 @@ COMMENT=		Text-based MIME mail client with PGP support
 
 BUILD_USES_MSGFMT=	yes
 
+WRKSRC=			${WRKDIR}/${DISTNAME:C/i$$//}
 USE_BUILDLINK2=		yes
 USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
diff --git a/mail/newmail/Makefile b/mail/newmail/Makefile
index dd40e8f717b..4808b40b011 100644
--- a/mail/newmail/Makefile
+++ b/mail/newmail/Makefile
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2003/07/21 16:56:47 martti Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:19:43 agc Exp $
 # FreeBSD: ports/mail/newmail/Makefile,v 1.4 2001/06/08 18:36:36 dwcjr Exp
 #
 
 DISTNAME=	newmail-1.0.1
-WRKSRC=		${WRKDIR}/newmail
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.ugh.net.au/pub/unix/newmail/
 
 MAINTAINER=	andrew@ugh.net.au
 COMMENT=	Program to check multiple local mailboxes for new mail
 
+WRKSRC=		${WRKDIR}/newmail
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/oe2mbx/Makefile b/mail/oe2mbx/Makefile
index 82b3ff526d4..4e2d04641bb 100644
--- a/mail/oe2mbx/Makefile
+++ b/mail/oe2mbx/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:46:37 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:19:43 agc Exp $
 #
 
 DISTNAME=	oe2mbx-1.21
-WRKSRC=		${WRKDIR}/liboe-0.92
 CATEGORIES=	mail
 MASTER_SITES=	http://www.gpl.no/liboe/download/
 
@@ -10,6 +9,7 @@ MAINTAINER=	zuntum@NetBSD.org
 HOMEPAGE=	http://www.gpl.no/liboe/
 COMMENT=	Outlook Express messages to the Unix mailbox format converter
 
+WRKSRC=		${WRKDIR}/liboe-0.92
 MAKEFILE=	makefile
 
 ALL_TARGET=	liboe oe2mbx
diff --git a/mail/offlineimap/Makefile b/mail/offlineimap/Makefile
index bbba2e1f57d..26168863640 100644
--- a/mail/offlineimap/Makefile
+++ b/mail/offlineimap/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/12/24 09:53:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/20 12:19:43 agc Exp $
 #
 
 DISTNAME=	offlineimap_${_OFFLINEIMAP_VER}
 PKGNAME=	offlineimap-${_OFFLINEIMAP_VER}
-WRKSRC=		${WRKDIR}/offlineimap
 CATEGORIES=	mail
 MASTER_SITES=	http://gopher.quux.org:70/devel/offlineimap/
 
@@ -11,6 +10,7 @@ MAINTAINER=	seb@NetBSD.org
 HOMEPAGE=	http://gopher.quux.org:70/devel/offlineimap/
 COMMENT=	Powerful IMAP/Maildir synchronization and reader support
 
+WRKSRC=		${WRKDIR}/offlineimap
 USE_BUILDLINK2=	# defined
 
 # This is only to placate pkglint
diff --git a/mail/p5-MIME-tools/Makefile b/mail/p5-MIME-tools/Makefile
index e0378d16249..afdab962110 100644
--- a/mail/p5-MIME-tools/Makefile
+++ b/mail/p5-MIME-tools/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2003/07/21 16:56:49 martti Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/20 12:19:43 agc Exp $
 #
 
 DISTNAME=       MIME-tools-5.411a
 PKGNAME=        p5-${DISTNAME:S/a/.1/}
 SVR4_PKGNAME=	p5mit
-WRKSRC=		${WRKDIR}/MIME-tools-5.411
 CATEGORIES=	perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=MIME/}
 
@@ -16,6 +15,7 @@ DEPENDS+=	p5-IO-stringy-[0-9]*:../../devel/p5-IO-stringy
 DEPENDS+=	p5-MIME-Base64-[0-9]*:../../converters/p5-MIME-Base64
 DEPENDS+=	p5-MailTools-[0-9]*:../../mail/p5-MailTools
 
+WRKSRC=			${WRKDIR}/MIME-tools-5.411
 USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/MIME-tools/.packlist
 
diff --git a/mail/qmHandle/Makefile b/mail/qmHandle/Makefile
index 2a53315d51f..9728d0290ff 100644
--- a/mail/qmHandle/Makefile
+++ b/mail/qmHandle/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2003/07/21 16:56:53 martti Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:19:44 agc Exp $
 #
 
 DISTNAME=	qmHandle-1.0.0
-WRKSRC=		${WRKDIR}
 CATEGORIES=	mail
 MASTER_SITES=	http://www.italpro.net/mb/soft/
 
@@ -12,6 +11,7 @@ COMMENT=	Tool to view and manage the qmail message queue
 
 RESTRICTED=	"Contact author before reselling"
 
+WRKSRC=		${WRKDIR}
 USE_PERL5=	YES
 REPLACE_PERL=	qmHandle
 NO_BUILD=	YES
diff --git a/mail/qmail-lint/Makefile b/mail/qmail-lint/Makefile
index 23c13e958a0..e13aeb2e931 100644
--- a/mail/qmail-lint/Makefile
+++ b/mail/qmail-lint/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/07/21 16:56:54 martti Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:19:44 agc Exp $
 #
 
 DISTNAME=	qmail-lint-0.55
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}
 CATEGORIES=	mail
 MASTER_SITES=	http://qmail.obeer.com/
 EXTRACT_SUFX=	#
@@ -14,6 +13,7 @@ COMMENT=	Examine the qmail configuration to see if any common errors exist
 
 EXTRACT_CMD=	${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}
 
+WRKSRC=		${WRKDIR}
 USE_PERL5=	yes
 REPLACE_PERL=	${DISTNAME}
 NO_BUILD=	yes
diff --git a/mail/qmail-users/Makefile b/mail/qmail-users/Makefile
index 4a50a93ca8c..e9905433b36 100644
--- a/mail/qmail-users/Makefile
+++ b/mail/qmail-users/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 21:46:56 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:19:44 agc Exp $
 #
 
 DISTNAME=	qmail-users-1.0
-WRKSRC=		${WRKDIR}
 CATEGORIES=	mail
 MASTER_SITES=   #
 DISTFILES=	#
@@ -21,6 +20,7 @@ PKG_USERS+=	qmailq:qmail::qmailq:${QMAILDIR}
 PKG_USERS+=	qmailr:qmail::qmailr:${QMAILDIR}
 PKG_USERS+=	qmails:qmail::qmails:${QMAILDIR}
 
+WRKSRC=		${WRKDIR}
 NO_BUILD=	YES
 NO_CHECKSUM=	YES
 USE_PKGINSTALL=	YES
diff --git a/mail/sendmail/Makefile.common b/mail/sendmail/Makefile.common
index 185b2e14c9b..267fdff3c72 100644
--- a/mail/sendmail/Makefile.common
+++ b/mail/sendmail/Makefile.common
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile.common,v 1.13 2003/12/03 22:11:02 reed Exp $
+# $NetBSD: Makefile.common,v 1.14 2004/01/20 12:19:44 agc Exp $
 #
 # Makefile fragment shared with libmilter
 #
 
 DISTNAME=	sendmail.${DIST_VERS}
-WRKSRC=		${WRKDIR}/sendmail-${DIST_VERS}
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.sendmail.org/pub/sendmail/ \
 		ftp://ftp.fu-berlin.de/pub/unix/mail/sendmail/ \
@@ -30,6 +29,7 @@ BUILD_DEFS+=    USE_INET6 USE_TCPWRAPPERS USE_LDAP USE_DB2 \
 		USE_SASL USE_SASL2 USE_STARTTLS USE_DB4
 DESCR_SRC=	${WRKDIR}/.DESCR_SRC
 
+WRKSRC=		${WRKDIR}/sendmail-${DIST_VERS}
 USE_BUILDLINK2=	YES
 USE_GNU_TOOLS+=	m4
 MAKE_ENV+=	M4="${M4}"
diff --git a/mail/sendmail811/Makefile b/mail/sendmail811/Makefile
index fba5c112a09..ccdeb8892fc 100644
--- a/mail/sendmail811/Makefile
+++ b/mail/sendmail811/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2003/11/12 03:39:41 jschauma Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/20 12:19:44 agc Exp $
 
 DISTNAME=	sendmail.8.11.6
 PKGNAME=	sendmail-8.11.6
 PKGREVISION=	7
-WRKSRC=		${WRKDIR}/${PKGNAME:C/nb[0-9]+$//}
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.sendmail.org/pub/sendmail/ \
 		ftp://ftp.fu-berlin.de/unix/mail/sendmail/ \
@@ -30,6 +29,7 @@ COMMENT=	The well known Mail Transport Agent
 
 LICENSE=	no-profit
 
+WRKSRC=		${WRKDIR}/${PKGNAME:C/nb[0-9]+$//}
 USE_BUILDLINK2=	# defined
 MAKE_ENV+=	BSD_BINOWN="${BINOWN}" BSD_BINGRP="${BINGRP}" \
 		BSD_MANOWN="${MANOWN}" BSD_MANGRP="${MANGRP}" \
diff --git a/mail/sigrot/Makefile b/mail/sigrot/Makefile
index fdf94b1e639..26454408dea 100644
--- a/mail/sigrot/Makefile
+++ b/mail/sigrot/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/06/18 09:22:19 agc Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:19:44 agc Exp $
 
 DISTNAME=	sigrot_1.2-1
 PKGNAME=	sigrot-1.2
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool/main/s/sigrot/}
 
@@ -10,6 +9,7 @@ MAINTAINER=	drue@users.sourceforge.net
 HOMEPAGE=	http://packages.debian.org/stable/mail/sigrot.html
 COMMENT=	Signature file rotation program
 
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 USE_BUILDLINK2=	yes
 USE_GMAKE=	yes
 
diff --git a/mail/sma/Makefile b/mail/sma/Makefile
index ead6af36552..79dcb3def5f 100644
--- a/mail/sma/Makefile
+++ b/mail/sma/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/09/24 09:25:46 tron Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/20 12:19:44 agc Exp $
 
 DISTNAME=       sma-1.3.2
-WRKSRC=         ${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	mail
 MASTER_SITES=   http://www.klake.org/sma/dl/
 
@@ -9,6 +8,7 @@ MAINTAINER=	markus@core.de
 HOMEPAGE=	http://www.klake.org/sma/
 COMMENT=	Sendmail log analyser
 
+WRKSRC=         ${WRKDIR}/${PKGNAME_NOREV}
 NO_CONFIGURE=	yes
 
 MAKEFILE=	Makefile
diff --git a/mail/ssmtp/Makefile b/mail/ssmtp/Makefile
index 4d5ed5a9381..322871bb890 100644
--- a/mail/ssmtp/Makefile
+++ b/mail/ssmtp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/11/14 00:51:43 jschauma Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:19:44 agc Exp $
 # FreeBSD Id: ports/mail/ssmtp/Makefile,v 1.10 2003/04/14 08:41:04 leeym Exp
 #
 # TLS functionality needs testing. Please let me know the result,
@@ -10,7 +10,6 @@
 DISTNAME=	ssmtp_2.60.3
 PKGNAME=	ssmtp-2.60.3
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/${PKGBASE}-${PKGVERSION:C/([0-9]+.[0-9]+)(.[0-9]+)(nb[0-9]+)?$/\1/}
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool/main/s/ssmtp/}
 
@@ -18,6 +17,7 @@ MAINTAINER=	pkg@pop.707.to
 HOMEPAGE=	http://packages.debian.org/testing/mail/ssmtp.html
 COMMENT=	Extremely simple MTA to forward mail to a mail hub
 
+WRKSRC=			${WRKDIR}/${PKGBASE}-${PKGVERSION:C/([0-9]+.[0-9]+)(.[0-9]+)(nb[0-9]+)?$/\1/}
 USE_BUILDLINK2=		YES
 USE_PKGINSTALL=		YES