- Update to 2.5.5

- Add support for NOPORTDOCS
- Remove old patch

PR:		ports/106336
Submitted by:	gabor
Approved by:	erwin (mentor)

3 files changed, 15 insertions, 51 deletions

diff --git a/print/mpage/Makefile b/print/mpage/Makefile
index 229979319189..72b4b20771ef 100644
--- a/print/mpage/Makefile
+++ b/print/mpage/Makefile
@@ -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 @@ PLIST_FILES=	bin/mpage %%DATADIR%%/CP850.PC %%DATADIR%%/ISO+STD+OTH \
 		%%DATADIR%%/ISO-Latin.1 %%DATADIR%%/ISO-Latin.2
 PLIST_DIRS=	%%DATADIR%%
 
+PORTDOCS=	CHANGES COPYING COPYING.LESSER Characters Copyright Encoding.format \
+		FAQ NEWS README READM.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>
diff --git a/print/mpage/distinfo b/print/mpage/distinfo
index 4f77b7e11221..1bb79ba0e6fe 100644
--- a/print/mpage/distinfo
+++ b/print/mpage/distinfo
@@ -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
diff --git a/print/mpage/files/patch-file_c b/print/mpage/files/patch-file_c
deleted file mode 100644
index 725f8b09a8db..000000000000
--- a/print/mpage/files/patch-file_c
+++ /dev/null
@@ -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