summaryrefslogtreecommitdiff
path: root/print
diff options
context:
space:
mode:
Diffstat (limited to 'print')
-rw-r--r--print/mpage/Makefile8
-rw-r--r--print/mpage/distinfo10
-rw-r--r--print/mpage/patches/patch-aa45
3 files changed, 31 insertions, 32 deletions
diff --git a/print/mpage/Makefile b/print/mpage/Makefile
index c7386c6f060..fd0c6b3b05e 100644
--- a/print/mpage/Makefile
+++ b/print/mpage/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2006/03/04 21:30:31 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2007/03/17 01:11:22 reed Exp $
#
-DISTNAME= mpage-2.5
+DISTNAME= mpage-2.5.5
CATEGORIES= print
-MASTER_SITES= ftp://ftp.mesa.nl/pub/mpage/
+MASTER_SITES= ftp://ftp.mesa.nl/pub/mpage/ \
+ http://www.mesa.nl/pub/mpage/
EXTRACT_SUFX= .tgz
MAINTAINER= pkgsrc-users@NetBSD.org
@@ -11,6 +12,7 @@ COMMENT= Print multiple pages per sheet of paper
HOMEPAGE= http://www.mesa.nl/download.html
BUILD_TARGET= default
+MAKE_ENV+= MANDIR=${PREFIX}/${PKGMANDIR}/man1
.include "../../mk/bsd.prefs.mk"
diff --git a/print/mpage/distinfo b/print/mpage/distinfo
index 9713e24b556..0005aafa275 100644
--- a/print/mpage/distinfo
+++ b/print/mpage/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2005/12/27 23:50:07 reed Exp $
+$NetBSD: distinfo,v 1.6 2007/03/17 01:11:22 reed Exp $
-SHA1 (mpage-2.5.tgz) = 84253fe3551b37ca857e487a93cca7532608ed29
-RMD160 (mpage-2.5.tgz) = cf035f5f3c8fbe9ad448e94ab3f3f6d3811b5bc5
-Size (mpage-2.5.tgz) = 59386 bytes
-SHA1 (patch-aa) = 6c704d0621356936a9bcc1b1a13c179def078d47
+SHA1 (mpage-2.5.5.tgz) = 5c53a31c2dc40c867ba1ca31e9912c99c90f3e74
+RMD160 (mpage-2.5.5.tgz) = 35c1acb0889f952c42eee52d013fb78dceb9db66
+Size (mpage-2.5.5.tgz) = 86409 bytes
+SHA1 (patch-aa) = 2a48eb59e02842720be4320326123009ba67e3da
diff --git a/print/mpage/patches/patch-aa b/print/mpage/patches/patch-aa
index 8e56fafe83d..bdc1c1a8589 100644
--- a/print/mpage/patches/patch-aa
+++ b/print/mpage/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2005/12/27 23:50:07 reed Exp $
+$NetBSD: patch-aa,v 1.6 2007/03/17 01:11:22 reed Exp $
---- Makefile.orig 1997-11-25 15:16:06.000000000 -0800
-+++ Makefile
-@@ -30,7 +30,6 @@
+--- Makefile.orig 2004-05-30 14:38:31.000000000 -0500
++++ Makefile 2006-11-30 17:26:46.000000000 -0600
+@@ -24,7 +24,6 @@
# Set this to an ANSI compatible C compiler (preferably gcc)
# See also system specific settings below
#CC=cc
@@ -10,29 +10,30 @@ $NetBSD: patch-aa,v 1.5 2005/12/27 23:50:07 reed Exp $
############################################################################
#
-@@ -45,7 +44,7 @@ CC=gcc
- # PAGE_A4 for European A4
+@@ -40,7 +39,7 @@
+ # See glob.c for all possibilities
#
- # PAGESIZE=PAGE_LETTER
--PAGESIZE=PAGE_A4
-+#PAGESIZE=PAGE_A4
+ # PAGESIZE=Letter
+-PAGESIZE=A4
++#PAGESIZE=A4
#
# Define your spooler type
-@@ -55,10 +54,9 @@ PAGESIZE=PAGE_A4
+@@ -50,11 +49,11 @@
SPOOL_TYPE=BSD_SPOOLER
# PREFIX=e:/usr # OS/2 type
-PREFIX=/usr/local
++#PREFIX=/usr/local
+ #PREFIX=/usr
BINDIR=$(PREFIX)/bin
--LIBDIR=$(PREFIX)/lib
+ LIBDIR=$(PREFIX)/share
-MANDIR=$(PREFIX)/man/man1
-+LIBDIR=$(PREFIX)/share
-+MANDIR=$(PREFIX)/${PKGMANDIR}/man1
++#MANDIR=$(PREFIX)/man/man1
#
# A default encoding is given in encoding.h. Setting ENCODING=1 will
-@@ -110,8 +108,8 @@ DEF_FILE =
+@@ -106,8 +105,8 @@
# Choose one of the following CFLAGS/CC definitions:
# If you are using gcc, you probably don't need to change anything here.
@@ -43,18 +44,14 @@ $NetBSD: patch-aa,v 1.5 2005/12/27 23:50:07 reed Exp $
# AIX (xlC on aix 4):
#CFLAGS = -O2 -s $(DEFS)
-@@ -168,10 +166,10 @@ mpage.ps: mpage.1
-
-
- #
--# add your proper install stuff
-+# BSD specific install stuff
- #
- install:
+@@ -181,7 +180,6 @@
+ if [ ! -d $(LIBDIR)/mpage ] ; then mkdir -p $(LIBDIR)/mpage ; fi
+ if [ ! -d $(BINDIR) ] ; then mkdir -p $(BINDIR) ; fi
+ if [ ! -d $(MANDIR) ] ; then mkdir -p $(MANDIR) ; fi
- cp mpage$(E) $(BINDIR)
- cp mpage.1 $(MANDIR)
+- -cp Encodings/* $(LIBDIR)/mpage
+- -chmod 644 $(LIBDIR)/mpage/*
+ $(BSD_INSTALL_PROGRAM) mpage$(E) $(BINDIR)
+ $(BSD_INSTALL_MAN) mpage.1 $(MANDIR)
- if [ ! -d $(LIBDIR)/mpage ] ; then mkdir $(LIBDIR)/mpage ; fi
-- -cp Encodings/* $(LIBDIR)/mpage
+ $(BSD_INSTALL_DATA) Encodings/* $(LIBDIR)/mpage