ports/73470: Update port: print/mpage to 2.5.4

[KATO Tsuguru]

>Number:         73470
>Category:       ports
>Synopsis:       Update port: print/mpage to 2.5.4
>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:   Wed Nov 03 16:10:26 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.10-RELEASE-p3 i386
>Organization:
>Environment:
>Description:
- Update to version 2.5.4

Remove file:
pkg-plist

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/print/mpage/Makefile print/mpage/Makefile
--- /usr/ports/print/mpage/Makefile	Wed Jul  9 21:35:45 2003
+++ print/mpage/Makefile	Mon Nov  1 21:00:24 2004
@@ -10,8 +10,7 @@
 # "Legal" (8.5" x 14").
 
 PORTNAME=	mpage
-PORTVERSION=	2.5.3
-PORTREVISION=	1
+PORTVERSION=	2.5.4
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.mesa.nl/pub/mpage/
 EXTRACT_SUFX=	.tgz
@@ -19,7 +18,12 @@
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Print multiple pages per sheet of paper
 
-MAN1=		mpage.1
 ALL_TARGET=	default
+
+MAN1=		mpage.1
+PLIST_FILES=	bin/mpage %%DATADIR%%/CP850.PC %%DATADIR%%/ISO+STD+OTH \
+		%%DATADIR%%/ISO-8859.1 %%DATADIR%%/ISO-8859.15 \
+		%%DATADIR%%/ISO-Latin.1 %%DATADIR%%/ISO-Latin.2
+PLIST_DIRS=	%%DATADIR%%
 
 .include <bsd.port.mk>
diff -urN /usr/ports/print/mpage/distinfo print/mpage/distinfo
--- /usr/ports/print/mpage/distinfo	Fri Jan 30 14:53:44 2004
+++ print/mpage/distinfo	Mon Nov  1 20:53:17 2004
@@ -1,2 +1,2 @@
-MD5 (mpage-2.5.3.tgz) = 4724dcba203100384b4611be8adc900c
-SIZE (mpage-2.5.3.tgz) = 82101
+MD5 (mpage-2.5.4.tgz) = c14d58e24e7fdebe0c9eeb57ef1895f4
+SIZE (mpage-2.5.4.tgz) = 93992
diff -urN /usr/ports/print/mpage/files/patch-file_c print/mpage/files/patch-file_c
--- /usr/ports/print/mpage/files/patch-file_c	Sat Jun 14 06:36:31 2003
+++ print/mpage/files/patch-file_c	Mon Nov  1 20:58:21 2004
@@ -1,6 +1,5 @@
-$OpenBSD: patch-file_c,v 1.2 2002/11/13 17:15:49 naddy Exp $
---- file.c.orig	Sun Jun 16 02:56:44 2002
-+++ file.c	Mon Nov 11 06:54:23 2002
+--- file.c.orig	Mon May 31 04:34:15 2004
++++ file.c	Mon Nov  1 20:58:16 2004
 @@ -18,6 +18,7 @@
   */
  
@@ -9,41 +8,40 @@
  #include "mpage.h"
  
  
-@@ -101,10 +102,10 @@ do_pr_file(fname, asheet, outfd)
-      * header or not
+@@ -119,11 +120,11 @@
       */
+ #define DASHES "-- "
      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, fname);
+-        (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", prprog,
-+        (void)snprintf(command, sizeof(command), "%s -l%d -w%d %s", prprog,
-                   asheet->sh_plength, asheet->sh_cwidth, fname);
+-        (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);
      /*
-      * open a pipe to the proper pr(1) command, and pr provides
-@@ -148,7 +149,7 @@ do_stdin(asheet, outfd)
-          * a temporary file; this temporary file will then
-          * be used as input to the do_doc routine
-          */
--        (void)strcpy(tmpfile, "/usr/tmp/mpageXXXXXX");
-+        (void)strlcpy(tmpfile, "/tmp/mpageXXXXXX", sizeof(tmpfile));
-         if ( (tmpfd = mkstemp(tmpfile)) == -1) {
-             fprintf(stderr, "%s: cannot create temporary file", MPAGE);
-             perror(MPAGE);
-@@ -156,11 +157,13 @@ do_stdin(asheet, outfd)
+@@ -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,
+-            (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,
++            (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
diff -urN /usr/ports/print/mpage/pkg-plist print/mpage/pkg-plist
--- /usr/ports/print/mpage/pkg-plist	Sun Apr 14 10:56:41 2002
+++ print/mpage/pkg-plist	Thu Jan  1 09:00:00 1970
@@ -1,8 +0,0 @@
-bin/mpage
-share/mpage/CP850.PC
-share/mpage/ISO+STD+OTH
-share/mpage/ISO-8859.1
-share/mpage/ISO-8859.15
-share/mpage/ISO-Latin.1
-share/mpage/ISO-Latin.2
- at dirrm share/mpage
>Release-Note:
>Audit-Trail:
>Unformatted: