From nobody Fri Sep 29 22:11:19 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ry4Lc0sKyz4tlTS; Fri, 29 Sep 2023 22:11:20 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ry4Lb74PWz3bM5; Fri, 29 Sep 2023 22:11:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696025480; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qSUJ5QHhrPM2SPu5dNnXkgF96BvPNrXnjaF1qaEp9uQ=; b=DzNomVjdhXjB66+v7sB+LqJbGX1eagJP5Ts8BsUCd4rKtF/ZKASBXSUWs8fh2vgxOL8fOC 62CxgNyCCDkyYc4i2GYIjB0USmBFqKWE1HDB+nK1YGe1s4tmG0mP4HINGqEpHJsK6z4XNH bF/E/wb8rIRjHmKUUZwButPHjY6zRVV1jUTpzMKzZ02IYaTdzBiOKYujOH2Ig4q4QUCnfC JqgJq/NF2x08ZMPIlrZmYkk/wAE2G+m3VXUuZxofehZbNCZpfUHq8Umrcaguv0CkxVNOj9 CdOkuHJLN+edx/wpve2wsG0J7LqAzmbsoaie1h7SFOe8REIt1AADYTYhaebzOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696025480; a=rsa-sha256; cv=none; b=XTiz4xODJ3GlVhCmTHmmNl7CBo0qPsCg7yuELn7VfIDdqKOpVuAGGwjlY1zkmj8qcvW+WY 9w5+WRprIXA5hZZDw/SISApF+3kDDtpyl5LspXRZQXINFCNsFJWfU2+xxF2B1UEvtAyiBZ DdkPbYmQBSXobPJ6UcjKnKiNsGUBXqcejFwdeNzriZbaP6kPxQUFyl6OQwzUnqD6GEdY5O oJzQGhc7J+miV4Nmmey5Tnd6ZSo+cIrtlpq1GKhL17EhDJ38uyJ/ZsZRcuOU08t6NfvqHe C1PMC5ae2CXtgNbDNx7JvZSzfPgjSvSAirVK9rER+J3021d7W7/QztMWJNGUKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696025480; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qSUJ5QHhrPM2SPu5dNnXkgF96BvPNrXnjaF1qaEp9uQ=; b=hvet7flNa3h1jZQixnW2Sx/2ewDLXVymIhBJquJAhMcuG3UDZroitwYoKGTqLBuomRoOGR lUFJLuhLlOkoLjeGLBBGwdsl/ZjOvXg3xB1uZlXe2EYQRkzMeW0GLrXsSPabx8lw0B8HoQ lhQXx1c6hVI2HPgH4ribRg8UUNBj/aoS/4/hOyTIkhtxXQQKWh6sAoksQ+A1lYLpJi8qVf YUzYhaZAo2osHRNW/sA8tRUDA2f7OOC0KcQQnXZ9+p72ovL5NUv7KhFFzbShL5LWDnIQgh RrxyCJR3qrdx6UBQ5Lw7NrcQxbDLYbK8LYzjNocjFKpDuQ4OP9F+uMC9lZh3Tw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ry4Lb63Lbz6Pp; Fri, 29 Sep 2023 22:11:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38TMBJnS046069; Fri, 29 Sep 2023 22:11:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38TMBJCq046066; Fri, 29 Sep 2023 22:11:19 GMT (envelope-from git) Date: Fri, 29 Sep 2023 22:11:19 GMT Message-Id: <202309292211.38TMBJCq046066@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Craig Leres Subject: git: 93c4589950fb - main - graphics/netpbm: Update to 11.04.01 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: leres X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 93c4589950fb7ab20cdb72a8a01fd7442bee29d6 Auto-Submitted: auto-generated The branch main has been updated by leres: URL: https://cgit.FreeBSD.org/ports/commit/?id=93c4589950fb7ab20cdb72a8a01fd7442bee29d6 commit 93c4589950fb7ab20cdb72a8a01fd7442bee29d6 Author: Craig Leres AuthorDate: 2023-09-29 22:10:55 +0000 Commit: Craig Leres CommitDate: 2023-09-29 22:10:55 +0000 graphics/netpbm: Update to 11.04.01 https://sourceforge.net/p/netpbm/code/4700/tree/advanced/doc/HISTORY Changes since 11.04.00: - pjtoppm: fix crash based on uninitialized variable. Introduced in Netpbm 11.04 (two days ago). - Build: Fix compile error on systems without 'asprintf'. Introduced in Netpbm 11.04 (yesterday). Changes since 11.03.06: - pamaddnoise: add -salt. - pamaddnoise: reject options that aren't meaningful for the type of noise specified rather than just ignore them. - ppmtosixel: Add -7bit, so it works on more terminals, including xterms. Thanks Scott Pakin. - g3topbm: Add -correctlong - build: Add COMPILED_BY environment variable to control the "compiled by" value from --version common option. This helps with creating reproducible builds. - pnmtojpeg: minor improvement to error messages about bad files. - pammixmulti: Remove disclaimer of patent license. - pgmtexture: Fix bug: ignores -d. Introduced in Netpbm 10.56 (September 2011). - pbmtopgm: Fix error message for excessive -width. - tifftopnm: Fix incorrect output with insanely wide/deep rows. - thinkjettopbm: Fix incorrect output with insanely wide rows. - ybmtopbm: Fix incorrect output with insanely wide rows. - pjtoppm: Fix incorrect output with insanely large number of rows. - library: add check of maxval for computable size. - Build: Include LDFLAGS in link of shared library. Also: Remove obsolete patches. --- graphics/netpbm/Makefile | 5 ++-- graphics/netpbm/distinfo | 6 ++-- .../files/patch-converter_ppm_ppmtompeg_psocket.c | 23 --------------- graphics/netpbm/files/patch-jasper | 22 --------------- graphics/netpbm/files/patch-lib_libpm.c | 33 ---------------------- graphics/netpbm/pkg-plist | 2 +- 6 files changed, 6 insertions(+), 85 deletions(-) diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index 765466a42148..83505a1dea53 100644 --- a/graphics/netpbm/Makefile +++ b/graphics/netpbm/Makefile @@ -1,5 +1,5 @@ PORTNAME= netpbm -DISTVERSION= 11.03.06 +DISTVERSION= 11.04.02 CATEGORIES= graphics MASTER_SITES= LOCAL/leres/netpbm @@ -22,7 +22,7 @@ USES= cpe gmake jpeg perl5 shebangfix tar:xz USE_LDCONFIG= yes CPE_VENDOR= netpbm_project -SVN_REV= r4687 +SVN_REV= r4709 SHEBANG_FILES= buildtools/makeman converter/pbm/pbmtox10bm \ editor/pnmflip editor/pnmquant editor/ppmfade \ @@ -52,7 +52,6 @@ X11_USE= xorg=x11,xau,xcb,xdmcp post-patch: ${REINPLACE_CMD} -e 's|misc|share/netpbm|g' ${WRKSRC}/common.mk - ${REINPLACE_CMD} -e 's|pkg-config|false|g' ${WRKSRC}/GNUmakefile .ifdef WITH_PIE .for dn in buildtools test ${REINPLACE_CMD} -e '/^all:/s/^/CFLAGS_FOR_BUILD+=${PIE_CFLAGS}\n/' \ diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo index 94ca4e99673f..a0c19222859e 100644 --- a/graphics/netpbm/distinfo +++ b/graphics/netpbm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695684831 -SHA256 (netpbm-11.03.06.tar.xz) = 1c1adfc1f6168942f6ab8df66db5954f2eaa2f052192414e2a4a99080121a3f9 -SIZE (netpbm-11.03.06.tar.xz) = 2428526 +TIMESTAMP = 1696025133 +SHA256 (netpbm-11.04.02.tar.xz) = c7af684a300a20285e67f8900537828681994e74f5870155f84bfb9daa75e99e +SIZE (netpbm-11.04.02.tar.xz) = 2432352 diff --git a/graphics/netpbm/files/patch-converter_ppm_ppmtompeg_psocket.c b/graphics/netpbm/files/patch-converter_ppm_ppmtompeg_psocket.c deleted file mode 100644 index 1d2fc2aa7672..000000000000 --- a/graphics/netpbm/files/patch-converter_ppm_ppmtompeg_psocket.c +++ /dev/null @@ -1,23 +0,0 @@ -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) - diff --git a/graphics/netpbm/files/patch-jasper b/graphics/netpbm/files/patch-jasper deleted file mode 100644 index 2151239155d8..000000000000 --- a/graphics/netpbm/files/patch-jasper +++ /dev/null @@ -1,22 +0,0 @@ ---- converter/other/jpeg2000/jpeg2ktopam.c.orig 2020-07-22 20:35:17 UTC -+++ converter/other/jpeg2000/jpeg2ktopam.c -@@ -17,6 +17,8 @@ - but plenty of source files of libjasper do to0, and they did not have - _XOPEN_SOURCE 600, so it would seem to be superfluous here too. - */ -+#include -+typedef __max_align_t max_align_t; - #include - - #include ---- converter/other/jpeg2000/pamtojpeg2k.c.orig 2020-07-22 20:35:17 UTC -+++ converter/other/jpeg2000/pamtojpeg2k.c -@@ -18,6 +18,8 @@ - _XOPEN_SOURCE 600, so it would seem to be superfluous here too. - */ - -+#include -+typedef __max_align_t max_align_t; - #include - - #include diff --git a/graphics/netpbm/files/patch-lib_libpm.c b/graphics/netpbm/files/patch-lib_libpm.c deleted file mode 100644 index d300bd6ae26b..000000000000 --- a/graphics/netpbm/files/patch-lib_libpm.c +++ /dev/null @@ -1,33 +0,0 @@ -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 -@@ -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 -+#include - #include - #include - #include -@@ -832,7 +833,7 @@ pm_arg0toprogname(const char arg0[]) { - unsigned int - pm_randseed(void) { - -- return time(NULL) ^ getpid(); -+ return arc4random(); - - } - diff --git a/graphics/netpbm/pkg-plist b/graphics/netpbm/pkg-plist index b4f8ab5ba805..c193643bada3 100644 --- a/graphics/netpbm/pkg-plist +++ b/graphics/netpbm/pkg-plist @@ -404,7 +404,7 @@ include/netpbm/runlength.h include/netpbm/shhopt.h lib/libnetpbm.so lib/libnetpbm.so.11 -lib/libnetpbm.so.11.103 +lib/libnetpbm.so.11.104 %%DATADIR%%/palmcolor8.map %%DATADIR%%/palmgray1.map %%DATADIR%%/palmgray2.map