CVS commit: pkgsrc

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Oct  3 08:30:20 UTC 2016

Modified Files:
        pkgsrc/mk: license.mk
        pkgsrc/pkgtools/pkg_install/files/lib: license.c

Log Message:
ibm-public-license-1.0 -> ipl-1.0


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 pkgsrc/mk/license.mk
cvs rdiff -u -r1.46 -r1.47 pkgsrc/pkgtools/pkg_install/files/lib/license.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/license.mk
diff -u pkgsrc/mk/license.mk:1.76 pkgsrc/mk/license.mk:1.77
--- pkgsrc/mk/license.mk:1.76   Thu Apr 21 07:51:51 2016
+++ pkgsrc/mk/license.mk        Mon Oct  3 08:30:20 2016
@@ -1,4 +1,4 @@
-# $NetBSD: license.mk,v 1.76 2016/04/21 07:51:51 leot Exp $
+# $NetBSD: license.mk,v 1.77 2016/10/03 08:30:20 wiz Exp $
 #
 # This file handles everything about the LICENSE variable. It is
 # included automatically by bsd.pkg.mk.
@@ -119,8 +119,8 @@ DEFAULT_ACCEPTABLE_LICENSES= \
        gnu-gpl-v2 gnu-lgpl-v2 gnu-lgpl-v2.1 \
        gnu-gpl-v3 gnu-lgpl-v3 \
        hpnd \
-       ibm-public-license-1.0 \
        ipafont \
+       ipl-1.0 \
        isc \
        lppl-1.0 lppl-1.2 lppl-1.3c \
        lucent \

Index: pkgsrc/pkgtools/pkg_install/files/lib/license.c
diff -u pkgsrc/pkgtools/pkg_install/files/lib/license.c:1.46 pkgsrc/pkgtools/pkg_install/files/lib/license.c:1.47
--- pkgsrc/pkgtools/pkg_install/files/lib/license.c:1.46        Thu Apr 21 07:51:51 2016
+++ pkgsrc/pkgtools/pkg_install/files/lib/license.c     Mon Oct  3 08:30:20 2016
@@ -1,4 +1,4 @@
-/*     $NetBSD: license.c,v 1.46 2016/04/21 07:51:51 leot Exp $        */
+/*     $NetBSD: license.c,v 1.47 2016/10/03 08:30:20 wiz Exp $ */
 
 /*-
  * Copyright (c) 2009 Joerg Sonnenberger <joerg%NetBSD.org@localhost>.
@@ -63,9 +63,9 @@ const char *default_acceptable_licenses 
     "gnu-gpl-v2 gnu-lgpl-v2 gnu-lgpl-v2.1 "
     "gnu-gpl-v3 gnu-lgpl-v3 "
     "hpnd "
-    "ibm-public-license-1.0 "
     "info-zip "
     "ipafont "
+    "ipl-1.0 "
     "isc "
     "lppl-1.0 lppl-1.2 lppl-1.3c "
     "lucent "