Modify this package to use the papersize package, to set the default

paper size at run-time.

2 files changed, 22 insertions, 48 deletions

diff --git a/print/enscript/Makefile b/print/enscript/Makefile
index f3c8453ee6e..a51aa4bceb4 100644
--- a/print/enscript/Makefile
+++ b/print/enscript/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 1998/08/20 15:17:23 tsarna Exp $
+# $NetBSD: Makefile,v 1.9 1998/11/09 18:06:19 agc Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/11/27 08:10:30 tg Exp
 #
 
 DISTNAME=		enscript-1.6.1
-PKGNAME=		enscript-${PAPERSIZE}-1.6.1
 CATEGORIES=		print
 MASTER_SITES=		${MASTER_SITE_GNU}
 
@@ -12,36 +11,18 @@ HOMEPAGE=		http://www.ngs.fi/mtr/genscript/
 
 CONFLICTS=		enscript-Letter-1.6.0 enscript-A4-1.6.0 \
 			enscript-Letterdj-1.6.0
+CONFLICTS+=		enscript-Letter-1.6.1 enscript-A4-1.6.1 \
+			enscript-Letterdj-1.6.1
+
+DEPENDS+=		papersize-1.0:../../print/papersize
 
-MANUAL_PACKAGE_BUILD=	PAPERSIZE has to be set to Letter or A4
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--disable-nls --with-media=${PAPERSIZE}
+CONFIGURE_ARGS+=	--disable-nls
 CONFIGURE_ENV=		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
-MAKE_ENV+=		`${CAT} ${PAPER}`
 
 # If you want to build a static binary, uncomment the following line
 #LDFLAGS+=		-static
 
-PAPERSIZE?=		A4
-PAPER=			${.CURDIR}/${WRKDIR:T}/PaperSize
-
-pre-configure:
-	@case "X${PAPERSIZE}" in					\
-	XA4)								\
-		${ECHO} "WIDTH=8.27 HEIGHT=11.64" > ${PAPER};		\
-		;;							\
-	XLetter)							\
-		${ECHO} "WIDTH=8.5 HEIGHT=11.0" > ${PAPER};		\
-		;;							\
-	XLetterdj)							\
-		;;							\
-	*)								\
-		@${ECHO} "Error: PAPERSIZE invalid: \"${PAPERSIZE}\"";	\
-		@${ECHO} "Possible values are:  A4 (default) or Letter";\
-		${FALSE};						\
-		;;							\
-	esac
-
 post-install:
 .for file in enscript mkafmmap states
 	strip ${PREFIX}/bin/${file}
diff --git a/print/magicfilter/Makefile b/print/magicfilter/Makefile
index e9b048a158f..fec39591b5f 100644
--- a/print/magicfilter/Makefile
+++ b/print/magicfilter/Makefile
@@ -1,47 +1,40 @@
-# $NetBSD: Makefile,v 1.7 1998/11/08 22:03:57 tron Exp $
+# $NetBSD: Makefile,v 1.8 1998/11/09 18:09:02 agc Exp $
 
 DISTNAME=	magicfilter-1.2
-PKGNAME=	magicfilter-${PAPERSIZE}-1.2
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	system/printing
 
 MAINTAINER=	tron@netbsd.org
 
-DEPENDS+=	a2ps-${PAPERSIZE}-4.10.3:../../print/a2ps \
-		ghostscript-5.50:../../print/ghostscript5 \
-		netpbm-19940301:../../graphics/netpbm \
-		teTeX-0.4p8:../../print/teTeX
+DEPENDS+=	a2ps--4.10.3:../../print/a2ps			\
+		ghostscript-5.50:../../print/ghostscript5	\
+		netpbm-19940301:../../graphics/netpbm		\
+		teTeX-0.4p8:../../print/teTeX			\
+		papersize-1.0:../../print/papersize
 
-CONFLICTS=	magicfilter-1.2
+CONFLICTS=	magicfilter-A4-1.2 magicfilter-Letter-1.2
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
 PLIST_SRC=	${WRKDIR}/PLIST
 
-PAPERSIZE?=	A4
 FILTER_DIR=	libexec/magicfilter
 
 post-install:
 	@${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
 	@${MKDIR} ${PREFIX}/${FILTER_DIR}
-	@(cd ${WRKSRC}/filters; \
-	  for FILTER in *-filter; do \
-	    TARGET=${PREFIX}/${FILTER_DIR}/$$FILTER; \
-	    ${ECHO} "Installing $$FILTER as $$TARGET"; \
-	    ${SED} 's/-sOutputFile=-/-sOutputFile=- ${GS_OPTS}/' \
-		<$$FILTER >${PREFIX}/${FILTER_DIR}/$$FILTER; \
-	    chown ${BINOWN}:${BINGRP} $$TARGET; \
-	    chmod ${BINMODE} $$TARGET; \
-	    ${ECHO} ${FILTER_DIR}/$$FILTER >>${PLIST_SRC}; \
+	@(cd ${WRKSRC}/filters;					\
+	  for FILTER in *-filter; do				\
+	    TARGET=${PREFIX}/${FILTER_DIR}/$$FILTER;		\
+	    ${ECHO} "Installing $$FILTER as $$TARGET";		\
+	    ${SED} 's/-sOutputFile=-/-sOutputFile=- -sPAPERSIZE=${PAPERSIZE}/' \
+		<$$FILTER >${PREFIX}/${FILTER_DIR}/$$FILTER;	\
+	    chown ${BINOWN}:${BINGRP} $$TARGET;			\
+	    chmod ${BINMODE} $$TARGET;				\
+	    ${ECHO} ${FILTER_DIR}/$$FILTER >>${PLIST_SRC};	\
 	  done)
 	@${ECHO} "@dirrm ${FILTER_DIR}" >>${PLIST_SRC}
 
 .include "../../mk/bsd.pkg.mk"
-
-.if ${PAPERSIZE} == A4
-GS_OPTS=	-sPAPERSIZE=a4
-.else
-GS_OPTS=	-sPAPERSIZE=letter
-.endif