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, 17 insertions, 22 deletions

diff --git a/print/xpdf-cyrillic/DEINSTALL b/print/xpdf-cyrillic/DEINSTALL
index 8fec0622e43..e96be09cf0f 100644
--- a/print/xpdf-cyrillic/DEINSTALL
+++ b/print/xpdf-cyrillic/DEINSTALL
@@ -1,19 +1,19 @@
 #!/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:51 salo Exp $
 
 PKGNAME=$1
 STAGE=$2
 
-XPDFRC=${PKG_PREFIX}/etc/xpdfrc
+XPDFRC=@PKG_SYSCONFDIR@/xpdfrc
 
 case ${STAGE} in
 DEINSTALL)
 	;;
 
 POST-DEINSTALL)
-	sed -e "/yrillic/d" ${XPDFRC} > ${XPDFRC}.tmp
-	mv -f ${XPDFRC}.tmp ${XPDFRC}
+	@SED@ -e "/yrillic/d" ${XPDFRC} > ${XPDFRC}.tmp
+	@MV@ -f ${XPDFRC}.tmp ${XPDFRC}
 	;;
 
 *)
diff --git a/print/xpdf-cyrillic/DESCR b/print/xpdf-cyrillic/DESCR
index cbafcf3aa5d..e835b770b33 100644
--- a/print/xpdf-cyrillic/DESCR
+++ b/print/xpdf-cyrillic/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
 Cyrillic PDF files.
 
diff --git a/print/xpdf-cyrillic/Makefile b/print/xpdf-cyrillic/Makefile
index 16747ddea04..46764f6eedb 100644
--- a/print/xpdf-cyrillic/Makefile
+++ b/print/xpdf-cyrillic/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:52 salo Exp $
 #
 
 DISTNAME=	xpdf-cyrillic
-PKGNAME=	${DISTNAME}-20020521
+PKGNAME=	${DISTNAME}-20020116
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
 
@@ -10,23 +10,24 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.foolabs.com/xpdf/
 COMMENT=	xpdf support files for Cyrillic
 
-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/cyrillic
+	${INSTALL_DATA_DIR} ${PREFIX}/share/xpdf/cyrillic
 	${INSTALL_DATA} ${WRKSRC}/KOI8-R.unicodeMap \
-		${X11PREFIX}/share/xpdf/cyrillic
+		${PREFIX}/share/xpdf/cyrillic
 
 post-install:
 	${CAT} ${WRKSRC}/add-to-xpdfrc >> ${PKG_SYSCONFDIR}/xpdfrc
diff --git a/print/xpdf-cyrillic/PLIST b/print/xpdf-cyrillic/PLIST
index f6856617f2d..b66866c0519 100644
--- a/print/xpdf-cyrillic/PLIST
+++ b/print/xpdf-cyrillic/PLIST
@@ -1,4 +1,3 @@
-@comment $NetBSD: PLIST,v 1.2 2002/12/09 16:01:39 tron Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/03/25 14:06:52 salo Exp $
 share/xpdf/cyrillic/KOI8-R.unicodeMap
 @dirrm share/xpdf/cyrillic
-@unexec ${RMDIR} %D/share/xpdf 2> /dev/null || ${TRUE}
diff --git a/print/xpdf-cyrillic/distinfo b/print/xpdf-cyrillic/distinfo
index f4dd55389f4..0ba99f85023 100644
--- a/print/xpdf-cyrillic/distinfo
+++ b/print/xpdf-cyrillic/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:53 salo Exp $
 
-SHA1 (xpdf-cyrillic-20020521/xpdf-cyrillic.tar.gz) = e876bda9cd0daa09757511a346aa4bd7884f5570
-Size (xpdf-cyrillic-20020521/xpdf-cyrillic.tar.gz) = 1286 bytes
+SHA1 (xpdf-cyrillic-20020116/xpdf-cyrillic.tar.gz) = a0589aa850077f6814518a3b42ffe111524ded8a
+Size (xpdf-cyrillic-20020116/xpdf-cyrillic.tar.gz) = 1284 bytes