summaryrefslogtreecommitdiff
path: root/print/mpage
diff options
context:
space:
mode:
authorwiz <wiz>2002-02-16 01:21:52 +0000
committerwiz <wiz>2002-02-16 01:21:52 +0000
commit7baaa3f25a1963d13a9c9e98c4a864b09231734e (patch)
tree8f82e0e50eebab2eceee09d711aad8fa346e8455 /print/mpage
parent59ab01fc1ceb6b4cbcacb6cca6401efe2cffde1d (diff)
downloadpkgsrc-7baaa3f25a1963d13a9c9e98c4a864b09231734e.tar.gz
Obey PAPERSIZE, as requested in pkg/15504.
Diffstat (limited to 'print/mpage')
-rw-r--r--print/mpage/Makefile12
-rw-r--r--print/mpage/distinfo4
-rw-r--r--print/mpage/patches/patch-aa13
3 files changed, 23 insertions, 6 deletions
diff --git a/print/mpage/Makefile b/print/mpage/Makefile
index 7e63404858e..3d6afe0d26d 100644
--- a/print/mpage/Makefile
+++ b/print/mpage/Makefile
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile,v 1.7 2002/02/09 19:25:33 jlam Exp $
-# FreeBSD Id: Makefile,v 1.1.1.1 1998/02/20 04:37:31 steve Exp
+# $NetBSD: Makefile,v 1.8 2002/02/16 01:21:52 wiz Exp $
+#
DISTNAME= mpage-2.5
CATEGORIES= print
@@ -12,4 +12,12 @@ COMMENT= Print multiple pages per sheet of paper
USE_BUILDLINK_ONLY= yes
ALL_TARGET= default
+.include "../../mk/bsd.prefs.mk"
+
+.if ${PAPERSIZE} == "A4"
+MAKEFLAGS+= PAGESIZE=PAGE_A4
+.elif ((${PAPERSIZE} == "Letter") || (${PAPERSIZE} == "Letterdj"))
+MAKEFLAGS+= PAGESIZE=PAGE_LETTER
+.endif
+
.include "../../mk/bsd.pkg.mk"
diff --git a/print/mpage/distinfo b/print/mpage/distinfo
index f9dcfa30c63..820d88c486e 100644
--- a/print/mpage/distinfo
+++ b/print/mpage/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 12:41:52 agc Exp $
+$NetBSD: distinfo,v 1.3 2002/02/16 01:21:52 wiz Exp $
SHA1 (mpage-2.5.tgz) = 84253fe3551b37ca857e487a93cca7532608ed29
Size (mpage-2.5.tgz) = 59386 bytes
-SHA1 (patch-aa) = 13bc6df891c4207c9577a9e0fe7779fa442ec53b
+SHA1 (patch-aa) = aaf640f11ac2a48d021cc868854b067c3dd20e7d
diff --git a/print/mpage/patches/patch-aa b/print/mpage/patches/patch-aa
index f7103cda39e..d63a7ba81ca 100644
--- a/print/mpage/patches/patch-aa
+++ b/print/mpage/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.3 2000/12/08 07:24:22 jlam Exp $
+$NetBSD: patch-aa,v 1.4 2002/02/16 01:21:53 wiz Exp $
---- Makefile.orig Tue Nov 25 18:16:06 1997
+--- Makefile.orig Wed Nov 26 00:16:06 1997
+++ Makefile
@@ -30,7 +30,6 @@
# Set this to an ANSI compatible C compiler (preferably gcc)
@@ -10,6 +10,15 @@ $NetBSD: patch-aa,v 1.3 2000/12/08 07:24:22 jlam Exp $
############################################################################
#
+@@ -45,7 +44,7 @@
+ # PAGE_A4 for European A4
+ #
+ # PAGESIZE=PAGE_LETTER
+-PAGESIZE=PAGE_A4
++#PAGESIZE=PAGE_A4
+
+ #
+ # Define your spooler type
@@ -55,9 +54,8 @@
SPOOL_TYPE=BSD_SPOOLER