From owner-svn-ports-head@freebsd.org Tue Sep 22 10:57:36 2020 Return-Path: Delivered-To: svn-ports-head@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 653F13E45EE; Tue, 22 Sep 2020 10:57:36 +0000 (UTC) (envelope-from se@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BwdYr1tw1z3YrB; Tue, 22 Sep 2020 10:57:36 +0000 (UTC) (envelope-from se@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 246AE1DFCA; Tue, 22 Sep 2020 10:57:36 +0000 (UTC) (envelope-from se@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08MAvaMs022432; Tue, 22 Sep 2020 10:57:36 GMT (envelope-from se@FreeBSD.org) Received: (from se@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08MAvYtG022426; Tue, 22 Sep 2020 10:57:34 GMT (envelope-from se@FreeBSD.org) Message-Id: <202009221057.08MAvYtG022426@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: se set sender to se@FreeBSD.org using -f From: =?UTF-8?Q?Stefan_E=c3=9fer?= Date: Tue, 22 Sep 2020 10:57:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r549571 - in head/print/pnm2ppa: . files X-SVN-Group: ports-head X-SVN-Commit-Author: se X-SVN-Commit-Paths: in head/print/pnm2ppa: . files X-SVN-Commit-Revision: 549571 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Sep 2020 10:57:36 -0000 Author: se Date: Tue Sep 22 10:57:34 2020 New Revision: 549571 URL: https://svnweb.freebsd.org/changeset/ports/549571 Log: Fix build with -fno-common While here add license, make Makefile better match current standards, and regenerate patch files (i.e. make portlint happy). Added: head/print/pnm2ppa/files/patch-pnm2ppa.c (contents, props changed) head/print/pnm2ppa/files/patch-ppa__syslog.h (contents, props changed) Modified: head/print/pnm2ppa/Makefile head/print/pnm2ppa/files/patch-docs__en__pnm2ppa.1 head/print/pnm2ppa/files/patch-pnm2ppa.conf head/print/pnm2ppa/files/patch-text-en.h Modified: head/print/pnm2ppa/Makefile ============================================================================== --- head/print/pnm2ppa/Makefile Tue Sep 22 10:36:01 2020 (r549570) +++ head/print/pnm2ppa/Makefile Tue Sep 22 10:57:34 2020 (r549571) @@ -3,21 +3,24 @@ PORTNAME= pnm2ppa PORTVERSION= 1.13 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= print MASTER_SITES= SF MAINTAINER= 000.fbsd@quip.cz COMMENT= Convert PNM images to PPA for some HP printers -OPTIONS_DEFINE= A4SIZE -A4SIZE_DESC= Set A4 (not Letter) as a default paper size +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/docs/en/LICENSE USES= gmake ghostscript:run GNU_CONFIGURE= yes -.include +OPTIONS_DEFINE= A4SIZE +A4SIZE_DESC= Set A4 (not Letter) as a default paper size +.include + .if defined(A4) || !empty(PORT_OPTIONS:MA4SIZE) RUN_DEPENDS+= enscript:print/enscript-a4 .else @@ -46,4 +49,4 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/pnm2ppa.1 ${STAGEDIR}${PREFIX}/man/man1 ${INSTALL_DATA} ${WRKSRC}/pnm2ppa.conf.sample ${STAGEDIR}${PREFIX}/etc -.include +.include Modified: head/print/pnm2ppa/files/patch-docs__en__pnm2ppa.1 ============================================================================== --- head/print/pnm2ppa/files/patch-docs__en__pnm2ppa.1 Tue Sep 22 10:36:01 2020 (r549570) +++ head/print/pnm2ppa/files/patch-docs__en__pnm2ppa.1 Tue Sep 22 10:57:34 2020 (r549571) @@ -1,6 +1,6 @@ ---- docs/en/pnm2ppa.1.orig Mon Nov 6 10:16:38 2000 -+++ docs/en/pnm2ppa.1 Tue Jan 30 22:02:49 2001 -@@ -51,13 +51,13 @@ +--- docs/en/pnm2ppa.1.orig 2002-06-23 05:17:58 UTC ++++ docs/en/pnm2ppa.1 +@@ -60,13 +60,13 @@ Econofast mode: lower print quality that is faster and .\"{{{ -f configFile .IP "\fB\-f \fIconfigFile\fR\fP" Re-reads configuration from \fIconfigFile\fR (after @@ -16,7 +16,7 @@ .\"}}} .\"{{{ --fd -@@ -161,7 +161,7 @@ +@@ -170,7 +170,7 @@ Sets the y-offset \fIyoffset\fR from the top of the pa .SH NOTES @@ -25,7 +25,7 @@ .PP The \fB-v\fP option resets all definitions (margins, offsets, etc.) back to the inbuilt defaults for that printer and should be used before subsequent -@@ -171,13 +171,13 @@ +@@ -180,13 +180,13 @@ pnm(5), ppm(5), pbm(5) .SH FILES Added: head/print/pnm2ppa/files/patch-pnm2ppa.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/print/pnm2ppa/files/patch-pnm2ppa.c Tue Sep 22 10:57:34 2020 (r549571) @@ -0,0 +1,10 @@ +--- pnm2ppa.c.orig 2009-12-12 19:14:55 UTC ++++ pnm2ppa.c +@@ -40,6 +40,7 @@ + #include "gamma.h" + #include "lang.h" + ++char syslog_message[128]; + + double Gamma_R, Gamma_G, Gamma_B; + int adjust_coloffsx, adjust_coloffsy; Modified: head/print/pnm2ppa/files/patch-pnm2ppa.conf ============================================================================== --- head/print/pnm2ppa/files/patch-pnm2ppa.conf Tue Sep 22 10:36:01 2020 (r549570) +++ head/print/pnm2ppa/files/patch-pnm2ppa.conf Tue Sep 22 10:57:34 2020 (r549571) @@ -1,5 +1,5 @@ ---- pnm2ppa.conf.orig Sun Nov 10 06:47:47 2002 -+++ pnm2ppa.conf Mon Nov 18 21:10:36 2002 +--- pnm2ppa.conf.orig 2002-11-09 21:47:47 UTC ++++ pnm2ppa.conf @@ -1,7 +1,7 @@ # Sample configuration file # @@ -9,7 +9,7 @@ # # uncomment entries by removing "#" to activate them. # -@@ -44,7 +44,7 @@ +@@ -44,7 +44,7 @@ version 0 # REMOVE THIS ENTRY to make 720 the de log_info 1 # <= COMMENT THIS OUT TO GET THE NEW DEFAULT BEHAVIOR! # Note: the "silent 1" and "log_info" keywords are only accepted from the @@ -18,7 +18,7 @@ # files specified by users with the pnm2ppa option "-f". #---------set the margins of the printed page------------------- -@@ -123,7 +123,7 @@ +@@ -123,7 +123,7 @@ log_info 1 # <= COMMENT THIS OUT TO GET #------------Color correct curve Gamma parameters------------------------- # Gamma color correction values for Red, Green and Blue: # (Note: a more effective method of color correction is to use Added: head/print/pnm2ppa/files/patch-ppa__syslog.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/print/pnm2ppa/files/patch-ppa__syslog.h Tue Sep 22 10:57:34 2020 (r549571) @@ -0,0 +1,11 @@ +--- ppa_syslog.h.orig 2009-12-10 19:11:17 UTC ++++ ppa_syslog.h +@@ -39,7 +39,7 @@ + #include + #endif + +-char syslog_message[128]; ++extern char syslog_message[128]; + extern size_t message_size ; + + void wrap_syslog( int, char *, char *); Modified: head/print/pnm2ppa/files/patch-text-en.h ============================================================================== --- head/print/pnm2ppa/files/patch-text-en.h Tue Sep 22 10:36:01 2020 (r549570) +++ head/print/pnm2ppa/files/patch-text-en.h Tue Sep 22 10:57:34 2020 (r549571) @@ -1,5 +1,5 @@ ---- text-en.h.orig Sat Oct 14 17:35:25 2000 -+++ text-en.h Tue Jan 30 21:42:43 2001 +--- text-en.h.orig 2002-02-11 15:38:30 UTC ++++ text-en.h @@ -73,7 +73,7 @@ /* 24 */ "Verbose logging to console\n",