Import of pkgsrc-2016Q3

2016-11-18 22:39:22 +01:00
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949747 additions and 377081 deletions
@@ -1,9 +1,12 @@
-# $NetBSD: Makefile,v 1.204 2015/06/12 10:50:11 wiz Exp $
+# $NetBSD: Makefile,v 1.210 2016/08/11 22:48:00 is Exp $
+
+TEST_TARGETS=	test

 DISTNAME=	netpbm-10.68.02
 CATEGORIES=	graphics
 MASTER_SITES=	#
-PKGREVISION=	2
+PKGREVISION=	5
+
 # manually created from svn checkout of
 # svn checkout http://svn.code.sf.net/p/netpbm/code/advanced netpbm
 # tar --exclude netpbm/.svn/\* -cvzf /archive/distfiles/netpbm-$VERSION.tar.gz netpbm
@@ -19,13 +22,15 @@ HOMEPAGE=	http://netpbm.sourceforge.net/
 COMMENT=	Toolkit for conversion of images between different formats
 LICENSE=	gnu-gpl-v2

-USE_TOOLS+=	gmake lex pax perl
+USE_TOOLS+=	gmake flex pax perl
 USE_FEATURES=	snprintf

 INSTALL_TARGET=	install-dev install-run
 MAKE_ENV+=	INSTALL=${INSTALL:Q} STRIPFLAG=${_STRIPFLAG_INSTALL:Q} \
 		pkgdir=${STAGEDIR:Q} MACHINE=${MACHINE:Q}
 MAKE_FLAGS+=	PKGMANDIR=${PKGMANDIR:Q}
+MAKE_FLAGS+=	CFLAGS_FOR_BUILD=${CFLAGS:Q}
+MAKE_FLAGS+=	LDFLAGS_FOR_BUILD=${LDFLAGS:Q}
 MAKE_FILE=	GNUmakefile
 REPLACE_PERL+=	converter/pbm/pbmtox10bm
 REPLACE_PERL+=	editor/pnmflip
@@ -51,16 +56,14 @@ SUBST_SED.rgb_txt+=	-e 's,/usr/share/netpbm/rgb.txt,${PREFIX}/share/netpbm/rgb.t
 # only used if NEED_RUNTIME_PATH is set, so set it unconditionally
 MAKE_FLAGS+=	NETPBMLIB_RUNTIME_PATH=${PREFIX}

-.if ${OPSYS} == "NetBSD"
-MAKE_FLAGS+=	NEED_RUNTIME_PATH=Y
-.elif ${OPSYS} == "Darwin"
-MAKE_FLAGS+=	NETPBMLIBTYPE=dylib
-MAKE_FLAGS+=	NETPBMLIBSUFFIX=dylib
-.elif ${OPSYS} == "SunOS"
-MAKE_FLAGS+=	LDSHLIB=-shared
-MAKE_FLAGS+=	NEED_RUNTIME_PATH=Y
-MAKE_FLAGS+=	NETWORKLD="-lsocket -lnsl"
-.elif ${OS_VARIANT} == "SCOOSR5"
+MAKE_FLAGS.NetBSD+=	NEED_RUNTIME_PATH=Y
+MAKE_FLAGS.Darwin+=	NETPBMLIBTYPE=dylib
+MAKE_FLAGS.Darwin+=	NETPBMLIBSUFFIX=dylib
+MAKE_FLAGS.SunOS+=	LDSHLIB=-shared
+MAKE_FLAGS.SunOS+=	NEED_RUNTIME_PATH=Y
+MAKE_FLAGS.SunOS+=	NETWORKLD="-lsocket -lnsl"
+
+.if ${OS_VARIANT} == "SCOOSR5"
 MAKE_FLAGS+=	NETWORKLD="-lsocket -lresolv"
 .endif

@@ -1,13 +1,15 @@
-$NetBSD: distinfo,v 1.100 2015/03/12 12:35:42 tnn Exp $
+$NetBSD: distinfo,v 1.103 2016/08/11 22:48:00 is Exp $

 SHA1 (netpbm-10.68.02.tar.gz) = 90fa87549dc7fb33bd7f9f29abad09fe99faf3e1
 RMD160 (netpbm-10.68.02.tar.gz) = 7567eb6c38f06ad89b995b9315deec91db94bfb0
+SHA512 (netpbm-10.68.02.tar.gz) = 7555889392e35f9b24ff70b62a5f9d80aa5157915ef7bf57efa3d5c0f0d0ca198c8baa97ce7985c68b6bea11c3dcfd64ca913b918b0d9d97f93d4927f6efa00b
 Size (netpbm-10.68.02.tar.gz) = 2703809 bytes
 SHA1 (netpbm-docs-r2313.tar.gz) = 8c36b17b1d2dca6ab7bd34666a8929b9ea665743
 RMD160 (netpbm-docs-r2313.tar.gz) = 03854f545c7c0f4c825ee08bc779b62da0ea05c3
+SHA512 (netpbm-docs-r2313.tar.gz) = 978f7e154aadfa2c4332c07f8e822ec1990697c22b4a3b56f5de434a1f249a6b552c6a76763d0ce2684dfbd5d14973bf0b05702dd0ad543c6f440a992bcac0d9
 Size (netpbm-docs-r2313.tar.gz) = 447907 bytes
 SHA1 (patch-common.mk) = f590cc66e0fe6a07e848b9b46662bca350557bea
-SHA1 (patch-converter_other_giftopnm.c) = d64d645307e12b32d3a9ce56885bbfb3a4a80d23
+SHA1 (patch-converter_other_giftopnm.c) = 444fd73c239279a94481a2163a9e31d340af1a15
 SHA1 (patch-lib_Makefile) = 3f93bd24c53aa1f22aa43545d7ca5422af8e78ca
-SHA1 (patch-pm__config.in.h) = 9cb3084371be4b354832581d47d552bfe9ff1ce1
+SHA1 (patch-pm__config.in.h) = c6d51bbdf6c1f7725f08f321591038e296761e61
 SHA1 (patch-wordaccess_be_aligned.h) = 7cc5cd1126f65b3307393c978ac9ff4a49d666de
@@ -1,4 +1,4 @@
-$NetBSD: patch-converter_other_giftopnm.c,v 1.1 2015/01/25 15:01:48 jperkin Exp $
+$NetBSD: patch-converter_other_giftopnm.c,v 1.2 2016/08/11 22:48:00 is Exp $

 Fix "giftopnm.c:368: error: incompatible types in assignment".

@@ -13,3 +13,17 @@ Fix "giftopnm.c:368: error: incompatible types in assignment".
         *eofP = TRUE;
         *lengthP = 0;
     } else {
+@@ -671,10 +671,13 @@ bitsOfLeBuffer(const unsigned char * con
+ 
+     assert(len <= 16);
+ 
+/* should be UNALIGNED_OK, but that'd need fixing, too */
+#if defined(__vax__) || defined(__i486__) || defined(__x86_64__)
+     if (BYTE_ORDER == LITTLE_ENDIAN)
+         /* Fast path */
+         codeBlock = *(uint32_t *) & buf[start/8];
+     else
+#endif
+         /* logic works for little endian too */
+         codeBlock =
+             (buf[start/8+0] <<  0) |
@@ -1,13 +1,14 @@
-$NetBSD: patch-pm__config.in.h,v 1.1 2014/11/23 14:38:34 gson Exp $
+$NetBSD: patch-pm__config.in.h,v 1.2 2016/05/16 21:23:31 richard Exp $

--- pm_config.in.h.orig	2014-11-23 14:12:37.000000000 +0000
+--- pm_config.in.h.orig	2014-09-08 21:53:09.000000000 +0000
 +++ pm_config.in.h
-@@ -139,7 +139,7 @@
+@@ -139,7 +139,8 @@
 
 /* #define HAVE_SETMODE */
 
 -#if (defined(__GLIBC__) || defined(__GNU_LIBRARY__) || defined(__APPLE__))
-+#if (defined(__GLIBC__) || defined(__GNU_LIBRARY__) || defined(__APPLE__)) || defined(__NetBSD__)
+#if (defined(__GLIBC__) || defined(__GNU_LIBRARY__) || defined(__APPLE__)) \
+	|| defined(__NetBSD__) || (defined(__SVR4) && defined (__sun))
   #define HAVE_VASPRINTF 1
 #else
   #define HAVE_VASPRINTF 0