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, 23 insertions, 28 deletions

diff --git a/print/xpdf-japanese/DEINSTALL b/print/xpdf-japanese/DEINSTALL
index c9cac1ac59a..9fa5f7d2109 100644
--- a/print/xpdf-japanese/DEINSTALL
+++ b/print/xpdf-japanese/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:56 salo Exp $
 
 PKGNAME=$1
 STAGE=$2
 
-XPDFRC=${PKG_PREFIX}/etc/xpdfrc
+XPDFRC=@PKG_SYSCONFDIR@/xpdfrc
 
 case ${STAGE} in
 DEINSTALL)
 	;;
 
 POST-DEINSTALL)
-	sed -e "/apanese/d" ${XPDFRC} > ${XPDFRC}.tmp
-	sed -e "/jisx0208/d" ${XPDFRC}.tmp > ${XPDFRC}
-	rm -f ${XPDFRC}.tmp
+	@SED@ -e "/apanese/d" ${XPDFRC} > ${XPDFRC}.tmp
+	@SED@ -e "/jisx0208/d" ${XPDFRC}.tmp > ${XPDFRC}
+	@RM@ -f ${XPDFRC}.tmp
 	;;
 
 *)
diff --git a/print/xpdf-japanese/DESCR b/print/xpdf-japanese/DESCR
index 65fb58c9ef8..4ea50bbbf2a 100644
--- a/print/xpdf-japanese/DESCR
+++ b/print/xpdf-japanese/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
 Japanese PDF files.
 
diff --git a/print/xpdf-japanese/Makefile b/print/xpdf-japanese/Makefile
index 44529562a0f..ad2e1a8bd87 100644
--- a/print/xpdf-japanese/Makefile
+++ b/print/xpdf-japanese/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2002/09/19 19:21:39 kei Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/25 14:06:57 salo Exp $
 #
 
 DISTNAME=	xpdf-japanese
-PKGNAME=	${DISTNAME}-20020521
+PKGNAME=	${DISTNAME}-20020401
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
 
@@ -10,31 +10,32 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.foolabs.com/xpdf/
 COMMENT=	xpdf support files for Japanese
 
-DEPENDS+=	xpdf>=1.00:../../print/xpdf
+DEPENDS+=	xpdf>=2.02:../../print/xpdf
 
-USE_X11BASE=	yes
+USE_X11=	yes
+USE_PKGINSTALL=	yes
 
-DIST_SUBDIR=	${PKGNAME}
+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/japanese
+	${INSTALL_DATA_DIR} ${PREFIX}/share/xpdf/japanese
 	${INSTALL_DATA} ${WRKSRC}/Adobe-Japan1.cidToUnicode \
-		${X11PREFIX}/share/xpdf/japanese
+		${PREFIX}/share/xpdf/japanese
 	${INSTALL_DATA} ${WRKSRC}/EUC-JP.unicodeMap \
-		${X11PREFIX}/share/xpdf/japanese
+		${PREFIX}/share/xpdf/japanese
 	${INSTALL_DATA} ${WRKSRC}/ISO-2022-JP.unicodeMap \
-		${X11PREFIX}/share/xpdf/japanese
+		${PREFIX}/share/xpdf/japanese
 	${INSTALL_DATA} ${WRKSRC}/Shift-JIS.unicodeMap \
-		${X11PREFIX}/share/xpdf/japanese
-	${INSTALL_DATA_DIR} ${X11PREFIX}/share/xpdf/japanese/CMap
-	${INSTALL_DATA} ${WRKSRC}/CMap/* ${X11PREFIX}/share/xpdf/japanese/CMap
+		${PREFIX}/share/xpdf/japanese
+	${INSTALL_DATA_DIR} ${PREFIX}/share/xpdf/japanese/CMap
+	${INSTALL_DATA} ${WRKSRC}/CMap/* ${PREFIX}/share/xpdf/japanese/CMap
 
 post-install:
 	${CAT} ${WRKSRC}/add-to-xpdfrc >> ${PKG_SYSCONFDIR}/xpdfrc
diff --git a/print/xpdf-japanese/PLIST b/print/xpdf-japanese/PLIST
index 8dffbcb54e5..fc586e942f1 100644
--- a/print/xpdf-japanese/PLIST
+++ b/print/xpdf-japanese/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/12/09 16:01:40 tron Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/03/25 14:06:57 salo Exp $
 share/xpdf/japanese/Adobe-Japan1.cidToUnicode
 share/xpdf/japanese/CMap/78-EUC-H
 share/xpdf/japanese/CMap/78-EUC-V
@@ -59,4 +59,3 @@ share/xpdf/japanese/ISO-2022-JP.unicodeMap
 share/xpdf/japanese/Shift-JIS.unicodeMap
 @dirrm share/xpdf/japanese/CMap
 @dirrm share/xpdf/japanese
-@unexec ${RMDIR} %D/share/xpdf 2> /dev/null || ${TRUE}
diff --git a/print/xpdf-japanese/distinfo b/print/xpdf-japanese/distinfo
index d3e5f81a3b2..1db8e10984f 100644
--- a/print/xpdf-japanese/distinfo
+++ b/print/xpdf-japanese/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/08/06 14:04:34 wiz Exp $
+$NetBSD: distinfo,v 1.2 2003/03/25 14:06:58 salo Exp $
 
-SHA1 (xpdf-japanese-20020521/xpdf-japanese.tar.gz) = d01254ae8c1e14232e44edf89f84a0f05b479372
-Size (xpdf-japanese-20020521/xpdf-japanese.tar.gz) = 430478 bytes
+SHA1 (xpdf-japanese-20020401/xpdf-japanese.tar.gz) = 056897c3a15708c8bb3702245afed3b70e08dd78
+Size (xpdf-japanese-20020401/xpdf-japanese.tar.gz) = 430457 bytes