svn commit: r529308 - in head/graphics/netpbm: . files

Tobias Kortkamp tobik at FreeBSD.org
Sat Mar 28 07:00:42 UTC 2020 

Author: tobik
Date: Sat Mar 28 06:51:10 2020
New Revision: 529308
URL: https://svnweb.freebsd.org/changeset/ports/529308

Log:
  graphics/netpbm: Update to 10.90.00
  
  Changes:	https://github.com/t6/netpbm/blob/v10.90.00/doc/HISTORY

Added:
  head/graphics/netpbm/files/patch-converter_other_pstopnm.c   (contents, props changed)
  head/graphics/netpbm/files/patch-converter_ppm_ppmtompeg_psocket.c   (contents, props changed)
Modified:
  head/graphics/netpbm/Makefile
  head/graphics/netpbm/distinfo
  head/graphics/netpbm/files/patch-lib_libpm.c
  head/graphics/netpbm/pkg-plist

Modified: head/graphics/netpbm/Makefile
==============================================================================
--- head/graphics/netpbm/Makefile	Sat Mar 28 04:10:43 2020	(r529307)
+++ head/graphics/netpbm/Makefile	Sat Mar 28 06:51:10 2020	(r529308)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	netpbm
-DISTVERSION=	10.89.01
+DISTVERSION=	10.90.00
 CATEGORIES=	graphics
 MASTER_SITES=	https://github.com/t6/netpbm/releases/download/v${DISTVERSION}/ \
 		LOCAL/tobik
@@ -50,9 +50,8 @@ TEST_TARGET=	check
 # Disable fragile tests.  tiff-flate-lzw-roundtrip's checksums are
 # different on FreeBSD so the test fails.  The resulting and
 # intermediary images look fine in spite of this.
-_DISABLE_TESTS=	all-in-place palm-roundtrip pamhue pammixmulti-identity \
-		pamtopdbimg pnmquant ppmgauss ps-alt-roundtrip \
-		tiff-flate-lzw-roundtrip
+_DISABLE_TESTS=	all-in-place palm-roundtrip pamdice pamhue pammixmulti-identity \
+		pamtopdbimg pnmquant ps-alt-roundtrip tiff-flate-lzw-roundtrip
 
 OPTIONS_DEFINE=		MANPAGES PERL STATIC SVGTOPAM X11
 OPTIONS_DEFAULT=	MANPAGES PERL
@@ -70,8 +69,8 @@ STATIC_LIB_DEPENDS_OFF=	libjasper.so:graphics/jasper \
 			libjbig.so:graphics/jbigkit \
 			libpng.so:graphics/png \
 			libtiff.so:graphics/tiff
-STATIC_USES_OFF=	jpeg
 STATIC_USES=		jpeg:build
+STATIC_USES_OFF=	jpeg
 SVGTOPAM_USES=		gnome
 SVGTOPAM_USE=		GNOME=libxml2
 SVGTOPAM_VARS_OFF=	_DISABLE_TESTS+=svgtopam
@@ -80,12 +79,9 @@ X11_USE=		XORG=x11,xau,xcb,xdmcp
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|misc|share/netpbm|g' ${WRKSRC}/common.mk
-	@${REINPLACE_CMD} -e 's|$$(PKGDIR)/link|$$(PKGDIR)/lib|g' \
-		-e 's|pkg-config|false|g' \
-		${WRKSRC}/GNUmakefile ${WRKSRC}/lib/Makefile
-.for test in ${_DISABLE_TESTS}
-	@${REINPLACE_CMD} -e '/${test}/d' ${WRKSRC}/test/Test-Order
-.endfor
+	@${REINPLACE_CMD} -e 's|pkg-config|false|g' ${WRKSRC}/GNUmakefile
+	@${REINPLACE_CMD} ${_DISABLE_TESTS:@.test. at -e '/${.test.}/d'@} \
+		${WRKSRC}/test/Test-Order
 
 post-patch-STATIC-on:
 	@${REINPLACE_CMD} -e 's|$$(LD)|$$(LD) -static|g' \

Modified: head/graphics/netpbm/distinfo
==============================================================================
--- head/graphics/netpbm/distinfo	Sat Mar 28 04:10:43 2020	(r529307)
+++ head/graphics/netpbm/distinfo	Sat Mar 28 06:51:10 2020	(r529308)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1579424381
-SHA256 (netpbm-10.89.01.tar.xz) = d9cdf66a18866a425984c1db47b4d6a19444149d71d278a2a1abe757a82a90cc
-SIZE (netpbm-10.89.01.tar.xz) = 2421072
+TIMESTAMP = 1585336405
+SHA256 (netpbm-10.90.00.tar.xz) = 520cd336692a479b713c6e97aa65e85bf0db0c14bb8a02fdb7502a5c9149933b
+SIZE (netpbm-10.90.00.tar.xz) = 2423776

Added: head/graphics/netpbm/files/patch-converter_other_pstopnm.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/netpbm/files/patch-converter_other_pstopnm.c	Sat Mar 28 06:51:10 2020	(r529308)
@@ -0,0 +1,14 @@
+pstopnm.c:268:14: warning: implicit declaration of function 'lstat' is invalid in C99 [-Wimplicit-function-declaration]
+    statRc = lstat(origFileName, &statbuf);
+             ^
+
+--- converter/other/pstopnm.c.orig	2020-03-27 19:22:48 UTC
++++ converter/other/pstopnm.c
+@@ -16,7 +16,6 @@
+ 
+ #define _DEFAULT_SOURCE 1 /* New name for SVID & BSD source defines */
+ #define _BSD_SOURCE 1   /* Make sure strdup() is in string.h */
+-#define _XOPEN_SOURCE 500
+     /* Make sure fdopen() is in stdio.h and strdup() is in string.h */
+ 
+ #include <assert.h>

Added: head/graphics/netpbm/files/patch-converter_ppm_ppmtompeg_psocket.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/netpbm/files/patch-converter_ppm_ppmtompeg_psocket.c	Sat Mar 28 06:51:10 2020	(r529308)
@@ -0,0 +1,23 @@
+psocket.c:123:15: warning: implicit declaration of function 'ntohl' is invalid in C99 [-Wimplicit-function-declaration]
+    *valueP = ntohl(converter.value);
+              ^
+psocket.c:196:23: warning: implicit declaration of function 'htonl' is invalid in C99 [-Wimplicit-function-declaration]
+    converter.value = htonl(value);
+                      ^
+psocket.c:295:34: warning: implicit declaration of function 'htons' is invalid in C99 [-Wimplicit-function-declaration]
+            nameEntry.sin_port = htons(tempShort);
+                                 ^
+psocket.c:358:32: warning: implicit declaration of function 'htons' is invalid in C99 [-Wimplicit-function-declaration]
+        nameEntry.sin_port   = htons(trialPortNum);
+                               ^
+
+--- converter/ppm/ppmtompeg/psocket.c.orig	2020-03-27 19:26:06 UTC
++++ converter/ppm/ppmtompeg/psocket.c
+@@ -9,7 +9,6 @@
+ 
+ ============================================================================*/
+ 
+-#define _XOPEN_SOURCE 500 /* Make sure stdio.h contains pclose() */
+ /* _ALL_SOURCE is needed on AIX to make the C library include the
+    socket services (e.g. define struct sockaddr)
+ 

Modified: head/graphics/netpbm/files/patch-lib_libpm.c
==============================================================================
--- head/graphics/netpbm/files/patch-lib_libpm.c	Sat Mar 28 04:10:43 2020	(r529307)
+++ head/graphics/netpbm/files/patch-lib_libpm.c	Sat Mar 28 06:51:10 2020	(r529308)
@@ -1,6 +1,20 @@
---- lib/libpm.c.orig	2017-06-10 22:23:50 UTC
+libpm.c:836:12: warning: implicit declaration of function 'arc4random' is invalid in C99
+      [-Wimplicit-function-declaration]
+          return arc4random();
+                     ^
+
+--- lib/libpm.c.orig	2020-03-27 19:09:35 UTC
 +++ lib/libpm.c
-@@ -18,6 +17,7 @@
+@@ -9,7 +9,7 @@
+ **************************************************************************/
+ 
+ #define _DEFAULT_SOURCE      /* New name for SVID & BSD source defines */
+-#define _XOPEN_SOURCE 500    /* Make sure ftello, fseeko are defined */
++#define _BSD_SOURCE 1
+ 
+ #include "netpbm/pm_config.h"
+ 
+@@ -17,6 +17,7 @@
  #include <unistd.h>
  #include <stdio.h>
  #include <stdarg.h>
@@ -8,7 +22,7 @@
  #include <string.h>
  #include <errno.h>
  #include <setjmp.h>
-@@ -824,7 +824,7 @@ pm_arg0toprogname(const char arg0[]) {
+@@ -832,7 +833,7 @@ pm_arg0toprogname(const char arg0[]) {
  unsigned int
  pm_randseed(void) {
  

Modified: head/graphics/netpbm/pkg-plist
==============================================================================
--- head/graphics/netpbm/pkg-plist	Sat Mar 28 04:10:43 2020	(r529307)
+++ head/graphics/netpbm/pkg-plist	Sat Mar 28 06:51:10 2020	(r529308)
@@ -398,7 +398,7 @@ include/netpbm/shhopt.h
 lib/libnetpbm.a
 lib/libnetpbm.so
 lib/libnetpbm.so.11
-lib/libnetpbm.so.11.89
+lib/libnetpbm.so.11.90
 %%MANPAGES%%man/man1/411toppm.1.gz
 %%MANPAGES%%man/man1/anytopnm.1.gz
 %%MANPAGES%%man/man1/asciitopgm.1.gz

More information about the svn-ports-all mailing list