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, 19 insertions, 24 deletions

diff --git a/print/xpdf-hebrew/DEINSTALL b/print/xpdf-hebrew/DEINSTALL
index af3790fcb60..083139646d0 100644
--- a/print/xpdf-hebrew/DEINSTALL
+++ b/print/xpdf-hebrew/DEINSTALL
@@ -1,20 +1,19 @@
 #!/bin/sh
 #
-# $NetBSD: DEINSTALL,v 1.1.1.1 2002/11/08 10:08:59 wiz Exp $
+# $NetBSD: DEINSTALL,v 1.2 2003/03/25 14:06:55 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 "/ebrew/d" ${XPDFRC} > ${XPDFRC}.tmp
+	@MV@ -f ${XPDFRC}.tmp ${XPDFRC}
 	;;
 
 *)
diff --git a/print/xpdf-hebrew/DESCR b/print/xpdf-hebrew/DESCR
index 4c49727e92c..0d27da34b90 100644
--- a/print/xpdf-hebrew/DESCR
+++ b/print/xpdf-hebrew/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 Glyph & Cog, LLC, and are licensed under the GNU
-General Public License (GPL), version 2.
-
 This package provides support files needed to use the Xpdf tools with
 Hebrew PDF files.
 
diff --git a/print/xpdf-hebrew/Makefile b/print/xpdf-hebrew/Makefile
index 8c701400980..35bc29de09b 100644
--- a/print/xpdf-hebrew/Makefile
+++ b/print/xpdf-hebrew/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/11/08 10:08:59 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/25 14:06:55 salo Exp $
 #
 
-DISTNAME=	xpdf-hebrew-2002-oct-22
-PKGNAME=	xpdf-hebrew-20021022
+DISTNAME=	xpdf-hebrew
+PKGNAME=	${DISTNAME}-20030216
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
 
@@ -10,22 +10,24 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.foolabs.com/xpdf/
 COMMENT=	xpdf support files for Hebrew
 
-DEPENDS+=	xpdf>=1.00:../../print/xpdf
+DEPENDS+=	xpdf>=2.02:../../print/xpdf
 
-USE_X11BASE=	yes
+USE_X11=	yes
+USE_PKGINSTALL=	yes
 
-WRKSRC=		${WRKDIR}/xpdf-hebrew
+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/hebrew
+	${INSTALL_DATA_DIR} ${PREFIX}/share/xpdf/hebrew
 	${INSTALL_DATA} ${WRKSRC}/ISO-8859-8.unicodeMap \
-		${X11PREFIX}/share/xpdf/hebrew
+		${PREFIX}/share/xpdf/hebrew
 
 post-install:
 	${CAT} ${WRKSRC}/add-to-xpdfrc >> ${PKG_SYSCONFDIR}/xpdfrc
diff --git a/print/xpdf-hebrew/PLIST b/print/xpdf-hebrew/PLIST
index a7b56f0a4b8..31e9d234b5d 100644
--- a/print/xpdf-hebrew/PLIST
+++ b/print/xpdf-hebrew/PLIST
@@ -1,4 +1,3 @@
-@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:56 salo Exp $
 share/xpdf/hebrew/ISO-8859-8.unicodeMap
 @dirrm share/xpdf/hebrew
-@unexec ${RMDIR} %D/share/xpdf 2> /dev/null || ${TRUE}
diff --git a/print/xpdf-hebrew/distinfo b/print/xpdf-hebrew/distinfo
index ea584dbef5e..c452826451b 100644
--- a/print/xpdf-hebrew/distinfo
+++ b/print/xpdf-hebrew/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/11/08 10:08:59 wiz Exp $
+$NetBSD: distinfo,v 1.2 2003/03/25 14:06:56 salo Exp $
 
-SHA1 (xpdf-hebrew-2002-oct-22.tar.gz) = 99699a6a772f9c37c06f00018068f1b33566d1bd
-Size (xpdf-hebrew-2002-oct-22.tar.gz) = 1127 bytes
+SHA1 (xpdf-hebrew-20030216/xpdf-hebrew.tar.gz) = b37d7b969b63e55aaf4bdaac1d518fba9922e32b
+Size (xpdf-hebrew-20030216/xpdf-hebrew.tar.gz) = 1314 bytes