Remove deprecated LICENSE_TYPE and set appropriate # comments

with its contents.
2001-06-20 01:43:11 +00:00 · 2001-06-20 01:43:11 +00:00 · e8a2398d62
commit e8a2398d62
parent a933f2e780
106 changed files with 210 additions and 210 deletions
--- a/audio/gom/Makefile
+++ b/audio/gom/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2001/05/05 21:59:27 espie Exp $
+# $OpenBSD: Makefile,v 1.14 2001/06/20 01:43:11 pvalchev Exp $

 BROKEN=	"check out gomconfig..."
 COMMENT=	"generic audio mixer"
@ -11,7 +11,7 @@ MASTER_SITE_SUBDIR= apps/sound/mixers

 MAINTAINER=	Scott Robinson <scott@tranzoa.com>

-LICENSE_TYPE=		GPL
+# License: GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/benchmarks/bonnie/Makefile
+++ b/benchmarks/bonnie/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2001/05/05 21:59:31 espie Exp $
+# $OpenBSD: Makefile,v 1.10 2001/06/20 01:43:11 pvalchev Exp $

 COMMENT=	"performance test of filesystem I/O"
 DISTNAME=       Bonnie
@ -7,7 +7,7 @@ CATEGORIES=	benchmarks

 MAINTAINER=	Niklas Hallqvist <niklas@openbsd.org>

-LICENSE_TYPE=		BSD
+# License: BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/benchmarks/bytebench/Makefile
+++ b/benchmarks/bytebench/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2001/05/05 21:59:33 espie Exp $
+# $OpenBSD: Makefile,v 1.12 2001/06/20 01:43:12 pvalchev Exp $

 COMMENT=	"BYTE magazine benchmark suite"
 DISTNAME=       bytebench-3.1
@ -7,7 +7,7 @@ NEED_VERSION=	1.250

 MAINTAINER=	Angelos D. Keromytis <angelos@openbsd.org>

-LICENSE_TYPE=		NONE
+# License: NONE
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/benchmarks/lmbench/Makefile
+++ b/benchmarks/lmbench/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2001/05/05 21:59:37 espie Exp $
+# $OpenBSD: Makefile,v 1.15 2001/06/20 01:43:12 pvalchev Exp $

 COMMENT=	"system performance measurement"
 DISTNAME=	lmbench
@ -7,7 +7,7 @@ CATEGORIES=	benchmarks

 MAINTAINER=	ports@openbsd.org

-LICENSE_TYPE=		GPL
+# License: GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/comms/conserver/Makefile
+++ b/comms/conserver/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2001/05/05 22:39:40 jakob Exp $
+# $OpenBSD: Makefile,v 1.17 2001/06/20 01:43:12 pvalchev Exp $

 COMMENT=	"manage remote serial consoles via TCP/IP"

@ -9,7 +9,7 @@ NEED_VERSION=	1.406

 MAINTAINER=	Angelos D. Keromytis <angelos@openbsd.org>

-LICENSE_TYPE=		BSD
+# License: BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/comms/hylafax/Makefile
+++ b/comms/hylafax/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2001/05/05 22:39:47 jakob Exp $
+# $OpenBSD: Makefile,v 1.29 2001/06/20 01:43:12 pvalchev Exp $

 COMMENT=	"send/receive faxes and share modems"

@ -26,7 +26,7 @@ PATCH_DIST_STRIP= -p1

 MAINTAINER=	David Leonard <d@openbsd.org>

-LICENSE_TYPE=		BSD
+# License: BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/comms/seyon/Makefile
+++ b/comms/seyon/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2001/05/05 22:40:16 jakob Exp $
+# $OpenBSD: Makefile,v 1.14 2001/06/20 01:43:13 pvalchev Exp $

 COMMENT=	"communication package for X11"

@ -12,7 +12,7 @@ EXTRACT_SUFX=	-tar.Z

 MAINTAINER=	ports@openbsd.org

-LICENSE_TYPE=		BSD
+# License: BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/comms/tkhylafax/Makefile
+++ b/comms/tkhylafax/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2001/05/05 22:40:20 jakob Exp $
+# $OpenBSD: Makefile,v 1.14 2001/06/20 01:43:13 pvalchev Exp $

 COMMENT=	"Tcl/Tk interface to Sam Leffler's fax package"

@ -13,7 +13,7 @@ BROKEN=		"required dependencies not available"

 MAINTAINER=	ports@openbsd.org

-LICENSE_TYPE=		"BSD NONE"
+# License: "BSD NONE"
 PERMIT_PACKAGE_CDROM=	YES
 PERMIT_PACKAGE_FTP=	YES
 PERMIT_DISTFILES_CDROM=	YES
--- a/converters/base64/Makefile
+++ b/converters/base64/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2001/05/05 23:11:14 lebel Exp $
+# $OpenBSD: Makefile,v 1.13 2001/06/20 01:43:13 pvalchev Exp $

 COMMENT=	"converter to/from base64 encoding"

@ -11,7 +11,7 @@ NEED_VERSION=	1.402

 MAINTAINER=	Angelos D. Keromytis <angelos@openbsd.org>

-LICENSE_TYPE=		PD
+# License: PD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/converters/mpack/Makefile
+++ b/converters/mpack/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2001/05/05 23:11:29 lebel Exp $
+# $OpenBSD: Makefile,v 1.12 2001/06/20 01:43:13 pvalchev Exp $

 COMMENT=	"external MIME packer/unpacker"

@ -9,7 +9,7 @@ NEED_VERSION=	1.402

 MAINTAINER=     Angelos D. Keromytis <angelos@openbsd.org>

-LICENSE_TYPE=		BSD
+# License: BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/converters/recode/Makefile
+++ b/converters/recode/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2001/05/05 23:11:51 lebel Exp $
+# $OpenBSD: Makefile,v 1.14 2001/06/20 01:43:14 pvalchev Exp $

 COMMENT=	"convert files between character sets and usages"

@ -8,7 +8,7 @@ NEED_VERSION=	1.402

 MAINTAINER=	Angelos D. Keromytis <angelos@openbsd.org>

-LICENSE_TYPE=		GPL
+# License: GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/devel/ElectricFence/Makefile
+++ b/devel/ElectricFence/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2001/05/06 00:12:42 lebel Exp $
+# $OpenBSD: Makefile,v 1.10 2001/06/20 01:43:14 pvalchev Exp $

 COMMENT=	"library providing malloc debugging via VM protection"

@ -11,7 +11,7 @@ NEED_VERSION=	1.402

 MAINTAINER=	Niklas Hallqvist <niklas@openbsd.org>

-LICENSE_TYPE=		GPL
+# License: GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/devel/bison/Makefile
+++ b/devel/bison/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2001/05/06 00:12:53 lebel Exp $
+# $OpenBSD: Makefile,v 1.20 2001/06/20 01:43:15 pvalchev Exp $

 COMMENT=	"GNU parser generator"

@ -8,7 +8,7 @@ NEED_VERSION=	1.402

 MAINTAINER=	David Leonard <d@openbsd.org>

-LICENSE_TYPE=		GPL
+# License: GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/devel/boehm-gc/Makefile
+++ b/devel/boehm-gc/Makefile
@ -15,7 +15,7 @@ EXTRACT_CASES= gc4.12.tar.gz) tar zxf ${FULLDISTDIR}/$$archive || true;;

 MAINTAINER=	Niklas Hallqvist <niklas@openbsd.org>

-LICENSE_TYPE=		BSD
+# License: BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/devel/id-utils/Makefile
+++ b/devel/id-utils/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2001/05/06 00:13:03 lebel Exp $
+# $OpenBSD: Makefile,v 1.22 2001/06/20 01:43:15 pvalchev Exp $

 COMMENT=	"gid/lid tools for looking up variables in code"

@ -8,7 +8,7 @@ NEED_VERSION=	1.402

 MAINTAINER=	ports@OpenBSD.ORG

-LICENSE_TYPE=		GPL
+# License: GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/devel/prc-tools/Makefile
+++ b/devel/prc-tools/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2001/06/02 23:41:44 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.14 2001/06/20 01:43:16 pvalchev Exp $

 COMMENT=	"PalmPilot(tm) development environment"

@ -14,7 +14,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \

 MAINTAINER=     Angelos D. Keromytis <angelos@openbsd.org>

-LICENSE_TYPE=		GPL
+# License: GPL
 PERMIT_PACKAGE_CDROM=	YES
 PERMIT_PACKAGE_FTP=	YES
 PERMIT_DISTFILES_CDROM=	YES
--- a/devel/xmake/Makefile
+++ b/devel/xmake/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2001/05/06 00:13:36 lebel Exp $
+# $OpenBSD: Makefile,v 1.13 2001/06/20 01:43:16 pvalchev Exp $

 COMMENT=	"powerful make utility"

@ -8,7 +8,7 @@ NEED_VERSION=	1.402

 MAINTAINER=	ports@openbsd.org

-LICENSE_TYPE=		NONE
+# License: NONE
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/editors/nvi-m17n/Makefile
+++ b/editors/nvi-m17n/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2001/05/06 00:29:15 lebel Exp $
+# $OpenBSD: Makefile,v 1.13 2001/06/20 01:43:17 pvalchev Exp $
 # NetBSD: Makefile,v 1.6 2000/01/19 12:28:44 hubertf Exp
 # FreeBSD Id: Makefile,v 1.11 1999/04/17 10:51:03 itojun Exp

@ -17,7 +17,7 @@ PATCHFILES=	nvi-1.79.m17n-19991117.diff.gz

 MAINTAINER=	Jun-ichiro itojun Hagino <itojun@itojun.org>

-LICENSE_TYPE=		BSD
+# License: BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/editors/xwpe/Makefile
+++ b/editors/xwpe/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2001/05/06 00:29:28 lebel Exp $
+# $OpenBSD: Makefile,v 1.16 2001/06/20 01:43:16 pvalchev Exp $

 COMMENT=	"powerful programming editor"

@ -11,7 +11,7 @@ MASTER_SITE_SUBDIR= apps/editors/X

 MAINTAINER=	Yannick Cote <yanick@fries.net>

-LICENSE_TYPE=		GPL
+# License: GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/games/bnetd/Makefile
+++ b/games/bnetd/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2001/05/06 01:06:12 lebel Exp $
+# $OpenBSD: Makefile,v 1.17 2001/06/20 01:43:17 pvalchev Exp $

 COMMENT=	"Battle.net(r) server emulator"

@ -9,7 +9,7 @@ MASTER_SITES=	http://www.bnetd.org/files/

 MAINTAINER=	Kevin Lo <kevlo@openbsd.org>

-LICENSE_TYPE=		GPL
+# License: GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/games/connect4/Makefile
+++ b/games/connect4/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2001/05/06 01:06:12 lebel Exp $
+# $OpenBSD: Makefile,v 1.14 2001/06/20 01:43:18 pvalchev Exp $

 COMMENT=	"curses version of the classic game"

@ -13,7 +13,7 @@ EXTRACT_CASES=	connect4) gunshar ${FULLDISTDIR}/$$archive ;;

 MAINTAINER=	Angelos D. Keromytis <angelos@openbsd.org>

-LICENSE_TYPE=		NONE
+# License: NONE
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/games/gnuchess/Makefile
+++ b/games/gnuchess/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2001/05/06 01:06:14 lebel Exp $
+# $OpenBSD: Makefile,v 1.17 2001/06/20 01:43:18 pvalchev Exp $

 COMMENT=	"Classic Gnu Chess"

@ -11,7 +11,7 @@ MASTER_SITE_SUBDIR= gnuchess

 MAINTAINER=	Angelos D. Keromytis <angelos@openbsd.org>

-LICENSE_TYPE=		GPL
+# License: GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/games/gnushogi/Makefile
+++ b/games/gnushogi/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2001/05/06 01:06:14 lebel Exp $
+# $OpenBSD: Makefile,v 1.14 2001/06/20 01:43:18 pvalchev Exp $
 #

 COMMENT=	"GNU version of Shogi"
@ -10,7 +10,7 @@ NEED_VERSION=	1.402

 MAINTAINER=	Angelos D. Keromytis <angelos@openbsd.org>

-LICENSE_TYPE=		GPL
+# License: GPL
 PERMIT_PACKAGE_CDROM=	YES
 PERMIT_PACKAGE_FTP=	YES
 PERMIT_DISTFILES_CDROM=	YES
--- a/games/netris/Makefile
+++ b/games/netris/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2001/05/06 01:06:15 lebel Exp $
+# $OpenBSD: Makefile,v 1.11 2001/06/20 01:43:18 pvalchev Exp $

 COMMENT=	"network head-to-head version of T*tris"

@ -9,7 +9,7 @@ MASTER_SITES=	ftp://ftp.netris.org/pub/netris/

 MAINTAINER=	Angelos D. Keromytis <angelos@openbsd.org>

-LICENSE_TYPE=		GPL
+# License: GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/games/starlanes/Makefile
+++ b/games/starlanes/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2001/05/06 01:06:17 lebel Exp $
+# $OpenBSD: Makefile,v 1.13 2001/06/20 01:43:19 pvalchev Exp $

 COMMENT=	"the classic space-age stock trading game"

@ -10,7 +10,7 @@ NEED_VERSION=	1.402

 MAINTAINER=	Angelos D. Keromytis <angelos@openbsd.org>

-LICENSE_TYPE=		GPL
+# License: GPL
 PERMIT_PACKAGE_CDROM=	YES
 PERMIT_PACKAGE_FTP=	YES
 PERMIT_DISTFILES_CDROM=	YES
--- a/games/xbl/Makefile
+++ b/games/xbl/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2001/05/06 01:06:21 lebel Exp $
+# $OpenBSD: Makefile,v 1.13 2001/06/20 01:43:22 pvalchev Exp $

 COMMENT=	"3D block-dropping game"

@ -10,7 +10,7 @@ EXTRACT_SUFX=	.tar.Z

 MAINTAINER=	Angelos D. Keromytis <angelos@openbsd.org>

-LICENSE_TYPE=		GPL
+# License: GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/games/xblast/Makefile
+++ b/games/xblast/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2001/05/06 01:06:21 lebel Exp $
+# $OpenBSD: Makefile,v 1.13 2001/06/20 01:43:19 pvalchev Exp $
 #

 COMMENT=	"graphical multi-player real-time strategy game for X11"
@ -10,7 +10,7 @@ NEED_VERSION=	1.402

 MAINTAINER=	ports@openbsd.org

-LICENSE_TYPE=		GPL
+# License: GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/games/xchomp/Makefile
+++ b/games/xchomp/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2001/05/06 01:06:23 lebel Exp $
+# $OpenBSD: Makefile,v 1.13 2001/06/20 01:43:19 pvalchev Exp $

 COMMENT=	"Pac-man-like game under X11"

@ -9,7 +9,7 @@ MASTER_SITES=	${MASTER_SITE_BACKUP}

 MAINTAINER=	ports@openbsd.org

-LICENSE_TYPE=		NONE
+# License: NONE
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/games/xcubes/Makefile
+++ b/games/xcubes/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2001/05/06 01:06:23 lebel Exp $
+# $OpenBSD: Makefile,v 1.12 2001/06/20 01:43:19 pvalchev Exp $
 #

 COMMENT=	"cube puzzle for X11"
@ -9,7 +9,7 @@ NEED_VERSION=	1.402

 MAINTAINER=	ports@openbsd.org

-LICENSE_TYPE=		BSD
+# License: BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/games/xdeblock/Makefile
+++ b/games/xdeblock/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2001/05/06 01:06:24 lebel Exp $
+# $OpenBSD: Makefile,v 1.15 2001/06/20 01:43:20 pvalchev Exp $

 COMMENT=	"block action game"

@ -12,7 +12,7 @@ EXTRACT_SUFX=	.tgz

 MAINTAINER=	ports@openbsd.org

-LICENSE_TYPE=		NONE
+# License: NONE
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/games/xdino/Makefile
+++ b/games/xdino/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2001/05/06 01:06:24 lebel Exp $
+# $OpenBSD: Makefile,v 1.12 2001/06/20 01:43:20 pvalchev Exp $
 #

 COMMENT=	"dino puzzle game for X11"
@ -9,7 +9,7 @@ NEED_VERSION=	1.402

 MAINTAINER=	ports@openbsd.org

-LICENSE_TYPE=		BSD
+# License: BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/games/xevil/Makefile
+++ b/games/xevil/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2001/05/06 01:06:25 lebel Exp $
+# $OpenBSD: Makefile,v 1.12 2001/06/20 01:43:20 pvalchev Exp $
 #

 COMMENT=	"side-view, fast-action, kill everything type of game"
@ -14,7 +14,7 @@ EXTRACT_SUFX=	.tar.Z

 MAINTAINER=	Angelos D. Keromytis <angelos@openbsd.org>

-LICENSE_TYPE=		GPL
+# License: GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/games/xgolgo/Makefile
+++ b/games/xgolgo/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2001/05/06 01:06:25 lebel Exp $
+# $OpenBSD: Makefile,v 1.12 2001/06/20 01:43:20 pvalchev Exp $
 #

 COMMENT=	"watch what you are doing -- are you hostile"
@ -10,7 +10,7 @@ NEED_VERSION=	1.402

 MAINTAINER=	ports@openbsd.org

-LICENSE_TYPE=		BSD
+# License: BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/games/xjig/Makefile
+++ b/games/xjig/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2001/05/06 01:06:27 lebel Exp $
+# $OpenBSD: Makefile,v 1.14 2001/06/20 01:43:21 pvalchev Exp $

 COMMENT=	"jigsaw puzzle game for X11"

@ -11,7 +11,7 @@ EXTRACT_SUFX=	.tgz

 MAINTAINER=	Angelos D. Keromytis <angelos@openbsd.org>

-LICENSE_TYPE=		BSD
+# License: BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/games/xmine/Makefile
+++ b/games/xmine/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2001/05/11 22:54:15 pjanzen Exp $
+# $OpenBSD: Makefile,v 1.15 2001/06/20 01:43:21 pvalchev Exp $

 COMMENT=	"Athena port of xminesweeper"

@ -9,7 +9,7 @@ NEED_VERSION=	1.402

 MAINTAINER=	Paul Janzen <pjanzen@openbsd.org>

-LICENSE_TYPE=		BSD
+# License: BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/games/xmj/Makefile
+++ b/games/xmj/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2001/05/06 01:06:30 lebel Exp $
+# $OpenBSD: Makefile,v 1.10 2001/06/20 01:43:21 pvalchev Exp $

 COMMENT=	"Mahjongg"

@ -10,7 +10,7 @@ MASTER_SITES=	${MASTER_SITE_BACKUP}

 MAINTAINER=	ports@openbsd.org

-LICENSE_TYPE=		BSD
+# License: BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/games/xpat2/Makefile
+++ b/games/xpat2/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2001/05/06 01:06:32 lebel Exp $
+# $OpenBSD: Makefile,v 1.15 2001/06/20 01:43:21 pvalchev Exp $

 COMMENT=	"X11 solitaire with 14 variations"

@ -10,7 +10,7 @@ EXTRACT_SUFX=	-src.tar.gz

 MAINTAINER=	Angelos D. Keromytis <angelos@openbsd.org>

-LICENSE_TYPE=		GPL
+# License: GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/games/xsol/Makefile
+++ b/games/xsol/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2001/05/06 01:06:34 lebel Exp $
+# $OpenBSD: Makefile,v 1.13 2001/06/20 01:43:22 pvalchev Exp $

 COMMENT=	"solitaire"

@ -10,7 +10,7 @@ MASTER_SITES=	${MASTER_SITE_BACKUP}

 MAINTAINER=	ports@openbsd.org

-LICENSE_TYPE=		BSD
+# License: BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/games/xsoldier/Makefile
+++ b/games/xsoldier/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2001/05/06 01:06:35 lebel Exp $
+# $OpenBSD: Makefile,v 1.11 2001/06/20 01:43:22 pvalchev Exp $
 #

 COMMENT=	"shooting game for X11"
@ -9,7 +9,7 @@ NEED_VERSION=	1.402

 MAINTAINER=	ports@openbsd.org

-LICENSE_TYPE=		GPL
+# License: GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/graphics/xanim/Makefile
+++ b/graphics/xanim/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2001/05/06 05:05:51 lebel Exp $
+# $OpenBSD: Makefile,v 1.14 2001/06/20 01:43:23 pvalchev Exp $

 COMMENT=	"X11 animation player with support for lots of formats"

@ -16,7 +16,7 @@ DIST_SUBDIR=xanim
 MASTER_SITES=ftp://xanim.va.pubnix.com/
 MASTER_SITES0=ftp://xanim.va.pubnix.com/modules/

-LICENSE_TYPE=	NOFEE
+# License: NOFEE
 PERMIT_PACKAGE_CDROM=	No
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_FTP=	Yes
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2001/06/13 03:53:39 kevlo Exp $
+# $OpenBSD: Makefile,v 1.25 2001/06/20 01:43:23 pvalchev Exp $

 COMMENT=	"simple paint program"

@ -10,7 +10,7 @@ HOMEPAGE=	http://home.worldonline.dk/~torsten/xpaint/

 MAINTAINER=	ports@openbsd.org

-# LICENSE_TYPE=		BSD
+# License: BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/graphics/xpm/Makefile
+++ b/graphics/xpm/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2000/06/09 17:13:34 espie Exp $
+# $OpenBSD: Makefile,v 1.11 2001/06/20 01:43:22 pvalchev Exp $
 #

 DISTNAME=	xpm
@ -7,7 +7,7 @@ DISTFILES=
 CATEGORIES=	graphics x11
 COMES_WITH=	2.3
 NEED_VERSION=	1.293
-LICENSE_TYPE=		INC
+# License: INC
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/japanese/kinput2/Makefile
+++ b/japanese/kinput2/Makefile
@ -10,7 +10,7 @@ MASTER_SITES=	ftp://ftp.sra.co.jp/pub/x11/kinput2/
 CATEGORIES=	japanese x11
 NEED_VERSION=   1.402

-LICENSE_TYPE=	NOFEE
+# License: NOFEE
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/japanese/kterm/Makefile
+++ b/japanese/kterm/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2001/05/06 01:11:40 lebel Exp $
+# $OpenBSD: Makefile,v 1.12 2001/06/20 01:43:23 pvalchev Exp $
 #

 COMMENT=	"Japanese-capable xterm"
@ -10,7 +10,7 @@ NEED_VERSION=	1.402
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	applications

-LICENSE_TYPE=	X
+# License: X
 PERMIT_PACKAGE_CDROM=Yes
 PERMIT_PACKAGE_FTP=Yes
 PERMIT_DISTFILES_CDROM=Yes
--- a/lang/Gofer/Makefile
+++ b/lang/Gofer/Makefile
@ -3,7 +3,7 @@
 # Date created:		31 January 1998
 # Whom:			Don Schmidt
 #
-# $OpenBSD: Makefile,v 1.11 2001/05/06 01:27:52 lebel Exp $
+# $OpenBSD: Makefile,v 1.12 2001/06/20 01:43:24 pvalchev Exp $
 #

 COMMENT=	"lazy functional language"
@ -17,7 +17,7 @@ MASTER_SITES=	http://www.cse.ogi.edu/~mpj/goferarc/

 MAINTAINER=	ports@OpenBSD.ORG

-LICENSE_TYPE=		BSD
+# License: BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/lang/camlp4/Makefile
+++ b/lang/camlp4/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2001/05/06 01:27:53 lebel Exp $
+# $OpenBSD: Makefile,v 1.16 2001/06/20 01:43:24 pvalchev Exp $

 COMMENT=	"Pre-Processor-Pretty-Printer for Objective Caml"

@ -12,7 +12,7 @@ MAINTAINER=	Angelos D. Keromytis <angelos@openbsd.org>

 BUILD_DEPENDS=	ocamlc::lang/ocaml

-LICENSE_TYPE=           BSD
+# License: BSD
 PERMIT_PACKAGE_CDROM=   No
 PERMIT_PACKAGE_FTP=     No
 PERMIT_DISTFILES_CDROM= Yes
--- a/mail/mh/Makefile
+++ b/mail/mh/Makefile
@ -3,7 +3,7 @@
 # Date created:		April 8, 1998
 # Whom:			Angelos D. Keromytis
 #
-# $OpenBSD: Makefile,v 1.9 2001/05/06 01:46:25 lebel Exp $
+# $OpenBSD: Makefile,v 1.10 2001/06/20 01:43:25 pvalchev Exp $
 #

 COMMENT=	"Rand MH mail handling system"
@ -23,7 +23,7 @@ MAINTAINER=	Angelos D. Keromytis <angelos@openbsd.org>

 BROKEN=		"Buffer overflow in MIME support, use nmh >= 1.03 instead."

-LICENSE_TYPE=		PD
+# License: PD
 PERMIT_PACKAGE_CDROM=	YES
 PERMIT_PACKAGE_FTP=	YES
 PERMIT_DISTFILES_CDROM=	YES
--- a/mail/pgpsendmail/Makefile
+++ b/mail/pgpsendmail/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2001/05/06 01:46:38 lebel Exp $
+# $OpenBSD: Makefile,v 1.15 2001/06/20 01:43:24 pvalchev Exp $
 # Original from: Ejovi Nuwere <ejovi@ejovi.net>

 COMMENT=	"PGP sign/encrypt/decrypt messages automatically"
@ -15,7 +15,7 @@ MASTER_SITES=   ftp://ftp.atnf.csiro.au/pub/people/rgooch/ \

 MAINTAINER=     ports@OpenBSD.ORG

-LICENSE_TYPE=		GPL
+# License: GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/mail/poppassd/Makefile
+++ b/mail/poppassd/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2001/05/06 01:46:41 lebel Exp $
+# $OpenBSD: Makefile,v 1.14 2001/06/20 01:43:25 pvalchev Exp $

 COMMENT=	"server: allow users to change password from within Eudora"

@ -10,7 +10,7 @@ MASTER_SITES=	ftp://ftp.qualcomm.com/eudora/servers/unix/password/

 MAINTAINER=	Angelos D. Keromytis <angelos@openbsd.org>

-LICENSE_TYPE=		NONE
+# License: NONE
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/mail/xfaces/Makefile
+++ b/mail/xfaces/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2001/05/06 01:46:55 lebel Exp $
+# $OpenBSD: Makefile,v 1.18 2001/06/20 01:43:25 pvalchev Exp $

 COMMENT=	"mail image display for X11"

@ -14,7 +14,7 @@ DISTFILES=	${DISTNAME}.tar.Z xfaces-sounds.tar.gz

 MAINTAINER=	ports@openbsd.org

-LICENSE_TYPE=		"BSD NO"
+# License: "BSD NO"
 PERMIT_PACKAGE_CDROM=	No
 PERMIT_PACKAGE_FTP=	No
 PERMIT_DISTFILES_CDROM=	No
--- a/mbone/common/Makefile
+++ b/mbone/common/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2001/05/06 02:07:15 lebel Exp $
+# $OpenBSD: Makefile,v 1.18 2001/06/20 01:43:26 pvalchev Exp $

 COMMENT=	"common library functions used by the UCL multicast utils"

@ -9,7 +9,7 @@ MASTER_SITES=   http://www-mice.cs.ucl.ac.uk/multimedia/software/common/

 MAINTAINER=	Angelos D. Keromytis <angelos@openbsd.org>

-LICENSE_TYPE=		BSD
+# License: BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/mbone/nte/Makefile
+++ b/mbone/nte/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2001/05/06 02:07:20 lebel Exp $
+# $OpenBSD: Makefile,v 1.17 2001/06/20 01:43:26 pvalchev Exp $

 COMMENT=	"Network Text Editor multicast tool from UCL"

@ -9,7 +9,7 @@ MASTER_SITES=   http://www-mice.cs.ucl.ac.uk/multimedia/software/nte/1.7.0/

 MAINTAINER=	Angelos D. Keromytis <angelos@openbsd.org>

-LICENSE_TYPE=		BSD
+# License: BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/mbone/rat/Makefile
+++ b/mbone/rat/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2001/05/06 02:07:23 lebel Exp $
+# $OpenBSD: Makefile,v 1.12 2001/06/20 01:43:26 pvalchev Exp $

 COMMENT=	"Robust Audio Tool from UCL"

@ -9,7 +9,7 @@ NEED_VERSION=	1.402
 MASTER_SITES=   http://www-mice.cs.ucl.ac.uk/multimedia/software/rat/3.0.33/
 MAINTAINER=	Angelos D. Keromytis <angelos@openbsd.org>

-LICENSE_TYPE=		BSD
+# License: BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/mbone/relate/Makefile
+++ b/mbone/relate/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2001/05/06 02:07:26 lebel Exp $
+# $OpenBSD: Makefile,v 1.17 2001/06/20 01:43:25 pvalchev Exp $

 COMMENT=	"ReLaTe integrated conferencing tool from UCL"

@ -8,7 +8,7 @@ NEED_VERSION=	1.402
 MASTER_SITES=   http://www-mice.cs.ucl.ac.uk/multimedia/software/relate-ui/2.0/
 MAINTAINER=	Angelos D. Keromytis <angelos@openbsd.org>

-LICENSE_TYPE=		BSD
+# License: BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/mbone/rtptools/Makefile
+++ b/mbone/rtptools/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2001/05/06 02:07:29 lebel Exp $
+# $OpenBSD: Makefile,v 1.11 2001/06/20 01:43:28 pvalchev Exp $

 COMMENT=	"record, playback and monitor RTPv2 data streams"

@ -9,7 +9,7 @@ MASTER_SITES=	ftp://ftp.cs.columbia.edu/pub/schulzrinne/rtptools/
 MAINTAINER=	Angelos D. Keromytis <angelos@openbsd.org>
 NEED_VERSION=	1.402

-LICENSE_TYPE=		NONE
+# License: NONE
 PERMIT_PACKAGE_CDROM=	YES
 PERMIT_PACKAGE_FTP=	YES
 PERMIT_DISTFILES_CDROM=	YES
--- a/mbone/sdr/Makefile
+++ b/mbone/sdr/Makefile
@ -1,4 +1,4 @@
-#   $OpenBSD: Makefile,v 1.16 2001/05/06 02:07:32 lebel Exp $
+#   $OpenBSD: Makefile,v 1.17 2001/06/20 01:43:27 pvalchev Exp $

 COMMENT=	"MBone Session Directory"

@ -9,7 +9,7 @@ MASTER_SITES=	http://www-mice.cs.ucl.ac.uk/multimedia/software/sdr/2.7e/

 MAINTAINER=	Angelos D. Keromytis <angelos@openbsd.org>

-LICENSE_TYPE=		BSD
+# License: BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/mbone/vat/Makefile
+++ b/mbone/vat/Makefile
@ -1,5 +1,5 @@
 # $FreeBSD: Makefile,v 1.9 1998/12/02 05:56:01 asami Exp $
-# $OpenBSD: Makefile,v 1.16 2001/05/06 02:07:37 lebel Exp $
+# $OpenBSD: Makefile,v 1.17 2001/06/20 01:43:27 pvalchev Exp $

 COMMENT=	"The Visual Audio Tool - multicast audioconferencing"

@ -11,7 +11,7 @@ MASTER_SITES=	ftp://ftp.ee.lbl.gov/conferencing/vat/alpha-test/

 MAINTAINER=	Angelos D. Keromytis <angelos@openbsd.org>

-LICENSE_TYPE=		BSD
+# License: BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/mbone/vic/Makefile
+++ b/mbone/vic/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2001/05/06 02:07:40 lebel Exp $
+# $OpenBSD: Makefile,v 1.23 2001/06/20 01:43:27 pvalchev Exp $

 COMMENT=	"MBONE video tool"

@ -9,7 +9,7 @@ MASTER_SITES=	http://www-mice.cs.ucl.ac.uk/multimedia/software/vic/2.8ucl4/

 MAINTAINER=	Angelos D. Keromytis <angelos@openbsd.org>

-LICENSE_TYPE=		BSD
+# License: BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/mbone/wb/Makefile
+++ b/mbone/wb/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2001/05/06 02:07:43 lebel Exp $
+# $OpenBSD: Makefile,v 1.14 2001/06/20 01:43:27 pvalchev Exp $
 #

 COMMENT=	"shared drawing (whiteboard) tool using multicast"
@ -12,7 +12,7 @@ ONLY_FOR_ARCHS=	i386

 MAINTAINER=	Angelos D. Keromytis <angelos@openbsd.org>

-LICENSE_TYPE=		NONE
+# License: NONE
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/mbone/wbd/Makefile
+++ b/mbone/wbd/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2001/05/06 02:07:46 lebel Exp $
+# $OpenBSD: Makefile,v 1.23 2001/06/20 01:43:26 pvalchev Exp $

 COMMENT=	"shared drawing (whiteboard) tool using multicast"

@ -10,7 +10,7 @@ MASTER_SITES=	http://www-mice.cs.ucl.ac.uk/multimedia/software/wbd/1.0ucl4/

 MAINTAINER=	Angelos D. Keromytis <angelos@openbsd.org>

-LICENSE_TYPE=		BSD
+# License: BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/misc/brs/Makefile
+++ b/misc/brs/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2001/05/06 02:29:44 lebel Exp $
+# $OpenBSD: Makefile,v 1.5 2001/06/20 01:43:28 pvalchev Exp $

 COMMENT=	"bible reader"

@ -12,7 +12,7 @@ NEED_VERSION=	1.402

 MAINTAINER=	J Shoemaker <shoemaker@softhome.net>

-LICENSE_TYPE=		GPL
+# License: GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/misc/jive/Makefile
+++ b/misc/jive/Makefile
@ -3,7 +3,7 @@
 # Date created:			  29 April 1998
 # Whom:				  Angelos D. Keromytis
 #
-# $OpenBSD: Makefile,v 1.12 2001/05/06 02:30:09 lebel Exp $
+# $OpenBSD: Makefile,v 1.13 2001/06/20 01:43:29 pvalchev Exp $
 #

 COMMENT=	"convert English text to Jive"
@ -15,7 +15,7 @@ MASTER_SITES=	ftp://nuxi.ucdavis.edu/pub/misc/

 MAINTAINER=     Angelos D. Keromytis <angelos@openbsd.org>

-LICENSE_TYPE=		NONE
+# License: NONE
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/misc/splitvt/Makefile
+++ b/misc/splitvt/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2001/05/06 02:30:58 lebel Exp $
+# $OpenBSD: Makefile,v 1.9 2001/06/20 01:43:29 pvalchev Exp $
 # Original from: Ejovi Nuwere <ejovi@ejovi.net>

 COMMENT=	"run two shells in a split window/terminal"
@ -11,7 +11,7 @@ MASTER_SITE_SUBDIR=	utils/console

 MAINTAINER=     ports@OpenBSD.ORG

-LICENSE_TYPE=		NONE
+# License: NONE
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/misc/xtar/Makefile
+++ b/misc/xtar/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2001/05/06 02:31:39 lebel Exp $
+# $OpenBSD: Makefile,v 1.18 2001/06/20 01:43:29 pvalchev Exp $

 COMMENT=	"view and manipulate contents of a tar file"

@ -10,7 +10,7 @@ MASTER_SITE_SUBDIR= utilities

 MAINTAINER=	ports@openbsd.org

-LICENSE_TYPE=		BSD
+# License: BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/net/ncftp/Makefile
+++ b/net/ncftp/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2001/05/06 05:00:10 lebel Exp $
+# $OpenBSD: Makefile,v 1.14 2001/06/20 01:43:29 pvalchev Exp $

 COMMENT=	"curses-based ftp program"

@ -10,7 +10,7 @@ MASTER_SITES=		ftp://ftp.ncftp.com/ncftp/

 MAINTAINER=		Eric Jackson <shinobi@monkey.org>

-LICENSE_TYPE=		GPL
+# License: GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/net/ns/Makefile
+++ b/net/ns/Makefile
@ -1,6 +1,6 @@
 #
 # $FreeBSD: ports/net/ns/Makefile,v 1.3 1999/11/28 18:31:26 steve Exp $
-# $OpenBSD: Makefile,v 1.15 2001/05/06 05:00:14 lebel Exp $
+# $OpenBSD: Makefile,v 1.16 2001/06/20 01:43:30 pvalchev Exp $
 #

 COMMENT=	"The UCB/LBNL Network Simulator Version 2"
@ -16,7 +16,7 @@ MASTER_SITES= ftp://ftp.ee.surrey.ac.uk/pub/Mirrors/ftp.isi.edu/nsnam/ \
 ftp://ftp.isi.edu/nsnam/ \
 http://www.isi.edu/nsnam/dist/

-LICENSE_TYPE=		BSD
+# License: BSD
 PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
--- a/net/sharity-light/Makefile
+++ b/net/sharity-light/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2001/05/06 05:00:27 lebel Exp $
+# $OpenBSD: Makefile,v 1.13 2001/06/20 01:43:30 pvalchev Exp $
 # $FreeBSD: Makefile,v 1.10 1999/01/06 17:11:23 dt Exp $

 COMMENT=	"userland smbfs --- SMB to NFS protocols converter"
@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.obdev.at/pub/Products/Sharity-Light/	\

 MAINTAINER=	ports@openbsd.org

-LICENSE_TYPE=		GPL
+# License: GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/net/slirp/Makefile
+++ b/net/slirp/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2001/05/06 05:00:28 lebel Exp $
+# $OpenBSD: Makefile,v 1.12 2001/06/20 01:43:30 pvalchev Exp $
 #

 COMMENT=	"SLIP/CSLIP emulator for users with shell accounts"
@ -11,7 +11,7 @@ MASTER_SITES=	ftp://blitzen.canberra.edu.au/pub/slirp/ \

 MAINTAINER=	ports@openbsd.org

-LICENSE_TYPE=		BSD
+# License: BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/news/newsfetch/Makefile
+++ b/news/newsfetch/Makefile
@ -3,7 +3,7 @@
 # Date created:		28 April 1998
 # Whom:			Ejovi Nuwere <ejovi@ejovi.net>
 #
-# $OpenBSD: Makefile,v 1.10 2001/05/06 02:59:34 lebel Exp $
+# $OpenBSD: Makefile,v 1.11 2001/06/20 01:43:31 pvalchev Exp $
 #

 COMMENT=	"download news articles from NNTP server"
@ -16,7 +16,7 @@ NEED_VERSION=	1.402

 MAINTAINER=	ports@OpenBSD.ORG

-LICENSE_TYPE=		NONE
+# License: NONE
 PERMIT_PACKAGE_CDROM=	YES
 PERMIT_PACKAGE_FTP=	YES
 PERMIT_DISTFILES_CDROM=	YES
--- a/news/plor/Makefile
+++ b/news/plor/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2001/04/21 16:58:03 shell Exp $
+# $OpenBSD: Makefile,v 1.12 2001/06/20 01:43:30 pvalchev Exp $
 # Original from: Ejovi Nuwere <ejovi@ejovi.net>

 COMMENT=	'alpha-release readers for reading SOUP and QWK packets'
@ -9,7 +9,7 @@ NEED_VERSION=	1.405

 MAINTAINER=	ports@OpenBSD.ORG

-LICENSE_TYPE=		GPL
+# License: GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/print/detex/Makefile
+++ b/print/detex/Makefile
@ -3,7 +3,7 @@
 # Date created:			  May 17 1998
 # Whom:				  Angelos D. Keromytis
 #
-# $OpenBSD: Makefile,v 1.11 2001/05/06 03:19:50 lebel Exp $
+# $OpenBSD: Makefile,v 1.12 2001/06/20 01:43:32 pvalchev Exp $
 #

 COMMENT=		"strip TeX/LaTeX codes from a file"
@ -16,7 +16,7 @@ EXTRACT_SUFX=		.tar

 MAINTAINER=     	Angelos D. Keromytis <angelos@openbsd.org>

-LICENSE_TYPE=		NONE
+# License: NONE
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/print/ghostscript/afpl/Makefile
+++ b/print/ghostscript/afpl/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2001/05/28 15:14:56 lebel Exp $
+# $OpenBSD: Makefile,v 1.9 2001/06/20 01:43:31 pvalchev Exp $

 COMMENT="AFPL PostScript interpreter"

@ -20,7 +20,7 @@ SUBST_VARS=		OSREV	VERSION
 DIST_SUBDIR=	gs

 # Aladdin license 
-LICENSE_TYPE=		COPY GPL BSD
+# License: COPY GPL BSD
 # Aladdin ghostscript wants a fee for redistribution
 PERMIT_DISTFILES_CDROM=	No
 PERMIT_DISTFILES_FTP=	Yes
--- a/print/ghostscript/aladdin/Makefile
+++ b/print/ghostscript/aladdin/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2001/05/24 02:28:12 kevlo Exp $
+# $OpenBSD: Makefile,v 1.16 2001/06/20 01:43:31 pvalchev Exp $

 COMMENT="AFPL PostScript interpreter"

@ -20,7 +20,7 @@ SUBST_VARS=		OSREV	VERSION
 DIST_SUBDIR=	gs

 # Aladdin license 
-LICENSE_TYPE=		COPY GPL BSD
+# License: COPY GPL BSD
 # Aladdin ghostscript wants a fee for redistribution
 PERMIT_DISTFILES_CDROM=	No
 PERMIT_DISTFILES_FTP=	Yes
--- a/print/ghostscript/gnu/Makefile
+++ b/print/ghostscript/gnu/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2001/05/24 02:28:14 kevlo Exp $
+# $OpenBSD: Makefile,v 1.19 2001/06/20 01:43:32 pvalchev Exp $
 # Original from:	Andreas Klemm <andreas@klemm.gtn.com>

 COMMENT=	"GNU Postscript interpreter"
@ -25,7 +25,7 @@ SUBST_VARS=		OSREV	VERSION
 DIST_SUBDIR=	gs

 # png and jpeg sources are under a BSD license
-LICENSE_TYPE=		GPL BSD
+# License: GPL BSD
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 PERMIT_PACKAGE_CDROM=	Yes
--- a/print/ghostview/Makefile
+++ b/print/ghostview/Makefile
@ -3,7 +3,7 @@
 # Date created:		December 2, 1997
 # Whom:			Angelos D. Keromytis
 #
-# $OpenBSD: Makefile,v 1.9 2001/05/06 03:19:53 lebel Exp $
+# $OpenBSD: Makefile,v 1.10 2001/06/20 01:43:33 pvalchev Exp $
 #

 COMMENT=	"X11 front-end for ghostscript"
@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= ghostview

 MAINTAINER=	ports@openbsd.org

-LICENSE_TYPE=		GPL
+# License: GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/print/mpage/Makefile
+++ b/print/mpage/Makefile
@ -3,7 +3,7 @@
 # Version required:     mpage 2.5
 # Date created:         August, 10th 1999
 # Whom:                 Ian McWilliam
-# $OpenBSD: Makefile,v 1.14 2001/05/06 03:19:56 lebel Exp $
+# $OpenBSD: Makefile,v 1.15 2001/06/20 01:43:32 pvalchev Exp $

 COMMENT=	"print multiple pages per sheet on PostScript printer"

@ -15,7 +15,7 @@ NEED_VERSION=	1.402

 MAINTAINER=	Ian McWilliam <i.mcwilliam@uws.edu.au>

-LICENSE_TYPE=		BSD
+# License: BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/print/pkfonts/Makefile
+++ b/print/pkfonts/Makefile
@ -2,7 +2,7 @@
 # Date created:		May 17 1998
 # Whom:			Angelos D. Keromytis
 #
-# $OpenBSD: Makefile,v 1.13 2001/05/06 03:20:00 lebel Exp $
+# $OpenBSD: Makefile,v 1.14 2001/06/20 01:43:32 pvalchev Exp $
 #

 COMMENT=	"English PK fonts, for ghostscript, xdvi and so on"
@ -20,7 +20,7 @@ EXTRACT_ONLY=

 MAINTAINER=	Angelos D. Keromytis <angelos@openbsd.org>

-LICENSE_TYPE=		NONE
+# License: NONE
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/security/ADMsnmp/Makefile
+++ b/security/ADMsnmp/Makefile
@ -3,7 +3,7 @@
 # Date created:		14 Mar 1999
 # Whom:			dugsong@monkey.org
 #
-# $OpenBSD: Makefile,v 1.11 2001/05/06 03:45:35 lebel Exp $
+# $OpenBSD: Makefile,v 1.12 2001/06/20 01:43:33 pvalchev Exp $

 COMMENT=	"SNMP audit scanner"

@ -19,7 +19,7 @@ MASTER_SITES=	http://el8.org/~antilove/ \

 MAINTAINER=	Dug Song <dugsong@monkey.org>

-LICENSE_TYPE=		NONE
+# License: NONE
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/security/fragrouter/Makefile
+++ b/security/fragrouter/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2001/05/06 03:45:47 lebel Exp $
+# $OpenBSD: Makefile,v 1.14 2001/06/20 01:43:33 pvalchev Exp $

 COMMENT=	"tool for testing network IDS implementations"

@ -11,7 +11,7 @@ MASTER_SITES=	http://www.anzen.com/research/nidsbench/

 MAINTAINER=	Dug Song <dugsong@monkey.org>

-LICENSE_TYPE=		BSD
+# License: BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/security/libident/Makefile
+++ b/security/libident/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2001/05/06 03:45:55 lebel Exp $
+# $OpenBSD: Makefile,v 1.11 2001/06/20 01:43:33 pvalchev Exp $

 COMMENT=	"library to interface the ident protocol server (rfc1413)"

@ -9,7 +9,7 @@ NEED_VERSION=	1.402

 MAINTAINER=	Angelos D. Keromytis <angelos@openbsd.org>

-LICENSE_TYPE=		PD
+# License: PD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/security/strobe/Makefile
+++ b/security/strobe/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2001/05/06 03:46:25 lebel Exp $
+# $OpenBSD: Makefile,v 1.14 2001/06/20 01:43:34 pvalchev Exp $
 # $FreeBSD: Makefile,v 1.5 1999/03/09 00:16:14 jseger Exp $

 COMMENT=	"fast scatter/gather TCP port scanner"
@ -12,7 +12,7 @@ EXTRACT_SUFX=	.tgz

 MAINTAINER=	Brad Smith <brad@openbsd.org>

-LICENSE_TYPE=		BSD
+# License: BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/sysutils/cfengine/Makefile
+++ b/sysutils/cfengine/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2001/05/06 03:58:58 lebel Exp $
+# $OpenBSD: Makefile,v 1.10 2001/06/20 01:43:34 pvalchev Exp $
 # $FreeBSD: Makefile,v 1.2 1998/08/19 11:28:23 jseger Exp $
 #

@ -10,7 +10,7 @@ NEED_VERSION=	1.402

 MAINTAINER=	ports@openbsd.org

-LICENSE_TYPE=		GPL
+# License: GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/sysutils/rtty/Makefile
+++ b/sysutils/rtty/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2001/05/06 03:59:05 lebel Exp $
+# $OpenBSD: Makefile,v 1.11 2001/06/20 01:43:34 pvalchev Exp $
 #

 COMMENT=	"multiuser "tip"/"cu" replacement with logging"
@ -9,7 +9,7 @@ NEED_VERSION=	1.402

 MAINTAINER=	ports@openbsd.org

-LICENSE_TYPE=		BSD
+# License: BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/sysutils/setquota/Makefile
+++ b/sysutils/setquota/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2001/05/06 03:59:06 lebel Exp $
+# $OpenBSD: Makefile,v 1.16 2001/06/20 01:43:34 pvalchev Exp $
 # Original from: Ejovi Nuwere <ejovi@ejovi.net>

 COMMENT=	"command line quota tools"
@ -10,7 +10,7 @@ MASTER_SITES=	ftp://ftp.jurai.net/users/winter/

 MAINTAINER= 	ports@OpenBSD.ORG

-LICENSE_TYPE=		BSD
+# License: BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/sysutils/tcplist/Makefile
+++ b/sysutils/tcplist/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2001/05/06 03:59:10 lebel Exp $
+# $OpenBSD: Makefile,v 1.14 2001/06/20 01:43:35 pvalchev Exp $
 # Original from: Ejovi Nuwere <ejovi@ejovi.net>

 COMMENT=	"list tcp connections to/from the local machine"
@ -11,7 +11,7 @@ EXTRACT_SUFX=	.shar

 MAINTAINER=     ports@OpenBSD.ORG

-LICENSE_TYPE=		BSD
+# License: BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/textproc/c2html/Makefile
+++ b/textproc/c2html/Makefile
@ -3,7 +3,7 @@
 # Date created:				December 1, 1997
 # Whom:					Angelos D. Keromytis
 #
-# $OpenBSD: Makefile,v 1.11 2001/05/06 04:11:39 lebel Exp $
+# $OpenBSD: Makefile,v 1.12 2001/06/20 01:43:35 pvalchev Exp $
 #

 COMMENT=		"C-language sources to HTML converter"
@ -19,7 +19,7 @@ MASTER_SITE_SUBDIR=	apps/www/converters

 MAINTAINER=		Angelos D. Keromytis <angelos@openbsd.org>

-LICENSE_TYPE=		GPL
+# License: GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/textproc/html/Makefile
+++ b/textproc/html/Makefile
@ -3,7 +3,7 @@
 # Date created:		December 1, 1997
 # Whom:			Angelos D. Keromytis
 #
-# $OpenBSD: Makefile,v 1.13 2001/05/06 04:11:42 lebel Exp $
+# $OpenBSD: Makefile,v 1.14 2001/06/20 01:43:35 pvalchev Exp $
 #

 COMMENT=	"all W3C published SGML DTDs for HTML"
@ -15,7 +15,7 @@ MASTER_SITES=	ftp://fallout.campusview.indiana.edu/pub/sgml/

 MAINTAINER=	Angelos D. Keromytis <angelos@openbsd.org>

-LICENSE_TYPE=		NONE
+# License: NONE
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/textproc/isearch/Makefile
+++ b/textproc/isearch/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2001/05/06 04:11:44 lebel Exp $
+# $OpenBSD: Makefile,v 1.14 2001/06/20 01:43:36 pvalchev Exp $
 # Original from: Ejovi Nuwere <ejovi@ejovi.net> 

 COMMENT=	"text search engine by CNIDR"
@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.cnidr.org/pub/NIDR.tools/Isearch/

 MAINTAINER=	ports@OpenBSD.ORG

-LICENSE_TYPE=		BSD
+# License: BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/textproc/pilot_makedoc/Makefile
+++ b/textproc/pilot_makedoc/Makefile
@ -3,7 +3,7 @@
 # Date created:				April 27 1998
 # Whom:					Angelos D. Keromytis
 #
-# $OpenBSD: Makefile,v 1.10 2001/06/02 23:41:46 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.11 2001/06/20 01:43:36 pvalchev Exp $
 #

 COMMENT=	"convert text into the Doc format used by PalmPilots"
@ -17,7 +17,7 @@ EXTRACT_ONLY=

 MAINTAINER=	Angelos D. Keromytis <angelos@openbsd.org>

-LICENSE_TYPE=		NONE
+# License: NONE
 PERMIT_PACKAGE_CDROM=	YES
 PERMIT_PACKAGE_FTP=	YES
 PERMIT_DISTFILES_CDROM=	YES
--- a/textproc/sgmlformat/Makefile
+++ b/textproc/sgmlformat/Makefile
@ -4,7 +4,7 @@
 # Whom:			jfieber
 #
 # $FreeBSD: Makefile,v 1.9 1998/02/21 21:59:37 jfieber Exp $
-# $OpenBSD: Makefile,v 1.10 2001/05/06 04:11:53 lebel Exp $
+# $OpenBSD: Makefile,v 1.11 2001/06/20 01:43:36 pvalchev Exp $
 #

 COMMENT=	"generate groff/HTML from linuxdoc/docbook SGML documents"
@ -16,7 +16,7 @@ MASTER_SITES=	http://fallout.campusview.indiana.edu/ports/distfiles/

 MAINTAINER=	Matthieu Herrb <matthieu@openbsd.org>

-LICENSE_TYPE=		BSD
+# License: BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/textproc/sp/Makefile
+++ b/textproc/sp/Makefile
@ -3,7 +3,7 @@
 # Date created:		May 21 1998
 # Whom:			Angelos D. Keromytis
 #
-# $OpenBSD: Makefile,v 1.9 2001/05/06 04:11:53 lebel Exp $
+# $OpenBSD: Makefile,v 1.10 2001/06/20 01:43:36 pvalchev Exp $
 #

 COMMENT=	"OO toolkit for SGML parsing and entity management"
@ -14,7 +14,7 @@ MASTER_SITES=	ftp://ftp.jclark.com/pub/sp/
 MAINTAINER=	ports@openbsd.org
 NEED_VERSION=	1.402

-LICENSE_TYPE=		BSD
+# License: BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/textproc/texi2html/Makefile
+++ b/textproc/texi2html/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2001/05/06 04:11:54 lebel Exp $
+# $OpenBSD: Makefile,v 1.13 2001/06/20 01:43:37 pvalchev Exp $

 COMMENT=	"texinfo to HTML converter"

@ -12,7 +12,7 @@ EXTRACT_SUFX=	.shar.Z

 MAINTAINER=	Angelos D. Keromytis <angelos@openbsd.org>

-LICENSE_TYPE=		GPL
+# License: GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/textproc/wdiff/Makefile
+++ b/textproc/wdiff/Makefile
@ -3,7 +3,7 @@
 # Date created:		May 16 1998
 # Whom:			Angelos D. Keromytis
 #
-# $OpenBSD: Makefile,v 1.12 2001/05/06 04:11:55 lebel Exp $
+# $OpenBSD: Makefile,v 1.13 2001/06/20 01:43:37 pvalchev Exp $
 #

 COMMENT=	"word differences between text files"
@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= wdiff

 MAINTAINER=	Angelos D. Keromytis <angelos@openbsd.org>

-LICENSE_TYPE=		GPL
+# License: GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/www/cgiparse/Makefile
+++ b/www/cgiparse/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2001/06/08 13:36:39 shell Exp $
+# $OpenBSD: Makefile,v 1.16 2001/06/20 01:43:37 pvalchev Exp $

 COMMENT=	"C library to parse CGI Forms"

@ -10,7 +10,7 @@ MAINTAINER=	ports@openbsd.org

 HOMEPAGE=	http://resnet.uoregon.edu/~gurney_j/jmpc/cgiparse.html

-LICENSE_TYPE=		BSD
+# License: BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/x11/explorer/Makefile
+++ b/x11/explorer/Makefile
@ -3,7 +3,7 @@
 # Date created:        May 19 1998
 # Whom:                Angelos D. Keromytis
 #
-# $OpenBSD: Makefile,v 1.16 2001/06/09 19:55:11 espie Exp $
+# $OpenBSD: Makefile,v 1.17 2001/06/20 01:43:38 pvalchev Exp $
 #

 COMMENT=	"file manager with same look and feel as Windows95(tm)"
@ -15,7 +15,7 @@ MASTER_SITES=	ftp://jungfrau.ptf.hro.nl/pub/explorer/

 MAINTAINER=	ports@openbsd.org

-LICENSE_TYPE=		GPL
+# License: GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/x11/lupe/Makefile
+++ b/x11/lupe/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2001/05/06 04:41:19 lebel Exp $
+# $OpenBSD: Makefile,v 1.13 2001/06/20 01:43:38 pvalchev Exp $

 COMMENT=	"real-time magnifying glass for X11"

@ -12,7 +12,7 @@ HOMEPAGE=	http://www.oersted.co.jp/~yav/soft/

 MAINTAINER=	ports@openbsd.org

-LICENSE_TYPE=		PD
+# License: PD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/x11/mouseclock/Makefile
+++ b/x11/mouseclock/Makefile
@ -3,7 +3,7 @@
 # Date created:		May 19 1998
 # Whom:			Angelos D. Keromytis
 #
-# $OpenBSD: Makefile,v 1.11 2001/05/06 04:41:19 lebel Exp $
+# $OpenBSD: Makefile,v 1.12 2001/06/20 01:43:39 pvalchev Exp $
 #

 COMMENT=	"display the current time using the X11 root cursor"
@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR=	X11/clocks

 MAINTAINER=	ports@openbsd.org

-LICENSE_TYPE=		GPL
+# License: GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/x11/viewfax/Makefile
+++ b/x11/viewfax/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2001/05/06 04:41:28 lebel Exp $
+# $OpenBSD: Makefile,v 1.11 2001/06/20 01:43:40 pvalchev Exp $
 # $FreeBSD: Makefile,v 1.9 1998/03/07 23:26:23 jmz Exp $

 COMMENT=	"display files containing g3 and/or g4 coded fax pages"
@ -12,7 +12,7 @@ CONFIGURE_STYLE=	imake

 MAINTAINER=	ports@openbsd.org

-LICENSE_TYPE=		GPL
+# License: GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/x11/xaniroc/Makefile
+++ b/x11/xaniroc/Makefile
@ -3,7 +3,7 @@
 # Date created:        May 19 1998
 # Whom:                Angelos D. Keromytis
 #
-# $OpenBSD: Makefile,v 1.9 2001/05/06 04:41:29 lebel Exp $
+# $OpenBSD: Makefile,v 1.10 2001/06/20 01:43:40 pvalchev Exp $
 #

 COMMENT=	"animate your root-cursor"
@ -18,7 +18,7 @@ EXTRACT_SUFX=	.src.tar.Z

 MAINTAINER=	ports@openbsd.org

-LICENSE_TYPE=		NONE
+# License: NONE
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/x11/xantfarm/Makefile
+++ b/x11/xantfarm/Makefile
@ -3,7 +3,7 @@
 # Date created:		6 January 1998
 # Whom:			Don Schmidt
 #
-# $OpenBSD: Makefile,v 1.8 2001/05/06 04:41:30 lebel Exp $
+# $OpenBSD: Makefile,v 1.9 2001/06/20 01:43:41 pvalchev Exp $
 #

 COMMENT=	"ant hill simulation on X11 root window"
@ -17,7 +17,7 @@ DISTFILES=	xantfarm23oct91.tar.gz

 MAINTAINER=	ports@OpenBSD.ORG

-LICENSE_TYPE=		BSD
+# License: BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/Show More
+++ b/Show More