From owner-svn-ports-head@FreeBSD.ORG  Mon Dec 30 22:56:01 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 49323FAE;
 Mon, 30 Dec 2013 22:56:01 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 34DE518B3;
 Mon, 30 Dec 2013 22:56:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBUMu15I064893;
 Mon, 30 Dec 2013 22:56:01 GMT (envelope-from ohauer@svn.freebsd.org)
Received: (from ohauer@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBUMu0Fe064888;
 Mon, 30 Dec 2013 22:56:00 GMT (envelope-from ohauer@svn.freebsd.org)
Message-Id: <201312302256.rBUMu0Fe064888@svn.freebsd.org>
From: Olli Hauer <ohauer@FreeBSD.org>
Date: Mon, 30 Dec 2013 22:56:00 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r338192 - in head: Mk textproc/libkolabxml
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Dec 2013 22:56:01 -0000

Author: ohauer
Date: Mon Dec 30 22:56:00 2013
New Revision: 338192
URL: http://svnweb.freebsd.org/changeset/ports/338192

Log:
  - APACHE10 is not OSI Approved [1]
  - fix AL2 in comment
  
  [1] Regarding https://spdx.org/licenses/
  [2] follow-up
  
  Noted by mat@
  
  PR:             ports/184785 [2]
  Approved by:	portmgr (tabthorpe@) implicit

Modified:
  head/Mk/bsd.licenses.db.mk
  head/textproc/libkolabxml/Makefile

Modified: head/Mk/bsd.licenses.db.mk
==============================================================================
--- head/Mk/bsd.licenses.db.mk	Mon Dec 30 22:50:38 2013	(r338191)
+++ head/Mk/bsd.licenses.db.mk	Mon Dec 30 22:56:00 2013	(r338192)
@@ -76,7 +76,7 @@ _LICENSE_NAME_AGPLv3=	GNU Affero General
 _LICENSE_GROUPS_AGPLv3=	FSF GPL OSI
 
 _LICENSE_NAME_APACHE10=	Apache License 1.0
-_LICENSE_GROUPS_APACHE10=	FSF OSI
+_LICENSE_GROUPS_APACHE10=	FSF
 
 _LICENSE_NAME_APACHE11=	Apache License 1.1
 _LICENSE_GROUPS_APACHE11=	FSF OSI

Modified: head/textproc/libkolabxml/Makefile
==============================================================================
--- head/textproc/libkolabxml/Makefile	Mon Dec 30 22:50:38 2013	(r338191)
+++ head/textproc/libkolabxml/Makefile	Mon Dec 30 22:56:00 2013	(r338192)
@@ -9,9 +9,9 @@ MASTER_SITES=	http://mirror.kolabsys.com
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Kolab XML Format Schema Definitions Library
 
-# The XSD schemas in schemas/ are AL2-licensed, and some files are
-# in public domain. The library itself and the installed headers are
-# considered LGPL3-licensed, though.
+# The XSD schemas in schemas/ are APACHE20-licensed, and some files
+# are in public domain. The library itself and the installed headers
+# are considered LGPL3-licensed, though.
 LICENSE=	LGPL3
 
 BUILD_DEPENDS=	xsdcxx:${PORTSDIR}/devel/xsd