Sync with updated xpdf-2.02 package.

- install into PREFIX, not X11PREFIX
- DEPENDS on xpdf>=2.02 due to USE_X11BASE->USE_X11 change
- fix DEINSTALL files to really remove chunks added to xpdfrc,
  correctly define PKG_SYSCONFDIR, don't use direct commands
  (sed->@SED@, mv->@MV@, rm->@RM@)
- define USE_PKGINSTALL to correctly replace variables in DEINSTALL files
- consistently use DIST_SUBDIR
- don't define completely bogus version numbers, use dates from the
  MASTER_SITE and xpdfrc chunks
- remove PREFIX/share/xpdf from PLISTs, this directory is now part of the xpdf
  package
- remove superfluous license/copyright note from DESCR files
- bump PKGREVISION where necessary

5 files changed, 26 insertions, 29 deletions

diff --git a/print/xpdf-chinese-simplified/DEINSTALL b/print/xpdf-chinese-simplified/DEINSTALL
index fdc8132b009..68b1310cc73 100644
--- a/print/xpdf-chinese-simplified/DEINSTALL
+++ b/print/xpdf-chinese-simplified/DEINSTALL
@@ -1,20 +1,20 @@
 #!/bin/sh
 #
-# $NetBSD: DEINSTALL,v 1.1.1.1 2002/08/06 14:04:34 wiz Exp $
+# $NetBSD: DEINSTALL,v 1.2 2003/03/25 14:06:48 salo Exp $
 
 PKGNAME=$1
 STAGE=$2
 
-XPDFRC=${PKG_PREFIX}/etc/xpdfrc
+XPDFRC=@PKG_SYSCONFDIR@/xpdfrc
 
 case ${STAGE} in
 DEINSTALL)
 	;;
 
 POST-DEINSTALL)
-	sed -e "/implified/d" ${XPDFRC} > ${XPDFRC}.tmp
-	sed -e "/gb2312/d" ${XPDFRC}.tmp > ${XPDFRC}
-	rm -f ${XPDFRC}.tmp
+	@SED@ -e "/implified/d" ${XPDFRC} > ${XPDFRC}.tmp
+	@SED@ -e "/gb2312/d" ${XPDFRC}.tmp > ${XPDFRC}
+	@RM@ -f ${XPDFRC}.tmp
 	;;
 
 *)
diff --git a/print/xpdf-chinese-simplified/DESCR b/print/xpdf-chinese-simplified/DESCR
index ab50785e044..abaec0ec194 100644
--- a/print/xpdf-chinese-simplified/DESCR
+++ b/print/xpdf-chinese-simplified/DESCR
@@ -1,8 +1,3 @@
-If this package includes CMap files, they contain their own copyright
-notices and distribution conditions.  All other files in the package
-are Copyright 2002 Derek B. Noonburg, and are licensed under the GNU
-General Public License (GPL), version 2.
-
 This package provides support files needed to use the Xpdf tools with
 Chinese (Simplified) PDF files.
 
diff --git a/print/xpdf-chinese-simplified/Makefile b/print/xpdf-chinese-simplified/Makefile
index b7fced2137a..4d197b156b5 100644
--- a/print/xpdf-chinese-simplified/Makefile
+++ b/print/xpdf-chinese-simplified/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2002/11/08 10:02:36 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/25 14:06:48 salo Exp $
 #
 
-DISTNAME=	xpdf-chinese-simplified-2002-jun-17
-PKGNAME=	xpdf-chinese-simplified-20020617
+DISTNAME=	xpdf-chinese-simplified
+PKGNAME=	${DISTNAME}-20020617
+PKGREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
 
@@ -10,30 +11,32 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.foolabs.com/xpdf/
 COMMENT=	xpdf support files for Chinese (Simplified)
 
-DEPENDS+=	xpdf>=1.00:../../print/xpdf
+DEPENDS+=	xpdf>=2.02:../../print/xpdf
 
-USE_X11BASE=	yes
+USE_X11=	yes
+USE_PKGINSTALL=	yes
 
-WRKSRC=		${WRKDIR}/xpdf-chinese-simplified
+DIST_SUBDIR=	${PKGNAME_NOREV}
+WRKSRC=		${WRKDIR}/${DISTNAME}
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
 post-patch:
 	${MV} ${WRKSRC}/add-to-xpdfrc ${WRKSRC}/add-to-xpdfrc.orig
-	${SED} -e 's:/usr/local:'${X11PREFIX}':g' < ${WRKSRC}/add-to-xpdfrc.orig > ${WRKSRC}/add-to-xpdfrc
+	${SED} -e 's:/usr/local:'${PREFIX}':g' < ${WRKSRC}/add-to-xpdfrc.orig > ${WRKSRC}/add-to-xpdfrc
 
 do-install:
-	${INSTALL_DATA_DIR} ${X11PREFIX}/share/xpdf/chinese-simplified
+	${INSTALL_DATA_DIR} ${PREFIX}/share/xpdf/chinese-simplified
 	${INSTALL_DATA} ${WRKSRC}/Adobe-GB1.cidToUnicode \
-		${X11PREFIX}/share/xpdf/chinese-simplified
+		${PREFIX}/share/xpdf/chinese-simplified
 	${INSTALL_DATA} ${WRKSRC}/EUC-CN.unicodeMap \
-		${X11PREFIX}/share/xpdf/chinese-simplified
+		${PREFIX}/share/xpdf/chinese-simplified
 	${INSTALL_DATA} ${WRKSRC}/GBK.unicodeMap \
-		${X11PREFIX}/share/xpdf/chinese-simplified
+		${PREFIX}/share/xpdf/chinese-simplified
 	${INSTALL_DATA} ${WRKSRC}/ISO-2022-CN.unicodeMap \
-		${X11PREFIX}/share/xpdf/chinese-simplified
-	${INSTALL_DATA_DIR} ${X11PREFIX}/share/xpdf/chinese-simplified/CMap
-	${INSTALL_DATA} ${WRKSRC}/CMap/* ${X11PREFIX}/share/xpdf/chinese-simplified/CMap
+		${PREFIX}/share/xpdf/chinese-simplified
+	${INSTALL_DATA_DIR} ${PREFIX}/share/xpdf/chinese-simplified/CMap
+	${INSTALL_DATA} ${WRKSRC}/CMap/* ${PREFIX}/share/xpdf/chinese-simplified/CMap
 
 post-install:
 	${CAT} ${WRKSRC}/add-to-xpdfrc >> ${PKG_SYSCONFDIR}/xpdfrc
diff --git a/print/xpdf-chinese-simplified/PLIST b/print/xpdf-chinese-simplified/PLIST
index 1671e8a01bb..0e5a2286b09 100644
--- a/print/xpdf-chinese-simplified/PLIST
+++ b/print/xpdf-chinese-simplified/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/12/09 16:01:38 tron Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/03/25 14:06:49 salo Exp $
 share/xpdf/chinese-simplified/Adobe-GB1.cidToUnicode
 share/xpdf/chinese-simplified/CMap/Adobe-GB1-0
 share/xpdf/chinese-simplified/CMap/Adobe-GB1-1
@@ -36,4 +36,3 @@ share/xpdf/chinese-simplified/GBK.unicodeMap
 share/xpdf/chinese-simplified/ISO-2022-CN.unicodeMap
 @dirrm share/xpdf/chinese-simplified/CMap
 @dirrm share/xpdf/chinese-simplified
-@unexec ${RMDIR} %D/share/xpdf 2> /dev/null || ${TRUE}
diff --git a/print/xpdf-chinese-simplified/distinfo b/print/xpdf-chinese-simplified/distinfo
index de76367d160..8a3b32c5d00 100644
--- a/print/xpdf-chinese-simplified/distinfo
+++ b/print/xpdf-chinese-simplified/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2002/11/08 10:02:36 wiz Exp $
+$NetBSD: distinfo,v 1.3 2003/03/25 14:06:49 salo Exp $
 
-SHA1 (xpdf-chinese-simplified-2002-jun-17.tar.gz) = 5243476337da12007a1beb11306fa3df34fefd49
-Size (xpdf-chinese-simplified-2002-jun-17.tar.gz) = 756188 bytes
+SHA1 (xpdf-chinese-simplified-20020617/xpdf-chinese-simplified.tar.gz) = 5243476337da12007a1beb11306fa3df34fefd49
+Size (xpdf-chinese-simplified-20020617/xpdf-chinese-simplified.tar.gz) = 756188 bytes