Use standard location for LICENSE line (in MAINTAINER/HOMEPAGE/COMMENT

block). Uncomment some commented out LICENSE lines while here.

25 files changed, 44 insertions, 67 deletions

diff --git a/mail/GNUMail/Makefile b/mail/GNUMail/Makefile
index 54adb9384a6..6645099df89 100644
--- a/mail/GNUMail/Makefile
+++ b/mail/GNUMail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2009/04/19 01:00:48 rh Exp $
+# $NetBSD: Makefile,v 1.31 2009/05/19 08:59:20 wiz Exp $
 #
 
 DISTNAME=	GNUMail-1.2.0pre3
@@ -9,7 +9,6 @@ MASTER_SITES=	http://debian.uni-essen.de/misc/GNUstep/Apps/GNUMail/
 MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://www.collaboration-world.com/gnumail/
 COMMENT=	GNUstep clone of NeXT's Mail.app application
-
 LICENSE=	gnu-lgpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/mail/OSBF-lua/Makefile b/mail/OSBF-lua/Makefile
index 1e0596ae4d1..72da9b2864e 100644
--- a/mail/OSBF-lua/Makefile
+++ b/mail/OSBF-lua/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/05/02 16:21:44 reed Exp $
+# $NetBSD: Makefile,v 1.3 2009/05/19 08:59:20 wiz Exp $
 #
 
 DISTNAME=	osbf-lua-2.0.4
@@ -8,7 +8,7 @@ MASTER_SITES=	http://luaforge.net/frs/download.php/2094/
 MAINTAINER=	shannonjr@NetBSD.org
 HOMEPAGE=	http://osbf-lua.luaforge.net/
 COMMENT=	Lua C module for text classification
-#LICENSE=	gnu-gpl-v2
+LICENSE=	gnu-gpl-v2
 
 PREV_PKGPATH=	mail/lua-OSBF
 
diff --git a/mail/Pantomime/Makefile b/mail/Pantomime/Makefile
index fb0c2ec9ed1..6d1703a6af4 100644
--- a/mail/Pantomime/Makefile
+++ b/mail/Pantomime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2009/04/18 23:55:27 rh Exp $
+# $NetBSD: Makefile,v 1.24 2009/05/19 08:59:20 wiz Exp $
 #
 
 DISTNAME=	Pantomime-1.2.0pre3
@@ -8,7 +8,6 @@ MASTER_SITES=	http://debian.uni-essen.de/misc/GNUstep/Apps/GNUMail/
 MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://www.collaboration-world.com/pantomime/
 COMMENT=	Objective-C mail system class library
-
 LICENSE=	gnu-lgpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile
index d1e13f6eddc..101dfb19993 100644
--- a/mail/clamav/Makefile
+++ b/mail/clamav/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.93 2009/04/14 06:16:24 martti Exp $
+# $NetBSD: Makefile,v 1.94 2009/05/19 08:59:20 wiz Exp $
 
 DISTNAME=	clamav-${CLAMAV_VERSION}
 PKGNAME=	clamav-${CLAMAV_VERSION:S/-/./}
@@ -9,7 +9,6 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=clamav/}
 MAINTAINER=	grant@NetBSD.org
 HOMEPAGE=	http://www.clamav.net/
 COMMENT=	Anti-virus toolkit
-
 LICENSE=	gnu-gpl-v2
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
diff --git a/mail/claws-mail/Makefile.common b/mail/claws-mail/Makefile.common
index afaefad1275..fc9de324c39 100644
--- a/mail/claws-mail/Makefile.common
+++ b/mail/claws-mail/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2008/10/15 16:22:02 smb Exp $
+# $NetBSD: Makefile.common,v 1.9 2009/05/19 08:59:20 wiz Exp $
 
 # used by mail/claws-mail/plugins.mk
 
@@ -10,6 +10,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sylpheed-claws/}
 EXTRACT_SUFX=	.tar.bz2
 
 HOMEPAGE=	http://claws-mail.org/
+LICENSE=	gnu-gpl-v3
 
 DISTINFO_FILE=	${.CURDIR}/../../mail/claws-mail/distinfo
 PATCHDIR=	${.CURDIR}/../../mail/claws-mail/patches
@@ -25,8 +26,6 @@ GNU_CONFIGURE=		YES
 # Force gnome detection off to avoid installing some extra files
 CONFIGURE_ENV+=		ac_cv_path_GNOME_CONFIG="no"
 
-#LICENSE=	gplv3
-
 CONFIGURE_ARGS+=        --enable-enchant
 CONFIGURE_ARGS+=	--enable-nls
 CONFIGURE_ARGS+=	--enable-openssl
diff --git a/mail/courier-analog/Makefile b/mail/courier-analog/Makefile
index 04b6f5addc6..8e4f6bc69c9 100644
--- a/mail/courier-analog/Makefile
+++ b/mail/courier-analog/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.5 2008/02/19 18:45:09 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2009/05/19 08:59:20 wiz Exp $
 
 DISTNAME=	courier-analog-0.15
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=	.tar.bz2
 
-#LICENSE=	gnu-gpl-v3
-
 MAINTAINER=	jlam@pkgsrc.org
 HOMEPAGE=	http://www.courier-mta.org/
 COMMENT=	Courier log analyzer
+LICENSE=	gnu-gpl-v3
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/mail/courier-mta/Makefile.common b/mail/courier-mta/Makefile.common
index 139031319e9..affb87e2517 100644
--- a/mail/courier-mta/Makefile.common
+++ b/mail/courier-mta/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.9 2008/02/19 18:45:23 jlam Exp $
+# $NetBSD: Makefile.common,v 1.10 2009/05/19 08:59:20 wiz Exp $
 
 COURIER_VERSION=	0.58.0
-#LICENSE=		gnu-gpl-v3
+LICENSE=		gnu-gpl-v3
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/cucipop/Makefile b/mail/cucipop/Makefile
index af807b65b55..1dc6cd9f928 100644
--- a/mail/cucipop/Makefile
+++ b/mail/cucipop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2008/03/04 17:57:18 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2009/05/19 08:59:21 wiz Exp $
 #
 
 DISTNAME=	cucipop-1.31
@@ -12,7 +12,6 @@ PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	The Cubic Circle POP3 mail server
-
 LICENSE=	cucipop-license
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/mail/dk-milter/Makefile b/mail/dk-milter/Makefile
index d98bd8b536b..92d1eaebd65 100644
--- a/mail/dk-milter/Makefile
+++ b/mail/dk-milter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2008/10/02 19:03:11 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2009/05/19 08:59:21 wiz Exp $
 
 DISTNAME=	dk-milter-0.3.0
 PKGREVISION=	3
@@ -8,10 +8,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dk-milter/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://sourceforge.net/projects/dk-milter/
 COMMENT=	Open source implementation of DomainKeys for sendmail
-
-BUILDLINK_API_DEPENDS.libmilter+=	libmilter>=8.13.0
-
-LICENSE=		sendmail-open-source-license
+LICENSE=	sendmail-open-source-license
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -68,6 +65,7 @@ do-install:
 
 .include "options.mk"
 .include "../../security/openssl/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libmilter+=	libmilter>=8.13.0
 .include "../../mail/libmilter/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/dkim-milter/Makefile b/mail/dkim-milter/Makefile
index 77f98751a7b..a7efcc662d1 100644
--- a/mail/dkim-milter/Makefile
+++ b/mail/dkim-milter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2009/03/28 01:03:55 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2009/05/19 08:59:21 wiz Exp $
 
 DISTNAME=	dkim-milter-2.8.2
 CATEGORIES=	mail
@@ -7,10 +7,6 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dkim-milter/}
 MAINTAINER=	imil@gcu.info
 HOMEPAGE=	http://sourceforge.net/projects/dkim-milter/
 COMMENT=	Open source DKIM filter software from Sendmail, Inc
-
-BUILDLINK_API_DEPENDS.libmilter+=	libmilter>=8.13.0
-BUILDLINK_API_DEPENDS.openssl+=		openssl>=0.9.8
-
 LICENSE=		sendmail-open-source-license
 
 MAKE_ENV+=		M4=${M4:Q}
@@ -108,7 +104,9 @@ post-install:
 			${PREFIX}/${PKGMANDIR}/man8
 .	endif
 
+BUILDLINK_API_DEPENDS.openssl+=		openssl>=0.9.8
 .include "../../security/openssl/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libmilter+=	libmilter>=8.13.0
 .include "../../mail/libmilter/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/evolution-data-server/Makefile b/mail/evolution-data-server/Makefile
index fbc978b35a2..563d297f8d3 100644
--- a/mail/evolution-data-server/Makefile
+++ b/mail/evolution-data-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.87 2009/04/27 16:05:19 wiz Exp $
+# $NetBSD: Makefile,v 1.88 2009/05/19 08:59:21 wiz Exp $
 #
 
 DISTNAME=	evolution-data-server-2.26.1.1
@@ -9,7 +9,6 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/projects/evolution/
 COMMENT=	Evolution data server
-
 LICENSE=	gnu-lgpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/mail/evolution-sharp/Makefile b/mail/evolution-sharp/Makefile
index c7dd1a8e514..48904592738 100644
--- a/mail/evolution-sharp/Makefile
+++ b/mail/evolution-sharp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/04/12 13:16:28 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2009/05/19 08:59:21 wiz Exp $
 #
 
 DISTNAME=	evolution-sharp-0.20.0
@@ -9,7 +9,6 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	${MASTER_SITE_GNOME:=sources/evolution-sharp/0.20/}
 COMMENT=	.NET language binding for various Evolution libraries
-
 LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/mail/faces/Makefile b/mail/faces/Makefile
index 32f19be9766..771499d6da4 100644
--- a/mail/faces/Makefile
+++ b/mail/faces/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2007/02/15 14:46:27 joerg Exp $
+# $NetBSD: Makefile,v 1.55 2009/05/19 08:59:21 wiz Exp $
 
 DISTNAME=	faces-1.6.1
 PKGREVISION=	4
@@ -8,16 +8,16 @@ EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Visual mail, user and print face server
-
-DEPENDS+=	netpbm>=9.2:../../graphics/netpbm
-
-CONFLICTS=	compface-[0-9]*
-
 LICENSE=	faces-license
+
 RESTRICTED=	Distribution not allowed if money exchanged
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
+DEPENDS+=	netpbm>=9.2:../../graphics/netpbm
+
+CONFLICTS=	compface-[0-9]*
+
 WRKSRC=			${WRKDIR}/faces
 USE_X11BASE=		YES
 USE_LIBTOOL=		YES
diff --git a/mail/fromto/Makefile b/mail/fromto/Makefile
index 381a8798759..e9a828acdba 100644
--- a/mail/fromto/Makefile
+++ b/mail/fromto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2008/03/04 17:57:18 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2009/05/19 08:59:21 wiz Exp $
 #
 
 DISTNAME=	fromto-1.5
@@ -8,8 +8,8 @@ EXTRACT_SUFX=	#empty
 
 MAINTAINER=	bad@NetBSD.org
 COMMENT=	Sendmail logfile viewer
-
 LICENSE=	fromto-license  # XXX missing
+
 RESTRICTED=	Redistribution allowed for non-commercial purposes only
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
diff --git a/mail/majordomo/Makefile b/mail/majordomo/Makefile
index d36107847ba..57a5ab0902a 100644
--- a/mail/majordomo/Makefile
+++ b/mail/majordomo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2009/02/17 12:57:07 joerg Exp $
+# $NetBSD: Makefile,v 1.31 2009/05/19 08:59:21 wiz Exp $
 
 DISTNAME=		majordomo-1.94.5
 PKGREVISION=		2
@@ -10,7 +10,6 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.greatcircle.com/majordomo/
 COMMENT=		The Majordomo mailing list manager
-
 LICENSE=		majordomo-license
 
 CONFLICTS+=		bounce-*
diff --git a/mail/milter-greylist/Makefile b/mail/milter-greylist/Makefile
index 99a6db0bda0..46d702267a9 100644
--- a/mail/milter-greylist/Makefile
+++ b/mail/milter-greylist/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2009/04/22 13:00:36 tron Exp $
+# $NetBSD: Makefile,v 1.44 2009/05/19 08:59:22 wiz Exp $
 
 DISTNAME=	milter-greylist-4.2.2
 CATEGORIES=	mail
@@ -8,7 +8,6 @@ EXTRACT_SUFX=	.tgz
 OWNER=		tron@NetBSD.org
 HOMEPAGE=	http://hcpnet.free.fr/milter-greylist/
 COMMENT=	Easy-to-use greylist milter for sendmail
-
 LICENSE=	original-bsd
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/mail/mpop/Makefile b/mail/mpop/Makefile
index 58a735e9b63..867b546122b 100644
--- a/mail/mpop/Makefile
+++ b/mail/mpop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2008/01/18 05:08:27 tnn Exp $
+# $NetBSD: Makefile,v 1.12 2009/05/19 08:59:22 wiz Exp $
 #
 
 DISTNAME=	mpop-1.0.12
@@ -7,11 +7,10 @@ CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mpop/}
 EXTRACT_SUFX=	.tar.bz2
 
-#LICENSE=	gnu-gpl-v3
-
 MAINTAINER=	reed@reedmedia.net
 HOMEPAGE=	http://mpop.sourceforge.net/
 COMMENT=	Small, fast and portable POP3 client
+LICENSE=	gnu-gpl-v3
 
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/mail/msmtp/Makefile b/mail/msmtp/Makefile
index a0982b0a016..9f716a5d18b 100644
--- a/mail/msmtp/Makefile
+++ b/mail/msmtp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2009/01/06 12:08:01 obache Exp $
+# $NetBSD: Makefile,v 1.22 2009/05/19 08:59:22 wiz Exp $
 
 DISTNAME=	msmtp-1.4.17
 CATEGORIES=	mail
@@ -8,8 +8,7 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	bcv@hub3.net
 HOMEPAGE=	http://msmtp.sourceforge.net/
 COMMENT=	SMTP plugin for MUAs
-
-#LICENSE=	gnu-gpl-v3
+LICENSE=	gnu-gpl-v3
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/mail/mush/Makefile b/mail/mush/Makefile
index 8deba4e1c5d..771dfbf00b7 100644
--- a/mail/mush/Makefile
+++ b/mail/mush/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2008/09/10 14:07:23 gdt Exp $
+# $NetBSD: Makefile,v 1.20 2009/05/19 08:59:22 wiz Exp $
 
 DISTNAME=	mush-7.2.5
 PKGNAME=	mush-7.2.6.b4.pl1
@@ -19,8 +19,8 @@ PATCHFILES=	patch-7.2.6-alpha-1 \
 
 MAINTAINER=	christos@NetBSD.org
 COMMENT=	Text-based mail client
-
 LICENSE=	mush-license
+
 RESTRICTED=		Unmodified source may be distributed but not sold.
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_CDROM=	${RESTRICTED}
diff --git a/mail/pine/Makefile b/mail/pine/Makefile
index 414eef14c46..5353edc5527 100644
--- a/mail/pine/Makefile
+++ b/mail/pine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.121 2008/11/13 14:21:05 tron Exp $
+# $NetBSD: Makefile,v 1.122 2009/05/19 08:59:22 wiz Exp $
 
 DISTNAME=	pine4.64
 PKGNAME=	pine-4.64
@@ -11,11 +11,9 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	pkgsrc-users@netbsd.org
 HOMEPAGE=	http://www.washington.edu/pine/
 COMMENT=	Program for Internet News and E-mail
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 LICENSE=	pine-license
 
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 CONF_FILES=    ${PREFIX}/share/examples/pine/pine.conf ${PKG_SYSCONFDIR}/pine.conf
 
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 73b857d8cd5..61234898f71 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.225 2009/05/14 17:12:10 martti Exp $
+# $NetBSD: Makefile,v 1.226 2009/05/19 08:59:22 wiz Exp $
 
 DISTNAME=	postfix-2.6.0
 PKGREVISION=	1
@@ -12,7 +12,6 @@ DIST_SUBDIR=	postfix
 MAINTAINER=	martti@NetBSD.org
 HOMEPAGE=	http://www.postfix.org/
 COMMENT=	Postfix SMTP server and tools
-
 LICENSE=	postfix-license
 
 CONFLICTS+=	courier-mta-[0-9]* fastforward>=0.51nb2 sendmail-[0-9]*
diff --git a/mail/sendmail/Makefile.common b/mail/sendmail/Makefile.common
index 418ca1bd0d1..657f7050d36 100644
--- a/mail/sendmail/Makefile.common
+++ b/mail/sendmail/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.48 2009/03/21 21:30:58 jnemeth Exp $
+# $NetBSD: Makefile.common,v 1.49 2009/05/19 08:59:22 wiz Exp $
 #
 # used by mail/libmilter/Makefile
 # used by mail/sendmail/Makefile
@@ -13,7 +13,6 @@ MASTER_SITES=	ftp://ftp.sendmail.org/pub/sendmail/ \
 
 OWNER?=		jnemeth@NetBSD.org
 HOMEPAGE=	http://www.sendmail.org/
-
 LICENSE=	sendmail-license
 
 DISTINFO_FILE=	${.CURDIR}/../../mail/sendmail/distinfo
diff --git a/mail/sendmail813/Makefile.common b/mail/sendmail813/Makefile.common
index e0ecbd1473b..6a90a1f5713 100644
--- a/mail/sendmail813/Makefile.common
+++ b/mail/sendmail813/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2008/01/04 02:26:18 jnemeth Exp $
+# $NetBSD: Makefile.common,v 1.3 2009/05/19 08:59:22 wiz Exp $
 #
 #
 
@@ -11,7 +11,6 @@ MASTER_SITES=	ftp://ftp.sendmail.org/pub/sendmail/ \
 
 MAINTAINER=	jnemeth@NetBSD.org
 HOMEPAGE=	http://www.sendmail.org/
-
 LICENSE=	sendmail-license
 
 DISTINFO_FILE?=	${.CURDIR}/../../mail/sendmail813/distinfo
diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index a1d6b4c3463..1811be42bba 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.93 2009/04/11 23:15:20 sno Exp $
+# $NetBSD: Makefile,v 1.94 2009/05/19 08:59:22 wiz Exp $
 
 DISTNAME=	Mail-SpamAssassin-3.2.5
 PKGNAME=	spamassassin-3.2.5
@@ -10,8 +10,7 @@ MASTER_SITES=	${MASTER_SITE_APACHE:=spamassassin/source/}
 MAINTAINER=	heinz@NetBSD.org
 HOMEPAGE=	http://spamassassin.apache.org/
 COMMENT=	Mail filter to identify spam
-
-#LICENSE=	apache-2.0
+LICENSE=	apache-2.0
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile
index db2e7967d13..ead7be212d5 100644
--- a/mail/xfmail/Makefile
+++ b/mail/xfmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2008/09/12 00:42:13 gdt Exp $
+# $NetBSD: Makefile,v 1.45 2009/05/19 08:59:23 wiz Exp $
 
 DISTNAME=		xfmail-1.5.5
 PKGREVISION=		1
@@ -9,7 +9,6 @@ EXTRACT_SUFX=		.tar.bz2
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://xfmail.slappy.org/
 COMMENT=		Xforms based mail application for Unix operating systems
-
 #LICENSE=		gpl-gnu-v2
 # A few files are.
 #LICENSE+=		mit-license