Import of pkgsrc-2014Q1

pkgtools/pkgin/Makefile

@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.38 2013/06/16 14:37:33 imil Exp $
-#
+# $NetBSD: Makefile,v 1.45 2014/02/12 23:18:28 tron Exp $
 
 GHCOMMIT=		3859170568fbe4fe21b5660dbaeca8d65ac10f1b
 DISTNAME=		${GHCOMMIT}
 PKGNAME=		pkgin-0.6.4
+PKGREVISION=		5
 CATEGORIES=		pkgtools
 MASTER_SITES=		https://github.com/NetBSDfr/pkgin/archive/
-FETCH_USING=		curl
 
 MAINTAINER=		imil@NetBSD.org
 HOMEPAGE=		http://pkgin.net/
@@ -18,7 +17,7 @@ CONF_FILES=		${EGDIR}/repositories.conf.example		\
 			${PKG_SYSCONFDIR}/${PKGBASE}/repositories.conf
 
 OWN_DIRS+=		${PKG_SYSCONFDIR}/${PKGBASE}
-INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1 ${EGDIR}
+INSTALLATION_DIRS+=	bin ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1 ${EGDIR}
 
 WRKSRC=			${WRKDIR}/pkgin-${GHCOMMIT}
 
@@ -50,7 +49,7 @@ CFLAGS.SunOS+=		-D_FILE_OFFSET_BITS=64
 
 MAKE_ENV+=		MACHINE_ARCH=${MACHINE_ARCH}
 
-DEPENDS+=		pkg_install>=20110215:../../pkgtools/pkg_install
+DEPENDS+=		pkg_install>=20130901:../../pkgtools/pkg_install
 
 # those have official repositories
 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "Minix"
@@ -63,6 +62,15 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pkgin ${DESTDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/pkgin.1				\
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+.if !empty(MANINSTALL:Mcatinstall)
+.  if defined(CATMAN_SECTION_SUFFIX) && !empty(CATMAN_SECTION_SUFFIX:M[Yy][Ee][Ss])
+	${INSTALL_MAN} ${WRKSRC}/pkgin.cat1				\
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1/pkgin.1
+.  else
+	${INSTALL_MAN} ${WRKSRC}/pkgin.cat1				\
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1/pkgin.0
+.  endif
+.endif
 	${INSTALL_DATA} ${WRKSRC}/repositories.conf			\
 		${DESTDIR}${EGDIR}/repositories.conf.example
 

pkgtools/pkgin/PLIST

@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2011/06/20 15:16:27 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2014/01/21 16:31:27 jperkin Exp $
 bin/pkgin
+man/cat1/pkgin.0
 man/man1/pkgin.1
 share/examples/pkgin/repositories.conf.example

pkgtools/pkgin/distinfo

@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.28 2013/06/16 14:37:33 imil Exp $
+$NetBSD: distinfo,v 1.32 2014/01/21 16:31:27 jperkin Exp $
 
 SHA1 (3859170568fbe4fe21b5660dbaeca8d65ac10f1b.tar.gz) = 58d06c5884dd490508f609c5320542c919afe0c7
 RMD160 (3859170568fbe4fe21b5660dbaeca8d65ac10f1b.tar.gz) = e783457044af3b41a784012f4d0961ed87e8c4af
 Size (3859170568fbe4fe21b5660dbaeca8d65ac10f1b.tar.gz) = 187873 bytes
+SHA1 (patch-Makefile.in) = 46f676a8e2bdb89f1d0f6f4e6c9cce55c56bb4bd
+SHA1 (patch-actions.c) = c7a630a2509ade9d913abb771a7bde4653a44e78
+SHA1 (patch-main.c) = 2faf9b225fdf30a997c5c0249cd40486d5d8d55c

pkgtools/pkgin/patches/patch-Makefile.in

@@ -0,0 +1,12 @@
+$NetBSD: patch-Makefile.in,v 1.3 2014/01/21 16:31:27 jperkin Exp $
+
+Support catpage.
+
+--- Makefile.in.orig	2013-06-16 14:00:45.000000000 +0000
++++ Makefile.in
+@@ -2,4 +2,5 @@
+ 
+ PROG=		pkgin
++MAN=		pkgin.1
+ VERSION=	@PACKAGE_VERSION@
+ SRCS=		main.c summary.c tools.c pkgindb.c depends.c actions.c \

pkgtools/pkgin/patches/patch-actions.c

@@ -0,0 +1,16 @@
+$NetBSD: patch-actions.c,v 1.2 2013/10/06 08:28:47 wiz Exp $
+
+No need to work-around 'pkg_add -f' bug any more.
+
+--- actions.c.orig	2013-06-16 14:00:45.000000000 +0000
++++ actions.c
+@@ -139,9 +139,6 @@ analyse_pkglog(long int filepos)
+ 		/* Warning: [...] was built for a platform */
+ 		if (strstr(err_line, "Warning") != NULL)
+ 			warn_count++;
+-		/* A different version [...] is already installed */
+-		if (strstr(err_line, "already installed") != NULL)
+-			err_count--;
+ 		/* 1 package addition failed */
+ 		if (strstr(err_line, "addition failed") != NULL)
+ 			err_count++;

pkgtools/pkgin/patches/patch-main.c

@@ -0,0 +1,35 @@
+$NetBSD: patch-main.c,v 1.2 2013/10/06 08:28:47 wiz Exp $
+
+--- main.c.orig	2013-06-16 14:00:45.000000000 +0000
++++ main.c
+@@ -50,7 +50,7 @@ main(int argc, char *argv[])
+ {
+ 	uint8_t		updb_all;
+ 	uint8_t		do_inst = DO_INST; /* by default, do install packages */
+-	int 		ch, rc = EXIT_SUCCESS;
++	int 		ch, i, rc = EXIT_SUCCESS;
+ 	struct stat	sb;
+ 	const char	*chrootpath = NULL;
+ 
+@@ -244,7 +244,8 @@ main(int argc, char *argv[])
+ 		break;
+ 	case PKG_IMPORT_CMD: /* import for keep packages and install them */
+ 		missing_param(argc, 2, MSG_MISSING_FILENAME);
+-		import_keep(do_inst, argv[1]);
++		for (i=1; i<argc; i++)
++			import_keep(do_inst, argv[i]);
+ 		break;
+ 	case PKG_SHPROV_CMD: /* show what a package provides */
+ 		missing_param(argc, 2, MSG_MISSING_PKGNAME);
+@@ -301,10 +302,9 @@ main(int argc, char *argv[])
+ static void
+ missing_param(int argc, int nargs, const char *msg)
+ {
+-	const char *foo = msg;
+ 
+ 	if (argc < nargs)
+-		errx(EXIT_FAILURE, foo);
++		errx(EXIT_FAILURE, "%s", msg);
+ }
+ 
+ /* find command index */