From a2e9765caee5dede949c3e6c01715ee2fffc9c15 Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Mon, 6 Nov 2006 10:47:18 +0000
Subject: Switch to modular buildlinks and prefer OWN_DIRS over PLIST
 exec/unexec.

---
 print/xpdf/Makefile | 8 +++-----
 print/xpdf/PLIST    | 4 +---
 2 files changed, 4 insertions(+), 8 deletions(-)

(limited to 'print')

diff --git a/print/xpdf/Makefile b/print/xpdf/Makefile
index cc25ce53dcb..be01c54a301 100644
--- a/print/xpdf/Makefile
+++ b/print/xpdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2006/10/09 12:52:36 joerg Exp $
+# $NetBSD: Makefile,v 1.59 2006/11/06 10:47:18 joerg Exp $
 
 DISTNAME=	xpdf-3.01
 PKGNAME=	${DISTNAME}pl2
@@ -47,15 +47,13 @@ SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.paths+=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
 SUBST_STAGE.paths=	post-patch
 
-# Used by supplemental packages.
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/xpdf
+OWN_DIRS=		share/xpdf
 
 BUILDLINK_API_DEPENDS.freetype2+=	freetype2>=2.2.1
 
 .include "../../fonts/t1lib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/xpdf/PLIST b/print/xpdf/PLIST
index 2be7be903da..c4420e3fc9e 100644
--- a/print/xpdf/PLIST
+++ b/print/xpdf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2004/03/03 10:50:09 adam Exp $
+@comment $NetBSD: PLIST,v 1.8 2006/11/06 10:47:18 joerg Exp $
 bin/pdffonts
 bin/pdfimages
 bin/pdfinfo
@@ -15,6 +15,4 @@ man/man1/pdftotext.1
 man/man1/xpdf.1
 man/man5/xpdfrc.5
 share/examples/xpdf/xpdfrc
-@exec ${MKDIR} %D/share/xpdf
-@dirrm share/xpdf
 @dirrm share/examples/xpdf
-- 
cgit v1.2.3