diff --git a/databases/gdl2/Makefile b/databases/gdl2/Makefile
index dc7670e6e586..5bb57beae91b 100644
--- a/databases/gdl2/Makefile
+++ b/databases/gdl2/Makefile
@@ -1,39 +1,40 @@
 # New ports collection makefile for:    gdl2
 # Date created:         12 Sep 2006
 # Whom:                 gurkan@phys.ethz.ch
 #
 # $FreeBSD$
 #
 
 PORTNAME=	gdl2
 PORTVERSION=	0.12.0
 PORTREVISION=	2
 CATEGORIES=	databases gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP}
 MASTER_SITE_SUBDIR=	libs
 DISTNAME=	gnustep-dl2-${PORTVERSION}
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	GNUstep Database Library 2 (Enterprise Objects Framework)
 
 LIB_DEPENDS=	sqlite3:${PORTSDIR}/databases/sqlite3
 
-LICENSE=	GPLv3
+LICENSE_COMB=	multi
+LICENSE=	GPLv3 LGPL3
 
 USE_GNUSTEP=	yes
 USE_GNUSTEP_BASE=	yes
 USE_GNUSTEP_CONFIGURE=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 USE_GNUSTEP_SYSTEM_LIBS+=	Gorm:${GORM_PORT}
 USE_GNUSTEP_SYSTEM_LIBS+=	Renaissance:${RENAISSANCE_PORT}
 USE_GNUSTEP_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 USE_PGSQL=	yes
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 GNU_CONFIGURE=	yes
 
 GORM_PORT?=	devel/gorm
 RENAISSANCE_PORT?=	x11-toolkits/renaissance
 
 .include <bsd.port.mk>
diff --git a/deskutils/preferences.app/Makefile b/deskutils/preferences.app/Makefile
index 7180a3af5edb..e639de57c8e4 100644
--- a/deskutils/preferences.app/Makefile
+++ b/deskutils/preferences.app/Makefile
@@ -1,39 +1,40 @@
 # New ports collection makefile for:   preferences
 # Date created:         04 Feb 2003
 # Whom:                 dirk.meyer@dinoex.sub.org
 #
 # $FreeBSD$
 #
 
 PORTNAME=	preferences
 PORTVERSION=	1.2.0
 PORTREVISION=	4
 CATEGORIES=	deskutils gnustep
 MASTER_SITES=	SF/prefsapp/prefsapp/${PORTVERSION}
 DISTNAME=	Preferences-${PORTVERSION}
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	GNUstep workspace manager
 
-LICENSE=	GPLv2
+LICENSE_COMB=	multi
+LICENSE=	GPLv2 LGPL21
 
 USE_BZIP2=	yes
 USE_GNUSTEP=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 USE_GNUSTEP_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 
 DEAFULT_LIBVERSION=	1.1.1
 MAKE_ENV+=	GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
 MODIFY=		GNUmakefile.preamble PrefsModule/GNUmakefile.preamble \
 		Modules/Keyboard/GNUmakefile.preamble \
 		Modules/PrefsApp/GNUmakefile.preamble
 
 post-patch:
 .for i in ${MODIFY}
 	@${MV} ${WRKSRC}/${i} ${WRKSRC}/${i}.sed
 	${SED} -e "s= -Werror==" ${WRKSRC}/${i}.sed > ${WRKSRC}/${i}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/devel/codeblocks/Makefile b/devel/codeblocks/Makefile
index 089880bc32e3..6f82ffb84fba 100644
--- a/devel/codeblocks/Makefile
+++ b/devel/codeblocks/Makefile
@@ -1,35 +1,36 @@
 # New ports collection makefile for:	codeblocks
 # Date created:				November, 15th 2005
 # Whom:					Matthias Sund <m.sund@arcor.de>
 #
 # $FreeBSD$
 #
 
 PORTNAME=		codeblocks
 PORTVERSION=		8.02
 PORTREVISION=	5
 CATEGORIES=		devel
 MASTER_SITES=		SF/${PORTNAME}/Sources/${PORTVERSION}
 DISTNAME=		${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Open source, cross-platform, free C/C++ IDE
 
 BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
 RUN_DEPENDS=	${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme
 
-LICENSE=	GPLv3
+LICENSE_COMB=	multi
+LICENSE=	GPLv3 LGPL3
 
 USE_BZIP2=	yes
 USE_WX=		2.8
 WANT_UNICODE=	yes
 USE_GNOME=	pkgconfig
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 CONFIGURE_ARGS+=	--with-wx-config=${WX_CONFIG} --with-contrib-plugins=all
 MAN1=	cb_console_runner.1 cb_share_config.1 codeblocks.1 codesnippets.1
 
 .include <bsd.port.mk>
diff --git a/devel/ruby-gnustep/Makefile b/devel/ruby-gnustep/Makefile
index b542b85de4cd..5fe7e49870c6 100644
--- a/devel/ruby-gnustep/Makefile
+++ b/devel/ruby-gnustep/Makefile
@@ -1,57 +1,58 @@
 # New ports collection makefile for:	Ruby/GNUstep
 # Date created:		14 September 2001
 # Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	gnustep
 PORTVERSION=	0.2.2
 PORTREVISION=	3
 CATEGORIES=	devel lang ruby gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP}
 MASTER_SITE_SUBDIR=	libs
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	rigs-${PORTVERSION}
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	A Ruby interface to the GNUstep development environment
 
-LICENSE=	GPLv2
+LICENSE_COMB=	multi
+LICENSE=	GPLv2 LGPL21
 
 USE_RUBY=	yes
 USE_GNUSTEP=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 USE_GNUSTEP_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 
 MAKE_FLAGS+=	debug=no
 
 post-extract:
 	${FIND} ${WRKSRC}/ -type f -name '.cvsignore' -delete
 	${FIND} -d ${WRKSRC}/ -type d -name CVS -exec ${RM} -rf "{}" ";"
 
 post-patch:
 	${ECHO_CMD} "" > ${WRKSRC}/Source/${MAKEFILE}.postamble
 	${RUBY} -i~ -p \
 		-e 'gsub(/-lpthread/, "-pthread");' \
 		-e 'gsub(/-lgmodel/, "");' \
 		${WRKSRC}/Source/${MAKEFILE}
 	${FIND} ${WRKSRC}/ -type f | \
 		${XARGS} ${RUBY} -i -pe 'gsub(/ ruby -/, " ${RUBY} -")'
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/Source/obj/librigs.so $(RUBY_SITEARCHLIBDIR)/
 .if !defined(NOPORTEXAMPLES)
 	${MKDIR} ${RUBY_MODEXAMPLESDIR}
 	${CP} -R ${WRKSRC}/Examples/* ${RUBY_MODEXAMPLESDIR}/
 .endif
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODDOCDIR}
 .for f in ChangeLog NEWS README TODO
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/german/unix-connect/Makefile b/german/unix-connect/Makefile
index 17966ffd3855..942cf0450e14 100644
--- a/german/unix-connect/Makefile
+++ b/german/unix-connect/Makefile
@@ -1,47 +1,48 @@
 # New ports collection makefile for:    unix-connect
 # Date created:         01.May 1999
 # Whom:                 dirk.meyer@dinoex.sub.org
 #
 # $FreeBSD$
 #
 
 PORTNAME=	unix-connect
 PORTVERSION=	0.95
 CATEGORIES=	german comms news mail
 MASTER_SITES=	ftp://ftp.dinoex.org/pub/unix-connect/ \
 		SF		
 
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Unix-Connect - mail+news-gateway for Zconnect (tm)
 
 BUILD_DEPENDS=	lrz:${PORTSDIR}/comms/lrzsz
 
-LICENSE=	GPLv2
+LICENSE_COMB=	multi
+LICENSE=	GPLv2 BSD
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 #USE_GMAKE=     yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-user=news
 CONFIGURE_ARGS+=--with-group=dialer
 CONFIGURE_ARGS+=--with-execdir=${PREFIX}/libexec/uconnect
 CONFIGURE_ARGS+=--with-confdir=${PREFIX}/etc/uconnect
 CONFIGURE_ARGS+=--with-spooldir=/var/spool/uconnect
 CONFIGURE_ARGS+=--with-mail=sendmail
 CONFIGURE_ARGS+=--with-news=cnews
 CONFIGURE_ARGS+=--enable-testing
 CFLAGS+=	-g
 CFLAGS:=	${CFLAGS:S/-O[0-9]*//g}	# gcc generates broken code in uwsmtp
 
 MANUAL_PACKAGE_BUILD=	needs hostname
 
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for i in README INSTALL TODO ChangeLog ChangeLog.configure
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/
 .endfor
 	@${TAR} -C ${WRKSRC}/docs -cf - . | ${TAR} -C ${DOCSDIR} -xf -
 .endif
 
 .include <bsd.port.mk>
diff --git a/lang/gnustep-base/Makefile b/lang/gnustep-base/Makefile
index 3fbfeb408c62..efde35510e67 100644
--- a/lang/gnustep-base/Makefile
+++ b/lang/gnustep-base/Makefile
@@ -1,88 +1,89 @@
 # New ports collection makefile for:    gnustep-base
 # Date created:         17 April 2001
 # Whom:                 Thomas Gellekum <tg@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	gnustep-base
 .if defined(WITH_GNUSTEP_DEVEL)
 PORTVERSION=	1.21.0
 .else
 PORTVERSION=	1.19.3
 PORTREVISION=	2
 .endif
 CATEGORIES=	lang devel gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP}
 MASTER_SITE_SUBDIR=	core
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	GNUstep Foundation library
 
 LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
 LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 LIB_DEPENDS+=	gmp.10:${PORTSDIR}/math/gmp
 LIB_DEPENDS+=	dns_sd:${PORTSDIR}/net/mDNSResponder
 LIB_DEPENDS+=	gnutls-openssl.40:${PORTSDIR}/security/gnutls
 BUILD_DEPENDS+=	pkg-config:${PORTSDIR}/devel/pkg-config
 
-LICENSE=        GPLv3
+LICENSE_COMB=	multi
+LICENSE=	GPLv3 LGPL3
 
 USE_AUTOTOOLS=	autoconf:262
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-procfs --disable-openssl --enable-tls \
 		--with-tls-prefix=${LOCALBASE} TLS_CONFIG="pkg-config -gnutls"
 USE_GNUSTEP=	yes
 USE_GNUSTEP_CONFIGURE=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 USE_GNUSTEP_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 USE_ICONV=	yes
 
 MAKE_FLAGS=	OPTFLAG="${CFLAGS}"
 MAKE_ENV+=	GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
 CFLAGS+=	-I${LOCALBASE}/include/libxml2/libxml
 BREAKS_IF_PEDANTIC=	yes
 PLIST_SUB+=	LOCALBASE=${LOCALBASE}
 ETCDIR=		${LOCALBASE}/etc
 
 .if !defined(WITHOUT_GNUSTEP_FAKEMAIN)
 CONFIGURE_ARGS+=	--enable-fake-main
 .endif
 
 PLIST_SUB+=	BASEVERSION=${PORTVERSION:C/[.][0-9]*$//1}
 EXTRA_PATCHES+=	${FILESDIR}/NSFileManager.m.patch
 
 .include <bsd.port.pre.mk>
 
 PATH:=	${PREFIX}/System/Tools:${PATH}
 
 post-build:
 .for i in ${MAKE_APPS}
 	(cd ${WRKSRC}/${i}; . ${GNUSTEP_MAKEFILES}/GNUstep.sh; \
 		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET})
 .endfor
 
 post-extract:
 	@${SED} -e "s=%%PREFIX%%=${LOCALBASE}=" \
 		-e "s=%%LDCONFIG_GCC%%=${LDCONFIG_GCC}=" \
 		${FILESDIR}/GNUstep.sh \
 		> ${WRKSRC}/GNUstep.sh
 	@${REINPLACE_CMD} -e "s|/usr/local/|${LOCALBASE}/|" \
 		${WRKSRC}/configure
 
 post-install:
 	-@${MKDIR} ${ETCDIR}/rc.d
 	${INSTALL_SCRIPT} ${WRKSRC}/GNUstep.sh ${ETCDIR}/rc.d/GNUstep.sh
 	${INSTALL_DATA} ${FILESDIR}/gdomap_if ${ETCDIR}
 .for i in ${INSTALL_APPS}
 	(cd ${WRKSRC}/${i}; . ${GNUSTEP_MAKEFILES}/GNUstep.sh; \
 		${SETENV} ${MAKE_ENV} ${GMAKE} -d ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
 .endfor
 
 test:
 	@(cd ${WRKSRC}/Testing && . ${GNUSTEP_MAKEFILES}/GNUstep.sh; ${GMAKE})
 
 regression-test:	test
 
 .include <bsd.port.post.mk>
diff --git a/net/tryst-examples/Makefile b/net/tryst-examples/Makefile
index ac7266e6284b..ef1208a724ae 100644
--- a/net/tryst-examples/Makefile
+++ b/net/tryst-examples/Makefile
@@ -1,43 +1,46 @@
 # New ports collection makefile for:    tryst-examples
 # Date created:         18 Dec 2006
 # Whom:                 dirk.meyer@dinoex.sub.org
 #
 # $FreeBSD$
 #
 
 PORTNAME=	tryst
 PORTVERSION=	1.0.8
 PORTREVISION=	3
 CATEGORIES=	net gnustep
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	dinoex
 PKGNAMESUFFIX=	-examples${PKGNAMESUFFIX2}
 DISTNAME=	tryst-108pl6
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	TBrowser and TChat
 
 LIB_DEPENDS=	dns_sd:${PORTSDIR}/net/mDNSResponder
 
+LICENSE_COMB=	dual
+LICENSE=	BSD LGPL21
+
 USE_GNUSTEP=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 USE_GNUSTEP_LOCAL_LIBS+=	Tryst:${TRYST_PORT}
 
 WRKSRC=		${WRKDIR}/Tryst-108.pl6
 USE_GNUSTEP_MAKE_DIRS+=	Examples/TBrowser Examples/TChat
 
 TRYST_PORT?=	net/tryst
 
 .if defined(FETCH_MAKESUM)
 MASTER_SITES=	http://gnustep.dyndns.org/Downloads/Frameworks/
 .endif
 
 # to build on 64bit
 post-patch:
 	${REINPLACE_CMD} -e 's|-Werror||' \
 		${WRKSRC}/Examples/TChat/GNUmakefile.preamble
 
 .include <bsd.port.mk>
diff --git a/net/tryst/Makefile b/net/tryst/Makefile
index cba738fd8cfa..b5d5e684032f 100644
--- a/net/tryst/Makefile
+++ b/net/tryst/Makefile
@@ -1,39 +1,42 @@
 # New ports collection makefile for:    tryst
 # Date created:         18 Dec 2006
 # Whom:                 dirk.meyer@dinoex.sub.org
 #
 # $FreeBSD$
 #
 
 PORTNAME=	tryst
 PORTVERSION=	1.0.8
 PORTREVISION=	3
 CATEGORIES=	net gnustep
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	dinoex
 DISTNAME=	tryst-108pl6
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Implementation of Apples Bonjour for GNUstep
 
 LIB_DEPENDS=	dns_sd:${PORTSDIR}/net/mDNSResponder
 
+LICENSE_COMB=	dual
+LICENSE=	BSD LGPL21
+
 USE_GNUSTEP=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 USE_GNUSTEP_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 
 WRKSRC=		${WRKDIR}/Tryst-108.pl6
 
 .if defined(FETCH_MAKESUM)
 MASTER_SITES=	http://gnustep.dyndns.org/Downloads/Frameworks/
 .endif
 
 # to build on 64bit
 post-patch:
 	${REINPLACE_CMD} -e 's|-Werror||' \
 		${WRKSRC}/GNUmakefile.preamble
 
 .include <bsd.port.mk>
diff --git a/www/apache13-modssl/Makefile b/www/apache13-modssl/Makefile
index 9e67b349537b..0b8952661b7c 100644
--- a/www/apache13-modssl/Makefile
+++ b/www/apache13-modssl/Makefile
@@ -1,432 +1,435 @@
 # New ports collection makefile for:	Apache + mod_ssl
 # Date created:		Sat Aug 22 12:00:00 CDT 1998
 # Whom:			rse@engelschall.com
 #
 # $FreeBSD$
 #
 
 PORTNAME=	apache+mod_ssl
 PORTVERSION=	${VERSION_APACHE}+${VERSION_MODSSL}
 PORTREVISION?=	2
 CATEGORIES?=	www security
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD} \
 		${MASTER_SITES_MODSSL:S/$/:mod_ssl/} \
 		http://www.mod-snmp.com/distr/:mod_snmp \
 		http://sysoev.ru/mod_accel/:mod_accel \
 		http://sysoev.ru/mod_deflate/:mod_deflate
 PKGNAMESUFFIX?=	${MODSNMP_SUFFIX}${MODACCEL_SUFFIX}${MODDEFLATE_SUFFIX}${IPV6_SUFFIX}${PKGNAMESUFFIX2}
 DISTNAME=	apache_${VERSION_APACHE}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${MODSSL_FILE}:mod_ssl \
 		${MODSNMP_DISTFILE} ${MODACCEL_DISTFILE} ${MODDEFLATE_DISTFILE}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} ${MODSSL_FILE} \
 		${MODACCEL_FILE} ${MODDEFLATE_FILE}
 
 .if defined(WITH_APACHE_IPV6) || defined(APACHE_WITH_IPV6) || make(makesum) || defined(FETCH_ALL)
 PATCH_SITES+=	ftp://ftp.42.org/pub/orphan/ ${MASTER_SITE_LOCAL}
 PATCH_SITE_SUBDIR=	dinoex
 PATCHFILES+=	apache-1.3.34modssl-v6-20051019.diff.gz
 .endif
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT?=	The Apache 1.3 webserver with SSL/TLS functionality
 
 LIB_DEPENDS=	mm.14:${PORTSDIR}/devel/mm
 PATCH_DEPENDS=	${BUILD_DEPENDS}
 
+LICENSE_COMB=	multi
+LICENSE=	ASL BSD
 CONFLICTS?=	apache+ipv6-1.* apache+ssl-1.* apache-1.* apache-2.* \
 		apache_fp-1.* caudium-devel-1.* caudium10-1.* caudium12-* \
 		ru-apache+mod_ssl-1.* ru-apache-1.* w3c-httpd-3.*
+
 VERSION_APACHE=	1.3.41
 VERSION_MODSSL=	2.8.31
 VERSION_MODSNMP=	1.3.14.13
 VERSION_MODACCEL=	1.0.34
 VERSION_MODDEFLATE=	1.0.21
 USE_OPENSSL=	yes
 HAS_CONFIGURE=	yes
 .if defined(WITH_PERL)
 USE_PERL5_RUN=	yes
 .else
 USE_PERL5_BUILD=	yes
 .endif
 MASTER_SITES_MODSSL=	http://www.modssl.org/source/ \
 		ftp://ftp.modssl.org/source/ \
 		ftp://ftp.blatzheim.com/pub/mod_ssl/ \
 		ftp://ftp.fu-berlin.de/unix/security/mod_ssl/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/mod_ssl/source,}
 MODSSL_FILE=	mod_ssl-${VERSION_MODSSL}-${VERSION_APACHE}${EXTRACT_SUFX}
 MODSNMP_FILE=	mod_snmp_${VERSION_MODSNMP}${EXTRACT_SUFX}
 
 USE_RC_SUBR=	apache
 
 .include <bsd.port.pre.mk>
 
 DOCSDIR=	${PREFIX}/share/doc/apache
 .if defined(APACHE_DATADIR)
 DATADIR=	${APACHE_DATADIR}
 .else
 DATADIR=	${PREFIX}/www
 .endif
 .if defined(APACHE_DOCUMENT_ROOT)
 DOCUMENT_ROOT=	${APACHE_DOCUMENT_ROOT}
 .else
 DOCUMENT_ROOT=	${DATADIR}/data
 .endif
 .if defined(APACHE_CGIBIN_ROOT)
 CGIBIN_ROOT=	${APACHE_CGIBIN_ROOT}
 .else
 CGIBIN_ROOT=${DATADIR}/cgi-bin
 .endif
 DEFAULT_PATH?=	${PREFIX}/bin:/bin:/usr/bin
 APACHE_LOCALSTATE_DIR?=	/var
 APACHE_LOGFILE_DIR?=	${APACHE_LOCALSTATE_DIR}/log
 
 .if exists(${LOCALBASE}/include/fnmatch.h)
 check-depends::
 	@${PKG_INFO} -W ${LOCALBASE}/include/fnmatch.h
 	@${ECHO_CMD} "Dependency error, please do: pkg_delete " \
 		`${PKG_INFO} -q -W ${LOCALBASE}/include/fnmatch.h`
 	@${FALSE}
 .endif
 
 .if defined(WITH_APACHE_SUEXEC) && !defined(WITHOUT_APACHE_SUEXEC)
 
 APACHE_SUEXEC_DOCROOT?=${DOCUMENT_ROOT}
 APACHE_SUEXEC_LOG?=/var/log/httpd-suexec.log
 APACHE_SUEXEC_USERDIR?=public_html
 APACHE_SUEXEC_UIDMIN?=1000
 APACHE_SUEXEC_GIDMIN?=1000
 APACHE_SUEXEC_CALLER?=www
 APACHE_SUEXEC_SAFE_PATH?=/bin:/usr/bin:${PREFIX}/bin
 
 SUEXEC_CONF=	--enable-suexec \
 		--suexec-docroot=${APACHE_SUEXEC_DOCROOT} \
 		--suexec-caller=${APACHE_SUEXEC_CALLER} \
 		--suexec-uidmin=${APACHE_SUEXEC_UIDMIN} \
 		--suexec-gidmin=${APACHE_SUEXEC_GIDMIN} \
 		--suexec-logfile=${APACHE_SUEXEC_LOG} \
 		--suexec-userdir=${APACHE_SUEXEC_USERDIR} \
 		--suexec-safepath=${APACHE_SUEXEC_SAFE_PATH}
 
 .if defined(APACHE_SUEXEC_UMASK)
 SUEXEC_CONF+=	--suexec-umask=${APACHE_SUEXEC_UMASK}
 .endif
 
 PLIST_FILES+=	sbin/suexec
 SUEXEC_MAN=	suexec.8
 
 .else   # !SUEXEC
 
 SUEXEC_CONF=
 SUEXEC_MAN=
 
 .endif  # !SUEXEC
 
 CONFIGURE_ARGS+=--prefix=${PREFIX} \
 		--server-uid=www \
 		--server-gid=www \
 		--with-perl=${PERL} \
 		--with-layout=FreeBSD \
 		--datadir=${DATADIR} \
 		--htdocsdir=${DOCUMENT_ROOT} \
 		--cgidir=${CGIBIN_ROOT} \
 		--localstatedir=${APACHE_LOCALSTATE_DIR} \
 		--logfiledir=${APACHE_LOGFILE_DIR} \
 		--without-confadjust \
 		--enable-module=most \
 		--enable-module=auth_db \
 		--enable-module=mmap_static \
 		--disable-module=auth_dbm \
 		--enable-shared=max \
 		--enable-module=ssl \
 		--enable-module=define \
 		${SUEXEC_CONF}
 
 .if defined(APACHE_RELATIVE_RUNTIMEDIR)
 CONFIGURE_ARGS+=	--runtimedir=${APACHE_RELATIVE_RUNTIMEDIR}
 .endif
 
 .if defined(WITHOUT_APACHE_EXPAT) || defined(APACHE_WITHOUT_EXPAT)
 CONFIGURE_ARGS+=	--disable-rule=EXPAT
 .else
 .if !defined(WITH_APACHE_INTERNAL_EXPAT)
 LIB_DEPENDS+=	expat.6:${PORTSDIR}/textproc/expat2
 LDFLAGS+=	-L${LOCALBASE}/lib
 .endif
 CONFIGURE_ARGS+=	--enable-rule=EXPAT
 .endif
 
 .if defined(APACHE_HARD_SERVER_LIMIT)
 HARD_SERVER_LIMIT=-DHARD_SERVER_LIMIT=${APACHE_HARD_SERVER_LIMIT}
 .else
 HARD_SERVER_LIMIT=-DHARD_SERVER_LIMIT=512
 .endif
 
 OPTIM=		${HARD_SERVER_LIMIT} \
 		-DDOCUMENT_LOCATION=\\"${DOCUMENT_ROOT}\\" \
 		-DDEFAULT_PATH=\\"${DEFAULT_PATH}\\" \
 		-DACCEPT_FILTER_NAME=\\"httpready\\"
 
 .if defined(APACHE_FD_SETSIZE)
 OPTIM+=		-DFD_SETSIZE=${APACHE_FD_SETSIZE}
 .else
 OPTIM+=		-DFD_SETSIZE=1024
 .endif
 
 .if defined(APACHE_BUFFERED_LOGS)
 OPTIM+=		-DBUFFERED_LOGS
 .endif
 
 .if defined(APACHE_PERF_TUNING)
 CFLAGS+=	-O3
 .endif
 .if defined(WITH_APACHE_PERF_TUNING) && !defined(WITHOUT_APACHE_PERF_TUNING)
 CFLAGS+=	-O3
 .endif
 
 .if defined(WITH_APACHE_MODSNMP) || defined(APACHE_WITH_MODSNMP) || make(makesum) || defined(FETCH_ALL)
 MODSNMP_DISTFILE=	${MODSNMP_FILE}:mod_snmp
 .endif
 .if defined(WITH_APACHE_MODSNMP) || defined(APACHE_WITH_MODSNMP)
 CONFLICTS+=	apache+mod_ssl-1.* \
 		apache+mod_ssl+ipv6-1.* \
 		apache+mod_ssl+mod_accel-1.* \
 		apache+mod_ssl+mod_accel+ipv6-1.* \
 		apache+mod_ssl+mod_accel+mod_deflate-1.* \
 		apache+mod_ssl+mod_accel+mod_deflate+ipv6-1.* \
 		apache+mod_ssl+mod_deflate-1.* \
 		apache+mod_ssl+mod_deflate+ipv6-1.*
 MODSNMP_SUFFIX=	+mod_snmp
 CONFIGURE_ARGS+=	--activate-module=src/modules/snmp_agt/libsnmp_agt.a
 CFLAGS+=	-DSNMP -DUSE_DB -DSNMP_CONFIG_H -DHARD_VIRTUAL_HOST_MAX=1000 \
 		-DSNMPLOCALONLY
 EXTRA_PATCHES+=	${WRKSRC}/src/modules/snmp_agt/mod_snmp.patch
 PLIST_FILES+=	%%DOCSDIR%%/mod/mod_snmp.html \
 		%%DOCSDIR%%/snmp_agt/index.html \
 		%%DOCSDIR%%/snmp_agt/www-mib.txt \
 		%%DOCSDIR%%/snmp_agt/snmpv2-mib.txt \
 		%%DOCSDIR%%/snmp_agt/rfc2594.txt \
 		%%DOCSDIR%%/snmp_agt/apache-scoreboard-mib.txt \
 		%%DOCSDIR%%/snmp_agt/apache-config-mib.txt
 PLIST_DIRS+=	%%DOCSDIR%%/snmp_agt %%DOCSDIR%% www/buckets www
 .else
 CONFLICTS+=	apache+*mod_snmp*-1.*
 .endif
 
 .if defined(WITH_APACHE_MODACCEL) || defined(APACHE_WITH_MODACCEL) || make(makesum) || defined(FETCH_ALL)
 MODACCEL_FILE=	mod_accel-${VERSION_MODACCEL}${EXTRACT_SUFX}
 MODACCEL_DISTFILE=	${MODACCEL_FILE}:mod_accel
 .endif
 .if defined(WITH_APACHE_MODACCEL) || defined(APACHE_WITH_MODACCEL)
 CONFLICTS+=	apache+mod_ssl-1.* \
 		apache+mod_ssl+ipv6-1.* \
 		apache+mod_ssl+mod_snmp-1.* \
 		apache+mod_ssl+mod_snmp+ipv6-1.* \
 		apache+mod_ssl+mod_snmp+mod_deflate-1.* \
 		apache+mod_ssl+mod_snmp+mod_deflate+ipv6-1.* \
 		apache+mod_ssl+mod_deflate-1.* \
 		apache+mod_ssl+mod_deflate+ipv6-1.*
 MODACCEL_SUFFIX=	+mod_accel
 CONFIGURE_ARGS+=	--activate-module=src/modules/extra/mod_randban.o \
 		--enable-shared=randban \
 		--activate-module=src/modules/extra/mod_freeze.o \
 		--enable-shared=freeze \
 		--activate-module=src/modules/accel/libaccel.a \
 		--enable-shared=accel
 EXTRA_PATCHES+=	${FILESDIR}/mod_accel-preservehost.patch ${FILESDIR}/mod_accel-Makefile.tmpl.patch
 EXTRA_PATCHES+=	${FILESDIR}/mod_accel-ap_ext_accel.patch
 PLIST_FILES+=	libexec/apache/libaccel.so \
 		libexec/apache/mod_freeze.so \
 		libexec/apache/mod_randban.so \
 		%%DOCSDIR%%/mod/mod_accel.html
 .else
 CONFLICTS+=	apache+*mod_accel*-1.*
 .endif
 
 .if defined(WITH_APACHE_MODDEFLATE) || defined(APACHE_WITH_MODDEFLATE) || make(makesum) || defined(FETCH_ALL)
 MODDEFLATE_FILE=	mod_deflate-${VERSION_MODDEFLATE}${EXTRACT_SUFX}
 MODDEFLATE_DISTFILE=	${MODDEFLATE_FILE}:mod_deflate
 .endif
 .if defined(WITH_APACHE_MODDEFLATE) || defined(APACHE_WITH_MODDEFLATE)
 CONFLICTS+=	apache+mod_ssl-1.* \
 		apache+mod_ssl+ipv6-1.* \
 		apache+mod_ssl+mod_snmp-1.* \
 		apache+mod_ssl+mod_snmp+ipv6-1.* \
 		apache+mod_ssl+mod_snmp+mod_accel-1.* \
 		apache+mod_ssl+mod_snmp+mod_accel+ipv6-1.* \
 		apache+mod_ssl+mod_accel-1.* \
 		apache+mod_ssl+mod_accel+ipv6-1.*
 MODDEFLATE_SUFFIX=	+mod_deflate
 CONFIGURE_ARGS+=	--activate-module=src/modules/extra/mod_deflate.o
 PLIST_FILES+=	%%DOCSDIR%%/mod/mod_deflate.html
 .else
 CONFLICTS+=	apache+*mod_deflate*-1.*
 .endif
 
 .if defined(WITH_APACHE_IPV6) || defined(APACHE_WITH_IPV6)
 .if defined(WITH_APACHE_MODACCEL) || defined(APACHE_WITH_MODACCEL)
 BROKEN=		"mod_accel and ipv6 don't compile together"
 .endif
 
 CONFLICTS+=	apache+mod_ssl-1.* \
 		apache+mod_ssl+mod_snmp-1.* \
 		apache+mod_ssl+mod_snmp+mod_accel-1.* \
 		apache+mod_ssl+mod_snmp+mod_accel+mod_deflate-1.* \
 		apache+mod_ssl+mod_accel-1.* \
 		apache+mod_ssl+mod_accel+mod_deflate-1.* \
 		apache+mod_ssl+mod_deflate-1.*
 IPV6_SUFFIX=	+ipv6
 CONFIGURE_ARGS+=	--enable-rule=INET6
 PLIST_SUB+=	WITHIPV6=""
 PLIST_FILES+=	include/apache/sa_len.h \
 		include/apache/sockaddr_storage.h
 .else
 EXTRA_PATCHES+=	${FILESDIR}/logresolve.c.patch
 .endif
 
 .if defined(WITH_APACHE_LATESTLOG)
 EXTRA_PATCHES+=	${FILESDIR}/rotatelogs.c.patch
 .endif
 
 CONFIGURE_ENV=	CFLAGS='${CFLAGS}' \
 		LDFLAGS='${LDFLAGS}' \
 		OPTIM='${OPTIM}' \
 		SSL_BASE='${OPENSSLBASE}' \
 		EAPI_MM='SYSTEM' \
 		PATH="${PREFIX}/bin:${PATH}"
 
 INSTALL_TARGET=	install-quiet
 
 MAN1=	dbmmanage.1 htdigest.1 htpasswd.1
 MAN8=	ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 \
 	${SUEXEC_MAN}
 
 TYPE=	test
 CRT=
 KEY=
 
 pre-fetch:
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "You may use the following build options:"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "  WITH_APACHE_SUEXEC=yes	enable the suEXEC feature"
 	@${ECHO_MSG} "				[default is no]"
 	@${ECHO_MSG} "  APACHE_SUEXEC_CALLER=user	set the suEXEC username of the allowed caller"
 	@${ECHO_MSG} "				[default is www]"
 	@${ECHO_MSG} "  APACHE_SUEXEC_DOCROOT=dir	set the suEXEC root directory"
 	@${ECHO_MSG} "				[default is ${DOCUMENT_ROOT}]"
 	@${ECHO_MSG} "  APACHE_SUEXEC_LOG=file	set the suEXEC logfile"
 	@${ECHO_MSG} "				[default is /var/log/httpd-suexec.log]"
 	@${ECHO_MSG} "  APACHE_SUEXEC_USERDIR=dir	set the suEXEC user subdirectory"
 	@${ECHO_MSG} "				[default is public_html]"
 	@${ECHO_MSG} "  APACHE_SUEXEC_UIDMIN=uid	set the suEXEC minimal allowed UID"
 	@${ECHO_MSG} "				[default is 1000]"
 	@${ECHO_MSG} "  APACHE_SUEXEC_GIDMIN=gid	set the suEXEC minimal allowed GID"
 	@${ECHO_MSG} "				[default is 1000]"
 	@${ECHO_MSG} "  APACHE_SUEXEC_SAFE_PATH=path	set the suEXEC safe PATH"
 	@${ECHO_MSG} "				[default is /bin:/usr/bin:${PREFIX}/bin]"
 	@${ECHO_MSG} "  APACHE_SUEXEC_UMASK=umask	set the umask for the suEXEC'd script"
 	@${ECHO_MSG} "				[default is inherited from the Apache process]"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "  APACHE_DATADIR=path		set data directory PATH"
 	@${ECHO_MSG} "				[default is ${PREFIX}/www]"
 	@${ECHO_MSG} "  APACHE_CGIBIN_ROOT=path	set CGIBIN directory PATH"
 	@${ECHO_MSG} "				the default is derived from APACHE_DATADIR"
 	@${ECHO_MSG} "				[currently the default is ${DATADIR}/cgibin]"
 	@${ECHO_MSG} "  APACHE_DOCUMENT_ROOT=path	set documents directory PATH"
 	@${ECHO_MSG} "				the default is derived from APACHE_DATADIR"
 	@${ECHO_MSG} "				[currently the default is ${DATADIR}/data]"
 	@${ECHO_MSG} "  APACHE_LOCALSTATE_DIR=path	set modifiable data PATH"
 	@${ECHO_MSG} "				[default is /var]"
 	@${ECHO_MSG} "  APACHE_LOGFILE_DIR=path 	set logfile directory PATH"
 	@${ECHO_MSG} "				the default is derived from APACHE_LOCALSTATE_DIR"
 	@${ECHO_MSG} "				[currently the default is ${APACHE_LOCALSTATE_DIR}/log]"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "  APACHE_HARD_SERVER_LIMIT=nr	Maximum number of Apache processes."
 	@${ECHO_MSG} "				[default is 512]"
 	@${ECHO_MSG} "  APACHE_FD_SETSIZE=nr		Maximum number of descriptors."
 	@${ECHO_MSG} "				[default is 1024]"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "  APACHE_BUFFERED_LOGS=yes	Log entries are buffered before writing."
 	@${ECHO_MSG} "				Writes may not be atomic, entries from multiple"
 	@${ECHO_MSG} "				children could become mixed together and your"
 	@${ECHO_MSG} "				web stats may be inaccurate."
 	@${ECHO_MSG} "				[default is no]"
 	@${ECHO_MSG} "  WITH_APACHE_PERF_TUNING=yes	CFLAGS optimization."
 	@${ECHO_MSG} "				This setting may produce broken code and thus"
 	@${ECHO_MSG} "				is not recommended for production servers."
 	@${ECHO_MSG} "				[default is no]"
 	@${ECHO_MSG} "  WITH_APACHE_LATESTLOG=yes	keep a hardlink on the lastest log."
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "  WITH_APACHE_IPV6=yes		IPv6 support."
 	@${ECHO_MSG} "				This setting turns IPv6 support on."
 	@${ECHO_MSG} "				[default is no]"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "  WITH_APACHE_MODSNMP=yes	mod_snmp support."
 	@${ECHO_MSG} "				This setting turns support for SNMP on."
 	@${ECHO_MSG} "				[default is no]"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "  WITH_APACHE_MODACCEL=yes	mod_accel support."
 	@${ECHO_MSG} "				This setting activates build of mod_accel."
 	@${ECHO_MSG} "				[default is no]"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "  WITH_APACHE_MODDEFLATE=yes	mod_deflate support."
 	@${ECHO_MSG} "				This setting activates build of mod_deflate."
 	@${ECHO_MSG} "				[default is no]"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "  WITHOUT_APACHE_EXPAT=yes	don't compile in expat."
 	@${ECHO_MSG} "				[default is no (expat is included)]"
 	@${ECHO_MSG} ""
 
 post-extract:
 	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' \
 		${WRKSRC}/src/Configure
 .if defined(WITH_APACHE_MODSNMP) || defined(APACHE_WITH_MODSNMP)
 	(cd ${WRKSRC}; ${TAR} xfz  ${DISTDIR}/${MODSNMP_FILE})
 .endif
 
 pre-patch:
 	@cd ${WRKDIR}/mod_ssl-${VERSION_MODSSL}-${VERSION_APACHE} \
 	&& ${ECHO_MSG} "===>  Applying mod_ssl-${VERSION_MODSSL} extension" \
 	&& ./configure --with-apache=../${DISTNAME} --expert
 .if defined(WITH_APACHE_MODACCEL) || defined(APACHE_WITH_MODACCEL)
 	@cd ${WRKDIR}/mod_accel-${VERSION_MODACCEL} \
 	&& ${ECHO_MSG} "===>  Applying mod_accel-${VERSION_MODACCEL} extension" \
 	&& ./configure --with-apache=../${DISTNAME} --with-mod_randban --with-mod_freeze \
 	&& ${MAKE}
 .endif
 .if defined(WITH_APACHE_MODDEFLATE) || defined(APACHE_WITH_MODDEFLATE)
 	@cd ${WRKDIR}/mod_deflate-${VERSION_MODDEFLATE} \
 	&& ${ECHO_MSG} "===>  Applying mod_deflate-${VERSION_MODDEFLATE} extension" \
 	&& ./configure --with-apache=../${DISTNAME} \
 	&& ${MAKE}
 .endif
 
 post-patch:
 	@${PERL} -pi -e 's|-print|-print0|;s|xargs|xargs -0|' \
 		${WRKSRC}/Makefile.tmpl
 	@${PERL} -pi -e "s|SSL_LDFLAGS=''|SSL_LDFLAGS='${OPENSSL_LDFLAGS}'|" \
 		${WRKSRC}/src/modules/ssl/libssl.module
 	@cd ${WRKSRC} \
 	&& ${FIND} . -type f -name "*.orig" -print | ${XARGS} ${RM} -f
 
 post-build:
 	@cd ${WRKSRC} \
 	&& ${ECHO_MSG} "===>  Creating Dummy Certificate for Server (SnakeOil)" \
 	&& ${ECHO_MSG} "      [use 'make certificate' to create a real one]" \
 	&& ${MAKE} certificate TYPE=dummy >/dev/null 2>&1
 
 certificate:
 	@cd ${WRKSRC} \
 	&& ${ECHO_MSG} "===>  Creating Test Certificate for Server" \
 	&& ${MAKE} certificate TYPE=${TYPE} CRT=${CRT} KEY=${KEY}
 
 pre-install:
 	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-install:
 .if defined(WITH_APACHE_MODSNMP) || defined(APACHE_WITH_MODSNMP)
 	@${MKDIR} ${DATADIR}/buckets
 	@${CHOWN} www:www ${DATADIR}/buckets
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/gnustep-back/Makefile b/x11-toolkits/gnustep-back/Makefile
index d74616b5ffae..1ae71fa9db14 100644
--- a/x11-toolkits/gnustep-back/Makefile
+++ b/x11-toolkits/gnustep-back/Makefile
@@ -1,99 +1,100 @@
 # New ports collection makefile for:	gnustep-back
 # Date created:				27.October 2002
 # Whom:					dirk.meyer@dinoex.sub.org
 #
 # $FreeBSD$
 #
 
 PORTNAME=	gnustep-back
 .if defined(WITH_GNUSTEP_DEVEL)
 PORTVERSION=	0.19.0
 .else
 PORTVERSION=	0.17.1
 PORTREVISION=	3
 .endif
 CATEGORIES=	x11-toolkits gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP}
 MASTER_SITE_SUBDIR=	core
 PKGNAMESUFFIX?=	${BACK_SUFFIX}${PKGNAMESUFFIX2}
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	GNUstep GUI backend
 
 LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg
 LIB_DEPENDS+=	tiff.4:${PORTSDIR}/graphics/tiff
 LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 LIB_DEPENDS+=	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
 LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
 
-LICENSE=	GPLv3
+LICENSE_COMB=	multi
+LICENSE=	GPLv3 LGPL3
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-tiff-library=${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--with-tiff-include=${LOCALBASE}/include
 CONFIGURE_ARGS+=	--with-jpeg-library=${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--with-jpeg-include=${LOCALBASE}/include
 CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 USE_GNUSTEP=	yes
 USE_GNUSTEP_GUI=	yes
 USE_GNUSTEP_CONFIGURE=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 USE_XORG=		xft xrender xmu xext x11
 USE_GL=			yes
 
 MAKE_FLAGS+=		OPTFLAG="${CFLAGS} -I${LOCALBASE}/include"
 MAKE_ENV+=		GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
 BACKVERSION=		${PORTVERSION:C/([0-9])*[.]([0-9]*).*/\1\2/1}
 BREAKS_IF_PEDANTIC=	yes
 
 .if defined(WITH_GNUSTEP_XDPS)
 GNUSTEP_DGS_PORT?=	x11/dgs
 BUILD_DEPENDS+=		dgs:${PORTSDIR}/${GNUSTEP_DGS_PORT}
 LIB_DEPENDS+=		dpstk:${PORTSDIR}/${GNUSTEP_DGS_PORT}
 CONFIGURE_ARGS+=	--enable-graphics=xdps --with-name=xdps
 CONFIGURE_ARGS+=	--disable-glitz
 PLIST_SUB+=		BACK=xdps-${BACKVERSION}
 PLIST_SUB+=		WITH_XLIB="@comment "
 BACK_SUFFIX?=		-xdps
 CONFLICTS?=		gunstep-back-0.* gunstep-back-art-0.* gunstep-back-cairo-0.*
 .elif defined(WITH_GNUSTEP_LIBART)
 LIB_DEPENDS+=		art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
 CONFIGURE_ARGS+=	--enable-graphics=art --with-name=art
 CONFIGURE_ARGS+=	--disable-glitz
 PLIST_SUB+=		BACK=art-${BACKVERSION}
 PLIST_SUB+=		WITH_XLIB="@comment "
 BACK_SUFFIX?=		-art
 CONFLICTS?=		gunstep-back-0.* gunstep-back-xdps-0.* gunstep-back-cairo-0.*
 .elif defined(WITH_GNUSTEP_CAIRO)
 CFLAGS+=		-I${LOCALBASE}/include/freetype2
 LIB_DEPENDS+=		art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
 LIB_DEPENDS+=		cairo.2:${PORTSDIR}/graphics/cairo
 CONFIGURE_ARGS+=	--enable-graphics=cairo --with-name=cairo
 CONFIGURE_ARGS+=	--disable-glitz
 PLIST_SUB+=		BACK=cairo-${BACKVERSION}
 PLIST_SUB+=		WITH_XLIB="@comment "
 BACK_SUFFIX?=		-cairo
 CONFLICTS?=		gunstep-back-0.* gunstep-back-xdps-0.* gunstep-back-art-0.*
 .else
 CONFIGURE_ARGS+=	--enable-graphics=xlib --with-name=back
 CONFIGURE_ARGS+=	--disable-glitz
 PLIST_SUB+=		BACK=back-${BACKVERSION}
 PLIST_SUB+=		WITH_XLIB=""
 CONFLICTS?=		gunstep-back-xdps-0.* gunstep-back-art-0.* gunstep-back-cairo-0.*
 .endif
 
 .include <bsd.port.pre.mk>
 
 TARGLIB!=	(cd ${PORTSDIR}/${GNUSTEP_OBJC_PORT} && make -V TARGLIB)
 
 ADDITIONAL_LDFLAGS+=	-L${TARGLIB}
 MAKE_FLAGS+=		messages=yes
 PLIST_SUB+=		BACKVERSION=${PORTVERSION:C/([0-9])*[.]([0-9]*).*/\1\2/1}
 
 pre-configure:
 .for file in config.guess config.sub install-sh
 	@${CP} ${GNUSTEP_PREFIX}/System/Library/Makefiles/${file} ${WRKSRC}
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/gnustep-gui/Makefile b/x11-toolkits/gnustep-gui/Makefile
index 62fc2af04006..c1069a755710 100644
--- a/x11-toolkits/gnustep-gui/Makefile
+++ b/x11-toolkits/gnustep-gui/Makefile
@@ -1,100 +1,101 @@
 # New ports collection makefile for:    gnustep-gui
 # Date created:         19 April 2001
 # Whom:                 Thomas Gellekum <tg@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	gnustep-gui
 .if defined(WITH_GNUSTEP_DEVEL)
 PORTVERSION=	0.19.0
 .else
 PORTVERSION=	0.17.1
 PORTREVISION=	2
 .endif
 CATEGORIES=	x11-toolkits gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP}
 MASTER_SITE_SUBDIR=	core
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	GNUstep GUI library
 
 LIB_DEPENDS+=	tiff.4:${PORTSDIR}/graphics/tiff
 LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg
 LIB_DEPENDS+=	png.6:${PORTSDIR}/graphics/png
 LIB_DEPENDS+=	gif.5:${PORTSDIR}/graphics/giflib
 .if defined(WITH_GNUSTEP_DEVEL)
 LIB_DEPENDS+=	sndfile:${PORTSDIR}/audio/libsndfile
 LIB_DEPENDS+=	ao.3:${PORTSDIR}/audio/libao
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libflite.a:${PORTSDIR}/audio/flite
 .else
 LIB_DEPENDS+=	audiofile:${PORTSDIR}/audio/libaudiofile
 .endif
 
-LICENSE=	GPLv3
+LICENSE_COMB=	multi
+LICENSE=	GPLv3 LGPL3
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-tiff-library=${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--with-tiff-include=${LOCALBASE}/include
 CONFIGURE_ARGS+=	--with-jpeg-library=${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--with-jpeg-include=${LOCALBASE}/include
 CONFIGURE_ARGS+=	--with-x
 CONFIGURE_ARGS+=	--with-x-include=${LOCALBASE}/include
 CONFIGURE_ARGS+=	--with-x-include=${LOCALBASE}/lib
 USE_GNUSTEP=	yes
 USE_GNUSTEP_CONFIGURE=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 USE_GNUSTEP_BASE=	yes
 USE_GNUSTEP_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 USE_XORG=	x11 xt
 
 EXTRA_PATCHES+=		${FILESDIR}/GNUmakefile.patch
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 MAKE_FLAGS+=	OPTFLAG="${CFLAGS}"
 MAKE_ENV+=	GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
 BREAKS_IF_PEDANTIC=	yes
 PLIST_SUB+=	BASEVERSION=${PORTVERSION:C/[.][0-9]*$//1}
 
 .if defined(WITHOUT_GNUSTEP_FAKEMAIN)
 .if !exists(/proc/curproc)
 IGNORE=		requires procfs mounted to build or run, for details see procfs(5)
 .endif
 .endif
 
 .if !defined(WITHOUT_PORTAUDIO2) && !defined(WITHOUT_PORTAUDIO) && !defined(WITH_GNUSTEP_DEVEL)
 LIB_DEPENDS+=	portaudio:${PORTSDIR}/audio/portaudio2
 CPPFLAGS+=	-I${LOCALBASE}/include/portaudio2 ${PTHREAD_CFLAGS}
 CFLAGS+=	${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib/portaudio2 ${PTHREAD_LIBS}
 ADDITIONAL_INCLUDE_DIRS+=	-I${LOCALBASE}/include/portaudio2
 ADDITIONAL_LDFLAGS+=	-L${LOCALBASE}/lib/portaudio2
 PLIST_SUB+=	WITH_PORTAUDIO=""
 .else
 PLIST_SUB+=	WITH_PORTAUDIO="@comment "
 .endif
 
 .if !defined(WITHOUT_CUPS)
 LIB_DEPENDS+=	cups.2:${PORTSDIR}/print/cups-client
 PLIST_SUB+=	WITH_CUPS=""
 .else
 PLIST_SUB+=	WITH_CUPS="@comment "
 .endif
 
 ASPELL_PORT?=	textproc/aspell
 .if !defined(WITHOUT_ASPELL)
 LIB_DEPENDS+=	aspell:${PORTSDIR}/${ASPELL_PORT}
 PLIST_SUB+=	WITH_ASPELL=""
 .else
 PLIST_SUB+=	WITH_ASPELL="@comment "
 .endif
 
 pre-configure:
 .for file in config.guess config.sub install-sh
 	@${CP} ${GNUSTEP_PREFIX}/System/Library/Makefiles/${file} ${WRKSRC}
 .endfor
 .if !defined(NOPORTDOCS)
 	${REINPLACE_CMD} -e "s|doc=no|doc=yes|" ${WRKSRC}/GNUmakefile
 .endif
 
 .include <bsd.port.mk>