Date: Mon, 4 Dec 2006 19:06:16 +0100 (CET) From: Gabor Kovesdan <gabor@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Gabor Kovesdan <gabor@FreeBSD.org> Subject: ports/106336: [patch] primt/mpage Message-ID: <20061204180616.D9FF69AAADF@server.t-hosting.hu> Resent-Message-ID: <200612041810.kB4IAIo2091872@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 106336 >Category: ports >Synopsis: [patch] primt/mpage >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Dec 04 18:10:18 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Gabor Kovesdan >Release: FreeBSD 6.1-RELEASE-p3 amd64 >Organization: n/a >Environment: >Description: - Update to 2.5.4 - Add support for NOPORTDOCS - Remove old patch >How-To-Repeat: >Fix: --- print-mpage.diff begins here --- Index: Makefile =================================================================== RCS file: /usr/cvs/ports/print/mpage/Makefile,v retrieving revision 1.15 diff -u -r1.15 Makefile --- Makefile 5 Nov 2004 13:22:00 -0000 1.15 +++ Makefile 4 Dec 2006 17:24:58 -0000 @@ -10,7 +10,7 @@ # "Legal" (8.5" x 14"). PORTNAME= mpage -PORTVERSION= 2.5.4 +PORTVERSION= 2.5.5 CATEGORIES= print MASTER_SITES= ftp://ftp.mesa.nl/pub/mpage/ EXTRACT_SUFX= .tgz @@ -26,4 +26,15 @@ %%DATADIR%%/ISO-Latin.1 %%DATADIR%%/ISO-Latin.2 PLIST_DIRS= %%DATADIR%% +PORTDOCS= CHANGES COPYING COPYING.LESSER Characters Copyright Encoding.format \ + FAQ NEWS README README.OS2 README.amiga SCOPTIONS TODO + +post-install: +.if !defined(NOPORTDOCS) + @${MKDIR} ${DOCSDIR} +.for FILE in ${PORTDOCS} + @${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR} +.endfor +.endif + .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /usr/cvs/ports/print/mpage/distinfo,v retrieving revision 1.6 diff -u -r1.6 distinfo --- distinfo 25 Nov 2005 17:42:51 -0000 1.6 +++ distinfo 4 Dec 2006 09:58:46 -0000 @@ -1,3 +1,3 @@ -MD5 (mpage-2.5.4.tgz) = c14d58e24e7fdebe0c9eeb57ef1895f4 -SHA256 (mpage-2.5.4.tgz) = c5487b9e5e72da60808272ed4c3de50f9237f3c9f30dfd9000520af6fbfc9a8e -SIZE (mpage-2.5.4.tgz) = 93992 +MD5 (mpage-2.5.5.tgz) = 0caccc549b3f9e8d8af465023b264a49 +SHA256 (mpage-2.5.5.tgz) = 3800a4dfe441401f033dae9ebad8fb32eb2ab8c944f77ae77c083e0dbb441ece +SIZE (mpage-2.5.5.tgz) = 86409 Index: files/patch-file_c =================================================================== RCS file: files/patch-file_c diff -N files/patch-file_c --- files/patch-file_c 5 Nov 2004 13:22:00 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,47 +0,0 @@ ---- file.c.orig Mon May 31 04:34:15 2004 -+++ file.c Mon Nov 1 20:58:16 2004 -@@ -18,6 +18,7 @@ - */ - - -+#include <string.h> - #include "mpage.h" - - -@@ -119,11 +120,11 @@ - */ - #define DASHES "-- " - if (opt_header != NULL) -- (void)sprintf(command, "%s -l%d -w%d -h \"%s\" %s%s", prprog, -+ (void)snprintf(command, sizeof(command), "%s -l%d -w%d -h \"%s\" %s%s", prprog, - asheet->sh_plength, asheet->sh_cwidth, opt_header, - fname[0] == '-' ? DASHES : "", fname); - else -- (void)sprintf(command, "%s -l%d -w%d %s%s", prprog, -+ (void)snprintf(command, sizeof(command), "%s -l%d -w%d %s%s", prprog, - asheet->sh_plength, asheet->sh_cwidth, - fname[0] == '-' ? DASHES : "", fname); - /* -@@ -168,7 +169,7 @@ - * but the tmpfilename - */ - -- (void) strcpy(tmpfile, "/usr/tmp/mpage-stdin-XXXXXX"); -+ (void) strlcpy(tmpfile, "/tmp/mpage-stdin-XXXXXX", sizeof(tmpfile)); - if ( (tmpfd = mkstemp(tmpfile)) == -1) { - fprintf(stderr, "%s: cannot create temporary file", MPAGE); - perror(MPAGE); -@@ -217,11 +218,11 @@ - } - close(tmpfd); - if (opt_header != NULL) -- (void)sprintf(command, "%s -l%d -w%d -h \"%s\" > %s", prprog, -+ (void)snprintf(command, sizeof(command), "%s -l%d -w%d -h \"%s\" > %s", prprog, - asheet->sh_plength, asheet->sh_cwidth, - opt_header, tmpfile); - else -- (void)sprintf(command, "%s -l%d -w%d > %s", prprog, -+ (void)snprintf(command, sizeof(command), "%s -l%d -w%d > %s", prprog, - asheet->sh_plength, asheet->sh_cwidth, tmpfile); - /* - * open a pipe to the pr(1) command which will create a --- print-mpage.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20061204180616.D9FF69AAADF>