Import of pkgsrc-2015Q2

pkgtools/pkg_install/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.206 2015/01/22 09:19:47 jperkin Exp $
+# $NetBSD: Makefile,v 1.208 2015/04/21 00:28:19 joerg Exp $
 
 # Notes to package maintainers:
 #
@@ -151,8 +151,10 @@ LIBARCHIVE_LIBS=	${SED} -n -e 's/^Libs.private://p' \
     ${WRKDIR}/libarchive/build/pkgconfig/libarchive.pc 2>/dev/null || echo
 LIBS+=		${LIBARCHIVE_LIBS:sh}
 
-CONFIG_GUESS_OVERRIDE+=	${WRKDIR}/libarchive/build/autoconf/config.guess
-CONFIG_SUB_OVERRIDE+=	${WRKDIR}/libarchive/build/autoconf/config.sub
+CONFIG_GUESS_OVERRIDE+=	${WRKDIR}/libarchive/build/autoconf/config.guess \
+			${WRKSRC}/config.guess
+CONFIG_SUB_OVERRIDE+=	${WRKDIR}/libarchive/build/autoconf/config.sub \
+			${WRKSRC}/config.sub
 
 .  if ${OPSYS} == "Cygwin"
 CPPFLAGS+=	-DLIBARCHIVE_STATIC
@@ -207,7 +209,8 @@ pre-configure:
 		${LIBARCHIVE_CONFIGURE_ARGS}
 	cd ${WRKDIR}/libarchive && ${BUILD_MAKE_CMD}
 .endif
-	cd ${WRKDIR}/libfetch && ${SETENV} ${MAKE_ENV} ${BSD_MAKE_ENV}	\
+	cd ${WRKDIR}/libfetch && ${TOUCH} fetch.cat3 &&			\
+		${SETENV} ${MAKE_ENV} ${BSD_MAKE_ENV}			\
 		${MAKE_PROGRAM} ${MAKE_FLAGS} ${BUILD_MAKE_FLAGS}	\
 			-f ${MAKE_FILE} depend all
 

pkgtools/pkg_install/files/add/main.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.28 2014/12/30 15:13:20 wiz Exp $	*/
+/*	$NetBSD: main.c,v 1.29 2015/05/08 16:29:37 agc Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -7,7 +7,7 @@
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: main.c,v 1.28 2014/12/30 15:13:20 wiz Exp $");
+__RCSID("$NetBSD: main.c,v 1.29 2015/05/08 16:29:37 agc Exp $");
 
 /*
  *
@@ -62,9 +62,9 @@ int	ReplaceSame = 0;
 static void
 usage(void)
 {
-	(void) fprintf(stderr, "%s\n%s\n%s\n%s\n",
+	(void) fprintf(stderr, "%s\n%s\n%s\n",
 	    "usage: pkg_add [-AfhInRuVv] [-C config] [-P destdir] [-K pkg_dbdir]",
-	    "               [-m machine] [-p prefix] [-s verification-type]\n",
+	    "               [-m machine] [-p prefix] [-s verification-type]",
 	    "               [[ftp|http]://[user[:password]@]host[:port]][/path/]pkg-name ...");
 	exit(1);
 }

pkgtools/pkg_install/files/lib/license.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: license.c,v 1.38 2014/05/15 09:59:09 wiz Exp $	*/
+/*	$NetBSD: license.c,v 1.41 2015/05/08 10:37:32 wiz Exp $	*/
 
 /*-
  * Copyright (c) 2009 Joerg Sonnenberger <joerg@NetBSD.org>.
@@ -57,6 +57,7 @@ const char *default_acceptable_licenses =
     "cpl-1.0 "
     "epl-v1.0 "
     "eupl-v1.1 "
+    "gfsl "
     "gnu-fdl-v1.1 gnu-fdl-v1.2 gnu-fdl-v1.3 "
     "gnu-gpl-v1 "
     "gnu-gpl-v2 gnu-lgpl-v2 gnu-lgpl-v2.1 "
@@ -64,7 +65,7 @@ const char *default_acceptable_licenses =
     "ibm-public-license-1.0 "
     "ipafont "
     "isc "
-    "lppl-1.3c "
+    "lppl-1.2 lppl-1.3c "
     "lucent "
     "miros "
     "mit "
@@ -82,6 +83,7 @@ const char *default_acceptable_licenses =
     "sgi-free-software-b-v2.0 "
     "sleepycat-public "
     "unlicense "
+    "w3c "
     "x11 "
     "zlib "
     "zpl";

pkgtools/pkg_install/files/lib/version.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: version.h,v 1.167 2014/12/30 15:13:21 wiz Exp $	*/
+/*	$NetBSD: version.h,v 1.168 2015/05/08 16:29:37 agc Exp $	*/
 
 /*
  * Copyright (c) 2001 Thomas Klausner.  All rights reserved.
@@ -27,6 +27,6 @@
 #ifndef _INST_LIB_VERSION_H_
 #define _INST_LIB_VERSION_H_
 
-#define PKGTOOLS_VERSION 20141227
+#define PKGTOOLS_VERSION 20150508
 
 #endif /* _INST_LIB_VERSION_H_ */