11 files changed, 23 insertions, 26 deletions

diff --git a/archivers/bzip/Makefile b/archivers/bzip/Makefile
index 34a9fd767437..7f0f6576d560 100644
--- a/archivers/bzip/Makefile
+++ b/archivers/bzip/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Fr  27 Sep 1996 11:47:35 MET DST
 # Whom:                 Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.7 1996/11/18 11:15:27 asami Exp $
+# $Id: Makefile,v 1.8 1996/12/06 10:56:31 max Exp $
 #
 
 DISTNAME=       bzip-0.21
@@ -12,7 +12,7 @@ MASTER_SITES=   http://www.cs.man.ac.uk/arch/people/j-seward/
 
 MAINTAINER=     andreas@klemm.gtn.com
 
-NO_CDROM=       yes     # Restrictive copyright (don't sell for profit)
+NO_CDROM=       "Restrictive copyright (don't sell for profit)"
 MAN1=		bzip.1 bunzip.1
 
 pre-install:
diff --git a/astro/sattrack/Makefile b/astro/sattrack/Makefile
index 16e7f53e0a70..a0ce61af2354 100644
--- a/astro/sattrack/Makefile
+++ b/astro/sattrack/Makefile
@@ -3,7 +3,7 @@
 # Date created:                      6 Apr 1996
 # Whom:                              Brent J. Nordquist <nordquist@platinum.com>
 #
-# $Id: Makefile,v 1.3 1996/10/31 11:22:02 asami Exp $
+# $Id: Makefile,v 1.4 1996/11/15 22:34:53 obrien Exp $
 #
 
 DISTNAME=          sattrack-3.1.4
@@ -12,10 +12,7 @@ MASTER_SITES=      http://ssl.berkeley.edu/isi_www/
 
 MAINTAINER=        nordquist@platinum.com
 
-# restrictive copyright: distribution via ftp is OK,
-# bundling with commercial products (CDROM) is forbidden
-# without author's consent
-NO_CDROM=	   yes
+NO_CDROM=	   "No bundling with commercial product without author's concent"
 
 WRKSRC=            ${WRKDIR}/SatTrack/src
 MAKE_FLAGS=        PREFIX=${PREFIX} -f
diff --git a/games/xinvaders/Makefile b/games/xinvaders/Makefile
index 4f19af2e4299..063a1f04d62e 100644
--- a/games/xinvaders/Makefile
+++ b/games/xinvaders/Makefile
@@ -3,7 +3,7 @@
 # Date created:         3 Jan 1995
 # Whom:                 swallace
 #
-# $Id: Makefile,v 1.7 1996/06/14 03:15:20 asami Exp $
+# $Id: Makefile,v 1.8 1996/11/18 10:36:05 asami Exp $
 #
 
 DISTNAME=       xinvaders
@@ -14,6 +14,6 @@ MASTER_SITE_SUBDIR=	games/x11/video
 
 USE_IMAKE=	yes
 
-NO_CDROM=	yes	# "don't sell for profit"
+NO_CDROM=	"don't sell for profit"
 
 .include <bsd.port.mk>
diff --git a/graphics/giftool/Makefile b/graphics/giftool/Makefile
index add0f27747bb..5f6fd701d646 100644
--- a/graphics/giftool/Makefile
+++ b/graphics/giftool/Makefile
@@ -3,7 +3,7 @@
 # Date created:        14 October 1996
 # Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.1.1.1 1996/10/30 13:44:05 jfitz Exp $
+# $Id: Makefile,v 1.2 1996/11/18 11:27:51 asami Exp $
 #
 
 DISTNAME=	giftool
@@ -13,7 +13,7 @@ MASTER_SITES=   ftp://ftp.huie.hokudai.ac.jp/pub/tool/graphics/
 
 MAINTAINER=	Nakai@Mlab.t.u-tokyo.ac.jp
 
-NO_CDROM=	yes	#shareware
+NO_CDROM=	"Shareware"
 
 NO_WRKSUBDIR=	yes
 ALL_TARGET=	giftool
diff --git a/java/jdk/Makefile b/java/jdk/Makefile
index dcc46949b708..c00bc3578085 100644
--- a/java/jdk/Makefile
+++ b/java/jdk/Makefile
@@ -3,7 +3,7 @@
 # Date created:		8 April 1996
 # Whom:			Sujal Patel <smpatel@freebsd.org>
 #
-# $Id: Makefile,v 1.3 1996/07/10 03:13:10 asami Exp $
+# $Id: Makefile,v 1.4 1996/11/18 11:41:08 asami Exp $
 #
 
 DISTNAME=       jdk
@@ -15,8 +15,8 @@ DISTFILES=      JDK-1_0_2-solaris2-sparc.tar.Z
 
 MAINTAINER=	smpatel@freebsd.org
 
+NO_CDROM=	"Put copyright on packaging, etc."
 NO_WRKSUBDIR=	yes
-NO_CDROM=	yes	# put copyright on packaging etc.
 
 post-install:
 	@cat ${PKGDIR}/DESCR
diff --git a/java/jdk11/Makefile b/java/jdk11/Makefile
index dcc46949b708..c00bc3578085 100644
--- a/java/jdk11/Makefile
+++ b/java/jdk11/Makefile
@@ -3,7 +3,7 @@
 # Date created:		8 April 1996
 # Whom:			Sujal Patel <smpatel@freebsd.org>
 #
-# $Id: Makefile,v 1.3 1996/07/10 03:13:10 asami Exp $
+# $Id: Makefile,v 1.4 1996/11/18 11:41:08 asami Exp $
 #
 
 DISTNAME=       jdk
@@ -15,8 +15,8 @@ DISTFILES=      JDK-1_0_2-solaris2-sparc.tar.Z
 
 MAINTAINER=	smpatel@freebsd.org
 
+NO_CDROM=	"Put copyright on packaging, etc."
 NO_WRKSUBDIR=	yes
-NO_CDROM=	yes	# put copyright on packaging etc.
 
 post-install:
 	@cat ${PKGDIR}/DESCR
diff --git a/misc/tkman/Makefile b/misc/tkman/Makefile
index 7ecce211a2cd..480798ecb0bc 100644
--- a/misc/tkman/Makefile
+++ b/misc/tkman/Makefile
@@ -3,7 +3,7 @@
 # Date created:         27 Dec 1994
 # Whom:                 thomas@ghpc8.ihf.rwth-aachen.de
 #
-# $Id: Makefile,v 1.19 1996/11/11 07:53:07 tg Exp $
+# $Id: Makefile,v 1.20 1996/11/17 09:06:37 obrien Exp $
 #
 
 DISTNAME=	tkman-1.8
@@ -17,7 +17,7 @@ LIB_DEPENDS=	tk41\\.1\\.:${PORTSDIR}/x11/tk41
 RUN_DEPENDS=	rman:${PORTSDIR}/misc/rman \
 		glimpse:${PORTSDIR}/misc/glimpse
 
-NO_CDROM=	yes	# Don't sell for profit
+NO_CDROM=	"Don't sell for profit"
 MAN1=		tkman.1
 
 .include <bsd.port.mk>
diff --git a/news/rkive/Makefile b/news/rkive/Makefile
index 89e9a3945bf1..6532dc05875b 100644
--- a/news/rkive/Makefile
+++ b/news/rkive/Makefile
@@ -3,7 +3,7 @@
 # Date created:		03 Jul 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.1.1.1 1995/07/15 22:46:25 torstenb Exp $
+# $Id: Makefile,v 1.2 1996/06/14 07:51:47 asami Exp $
 #
 
 DISTNAME=	rkive3.1
@@ -13,7 +13,7 @@ EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	torstenb@FreeBSD.ORG
 
-NO_CDROM=	yes	# don't make money from it
+NO_CDROM=	"Don't make money from it"
 
 pre-patch:
 	@cp ${WRKSRC}/Makefile.dst ${WRKSRC}/Makefile
diff --git a/textproc/glimpse/Makefile b/textproc/glimpse/Makefile
index 5af53093a417..eb4117b22f81 100644
--- a/textproc/glimpse/Makefile
+++ b/textproc/glimpse/Makefile
@@ -3,7 +3,7 @@
 # Date created:		25 August 1996
 # Whom:			chuckr@freebsd.org
 #
-# $Id: Makefile,v 1.6 1996/11/11 05:49:36 obrien Exp $
+# $Id: Makefile,v 1.7 1996/11/17 09:05:49 obrien Exp $
 #
 
 DISTNAME=       glimpse-3.6.src
@@ -14,7 +14,7 @@ EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	chuckr@freebsd.org
 
-NO_CDROM=	yes	# Restrictive copyright (don't sell for profit)
+NO_CDROM=	"Restrictive copyright (don't sell for profit)"
 GNU_CONFIGURE=	yes
 MAN1=		glimpse.1 glimpseindex.1 glimpseserver.1 agrep.1
 
diff --git a/textproc/rman/Makefile b/textproc/rman/Makefile
index 5b1b1ff15bed..f8521f0df12d 100644
--- a/textproc/rman/Makefile
+++ b/textproc/rman/Makefile
@@ -3,7 +3,7 @@
 # Date created:         27 Dec 1994
 # Whom:                 thomas@ghpc8.ihf.rwth-aachen.de
 #
-# $Id: Makefile,v 1.10 1996/11/11 05:50:04 obrien Exp $
+# $Id: Makefile,v 1.11 1996/11/17 09:06:32 obrien Exp $
 #
 
 DISTNAME=       rman-2.5a6
@@ -13,7 +13,7 @@ EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	thomas@ghpc8.ihf.rwth-aachen.de
 
-NO_CDROM=	yes	# don't sell for profit
+NO_CDROM=	"Don't sell for profit"
 MAN1=		rman.1
 
 .include <bsd.port.mk>
diff --git a/www/webcopy/Makefile b/www/webcopy/Makefile
index bd4869f3576d..91d79b87c5dd 100644
--- a/www/webcopy/Makefile
+++ b/www/webcopy/Makefile
@@ -3,7 +3,7 @@
 # Date created:         14 Sep 1996
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.4 1996/11/06 13:12:38 asami Exp $
+# $Id: Makefile,v 1.5 1996/11/18 11:42:14 asami Exp $
 #
 
 # WWW site: http://www.inf.utfsm.cl/~vparada/webcopy.html
@@ -15,9 +15,9 @@ DISTFILES=      webcopy.tgz
 
 MAINTAINER=     ache@FreeBSD.ORG
 
+NO_PACKAGE= "This program cannot be distributed if modified in any way"
+NO_CDROM= "Don't sell for profit without written permission"
 ALL_TARGET=
-NO_PACKAGE= yes # This program cannot be distributed if modified in any way
-NO_CDROM= yes   # Don't sell for profit without written permission
 
 do-install:
 	cd ${WRKSRC}; ${INSTALL_SCRIPT} webcopy ${PREFIX}/bin