- Add LICENSE knob(s)

58 files changed, 158 insertions, 13 deletions

diff --git a/archivers/aolserver-nszlib/Makefile b/archivers/aolserver-nszlib/Makefile
index e13c68f49c8f..f6d6e103edc8 100644
--- a/archivers/aolserver-nszlib/Makefile
+++ b/archivers/aolserver-nszlib/Makefile
@@ -18,6 +18,9 @@ DIST_SUBDIR=	aolserver
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	Zlib library interface for AOLserver
 
+LICENSE=	MPL GPLv1
+LICENSE_COMB=	dual
+
 AOLSERVERBASE?=	aolserver
 
 BUILD_DEPENDS+=	${LOCALBASE}/${AOLSERVERBASE}/bin/nsd:${PORTSDIR}/www/aolserver
diff --git a/archivers/p5-Compress-Raw-Bzip2/Makefile b/archivers/p5-Compress-Raw-Bzip2/Makefile
index 2a03c4aac20f..f68115bd79a2 100644
--- a/archivers/p5-Compress-Raw-Bzip2/Makefile
+++ b/archivers/p5-Compress-Raw-Bzip2/Makefile
@@ -15,6 +15,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	Low-Level Interface to bzip2 compression library
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 PERL_CONFIGURE=	YES
 
 MAN3=		Compress::Raw::Bzip2.3
diff --git a/archivers/p5-Compress-Raw-Zlib/Makefile b/archivers/p5-Compress-Raw-Zlib/Makefile
index 1d2d0ae6447f..232ac8dfc12e 100644
--- a/archivers/p5-Compress-Raw-Zlib/Makefile
+++ b/archivers/p5-Compress-Raw-Zlib/Makefile
@@ -15,6 +15,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	Low-Level Interface to zlib compression library
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 PERL_CONFIGURE=	YES
 
 MAN3=		Compress::Raw::Zlib.3
diff --git a/archivers/p5-IO-Compress/Makefile b/archivers/p5-IO-Compress/Makefile
index 1c4ab71e1a80..9a7623d00bcb 100644
--- a/archivers/p5-IO-Compress/Makefile
+++ b/archivers/p5-IO-Compress/Makefile
@@ -21,6 +21,9 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 
 CONFLICTS=	p5-Compress-Zlib-2* p5-IO-Compress-Base-2* p5-IO-Compress-Zlib-2* p5-IO-Compress-Bzip2-2*
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 PERL_CONFIGURE=	YES
 
 MAN3=		Compress::Zlib.3 \
diff --git a/audio/epos-devel/Makefile b/audio/epos-devel/Makefile
index 27ec5016d9ea..f85a90e616e3 100644
--- a/audio/epos-devel/Makefile
+++ b/audio/epos-devel/Makefile
@@ -13,6 +13,11 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-dev/${PORTVERSION}
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	Text-to-Speech system
 
+LICENSE=	GPLv2 LGPL20
+LICENSE_COMB=	multi
+LICENSE_FILE_GPLv2=	${WRKSRC}/doc/COPYING
+LICENSE_FILE_LGPL20=	${WRKSRC}/libs/regex/COPYING.LIB
+
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/comms/smstools3/Makefile b/comms/smstools3/Makefile
index 978224854625..5aa9cf117f8a 100644
--- a/comms/smstools3/Makefile
+++ b/comms/smstools3/Makefile
@@ -18,6 +18,10 @@ CONFLICTS=	gnokii-[0-9]* smstools-2.* sendsms-[0-9]*
 OPTIONS=	STATS "Build status and statistics support" on
 
 WRKSRC=		${WRKDIR}/smstools3
+
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 USE_RC_SUBR=	smsd
diff --git a/databases/aolserver-nspostgres/Makefile b/databases/aolserver-nspostgres/Makefile
index c86f8f121e7c..4297bf03e448 100644
--- a/databases/aolserver-nspostgres/Makefile
+++ b/databases/aolserver-nspostgres/Makefile
@@ -17,6 +17,8 @@ DIST_SUBDIR=	aolserver
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	Internal PostgreSQL driver for AOLserver
 
+LICENSE=	MPL
+
 WRKSRC=		${WRKDIR}/nspostgres-${PORTVERSION}
 
 AOLSERVERBASE?=	aolserver
diff --git a/databases/luasql-mysql/Makefile b/databases/luasql-mysql/Makefile
index 4cd909b87090..548f9eb54199 100644
--- a/databases/luasql-mysql/Makefile
+++ b/databases/luasql-mysql/Makefile
@@ -15,6 +15,8 @@ PKGNAMESUFFIX=	-${LUASQL_DRIVER}
 MAINTAINER=	mm@FreeBSD.org
 COMMENT?=	LuaSQL driver
 
+LICENSE=	MIT
+
 DISTFILE_REV=	2686
 
 USE_LUA=	5.1
diff --git a/databases/metakit/Makefile b/databases/metakit/Makefile
index 198c1d46e256..5172d464ec5f 100644
--- a/databases/metakit/Makefile
+++ b/databases/metakit/Makefile
@@ -14,6 +14,9 @@ MASTER_SITES=	http://www.equi4.com/pub/mk/
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	C++ embedded database engine, supports Python and Tcl
 
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/../license.terms
+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/builds
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile
index 6156edad437a..274e95cdce89 100644
--- a/devel/binutils/Makefile
+++ b/devel/binutils/Makefile
@@ -25,6 +25,11 @@ CONFLICTS=	libbfd-[0-9]*
 
 OPTIONS=	NLS "Enable National Language Support" off
 
+LICENSE=	GPLv3 LGPL3
+LICENSE_COMB=	multi
+LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING3
+LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING3.LIB
+
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS+=	--with-system-zlib \
diff --git a/devel/libcfg/Makefile b/devel/libcfg/Makefile
index 094bcdd14dde..81a149186533 100644
--- a/devel/libcfg/Makefile
+++ b/devel/libcfg/Makefile
@@ -15,6 +15,9 @@ DISTNAME=	${PORTNAME}+-${DISTVERSION}
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	Library for command line and configuration file parsing
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 USE_AUTOTOOLS=	autoconf
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -53,7 +56,7 @@ post-install:
 .endif
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for FILE in AUTHORS COPYING README TODO
+.for FILE in AUTHORS README TODO
 	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
 .endfor
 .if defined(WITH_HTMLDOCS)
diff --git a/devel/libcfg/distinfo b/devel/libcfg/distinfo
index edb5a80cce3e..81b9972cb9f0 100644
--- a/devel/libcfg/distinfo
+++ b/devel/libcfg/distinfo
@@ -1,3 +1,2 @@
-MD5 (libcfg+-0.6.2.tar.gz) = e117a2d054c5f5831fdb5ed27c26d767
 SHA256 (libcfg+-0.6.2.tar.gz) = 8f7984dc7e457c738c6f1ab778900d61183156d18a6c67f929376d9dfeac278c
 SIZE (libcfg+-0.6.2.tar.gz) = 169482
diff --git a/devel/libevent/Makefile b/devel/libevent/Makefile
index 6736b68ea4c4..1a3bf95d1920 100644
--- a/devel/libevent/Makefile
+++ b/devel/libevent/Makefile
@@ -15,6 +15,8 @@ DISTNAME=	${PORTNAME}-${DISTVERSION}-stable
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	Provides an API to execute callback functions on certain events
 
+LICENSE=	BSD
+
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/devel/libevent2/Makefile b/devel/libevent2/Makefile
index 041b2669728d..2b4cc172bc54 100644
--- a/devel/libevent2/Makefile
+++ b/devel/libevent2/Makefile
@@ -15,6 +15,9 @@ DISTNAME=	${PORTNAME:S/2//}-${DISTVERSION}-stable
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	API for executing callback functions on events or timeouts
 
+LICENSE=	BSD
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
 USE_GNOME=	lthack
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	${PREFIX}/lib/event2
diff --git a/devel/liboil/Makefile b/devel/liboil/Makefile
index e8c458d533f6..ff82f86a3ec3 100644
--- a/devel/liboil/Makefile
+++ b/devel/liboil/Makefile
@@ -14,6 +14,9 @@ MASTER_SITES=	http://liboil.freedesktop.org/download/
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	Library of optimized inner loops
 
+LICENSE=	BSD
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 USE_GNOME=	pkgconfig gnomehack gnometarget ltverhack
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
diff --git a/devel/orc/Makefile b/devel/orc/Makefile
index 2fb2d6d2896b..c85763677cfe 100644
--- a/devel/orc/Makefile
+++ b/devel/orc/Makefile
@@ -12,6 +12,9 @@ MASTER_SITES=	http://code.entropywave.com/download/orc/
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	Library and toolset to operate arrays of data
 
+LICENSE=	BSD
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 USE_GNOME=	pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
diff --git a/devel/pcre/Makefile b/devel/pcre/Makefile
index 4bbc9f5a43be..e82ff03c2336 100644
--- a/devel/pcre/Makefile
+++ b/devel/pcre/Makefile
@@ -16,6 +16,9 @@ MASTER_SITE_SUBDIR=${PORTNAME}
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	Perl Compatible Regular Expressions library
 
+LICENSE=	BSD
+LICENSE_FILE=	${WRKSRC}/LICENCE
+
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/devel/smake/Makefile b/devel/smake/Makefile
index 941429adfbb3..a15c803d8d3e 100644
--- a/devel/smake/Makefile
+++ b/devel/smake/Makefile
@@ -16,6 +16,11 @@ COMMENT=	Highly portable make program with automake features
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/.a.*//g}
 
+LICENSE=	CDDL GPLv2
+LICENSE_COMB=	multi
+LICENSE_FILE_CDDL=	${WRKSRC}/CDDL.Schily.txt
+LICENSE_FILE_GPLv2=	${WRKSRC}/GPL-2.0.txt
+
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 MAKE_ARGS=	INS_BASE=${PREFIX}
diff --git a/devel/smake/distinfo b/devel/smake/distinfo
index c77ddc36e754..2ab24b5f146e 100644
--- a/devel/smake/distinfo
+++ b/devel/smake/distinfo
@@ -1,3 +1,2 @@
-MD5 (smake-1.2.1.tar.bz2) = 2fd7bd44b22da1640aaa6fbd31c727e4
 SHA256 (smake-1.2.1.tar.bz2) = 26254b17e942b70d86125e0342a5ce7706cf554c8202ab323748db1e3577d578
 SIZE (smake-1.2.1.tar.bz2) = 386712
diff --git a/dns/fastresolve/Makefile b/dns/fastresolve/Makefile
index 43ce45a10e37..17087e6440ab 100644
--- a/dns/fastresolve/Makefile
+++ b/dns/fastresolve/Makefile
@@ -17,6 +17,9 @@ COMMENT=	Programs that process web logs to get DNS and domain ownership info
 LIB_DEPENDS=	adns.1:${PORTSDIR}/dns/adns
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/BerkeleyDB.pm:${PORTSDIR}/databases/p5-BerkeleyDB
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 USE_BZIP2=	yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile
index 16e33d9bdeca..d732ab4a151d 100644
--- a/ftp/proftpd/Makefile
+++ b/ftp/proftpd/Makefile
@@ -24,6 +24,9 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER?=	mm@FreeBSD.org
 COMMENT?=	Highly configurable ftp daemon
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 MAN1=	ftpcount.1 ftpwho.1 ftptop.1
 MAN5=	xferlog.5
 MAN8=	proftpd.8 ftpscrub.8 ftpshut.8 ftpdctl.8
diff --git a/graphics/aolserver-nsgd/Makefile b/graphics/aolserver-nsgd/Makefile
index 781a9dde2c88..a9998ceea902 100644
--- a/graphics/aolserver-nsgd/Makefile
+++ b/graphics/aolserver-nsgd/Makefile
@@ -18,6 +18,8 @@ DIST_SUBDIR=	aolserver
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	Graphics module for AOLserver
 
+LICENSE=	GPLv2
+
 WRKSRC=		${WRKDIR}
 
 AOLSERVERBASE?=	aolserver
diff --git a/graphics/aolserver-nsgd/distinfo b/graphics/aolserver-nsgd/distinfo
index 05a29012b2db..6ac5660b9478 100644
--- a/graphics/aolserver-nsgd/distinfo
+++ b/graphics/aolserver-nsgd/distinfo
@@ -1,3 +1,2 @@
-MD5 (aolserver/nsgd2.tgz) = 761b52a9a0b0cb7f9761741ea519242e
 SHA256 (aolserver/nsgd2.tgz) = 5631b94bb3322da74f71a65a5e768f07d75f4b27be74f1d38edd268db3824192
 SIZE (aolserver/nsgd2.tgz) = 14602
diff --git a/graphics/pecl-imagick/Makefile b/graphics/pecl-imagick/Makefile
index 886381abcca4..53b8f4dfdd02 100644
--- a/graphics/pecl-imagick/Makefile
+++ b/graphics/pecl-imagick/Makefile
@@ -18,6 +18,8 @@ COMMENT=	Provides a wrapper to the ImageMagick/GraphicsMagick library
 
 LIB_DEPENDS=	MagickWand.4:${PORTSDIR}/graphics/ImageMagick
 
+LICENSE=	PHP301
+
 USE_PHP=	yes
 USE_PHPEXT=	yes
 
diff --git a/graphics/php-facedetect/Makefile b/graphics/php-facedetect/Makefile
index 5eb8bed3ff82..cbd78d3ecc6a 100644
--- a/graphics/php-facedetect/Makefile
+++ b/graphics/php-facedetect/Makefile
@@ -17,6 +17,8 @@ COMMENT=	Face detection extension for PHP using OpenCV library
 
 LIB_DEPENDS=	cv.2:${PORTSDIR}/graphics/opencv
 
+LICENSE=	PHP30
+
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
diff --git a/irc/dircproxy/Makefile b/irc/dircproxy/Makefile
index b69fc486cc30..3fc0a1248ca6 100644
--- a/irc/dircproxy/Makefile
+++ b/irc/dircproxy/Makefile
@@ -14,6 +14,9 @@ PKGNAMESUFFIX=	-devel
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	A detachable irc proxy server with many features
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
 SUB_FILES+=	pkg-message
diff --git a/irc/tr-ircd/Makefile b/irc/tr-ircd/Makefile
index 76e27e1e19f1..b7b1d4b6e271 100644
--- a/irc/tr-ircd/Makefile
+++ b/irc/tr-ircd/Makefile
@@ -15,6 +15,9 @@ DISTNAME=	${PORTNAME:S/-//}-release-${PORTVERSION}-r
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	An irc daeemon based on Bahamut and hybrid-7
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
@@ -73,7 +76,7 @@ CFLAGS+=	-fPIC
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e "s,-O2,${CFLAGS}," ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e "s|-O2|${CFLAGS}|" ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e "s, ircpasswd,tr-ircpasswd," \
 		-e "s,/home/ircd/lib,${TRIRCD_LIBDIR}," \
 		-e "s,/home/ircd/ircd5/lib/,${TRIRCD_LIBDIR}," \
diff --git a/math/p5-Math-VecStat/Makefile b/math/p5-Math-VecStat/Makefile
index 3a51200aebf6..be69e7e9f48e 100644
--- a/math/p5-Math-VecStat/Makefile
+++ b/math/p5-Math-VecStat/Makefile
@@ -15,6 +15,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	Basic statistics on vectors
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 PERL_CONFIGURE=	yes
 
 MAN3=		Math::VecStat.3
diff --git a/multimedia/gavl/Makefile b/multimedia/gavl/Makefile
index 86fd18c95276..f29b9f8732a5 100644
--- a/multimedia/gavl/Makefile
+++ b/multimedia/gavl/Makefile
@@ -16,6 +16,9 @@ COMMENT=	A library for handling uncompressed video and audio data
 LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png \
 		samplerate.1:${PORTSDIR}/audio/libsamplerate
 
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 USE_GNOME=	pkgconfig gnometarget gnomehack
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/multimedia/libquicktime-lame/Makefile b/multimedia/libquicktime-lame/Makefile
index 98c2c3d482f4..e908afdae5c2 100644
--- a/multimedia/libquicktime-lame/Makefile
+++ b/multimedia/libquicktime-lame/Makefile
@@ -16,6 +16,9 @@ COMMENT=	LAME plugin for libquicktime
 LIB_DEPENDS=	quicktime.0:${PORTSDIR}/multimedia/libquicktime \
 		mp3lame.0:${PORTSDIR}/audio/lame
 
+LICENSE=	LGPL21
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 MASTERDIR=	${.CURDIR}/../libquicktime
 PLIST=		${.CURDIR}/pkg-plist
 
diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile
index d28e04269b7a..2a17b04b011b 100644
--- a/multimedia/libquicktime/Makefile
+++ b/multimedia/libquicktime/Makefile
@@ -18,6 +18,9 @@ COMMENT=	A library for reading and writing quicktime files
 LIB_DEPENDS=	vorbis.4:${PORTSDIR}/audio/libvorbis
 .endif
 
+LICENSE=	LGPL21
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 USE_LDCONFIG=	yes
 USE_GNOME=	gnometarget gnomehack pkgconfig
 USE_GMAKE=	yes
diff --git a/multimedia/schroedinger/Makefile b/multimedia/schroedinger/Makefile
index 2b862eed2cf2..6b06342a2891 100644
--- a/multimedia/schroedinger/Makefile
+++ b/multimedia/schroedinger/Makefile
@@ -14,6 +14,13 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	High-speed Dirac codec
 
+LICENSE=	GPLv2 LGPL20 MIT MPL
+LICENSE_COMB=	dual
+LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING.GPL
+LICENSE_FILE_LGPL20=	${WRKSRC}/COPYING.LGPL
+LICENSE_FILE_MIT=	${WRKSRC}/COPYING.MIT
+LICENSE_FILE_MPL=	${WRKSRC}/COPYING.MPL
+
 LIB_DEPENDS=	orc-0.4:${PORTSDIR}/devel/orc
 BUILD_DEPENDS=	orc>=0.4.10:${PORTSDIR}/devel/orc
 
diff --git a/net-im/jabber-pyicq/Makefile b/net-im/jabber-pyicq/Makefile
index 5a22e0169fbc..83eb7a7ef9d6 100644
--- a/net-im/jabber-pyicq/Makefile
+++ b/net-im/jabber-pyicq/Makefile
@@ -20,6 +20,9 @@ COMMENT=	Python ICQ-Transport for Jabber
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/OpenSSL/__init__.py:${PORTSDIR}/security/py-openssl \
 		${PYTHON_SITELIBDIR}/PIL/__init__.py:${PORTSDIR}/graphics/py-imaging
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 PROJECTHOST=	pyicqt
 OPTIONS=	JABBER "Use with jabberd14 (net-im/jabber)" off \
 		JABBERD "Use with jabberd 2.x (net-im/jabberd)" off \
@@ -37,7 +40,7 @@ SUB_LIST=	PYTHON_CMD=${LOCAL_PYTHON}
 
 INST_DIR=	${PREFIX}/lib/jabber/${PORTNAME}
 
-PORTDOCS=	COPYING NEWS README README.jabberd14 README.jabberd2 README.external
+PORTDOCS=	NEWS README README.jabberd14 README.jabberd2 README.external
 
 .include <bsd.port.pre.mk>
 
diff --git a/net-im/jabber/Makefile b/net-im/jabber/Makefile
index 05d83c4428f0..21a1eeede8f3 100644
--- a/net-im/jabber/Makefile
+++ b/net-im/jabber/Makefile
@@ -25,6 +25,9 @@ LIB_DEPENDS=	pth.20:${PORTSDIR}/devel/pth-hard \
 		tasn1.4:${PORTSDIR}/security/libtasn1 \
 		gnutls.40:${PORTSDIR}/security/gnutls
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 OPTIONS=	IPV6 "Enable IPv6 support" off \
 		MYSQL "Build with MySQL support" off \
 		PGSQL "Build with PostgreSQL support" off
@@ -67,7 +70,7 @@ SUB_LIST+=	JABBER_USER=${JABBER_USER} JABBER_UID=${JABBER_UID} \
 		JABBER_SPOOLDIR="${JABBER_SPOOLDIR}" \
 		JABBER_RUNDIR="${JABBER_RUNDIR}"
 
-DOCS=		AUTHORS COPYING ChangeLog INSTALL NEWS README README.SQL README.config \
+DOCS=		AUTHORS ChangeLog INSTALL NEWS README README.SQL README.config \
 		README.filespool README.karma README.protocols TODO UPGRADE mysql.sql
 
 .include <bsd.port.pre.mk>
diff --git a/net-im/jabber/pkg-plist b/net-im/jabber/pkg-plist
index 1bbc5572125d..840c3e2fca26 100644
--- a/net-im/jabber/pkg-plist
+++ b/net-im/jabber/pkg-plist
@@ -38,7 +38,6 @@ share/locale/hu/LC_MESSAGES/jabberd14.mo
 share/locale/it/LC_MESSAGES/jabberd14.mo
 share/locale/nl/LC_MESSAGES/jabberd14.mo
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
diff --git a/net-im/jabberd/Makefile b/net-im/jabberd/Makefile
index d562f7fc5083..be1e8d779d7b 100644
--- a/net-im/jabberd/Makefile
+++ b/net-im/jabberd/Makefile
@@ -19,6 +19,9 @@ LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2 \
 		idn.17:${PORTSDIR}/dns/libidn \
 		udns.0:${PORTSDIR}/dns/udns
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 OPTIONS=	MYSQL "Support MySQL (storage/auth/reg)" on \
 		POSTGRESQL "Support PostgreSQL (storage/auth/reg)" off \
 		LDAP "Support OpenLDAP (storage/auth/reg)" off \
diff --git a/net-im/mu-conference/Makefile b/net-im/mu-conference/Makefile
index 2867861ae124..03a522fd9438 100644
--- a/net-im/mu-conference/Makefile
+++ b/net-im/mu-conference/Makefile
@@ -17,6 +17,9 @@ COMMENT=	Multi-User Conferencing component for Jabber
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2 \
 		idn.17:${PORTSDIR}/dns/libidn
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 USE_GNOME=	glib20 pkgconfig
 USE_RC_SUBR=	${PORTNAME}
 
@@ -28,7 +31,7 @@ OPTIONS=	MYSQL "Enable MySQL support" off \
 SUB_FILES+=	pkg-message README.FreeBSD.jabberd14 \
 		README.FreeBSD.jabberd2 README.FreeBSD.external
 
-DOCFILES=	AUTHORS COPYING ChangeLog FAQ LICENSE README TODO \
+DOCFILES=	AUTHORS ChangeLog FAQ LICENSE README TODO \
 		XEP0045_SUPPORT muc-default.xml style.css
 
 PORTDOCS=	*
diff --git a/net-mgmt/nsca/Makefile b/net-mgmt/nsca/Makefile
index e058923f7c2b..bfb62650c577 100644
--- a/net-mgmt/nsca/Makefile
+++ b/net-mgmt/nsca/Makefile
@@ -23,6 +23,8 @@ LIB_DEPENDS=	mcrypt.8:${PORTSDIR}/security/libmcrypt
 IGNORE=		you cannot define WITHOUT_SERVER and WITHOUT_CLIENT
 .endif
 
+LICENSE=	GPLv2
+
 GNU_CONFIGURE=	yes
 USE_PERL5=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} --localstatedir=/var/spool/nagios
diff --git a/net/relayd/Makefile b/net/relayd/Makefile
index 229ae0a2f415..04bc16f8473d 100644
--- a/net/relayd/Makefile
+++ b/net/relayd/Makefile
@@ -14,6 +14,8 @@ MASTER_SITE_SUBDIR=	mm
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	OpenBSD relay daemon
 
+LICENSE=	BSD
+
 DISTNAME=	${PORTNAME}-${PORTVERSION}-1
 USE_BZIP2=	yes
 MANCOMPRESSED=	yes
diff --git a/net/smbldap-tools/Makefile b/net/smbldap-tools/Makefile
index 4a1f1cbf5fe6..46780396298c 100644
--- a/net/smbldap-tools/Makefile
+++ b/net/smbldap-tools/Makefile
@@ -21,6 +21,9 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/a//}
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 USE_PERL5=	yes
 NO_BUILD=	yes
 
diff --git a/print/pkpgcounter/Makefile b/print/pkpgcounter/Makefile
index cc8c51fe5764..4f39a4cc35ff 100644
--- a/print/pkpgcounter/Makefile
+++ b/print/pkpgcounter/Makefile
@@ -17,6 +17,9 @@ COMMENT=	Count pages and ink coverage precent
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/PIL.pth:${PORTSDIR}/graphics/py-imaging
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 
diff --git a/print/pkpgcounter/distinfo b/print/pkpgcounter/distinfo
index 416b3308ff22..f9b75dfc9947 100644
--- a/print/pkpgcounter/distinfo
+++ b/print/pkpgcounter/distinfo
@@ -1,3 +1,2 @@
-MD5 (pkpgcounter-3.50.tar.gz) = 564dd96e8a5433564c2e39319e65217e
 SHA256 (pkpgcounter-3.50.tar.gz) = cbeea2c571682d5fa6ac1ffeec36d3495dbe65665581f2f0ae6255dbd7d62118
 SIZE (pkpgcounter-3.50.tar.gz) = 195579
diff --git a/security/aolserver-nsencrypt/Makefile b/security/aolserver-nsencrypt/Makefile
index 0768477381d0..d3d41ee062e3 100644
--- a/security/aolserver-nsencrypt/Makefile
+++ b/security/aolserver-nsencrypt/Makefile
@@ -16,6 +16,9 @@ DIST_SUBDIR=	aolserver
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	OpenSSL data encryption module for AOLserver
 
+LICENSE=	GPLv1 MPL
+LICENSE_COMB=	dual
+
 WRKSRC=		${WRKDIR}/nsencrypt-${PORTVERSION}
 
 AOLSERVERBASE?=	aolserver
diff --git a/security/aolserver-nsmcrypt/Makefile b/security/aolserver-nsmcrypt/Makefile
index c78f7932367b..9a690dba4177 100644
--- a/security/aolserver-nsmcrypt/Makefile
+++ b/security/aolserver-nsmcrypt/Makefile
@@ -21,6 +21,9 @@ PORTSCOUT=	skipv:2.0
 
 WRKSRC=		${WRKDIR}
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 AOLSERVERBASE?=	aolserver
 LIB_DEPENDS+=	mcrypt.8:${PORTSDIR}/security/mcrypt
 BUILD_DEPENDS+=	${LOCALBASE}/${AOLSERVERBASE}/bin/nsd:${PORTSDIR}/www/aolserver
diff --git a/security/aolserver-nsmhash/Makefile b/security/aolserver-nsmhash/Makefile
index 0c67dd82fbfd..2e6bced1cad7 100644
--- a/security/aolserver-nsmhash/Makefile
+++ b/security/aolserver-nsmhash/Makefile
@@ -21,6 +21,9 @@ PORTSCOUT=	skipv:2.0
 
 WRKSRC=		${WRKDIR}
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 AOLSERVERBASE?=	aolserver
 LIB_DEPENDS+=	mhash.2:${PORTSDIR}/security/mhash
 BUILD_DEPENDS+=	${LOCALBASE}/${AOLSERVERBASE}/bin/nsd:${PORTSDIR}/www/aolserver
diff --git a/security/aolserver-nsopenssl/Makefile b/security/aolserver-nsopenssl/Makefile
index dae85ef0e2dc..83b2764235f9 100644
--- a/security/aolserver-nsopenssl/Makefile
+++ b/security/aolserver-nsopenssl/Makefile
@@ -18,6 +18,9 @@ COMMENT=	OpenSSL socket encryption module for AOLserver
 
 WRKSRC=		${WRKDIR}/nsopenssl-3.0beta26
 
+LICENSE=	GPLv1 MPL
+LICENSE_COMB=	dual
+
 AOLSERVERBASE?=	aolserver
 BUILD_DEPENDS+=	${LOCALBASE}/${AOLSERVERBASE}/bin/nsd:${PORTSDIR}/www/aolserver
 RUN_DEPENDS+=	${LOCALBASE}/${AOLSERVERBASE}/bin/nsd:${PORTSDIR}/www/aolserver
diff --git a/security/aolserver-nssha1/Makefile b/security/aolserver-nssha1/Makefile
index bb5bb6af7cc0..0a5ff70c2820 100644
--- a/security/aolserver-nssha1/Makefile
+++ b/security/aolserver-nssha1/Makefile
@@ -18,6 +18,9 @@ COMMENT=	AOLserver module to perform SHA1 hashes
 
 WRKSRC=		${WRKDIR}/nssha1-${PORTVERSION}
 
+LICENSE=	GPLv1 MPL
+LICENSE_COMB=	dual
+
 AOLSERVERBASE?=	aolserver
 BUILD_DEPENDS+=	${LOCALBASE}/${AOLSERVERBASE}/bin/nsd:${PORTSDIR}/www/aolserver
 RUN_DEPENDS+=	${LOCALBASE}/${AOLSERVERBASE}/bin/nsd:${PORTSDIR}/www/aolserver
diff --git a/security/pear-Auth_OpenID/Makefile b/security/pear-Auth_OpenID/Makefile
index d5240b250f5d..44481f40aac2 100644
--- a/security/pear-Auth_OpenID/Makefile
+++ b/security/pear-Auth_OpenID/Makefile
@@ -19,6 +19,9 @@ BUILD_DEPENDS=	${RUN_DEPENDS}
 
 CONFLICTS=	php-Auth_OpenID-1.*
 
+LICENSE=	ASL
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 USE_BZIP2=	yes
 LATEST_LINK=	pear-Auth_OpenID
 
diff --git a/security/pear-Auth_OpenID/distinfo b/security/pear-Auth_OpenID/distinfo
index 0ae1cf77be69..6ba6be8d7ab4 100644
--- a/security/pear-Auth_OpenID/distinfo
+++ b/security/pear-Auth_OpenID/distinfo
@@ -1,3 +1,2 @@
-MD5 (PEAR/php-openid-2.1.3.tar.bz2) = de51927c576f06d54e4a89665bc32391
 SHA256 (PEAR/php-openid-2.1.3.tar.bz2) = 68f169b87710f98445361c2ea700cc77dda7016acf696ff2a0dae7aeb72b9c92
 SIZE (PEAR/php-openid-2.1.3.tar.bz2) = 315437
diff --git a/sysutils/cciss_vol_status/Makefile b/sysutils/cciss_vol_status/Makefile
index 9f367c131c8f..721b92018e09 100644
--- a/sysutils/cciss_vol_status/Makefile
+++ b/sysutils/cciss_vol_status/Makefile
@@ -13,6 +13,9 @@ MASTER_SITES=	SF/cciss/${PORTNAME}
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	Reports status of logical drives on ciss(4) controllers
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 GNU_CONFIGURE=	yes
 
 MAN8=		cciss_vol_status.8
diff --git a/sysutils/py-zfs/Makefile b/sysutils/py-zfs/Makefile
index b17ede8bef20..27c7d389c2a9 100644
--- a/sysutils/py-zfs/Makefile
+++ b/sysutils/py-zfs/Makefile
@@ -16,6 +16,8 @@ DISTFILES=	# none
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	Python ZFS library
 
+LICENSE=	CDDL
+
 USE_PYTHON=	2.4-2.7
 MAKEFILE=	${FILESDIR}/Makefile.lib
 MAKE_ARGS+=	PYTHON_INCLUDEDIR="${PYTHON_INCLUDEDIR}" \
diff --git a/sysutils/syslinux/Makefile b/sysutils/syslinux/Makefile
index 663347885a09..cb607c98827d 100644
--- a/sysutils/syslinux/Makefile
+++ b/sysutils/syslinux/Makefile
@@ -18,6 +18,9 @@ COMMENT=	Syslinux for FreeBSD
 BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 RUN_DEPENDS=	mtools:${PORTSDIR}/emulators/mtools
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 MAN1=		syslinux.1
 
 USE_BZIP2=	yes
diff --git a/sysutils/zfs-stats/Makefile b/sysutils/zfs-stats/Makefile
index 3905825c350c..2a08b95902b2 100644
--- a/sysutils/zfs-stats/Makefile
+++ b/sysutils/zfs-stats/Makefile
@@ -13,6 +13,8 @@ MASTER_SITES=	http://www.vx.sk/zfs-stats/
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	Display human-readable ZFS statistics
 
+LICENSE=	BSD
+
 USE_PERL5=	yes
 
 NO_BUILD=	yes
diff --git a/textproc/ruby-deplate/Makefile b/textproc/ruby-deplate/Makefile
index 4b30fbffe87b..8fa1ef1675e7 100644
--- a/textproc/ruby-deplate/Makefile
+++ b/textproc/ruby-deplate/Makefile
@@ -15,6 +15,9 @@ DIST_SUBDIR=		ruby
 MAINTAINER=		mm@FreeBSD.org
 COMMENT=		Ruby tool for converting wiki-like markup
 
+LICENSE=		GPLv2
+LICENSE_FILE=		${WRKSRC}/LICENSE.TXT
+
 WRKSRC=			${WRKDIR}/${PORTNAME}
 
 USE_ZIP=		yes
diff --git a/textproc/ruby-deplate/distinfo b/textproc/ruby-deplate/distinfo
index 8efd75129ea4..0ebfd8f4c861 100644
--- a/textproc/ruby-deplate/distinfo
+++ b/textproc/ruby-deplate/distinfo
@@ -1,3 +1,2 @@
-MD5 (ruby/deplate-0.8.5.zip) = 799f7b0a7c91d7c8febb0fb7c03cc9c0
 SHA256 (ruby/deplate-0.8.5.zip) = 3a5318135bb99288bfe708418102df16eae11af89d4e493afbf73a52443957b2
 SIZE (ruby/deplate-0.8.5.zip) = 428378
diff --git a/www/aolserver/Makefile b/www/aolserver/Makefile
index b55e54e2fa7c..663db1f9b3fe 100644
--- a/www/aolserver/Makefile
+++ b/www/aolserver/Makefile
@@ -16,6 +16,9 @@ DIST_SUBDIR=	aolserver
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	A multithreaded web server with embedded TCL interpreter
 
+LICENSE=	MPL
+LICENSE_FILE=	${WRKSRC}/license.terms
+
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 
 AOLSERVERBASE?=	${PORTNAME}
diff --git a/www/mod_auth_mysql2/Makefile b/www/mod_auth_mysql2/Makefile
index 652596a9ecb0..813df1772f5f 100644
--- a/www/mod_auth_mysql2/Makefile
+++ b/www/mod_auth_mysql2/Makefile
@@ -17,11 +17,12 @@ DIST_SUBDIR=	apache22
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	MySQL-based authentication module with VirtualHost support
 
-MAKE_JOBS_SAFE=  yes
+LICENSE=	ASL
 
 LATEST_LINK=	mod_auth_mysql2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
+MAKE_JOBS_SAFE=  yes
 USE_MYSQL=	YES
 USE_APACHE=	2.0+
 AP_FAST_BUILD=	YES
diff --git a/www/openacs/Makefile b/www/openacs/Makefile
index 7442d795724c..8d246e1e242e 100644
--- a/www/openacs/Makefile
+++ b/www/openacs/Makefile
@@ -14,6 +14,9 @@ EXTRACT_SUFX=	.tgz?revision_id=${DIST_REV_ID}
 MAINTAINER?=	mm@FreeBSD.org
 COMMENT?=	A modular web application platform for communities
 
+LICENCE=	GPLv2
+LICENCE_FILE=	${WRKDIR}/license.txt
+
 DIST_REV_ID?=	2967507
 
 AOLSERVERBASE?=	${LOCALBASE}/aolserver