1. Fix last commit if PAPERSIZE's not defined anywhere

2. Split out common code.

3 files changed, 44 insertions, 62 deletions

diff --git a/graphics/xpdf-crypto/Makefile b/graphics/xpdf-crypto/Makefile
index ce798f015e2..19c61ac10bd 100644
--- a/graphics/xpdf-crypto/Makefile
+++ b/graphics/xpdf-crypto/Makefile
@@ -1,45 +1,19 @@
-# $NetBSD: Makefile,v 1.2 1999/10/23 15:12:54 fredb Exp $
+# $NetBSD: Makefile,v 1.3 1999/10/25 01:36:26 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.12 1998/03/11 03:08:12 vanilla Exp
 # 
 
-DISTNAME=	xpdf-0.90
-PKGNAME=	xpdf-crypto-0.90
-CATEGORIES=	graphics print
-MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
-EXTRACT_SUFX=	.tgz
+PKGNAME=	xpdf-crypto-${VERS}
 
 PATCH_SITES=	http://www.fefe.de/
 PATCHFILES=	xpdf-0.90-fefe-diff2.gz
 PATCH_DIST_STRIP= -p1
 
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.foolabs.com/xpdf/
-
-DEPENDS+=	t1lib-0.9.2:../../textproc/t1lib
-DEPENDS+=	xpm-3.4k:../../graphics/xpm
+MAINTAINER=     packages@netbsd.org
+HOMEPAGE=       http://www.foolabs.com/xpdf/
 
 RESTRICTED=	"Crypto; export-controlled"
 MIRROR_DISTFILE= no
 
-USE_X11BASE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+= --enable-japanese
-
 CONFLICTS=	xpdf-0.[789][a0]
 
-MAN1=		xpdf.1 pdftops.1 pdftotext.1 pdfinfo.1 pdftopbm.1 pdfimages.1
-
-post-install:
-	@cd ${WRKSRC}/doc; \
-	  for m in ${MAN1}; do \
-	    nroff -Tascii -mandoc $$m > $${m%.1}.0; \
-	  done; \
-	  ${ECHO} ${INSTALL_MAN} ${MAN1:S/.1/.0/} ${PREFIX}/man/cat1; \
-	  ${INSTALL_MAN} ${MAN1:S/.1/.0/} ${PREFIX}/man/cat1
-
-.include "../../mk/bsd.prefs.mk"
-.if ${PAPERSIZE} == "A4"
-CONFIGURE_ARGS+= --enable-a4-paper
-.endif
-
-.include "../../mk/bsd.pkg.mk"
+.include "../xpdf/Makefile.common"
diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile
index 7c15634070e..4e7760e516f 100644
--- a/graphics/xpdf/Makefile
+++ b/graphics/xpdf/Makefile
@@ -1,37 +1,8 @@
-# $NetBSD: Makefile,v 1.11 1999/10/23 15:08:31 fredb Exp $
+# $NetBSD: Makefile,v 1.12 1999/10/25 01:36:27 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.12 1998/03/11 03:08:12 vanilla Exp
 # 
 
-DISTNAME=	xpdf-0.90
-CATEGORIES=	graphics print
-MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
-EXTRACT_SUFX=	.tgz
-
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.foolabs.com/xpdf/
 
-DEPENDS+=	t1lib-0.9.2:../../textproc/t1lib
-DEPENDS+=	xpm-3.4k:../../graphics/xpm
-
-USE_X11BASE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--enable-japanese
-
-CONFLICTS=	xpdf-crypto-0.90
-
-MAN1=		xpdf.1 pdftops.1 pdftotext.1 pdfinfo.1 pdftopbm.1 pdfimages.1
-
-post-install:
-	@cd ${WRKSRC}/doc; \
-	  for m in ${MAN1}; do \
-	    nroff -Tascii -mandoc $$m > $${m%.1}.0; \
-	  done; \
-	  ${ECHO} ${INSTALL_MAN} ${MAN1:S/.1/.0/} ${PREFIX}/man/cat1; \
-	  ${INSTALL_MAN} ${MAN1:S/.1/.0/} ${PREFIX}/man/cat1
-
-.include "../../mk/bsd.prefs.mk"
-.if ${PAPERSIZE} == "A4"
-CONFIGURE_ARGS+= --enable-a4-paper
-.endif
-
-.include "../../mk/bsd.pkg.mk"
+.include "Makefile.common"
diff --git a/graphics/xpdf/Makefile.common b/graphics/xpdf/Makefile.common
new file mode 100644
index 00000000000..35c7fe5e0b6
--- /dev/null
+++ b/graphics/xpdf/Makefile.common
@@ -0,0 +1,37 @@
+# $NetBSD: Makefile.common,v 1.1 1999/10/25 01:36:27 hubertf Exp $
+# FreeBSD Id: Makefile,v 1.12 1998/03/11 03:08:12 vanilla Exp
+# 
+
+#
+# Common Makefile for xpdf and xpdf-crypto pkgs
+#
+
+VERS=		0.90
+DISTNAME=	xpdf-${VERS}
+CATEGORIES=	graphics print
+MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
+EXTRACT_SUFX=	.tgz
+
+DEPENDS+=	t1lib-0.9.2:../../textproc/t1lib
+DEPENDS+=	xpm-3.4k:../../graphics/xpm
+
+USE_X11BASE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=--enable-japanese
+
+MAN1=		xpdf.1 pdftops.1 pdftotext.1 pdfinfo.1 pdftopbm.1 pdfimages.1
+
+post-install:
+	@cd ${WRKSRC}/doc; \
+	  for m in ${MAN1}; do \
+	    nroff -Tascii -mandoc $$m > $${m%.1}.0; \
+	  done; \
+	  ${ECHO} ${INSTALL_MAN} ${MAN1:S/.1/.0/} ${PREFIX}/man/cat1; \
+	  ${INSTALL_MAN} ${MAN1:S/.1/.0/} ${PREFIX}/man/cat1
+
+.include "../../mk/bsd.prefs.mk"
+.if defined(PAPERSIZE) && ${PAPERSIZE} == "A4"
+CONFIGURE_ARGS+= --enable-a4-paper
+.endif
+
+.include "../../mk/bsd.pkg.mk"