cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to mpage-2.5.7 (move to gplv2+)

Browse Source 
from Ian McWilliam (maintainer)
This commit is contained in:
jca 2017-08-23 07:45:00 +00:00
parent 0158ae2c80
commit e6e59931ba
7 changed files with 42 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
print/mpage/Makefile
View File

@ -1,18 +1,16 @@
# $OpenBSD: Makefile,v 1.34 2015/12/23 12:33:51 jca Exp $
# $OpenBSD: Makefile,v 1.35 2017/08/23 07:45:00 jca Exp $
COMMENT= print multiple pages per sheet on PostScript printer
DISTNAME= mpage-2.5.6
DISTNAME= mpage-2.5.7
EXTRACT_SUFX= .tgz
REVISION= 3
CATEGORIES= print
MAINTAINER= Ian McWilliam <kaosagnt@gmail.com>
PERMIT_PACKAGE_CDROM= incomplete license
PERMIT_PACKAGE_FTP= incomplete license
PERMIT_DISTFILES_FTP= Yes
# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += c

4
print/mpage/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (mpage-2.5.6.tgz) = T+Zt/Cf3xL+8pg72F/loqi5u6HfokhqpaMFqA6pO3AQ=
SIZE (mpage-2.5.6.tgz) = 86748
SHA256 (mpage-2.5.7.tgz) = UaucTl/dN+A8kN9nVvMMC2GjTwZstiX4kk/u3Es+w/4=
SIZE (mpage-2.5.7.tgz) = 87190

11
print/mpage/patches/patch-args_c
View File

@ -1,7 +1,8 @@
$OpenBSD: patch-args_c,v 1.5 2010/05/26 13:53:16 jasper Exp $
--- args.c.orig Mon May 31 05:37:45 2004
+++ args.c Fri May 21 11:57:57 2010
@@ -36,6 +36,7 @@ do_args(int argc, char **argv, int envflag)
$OpenBSD: patch-args_c,v 1.6 2017/08/23 07:45:00 jca Exp $
Index: args.c
--- args.c.orig
+++ args.c
@@ -44,6 +44,7 @@ do_args(int argc, char **argv, int envflag)
int finished;
int currarg;
int opterrors;
@ -9,7 +10,7 @@ $OpenBSD: patch-args_c,v 1.5 2010/05/26 13:53:16 jasper Exp $
int i;
@@ -152,18 +153,17 @@ do_args(int argc, char **argv, int envflag)
@@ -160,18 +161,17 @@ do_args(int argc, char **argv, int envflag)
break;
case 'C': /* select character definitions */
consumed = 1;

19
print/mpage/patches/patch-file_c
View File

@ -1,7 +1,8 @@
$OpenBSD: patch-file_c,v 1.3 2010/05/26 13:53:16 jasper Exp $
--- file.c.orig Sat Sep 17 20:38:53 2005
+++ file.c Wed Mar 24 12:18:35 2010
@@ -18,6 +18,7 @@
$OpenBSD: patch-file_c,v 1.4 2017/08/23 07:45:00 jca Exp $
Index: file.c
--- file.c.orig
+++ file.c
@@ -26,6 +26,7 @@
*/
@ -9,7 +10,7 @@ $OpenBSD: patch-file_c,v 1.3 2010/05/26 13:53:16 jasper Exp $
#include "mpage.h"
@@ -119,11 +120,11 @@ do_pr_file(fname, asheet, outfd)
@@ -127,11 +128,11 @@ do_pr_file(fname, asheet, outfd)
*/
#define DASHES "-- "
if (opt_header != NULL)
@ -23,7 +24,7 @@ $OpenBSD: patch-file_c,v 1.3 2010/05/26 13:53:16 jasper Exp $
asheet->sh_plength, asheet->sh_cwidth,
fname[0] == '-' ? DASHES : "", fname);
/*
@@ -168,7 +169,7 @@ do_stdin(asheet, outfd)
@@ -176,7 +177,7 @@ do_stdin(asheet, outfd)
* but the tmpfilename
*/
@ -32,7 +33,7 @@ $OpenBSD: patch-file_c,v 1.3 2010/05/26 13:53:16 jasper Exp $
if ( (tmpfd = mkstemp(tmpfile)) == -1) {
fprintf(stderr, "%s: cannot create temporary file", MPAGE);
perror(MPAGE);
@@ -209,7 +210,7 @@ do_stdin(asheet, outfd)
@@ -217,7 +218,7 @@ do_stdin(asheet, outfd)
* a temporary file; this temporary file will then
* be used as input to the do_doc routine
*/
@ -41,7 +42,7 @@ $OpenBSD: patch-file_c,v 1.3 2010/05/26 13:53:16 jasper Exp $
if ( (tmpfd = mkstemp(tmpfile)) == -1) {
fprintf(stderr, "%s: cannot create temporary file", MPAGE);
perror(MPAGE);
@@ -217,11 +218,11 @@ do_stdin(asheet, outfd)
@@ -225,11 +226,11 @@ do_stdin(asheet, outfd)
}
close(tmpfd);
if (opt_header != NULL)
@ -55,7 +56,7 @@ $OpenBSD: patch-file_c,v 1.3 2010/05/26 13:53:16 jasper Exp $
asheet->sh_plength, asheet->sh_cwidth, tmpfile);
/*
* open a pipe to the pr(1) command which will create a
@@ -281,7 +282,7 @@ do_stdin(asheet, outfd)
@@ -289,7 +290,7 @@ do_stdin(asheet, outfd)
/*
* store the input to the temporary file to guess encoding correctly
*/

9
print/mpage/patches/patch-mpage_c
View File

@ -1,7 +1,8 @@
$OpenBSD: patch-mpage_c,v 1.2 2010/05/26 13:53:16 jasper Exp $
--- mpage.c.orig Wed Jan 9 21:47:07 2008
+++ mpage.c Wed Mar 24 12:13:27 2010
@@ -79,10 +79,10 @@ char **argv;
$OpenBSD: patch-mpage_c,v 1.3 2017/08/23 07:45:00 jca Exp $
Index: mpage.c
--- mpage.c.orig
+++ mpage.c
@@ -87,10 +87,10 @@ char **argv;
*/
if (doprint) {
if (printque != NULL)

11
print/mpage/patches/patch-mpage_h
View File

@ -1,7 +1,8 @@
$OpenBSD: patch-mpage_h,v 1.2 2010/05/26 13:53:16 jasper Exp $
--- mpage.h.orig Mon Jan 14 23:52:30 2008
+++ mpage.h Fri May 21 12:02:36 2010
@@ -204,6 +204,13 @@ struct pagebox {
$OpenBSD: patch-mpage_h,v 1.3 2017/08/23 07:45:00 jca Exp $
Index: mpage.h
--- mpage.h.orig
+++ mpage.h
@@ -211,6 +211,13 @@ struct pagebox {
int thick;/* line thickness */
};
@ -15,7 +16,7 @@ $OpenBSD: patch-mpage_h,v 1.2 2010/05/26 13:53:16 jasper Exp $
/*
* Structure to describe a physical piece of paper, e.g. A4 or Letter
@@ -213,14 +220,6 @@ struct page_desc {
@@ -220,14 +227,6 @@ struct page_desc {
int width;
int height;
};

17
print/mpage/patches/patch-post_c
View File

@ -1,7 +1,8 @@
$OpenBSD: patch-post_c,v 1.3 2010/05/19 14:55:00 espie Exp $
--- post.c.orig Wed Oct 16 23:45:54 2002
+++ post.c Wed May 19 14:52:00 2010
@@ -353,6 +353,7 @@ ps_copyprolog(fd, outfd)
$OpenBSD: patch-post_c,v 1.4 2017/08/23 07:45:00 jca Exp $
Index: post.c
--- post.c.orig
+++ post.c
@@ -361,6 +361,7 @@ ps_copyprolog(fd, outfd)
FILE *fd;
FILE *outfd;
{
@ -9,7 +10,7 @@ $OpenBSD: patch-post_c,v 1.3 2010/05/19 14:55:00 espie Exp $
Debug(DB_PSDOC, "%%ps_copyprolog: adding mpage prolog\n", 0);
if (!have_showsheet) {
@@ -399,15 +400,17 @@ ps_copyprolog(fd, outfd)
@@ -407,15 +408,17 @@ ps_copyprolog(fd, outfd)
*/
if (tex1)
free(tex1);
@ -31,7 +32,7 @@ $OpenBSD: patch-post_c,v 1.3 2010/05/19 14:55:00 espie Exp $
}
}
fprintf(outfd, "%s", currline);
@@ -432,7 +435,7 @@ ps_roff_copyprolog(fd, outfd)
@@ -440,7 +443,7 @@ ps_roff_copyprolog(fd, outfd)
/* if (strcmp(currline, "xi\n") == 0) */
if (strstr(currline, "xi\n")) {
fprintf(outfd, "%%%s", currline);
@ -40,7 +41,7 @@ $OpenBSD: patch-post_c,v 1.3 2010/05/19 14:55:00 espie Exp $
}
else if (strncmp(currline, "%%Page:", 7) == 0) {
fprintf(outfd, "/p { } def\n");
@@ -1013,6 +1016,8 @@ post_one_line(line, fd, outfd, indoc, flush_page)
@@ -1021,6 +1024,8 @@ post_one_line(line, fd, outfd, indoc, flush_page)
int * indoc;
int flush_page;
{
@ -49,7 +50,7 @@ $OpenBSD: patch-post_c,v 1.3 2010/05/19 14:55:00 espie Exp $
if (strncmp(line, "%%BeginDocument", 15) == 0) {
(*indoc)++;
}
@@ -1063,15 +1068,17 @@ post_one_line(line, fd, outfd, indoc, flush_page)
@@ -1071,15 +1076,17 @@ post_one_line(line, fd, outfd, indoc, flush_page)
*/
if (tex1)
free(tex1);