From owner-svn-ports-all@freebsd.org Sat Mar 28 07:00:41 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EB8D42726DE; Sat, 28 Mar 2020 07:00:41 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48q8kd4YBmz44FV; Sat, 28 Mar 2020 07:00:41 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D4CD3807E; Sat, 28 Mar 2020 06:51:11 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02S6pBrT070076; Sat, 28 Mar 2020 06:51:11 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02S6pAeg070070; Sat, 28 Mar 2020 06:51:10 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <202003280651.02S6pAeg070070@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Sat, 28 Mar 2020 06:51:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r529308 - in head/graphics/netpbm: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head/graphics/netpbm: . files X-SVN-Commit-Revision: 529308 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Mar 2020 07:00:42 -0000 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.@-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 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 #include #include @@ -8,7 +22,7 @@ #include #include #include -@@ -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