add LICENSE_COMB

11 files changed, 25 insertions, 8 deletions

diff --git a/databases/gdl2/Makefile b/databases/gdl2/Makefile
index dc7670e6e586..5bb57beae91b 100644
--- a/databases/gdl2/Makefile
+++ b/databases/gdl2/Makefile
@@ -18,7 +18,8 @@ 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
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
@@ -15,7 +15,8 @@ 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
diff --git a/devel/codeblocks/Makefile b/devel/codeblocks/Makefile
index 089880bc32e3..6f82ffb84fba 100644
--- a/devel/codeblocks/Makefile
+++ b/devel/codeblocks/Makefile
@@ -18,7 +18,8 @@ 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
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
@@ -17,7 +17,8 @@ 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
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
@@ -17,7 +17,8 @@ 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
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
@@ -26,7 +26,8 @@ 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
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
@@ -20,6 +20,9 @@ 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
diff --git a/net/tryst/Makefile b/net/tryst/Makefile
index cba738fd8cfa..b5d5e684032f 100644
--- a/net/tryst/Makefile
+++ b/net/tryst/Makefile
@@ -19,6 +19,9 @@ 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
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
@@ -33,9 +33,12 @@ 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
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
@@ -26,7 +26,8 @@ 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
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
@@ -31,7 +31,8 @@ BUILD_DEPENDS+=	${LOCALBASE}/lib/libflite.a:${PORTSDIR}/audio/flite
 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