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

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

6 files changed, 33 insertions, 33 deletions

diff --git a/print/acroread/Makefile b/print/acroread/Makefile
index f5566dc1dad..6f23958de1a 100644
--- a/print/acroread/Makefile
+++ b/print/acroread/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2007/07/29 05:19:47 jlam Exp $
+# $NetBSD: Makefile,v 1.55 2009/05/19 08:59:30 wiz Exp $
 
 DISTNAME=	acroread	# overridden below
 PKGNAME=	acroread-4.05
@@ -10,13 +10,13 @@ MASTER_SITES=	ftp://ftp-pac.adobe.com/pub/adobe/acrobatreader/unix/4.x/ \
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.adobe.com/products/acrobat/readstep2.html
 COMMENT=	View, distribute and print PDF documents
+LICENSE=	adobe-acrobat-license
 
 RESTRICTED=		Original installer required to redistribute.
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_FTP=		${RESTRICTED}
-LICENSE=		adobe-acrobat-license
 
 BUILD_DIRS=		# empty
 
diff --git a/print/acroread5/Makefile b/print/acroread5/Makefile
index 0e62832e953..b6572f28227 100644
--- a/print/acroread5/Makefile
+++ b/print/acroread5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2007/07/29 05:19:50 jlam Exp $
+# $NetBSD: Makefile,v 1.38 2009/05/19 08:59:30 wiz Exp $
 
 DISTNAME=	acroread5	# overridden below
 PKGNAME=	acroread5-5.10
@@ -9,18 +9,18 @@ MASTER_SITES=	http://ardownload.adobe.com/pub/adobe/acrobatreader/unix/5.x/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.adobe.com/products/acrobat/readstep2.html
 COMMENT=	View, distribute and print PDF documents
-
-CONFLICTS+=	acroread-5.*
-# conflict with acroread7 due to bin/acroread
-CONFLICTS+=	acroread-7.*
-CONFLICTS+=	acroread7-7.*
+LICENSE=		adobe-acrobat-license
 
 RESTRICTED=		Original installer required to redistribute.
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_FTP=		${RESTRICTED}
-LICENSE=		adobe-acrobat-license
+
+CONFLICTS+=	acroread-5.*
+# conflict with acroread7 due to bin/acroread
+CONFLICTS+=	acroread-7.*
+CONFLICTS+=	acroread7-7.*
 
 WRKSRC=			${WRKDIR}/installers
 BUILD_DIRS=		# empty
diff --git a/print/acroread7/Makefile b/print/acroread7/Makefile
index 001165ecea3..8046448ea5c 100644
--- a/print/acroread7/Makefile
+++ b/print/acroread7/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2008/08/11 14:29:20 is Exp $
+# $NetBSD: Makefile,v 1.23 2009/05/19 08:59:30 wiz Exp $
 
 DISTNAME=	acroread7	# overridden below
 PKGNAME=	acroread7-7.0.9
@@ -9,6 +9,13 @@ MASTER_SITES=	http://ardownload.adobe.com/pub/adobe/reader/unix/7x/7.0.9/enu/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.adobe.com/products/acrobat/readstep2.html
 COMMENT=	View, distribute and print PDF documents
+LICENSE=		adobe-acrobat-license
+
+RESTRICTED=		Original installer required to redistribute.
+NO_SRC_ON_CDROM=	${RESTRICTED}
+NO_BIN_ON_CDROM=	${RESTRICTED}
+NO_BIN_ON_FTP=		${RESTRICTED}
+NO_SRC_ON_FTP=		${RESTRICTED}
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -17,13 +24,6 @@ CONFLICTS+=	acroread-5.*
 # maybe should do ALTERNATIVES?
 CONFLICTS+=	acroread5-5.*
 
-RESTRICTED=		Original installer required to redistribute.
-NO_SRC_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_FTP=		${RESTRICTED}
-NO_SRC_ON_FTP=		${RESTRICTED}
-LICENSE=		adobe-acrobat-license
-
 WRKSRC=			${WRKDIR}/AdobeReader
 BUILD_DIRS=		# empty
 
diff --git a/print/acroread8/Makefile b/print/acroread8/Makefile
index e3261ace9f7..52fda3acfb2 100644
--- a/print/acroread8/Makefile
+++ b/print/acroread8/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/11/05 11:01:23 obache Exp $
+# $NetBSD: Makefile,v 1.5 2009/05/19 08:59:30 wiz Exp $
 
 DISTNAME=	acroread8	# overridden below
 PKGNAME=	acroread8-8.1.3
@@ -8,6 +8,13 @@ MASTER_SITES=	http://ardownload.adobe.com/pub/adobe/reader/unix/8.x/8.1.3/enu/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.adobe.com/products/acrobat/readstep2.html
 COMMENT=	View, distribute and print PDF documents
+LICENSE=	adobe-acrobat-license
+
+RESTRICTED=		Original installer required to redistribute.
+NO_SRC_ON_CDROM=	${RESTRICTED}
+NO_BIN_ON_CDROM=	${RESTRICTED}
+NO_BIN_ON_FTP=		${RESTRICTED}
+NO_SRC_ON_FTP=		${RESTRICTED}
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -17,13 +24,6 @@ CONFLICTS+=	acroread-5.*
 CONFLICTS+=	acroread5-5.*
 CONFLICTS+=	acroread7-7.*
 
-RESTRICTED=		Original installer required to redistribute.
-NO_SRC_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_FTP=		${RESTRICTED}
-NO_SRC_ON_FTP=		${RESTRICTED}
-LICENSE=		adobe-acrobat-license
-
 WRKSRC=			${WRKDIR}/AdobeReader
 BUILD_DIRS=		# empty
 
diff --git a/print/pcps/Makefile b/print/pcps/Makefile
index 4c20c65df85..aac34380a6f 100644
--- a/print/pcps/Makefile
+++ b/print/pcps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2008/06/12 02:14:43 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2009/05/19 08:59:30 wiz Exp $
 #
 
 DISTNAME=	pcps840
@@ -10,6 +10,11 @@ MASTER_SITES=	ftp://garbo.uwasa.fi/unix/pcps/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.swreg.org/soft_shop/695/shopscr3.shtml
 COMMENT=	Converts text files to PostScript(tm)
+LICENSE=	pcps-license
+
+RESTRICTED=	This is shareware for your evaluation and subsequent payment
+NO_BIN_ON_FTP=	${RESTRICTED}
+NO_BIN_ON_CDROM=${RESTRICTED}
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -19,11 +24,6 @@ BUILD_TARGET=
 MAKE_ENV+=	"CC=${CC} ${CFLAGS} -DUNIX"
 NO_CONFIGURE=	yes
 
-LICENSE=	pcps-license
-RESTRICTED=	This is shareware for your evaluation and subsequent payment
-NO_BIN_ON_FTP=	${RESTRICTED}
-NO_BIN_ON_CDROM=${RESTRICTED}
-
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/doc/pcps share/examples/pcps
 
 CONF_FILES+=	${PREFIX}/share/examples/pcps/pcps.cfg ${PREFIX}/bin/pcps.cfg
diff --git a/print/tex-foiltex/Makefile b/print/tex-foiltex/Makefile
index 831b23c3cfc..b814cb6738a 100644
--- a/print/tex-foiltex/Makefile
+++ b/print/tex-foiltex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/09/12 11:39:06 gdt Exp $
+# $NetBSD: Makefile,v 1.8 2009/05/19 08:59:30 wiz Exp $
 
 DISTNAME=	# empty
 PKGNAME=	tex-foiltex-2.1.4a
@@ -10,8 +10,8 @@ DISTFILES=	foiltex.dtx foiltex.ins
 MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://www.tex.ac.uk/tex-archive/help/Catalogue/entries/foiltex.html
 COMMENT=	LaTeX2e class for overhead transparencies
-
 LICENSE=	foiltex-license
+
 RESTRICTED=	May not be redistributed for profit
 NO_BIN_ON_CDROM=${RESTRICTED}
 NO_SRC_ON_CDROM=${RESTRICTED}