CATEGORIES+= --> CATEGORIES=

And clean up variable ordering (as shown in the handbook) as little.

25 files changed, 57 insertions, 61 deletions

diff --git a/converters/mpack/Makefile b/converters/mpack/Makefile
index 850ed85409d7..18a4862a88b0 100644
--- a/converters/mpack/Makefile
+++ b/converters/mpack/Makefile
@@ -3,17 +3,18 @@
 # Date created:         1 May 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.3 1995/11/22 13:12:23 asami Exp $
+# $Id: Makefile,v 1.4 1995/11/26 10:51:42 asami Exp $
 #
 
 DISTNAME=       mpack-1.5-src
 PKGNAME=        mpack-1.5
-EXTRACT_SUFX=   .tar.Z
-CATEGORIES+=    mail news
+CATEGORIES=     mail news
 MASTER_SITES=   ftp://ftp.andrew.cmu.edu/pub/mpack/
-WRKSRC=         ${WRKDIR}/mpack
-MAKEFLAGS=      -DDESTDIR=${PREFIX} -f
+EXTRACT_SUFX=   .tar.Z
 
 MAINTAINER=     ache@FreeBSD.ORG
 
+WRKSRC=         ${WRKDIR}/mpack
+MAKEFLAGS=      -DDESTDIR=${PREFIX} -f
+
 .include <bsd.port.mk>
diff --git a/mail/elm+ME/Makefile b/mail/elm+ME/Makefile
index 24eabf98f1f5..30f89a5dc016 100644
--- a/mail/elm+ME/Makefile
+++ b/mail/elm+ME/Makefile
@@ -4,11 +4,11 @@
 # Date created:         26 June 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.30 1996/09/21 12:20:13 ache Exp $
+# $Id: Makefile,v 1.31 1996/10/03 19:07:54 ache Exp $
 #
 
 DISTNAME=       elm-2.4ME+28
-CATEGORIES+=	mail
+CATEGORIES=	mail
 MASTER_SITES=   ftp://dionysos.fmi.fi/KEH/ \
 		ftp://ftp.funet.fi/pub/unix/mail/elm/elm-2.4ME+/ \
 		ftp://ftp.ibp.fr/pub/unix/mail/elm-me/
diff --git a/mail/elm/Makefile b/mail/elm/Makefile
index 24eabf98f1f5..30f89a5dc016 100644
--- a/mail/elm/Makefile
+++ b/mail/elm/Makefile
@@ -4,11 +4,11 @@
 # Date created:         26 June 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.30 1996/09/21 12:20:13 ache Exp $
+# $Id: Makefile,v 1.31 1996/10/03 19:07:54 ache Exp $
 #
 
 DISTNAME=       elm-2.4ME+28
-CATEGORIES+=	mail
+CATEGORIES=	mail
 MASTER_SITES=   ftp://dionysos.fmi.fi/KEH/ \
 		ftp://ftp.funet.fi/pub/unix/mail/elm/elm-2.4ME+/ \
 		ftp://ftp.ibp.fr/pub/unix/mail/elm-me/
diff --git a/mail/exim-devel/Makefile b/mail/exim-devel/Makefile
index e925efcdb748..3ad92cf3d5de 100644
--- a/mail/exim-devel/Makefile
+++ b/mail/exim-devel/Makefile
@@ -3,11 +3,11 @@
 # Date created:		23 June 1996
 # Whom:			markm
 #
-# $Id: Makefile,v 1.2 1996/07/09 21:24:41 asami Exp $
+# $Id: Makefile,v 1.3 1996/10/31 19:25:50 markm Exp $
 #
 
 DISTNAME=	exim-0.57
-CATEGORIES+=	mail
+CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cus.cam.ac.uk/pub/software/programs/exim/
 DISTFILES=	exim-0.57.tar.gz exim-texinfo-0.57.tar.gz
 
diff --git a/mail/exim-old/Makefile b/mail/exim-old/Makefile
index e925efcdb748..3ad92cf3d5de 100644
--- a/mail/exim-old/Makefile
+++ b/mail/exim-old/Makefile
@@ -3,11 +3,11 @@
 # Date created:		23 June 1996
 # Whom:			markm
 #
-# $Id: Makefile,v 1.2 1996/07/09 21:24:41 asami Exp $
+# $Id: Makefile,v 1.3 1996/10/31 19:25:50 markm Exp $
 #
 
 DISTNAME=	exim-0.57
-CATEGORIES+=	mail
+CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cus.cam.ac.uk/pub/software/programs/exim/
 DISTFILES=	exim-0.57.tar.gz exim-texinfo-0.57.tar.gz
 
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index e925efcdb748..3ad92cf3d5de 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -3,11 +3,11 @@
 # Date created:		23 June 1996
 # Whom:			markm
 #
-# $Id: Makefile,v 1.2 1996/07/09 21:24:41 asami Exp $
+# $Id: Makefile,v 1.3 1996/10/31 19:25:50 markm Exp $
 #
 
 DISTNAME=	exim-0.57
-CATEGORIES+=	mail
+CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cus.cam.ac.uk/pub/software/programs/exim/
 DISTFILES=	exim-0.57.tar.gz exim-texinfo-0.57.tar.gz
 
diff --git a/mail/exmh2/Makefile b/mail/exmh2/Makefile
index cefe14995603..1479a9f503be 100644
--- a/mail/exmh2/Makefile
+++ b/mail/exmh2/Makefile
@@ -3,11 +3,11 @@
 # Date released:		10 Oct 96
 # Whom:				Peter Wemm <peter@freebsd.org>
 #
-# $Id$
+# $Id: Makefile,v 1.2 1996/10/15 11:27:26 peter Exp $
 #
 
 DISTNAME=	exmh-1.6.9
-CATEGORIES+=	mail
+CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.sunlabs.com/pub/tcl/exmh/
 EXTRACT_SUFX=	.tar.Z
 
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index d9a3801ff27a..8ce88a1a02ed 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -3,17 +3,16 @@
 # Date created:		26 Oct 1996
 # Whom:			Ville Eerola <ve@sci.fi>
 #
-# $Id $
+# $Id$
 #
 
 DISTNAME=	fetchmail-1.9
-CATEGORIES+=	mail
+CATEGORIES=	mail
 MASTER_SITES=	ftp://locke.ccil.org/pub/esr/
 
-GNU_CONFIGURE=	yes
-
 MAINTAINER=	ve@sci.fi
 
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	LDFLAGS="${CFLAGS}"
 
 post-install:
diff --git a/mail/mailagent/Makefile b/mail/mailagent/Makefile
index d406410db3f2..cf601063460a 100644
--- a/mail/mailagent/Makefile
+++ b/mail/mailagent/Makefile
@@ -3,12 +3,12 @@
 # Date created:			23 Sep 1996
 # Whom:				Masafumi NAKANE <max@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.1.1.1 1996/09/29 03:26:45 max Exp $
+# $Id: Makefile,v 1.2 1996/11/02 20:24:00 max Exp $
 #
 
 DISTNAME=	mailagent-3.0pl44
 PKGNAME=	mailagent-3.0.44
-CATEGORIES+=	mail
+CATEGORIES=	mail
 MASTER_SITES=	http://www.sfc.wide.ad.jp/~max/FreeBSD/ports/distfiles/ 
 
 MAINTAINER=	max@FreeBSD.ORG
diff --git a/mail/majordomo/Makefile b/mail/majordomo/Makefile
index 93415b4c0ae1..1719503f3aba 100644
--- a/mail/majordomo/Makefile
+++ b/mail/majordomo/Makefile
@@ -3,15 +3,14 @@
 # Date created:		23 October 1996
 # Whom:			jfitz@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.1.1.1 1996/07/20 01:39:21 asami Exp $
+# $Id: Makefile,v 1.2 1996/10/26 18:21:06 jfitz Exp $
 #
 
 DISTNAME=	majordomo-1.94
-CATEGORIES+=	mail
+CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.greatcircle.com/pub/majordomo/ \
 		ftp://ftp.sgi.com/other/majordomo/ \
 		ftp://ftp-europe.sgi.com/other/majordomo/
-
 EXTRACT_SUFX=   .tar.Z
 
 MAINTAINER=	jfitz@FreeBSD.ORG
@@ -19,7 +18,6 @@ MAINTAINER=	jfitz@FreeBSD.ORG
 # Needs to create a user and group
 IS_INTERACTIVE= yes
 NO_PACKAGE=	yes
-
 ALL_TARGET=	wrapper
 INSTALL_TARGET=	install install-wrapper
 
diff --git a/mail/metamail/Makefile b/mail/metamail/Makefile
index e59697c3c501..b8b2878e27a3 100644
--- a/mail/metamail/Makefile
+++ b/mail/metamail/Makefile
@@ -3,12 +3,12 @@
 # Date created:		17 Oct 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.4 1995/04/23 12:47:03 asami Exp $
+# $Id: Makefile,v 1.5 1995/05/06 00:23:00 torstenb Exp $
 #
 
 DISTNAME=	mm2.7
 PKGNAME=	mm-2.7
-CATEGORIES+=	mail
+CATEGORIES=	mail
 MASTER_SITES=	ftp://thumper.bellcore.com/pub/nsb/
 EXTRACT_SUFX=	.tar.Z
 
diff --git a/mail/mh/Makefile b/mail/mh/Makefile
index d6de64e993a4..c5b05945e026 100644
--- a/mail/mh/Makefile
+++ b/mail/mh/Makefile
@@ -3,12 +3,12 @@
 # Date created:		Oct 4, 1994
 # Whom:			pst
 #
-# $Id: Makefile,v 1.8 1996/04/26 08:42:49 asami Exp $
+# $Id: Makefile,v 1.9 1996/04/27 19:16:34 pst Exp $
 #
 
 DISTNAME=	mh-6.8.3
 PKGNAME=	mh-6.8.4
-CATEGORIES+=	mail
+CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.ics.uci.edu/pub/mh/tar/
 EXTRACT_SUFX=	.tar.Z
 
diff --git a/mail/p5-Mail-Folder/Makefile b/mail/p5-Mail-Folder/Makefile
index ec1af7e84727..d35adc58ef0b 100644
--- a/mail/p5-Mail-Folder/Makefile
+++ b/mail/p5-Mail-Folder/Makefile
@@ -3,12 +3,12 @@
 # Date created:				October 24th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.2 1996/10/24 09:58:34 jfitz Exp $
+#   $Id: Makefile,v 1.1.1.1 1996/10/24 13:43:04 jfitz Exp $
 #
 
 DISTNAME=	MailFolder-0.03
 PKGNAME=	p5-Mail-Folder-0.03
-CATEGORIES+=	mail
+CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.digital.com/pub/plan/perl/CPAN/modules/by-module/Mail/ \
 		ftp://ftp.cdrom.com/pub/perl/CPAN/modules/by-module/Mail/ \
 		ftp://ftp.cis.ufl.edu/pub/perl/CPAN/modules/by-module/Mail/ \
diff --git a/mail/p5-Mail-POP3Client/Makefile b/mail/p5-Mail-POP3Client/Makefile
index e8422b08b38e..12d48aa20961 100644
--- a/mail/p5-Mail-POP3Client/Makefile
+++ b/mail/p5-Mail-POP3Client/Makefile
@@ -3,12 +3,12 @@
 # Date created:				October 24th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.2 1996/10/24 09:58:34 jfitz Exp $
+#   $Id: Makefile,v 1.1.1.1 1996/10/24 13:44:50 jfitz Exp $
 #
 
 DISTNAME=	POP3Client-1_14
 PKGNAME=	p5-Mail-POP3Client-1.14
-CATEGORIES+=	mail
+CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.digital.com/pub/plan/perl/CPAN/modules/by-module/Mail/ \
 		ftp://ftp.cdrom.com/pub/perl/CPAN/modules/by-module/Mail/ \
 		ftp://ftp.cis.ufl.edu/pub/perl/CPAN/modules/by-module/Mail/ \
diff --git a/mail/p5-Mail-Tools/Makefile b/mail/p5-Mail-Tools/Makefile
index 404a3d608809..65818a552b3a 100644
--- a/mail/p5-Mail-Tools/Makefile
+++ b/mail/p5-Mail-Tools/Makefile
@@ -3,12 +3,12 @@
 # Date created:				October 24th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.2 1996/10/24 09:58:34 jfitz Exp $
+#   $Id: Makefile,v 1.1.1.1 1996/10/24 13:43:47 jfitz Exp $
 #
 
 DISTNAME=	MailTools-1.06
 PKGNAME=	p5-Mail-Tools-1.06
-CATEGORIES+=	mail
+CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.digital.com/pub/plan/perl/CPAN/modules/by-module/Mail/ \
 		ftp://ftp.cdrom.com/pub/perl/CPAN/modules/by-module/Mail/ \
 		ftp://ftp.cis.ufl.edu/pub/perl/CPAN/modules/by-module/Mail/ \
@@ -21,7 +21,6 @@ MAINTAINER=	jfitz@FreeBSD.ORG
 BUILD_DEPENDS= 	perl5.003:${PORTSDIR}/lang/perl5 \
 		${PREFIX}/lib/perl5/site_perl/Net/SMTP.pm:${PORTSDIR}/net/p5-Net \
 		${PREFIX}/lib/perl5/site_perl/Net/Domain.pm:${PORTSDIR}/net/p5-Net
-
 RUN_DEPENDS=	perl5.003:${PORTSDIR}/lang/perl5
 
 do-configure:
diff --git a/mail/pgpsendmail/Makefile b/mail/pgpsendmail/Makefile
index ee877698bae7..6581b87ce7d7 100644
--- a/mail/pgpsendmail/Makefile
+++ b/mail/pgpsendmail/Makefile
@@ -3,12 +3,12 @@
 # Date created:         20 Jan 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.7 1995/07/13 00:55:38 asami Exp $
+# $Id: Makefile,v 1.8 1995/09/23 17:13:54 ache Exp $
 #
 
 DISTNAME=       PGPsendmail-v1.4
 PKGNAME=	pgpsendmail-1.4
-CATEGORIES+=	mail
+CATEGORIES=	mail
 MASTER_SITES=   ftp://ftp.dhp.com/pub/crypto/pgp/PGPsendmail/
 
 MAINTAINER=     ache@FreeBSD.ORG
diff --git a/mail/pine4/Makefile b/mail/pine4/Makefile
index 43df8bc5f140..8eab7308aab1 100644
--- a/mail/pine4/Makefile
+++ b/mail/pine4/Makefile
@@ -3,12 +3,12 @@
 # Date created:		03 September 1994
 # Whom:			mr
 #
-# $Id: Makefile,v 1.11 1995/08/14 11:52:36 asami Exp $
+# $Id: Makefile,v 1.12 1996/07/17 03:57:57 asami Exp $
 #
 
 DISTNAME=	pine3.95
 PKGNAME=	pine-3.95
-CATEGORIES+=	mail
+CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cac.washington.edu/pine/
 
 post-install:
diff --git a/mail/poppassd/Makefile b/mail/poppassd/Makefile
index 1fdff2c0762e..a7b128fbdd3e 100644
--- a/mail/poppassd/Makefile
+++ b/mail/poppassd/Makefile
@@ -3,23 +3,22 @@
 # Date Created:	21 August 1996
 # Whom:	Andrew Stevenson <andrew@ugh.net.au> based heavily on the changes by Stephen Melvin <melvin@zytek.com>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/11/03 20:45:24 jfitz Exp $
 #
 
 DISTNAME=	poppassd
 PKGNAME=	poppassd-4.0
-CATEGORIES+=	mail
+CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.qualcomm.com/quest/unix/servers/password/
 DISTFILES=	pwserve-4
 
 MAINTAINER=	andrew@ugh.net.au
 
-ALL_TARGET=	poppassd
-
 EXTRACT_CMD=	/bin/cat
 EXTRACT_SUFX=	
 EXTRACT_BEFORE_ARGS=	
 EXTRACT_AFTER_ARGS=	| /usr/bin/sed -e '1,16d' | /bin/sh
+ALL_TARGET=	poppassd
 
 post-install:
 	@ strip ${PREFIX}/libexec/poppassd
diff --git a/mail/popper/Makefile b/mail/popper/Makefile
index 7e4546c6ab7a..b786fa9461e5 100644
--- a/mail/popper/Makefile
+++ b/mail/popper/Makefile
@@ -3,12 +3,12 @@
 # Date created:		1 April 1995
 # Whom:			pst
 #
-# $Id: Makefile,v 1.11 1996/06/26 00:21:25 pst Exp $
+# $Id: Makefile,v 1.12 1996/07/05 06:12:45 asami Exp $
 #
 
 DISTNAME=	qpop2.2
 PKGNAME=	qpop-2.2
-CATEGORIES+=	mail
+CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.qualcomm.com/quest/unix/servers/popper/
 EXTRACT_SUFX=	.tar.Z
 
diff --git a/mail/procmail/Makefile b/mail/procmail/Makefile
index ab325869612e..67273c67cf38 100644
--- a/mail/procmail/Makefile
+++ b/mail/procmail/Makefile
@@ -3,12 +3,12 @@
 # Date created:		24 September 1994
 # Whom:			adam
 #
-# $Id: Makefile,v 1.19 1995/06/26 05:00:44 ache Exp $
+# $Id: Makefile,v 1.20 1995/12/28 16:02:43 ache Exp $
 #
 
 DISTNAME=       procmail-3.11pre4
 PKGNAME=        procmail-3.11p4
-CATEGORIES+=	mail
+CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.informatik.rwth-aachen.de/pub/packages/procmail/
 INSTALL_TARGET= install-suid install.man
 
diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index 7e4546c6ab7a..b786fa9461e5 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -3,12 +3,12 @@
 # Date created:		1 April 1995
 # Whom:			pst
 #
-# $Id: Makefile,v 1.11 1996/06/26 00:21:25 pst Exp $
+# $Id: Makefile,v 1.12 1996/07/05 06:12:45 asami Exp $
 #
 
 DISTNAME=	qpop2.2
 PKGNAME=	qpop-2.2
-CATEGORIES+=	mail
+CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.qualcomm.com/quest/unix/servers/popper/
 EXTRACT_SUFX=	.tar.Z
 
diff --git a/mail/smail/Makefile b/mail/smail/Makefile
index 7a73059fb830..bb9a620b6e70 100644
--- a/mail/smail/Makefile
+++ b/mail/smail/Makefile
@@ -3,11 +3,11 @@
 # Date created:		16 Oct 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.10 1995/10/06 22:03:17 torstenb Exp $
+# $Id: Makefile,v 1.11 1995/11/09 06:01:03 asami Exp $
 #
 
 DISTNAME=	smail-3.1.29.1
-CATEGORIES+=	mail
+CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.uu.net/networking/mail/smail/
 
 MAINTAINER=	torstenb@FreeBSD.ORG
diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile
index 951fd34dd023..5195a1103f02 100644
--- a/mail/xfmail/Makefile
+++ b/mail/xfmail/Makefile
@@ -3,12 +3,12 @@
 # Date created:		30 June 1996
 # Whom:			gena
 #
-# $Id: Makefile,v 1.4 1995/11/22 04:57:00 asami Exp $
+# $Id: Makefile,v 1.5 1996/07/12 11:51:51 asami Exp $
 #
 
 DISTNAME=	xfmail
 PKGNAME=	xfmail-0.4
-CATEGORIES+=	mail x11
+CATEGORIES=	mail x11
 MASTER_SITES=	ftp://burka.netvision.net.il/pub/xfmail/
 
 MAINTAINER=	gena@NetVision.net.il
@@ -16,8 +16,8 @@ MAINTAINER=	gena@NetVision.net.il
 LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
 		xforms\\.0\\.:${PORTSDIR}/x11/xforms
 
-USE_X11=	yes
 WRKSRC=		${WRKDIR}/xfmail/ui
+USE_X11=	yes
 
 pre-configure:
 	@(cd ${WRKSRC} ; cp Makefile.FreeBSD Makefile)
diff --git a/mail/xlbiff/Makefile b/mail/xlbiff/Makefile
index 793001c788cb..f9dbabcdd37f 100644
--- a/mail/xlbiff/Makefile
+++ b/mail/xlbiff/Makefile
@@ -3,10 +3,10 @@
 # Date created:		23-Aug-1995
 # Whom:                 David O'Brien <obrien@cs.ucdavis.edu>
 #
-# $Id: Makefile,v 1.1.1.1 1996/02/29 01:57:44 asami Exp $
+# $Id: Makefile,v 1.1.1.1 1996/11/03 06:44:20 obrien Exp $
 
 DISTNAME=	xlbiff-3.0
-CATEGORIES+=	mail x11
+CATEGORIES=	mail x11
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/  \
 		ftp://ftp.pacbell.com/mirror/ftp.x.org/X11/R5contrib/  \
 		ftp://ftp.funet.fi//pub/X11/R5contrib/  \
diff --git a/mail/youbin/Makefile b/mail/youbin/Makefile
index beedd506fd51..a65393625a2c 100644
--- a/mail/youbin/Makefile
+++ b/mail/youbin/Makefile
@@ -3,11 +3,11 @@
 # Date created:			09 Aug 1996
 # Whom:				Masafumi NAKANE <max@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.5 1996/09/18 19:20:24 max Exp $
+# $Id: Makefile,v 1.6 1996/10/09 12:50:54 max Exp $
 #
 
 DISTNAME=	youbin-2.13
-CATEGORIES+=	mail
+CATEGORIES=	mail
 MASTER_SITES=	ftp://nuis.nuie.nagoya-u.ac.jp/info/nagoya-u/ \
 		ftp://ftp.kyoto.wide.ad.jp/pub/net/