summaryrefslogtreecommitdiff
path: root/print
diff options
context:
space:
mode:
authorsalo <salo>2003-03-25 14:06:48 +0000
committersalo <salo>2003-03-25 14:06:48 +0000
commit1d8a9ad05a7db072a18186d07425791a9afcbccf (patch)
tree3125084151c8c91095d4c3c396280430091bc1af /print
parentb7439e5ecd1373ec82561175f710b9b8ae710fb0 (diff)
downloadpkgsrc-1d8a9ad05a7db072a18186d07425791a9afcbccf.tar.gz
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
Diffstat (limited to 'print')
-rw-r--r--print/xpdf-chinese-simplified/DEINSTALL10
-rw-r--r--print/xpdf-chinese-simplified/DESCR5
-rw-r--r--print/xpdf-chinese-simplified/Makefile31
-rw-r--r--print/xpdf-chinese-simplified/PLIST3
-rw-r--r--print/xpdf-chinese-simplified/distinfo6
-rw-r--r--print/xpdf-chinese-traditional/DEINSTALL10
-rw-r--r--print/xpdf-chinese-traditional/DESCR5
-rw-r--r--print/xpdf-chinese-traditional/Makefile23
-rw-r--r--print/xpdf-chinese-traditional/PLIST3
-rw-r--r--print/xpdf-chinese-traditional/distinfo6
-rw-r--r--print/xpdf-cyrillic/DEINSTALL8
-rw-r--r--print/xpdf-cyrillic/DESCR5
-rw-r--r--print/xpdf-cyrillic/Makefile17
-rw-r--r--print/xpdf-cyrillic/PLIST3
-rw-r--r--print/xpdf-cyrillic/distinfo6
-rw-r--r--print/xpdf-greek/DEINSTALL8
-rw-r--r--print/xpdf-greek/DESCR5
-rw-r--r--print/xpdf-greek/Makefile17
-rw-r--r--print/xpdf-greek/PLIST3
-rw-r--r--print/xpdf-greek/distinfo6
-rw-r--r--print/xpdf-hebrew/DEINSTALL9
-rw-r--r--print/xpdf-hebrew/DESCR5
-rw-r--r--print/xpdf-hebrew/Makefile20
-rw-r--r--print/xpdf-hebrew/PLIST3
-rw-r--r--print/xpdf-hebrew/distinfo6
-rw-r--r--print/xpdf-japanese/DEINSTALL10
-rw-r--r--print/xpdf-japanese/DESCR5
-rw-r--r--print/xpdf-japanese/Makefile27
-rw-r--r--print/xpdf-japanese/PLIST3
-rw-r--r--print/xpdf-japanese/distinfo6
-rw-r--r--print/xpdf-korean/DEINSTALL10
-rw-r--r--print/xpdf-korean/DESCR5
-rw-r--r--print/xpdf-korean/Makefile23
-rw-r--r--print/xpdf-korean/PLIST3
-rw-r--r--print/xpdf-korean/distinfo6
-rw-r--r--print/xpdf-latin2/DEINSTALL8
-rw-r--r--print/xpdf-latin2/DESCR5
-rw-r--r--print/xpdf-latin2/Makefile21
-rw-r--r--print/xpdf-latin2/PLIST3
-rw-r--r--print/xpdf-latin2/distinfo6
-rw-r--r--print/xpdf-thai/DEINSTALL8
-rw-r--r--print/xpdf-thai/DESCR5
-rw-r--r--print/xpdf-thai/Makefile19
-rw-r--r--print/xpdf-thai/PLIST3
-rw-r--r--print/xpdf-thai/distinfo6
-rw-r--r--print/xpdf-turkish/DEINSTALL8
-rw-r--r--print/xpdf-turkish/DESCR5
-rw-r--r--print/xpdf-turkish/Makefile17
-rw-r--r--print/xpdf-turkish/PLIST3
-rw-r--r--print/xpdf-turkish/distinfo6
50 files changed, 199 insertions, 245 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
diff --git a/print/xpdf-chinese-traditional/DEINSTALL b/print/xpdf-chinese-traditional/DEINSTALL
index bcdb41d0cfb..a8d5f19c518 100644
--- a/print/xpdf-chinese-traditional/DEINSTALL
+++ b/print/xpdf-chinese-traditional/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:50 salo Exp $
PKGNAME=$1
STAGE=$2
-XPDFRC=${PKG_PREFIX}/etc/xpdfrc
+XPDFRC=@PKG_SYSCONFDIR@/xpdfrc
case ${STAGE} in
DEINSTALL)
;;
POST-DEINSTALL)
- sed -e "/raditional/d" ${XPDFRC} > ${XPDFRC}.tmp
- sed -e "/big5/d" -e "/Ar[ph][ph]ic fonts, you may/d" ${XPDFRC}.tmp > ${XPDFRC}
- rm -f ${XPDFRC}.tmp
+ @SED@ -e "/raditional/d" ${XPDFRC} > ${XPDFRC}.tmp
+ @SED@ -e "/big5/d" -e "/Ar[ph][ph]ic fonts, you may/d" ${XPDFRC}.tmp > ${XPDFRC}
+ @RM@ -f ${XPDFRC}.tmp
;;
*)
diff --git a/print/xpdf-chinese-traditional/DESCR b/print/xpdf-chinese-traditional/DESCR
index ec03cfcfa10..40f1737467f 100644
--- a/print/xpdf-chinese-traditional/DESCR
+++ b/print/xpdf-chinese-traditional/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 (Traditional) PDF files.
diff --git a/print/xpdf-chinese-traditional/Makefile b/print/xpdf-chinese-traditional/Makefile
index 651a83d8390..ee1ba1e9768 100644
--- a/print/xpdf-chinese-traditional/Makefile
+++ b/print/xpdf-chinese-traditional/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:50 salo Exp $
#
DISTNAME= xpdf-chinese-traditional
-PKGNAME= ${DISTNAME}-20020521
+PKGNAME= ${DISTNAME}-20020414
CATEGORIES= print
MASTER_SITES= ftp://ftp.foolabs.com/pub/xpdf/
@@ -10,27 +10,28 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.foolabs.com/xpdf/
COMMENT= xpdf support files for Chinese (Traditional)
-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' -e 's/Arhpic/Arphic/g' < ${WRKSRC}/add-to-xpdfrc.orig > ${WRKSRC}/add-to-xpdfrc
+ ${SED} -e 's:/usr/local:'${PREFIX}':g' -e 's/Arhpic/Arphic/g' < ${WRKSRC}/add-to-xpdfrc.orig > ${WRKSRC}/add-to-xpdfrc
do-install:
- ${INSTALL_DATA_DIR} ${X11PREFIX}/share/xpdf/chinese-traditional
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/xpdf/chinese-traditional
${INSTALL_DATA} ${WRKSRC}/Adobe-CNS1.cidToUnicode \
- ${X11PREFIX}/share/xpdf/chinese-traditional
+ ${PREFIX}/share/xpdf/chinese-traditional
${INSTALL_DATA} ${WRKSRC}/Big5.unicodeMap \
- ${X11PREFIX}/share/xpdf/chinese-traditional
- ${INSTALL_DATA_DIR} ${X11PREFIX}/share/xpdf/chinese-traditional/CMap
- ${INSTALL_DATA} ${WRKSRC}/CMap/* ${X11PREFIX}/share/xpdf/chinese-traditional/CMap
+ ${PREFIX}/share/xpdf/chinese-traditional
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/xpdf/chinese-traditional/CMap
+ ${INSTALL_DATA} ${WRKSRC}/CMap/* ${PREFIX}/share/xpdf/chinese-traditional/CMap
post-install:
${CAT} ${WRKSRC}/add-to-xpdfrc >> ${PKG_SYSCONFDIR}/xpdfrc
diff --git a/print/xpdf-chinese-traditional/PLIST b/print/xpdf-chinese-traditional/PLIST
index d79eacd4f5a..9c90c43a5af 100644
--- a/print/xpdf-chinese-traditional/PLIST
+++ b/print/xpdf-chinese-traditional/PLIST
@@ -1,4 +1,4 @@
-@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:51 salo Exp $
share/xpdf/chinese-traditional/Adobe-CNS1.cidToUnicode
share/xpdf/chinese-traditional/Big5.unicodeMap
share/xpdf/chinese-traditional/CMap/Adobe-CNS1-0
@@ -43,4 +43,3 @@ share/xpdf/chinese-traditional/CMap/UniCNS-UTF8-H
share/xpdf/chinese-traditional/CMap/UniCNS-UTF8-V
@dirrm share/xpdf/chinese-traditional/CMap
@dirrm share/xpdf/chinese-traditional
-@unexec ${RMDIR} %D/share/xpdf 2> /dev/null || ${TRUE}
diff --git a/print/xpdf-chinese-traditional/distinfo b/print/xpdf-chinese-traditional/distinfo
index e90b2202377..350c84599e9 100644
--- a/print/xpdf-chinese-traditional/distinfo
+++ b/print/xpdf-chinese-traditional/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:51 salo Exp $
-SHA1 (xpdf-chinese-traditional-20020521/xpdf-chinese-traditional.tar.gz) = 95e9c5d471aa670f63cb3c340363a48b396e4f44
-Size (xpdf-chinese-traditional-20020521/xpdf-chinese-traditional.tar.gz) = 698902 bytes
+SHA1 (xpdf-chinese-traditional-20020414/xpdf-chinese-traditional.tar.gz) = a8de3e7184f445b01f4394f212d1e8f3c39acda0
+Size (xpdf-chinese-traditional-20020414/xpdf-chinese-traditional.tar.gz) = 698901 bytes
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
diff --git a/print/xpdf-greek/DEINSTALL b/print/xpdf-greek/DEINSTALL
index b608a939e09..eb30b87a931 100644
--- a/print/xpdf-greek/DEINSTALL
+++ b/print/xpdf-greek/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:53 salo Exp $
PKGNAME=$1
STAGE=$2
-XPDFRC=${PKG_PREFIX}/etc/xpdfrc
+XPDFRC=@PKG_SYSCONFDIR@/xpdfrc
case ${STAGE} in
DEINSTALL)
;;
POST-DEINSTALL)
- sed -e "/reek/d" ${XPDFRC} > ${XPDFRC}.tmp
- mv -f ${XPDFRC}.tmp ${XPDFRC}
+ @SED@ -e "/reek/d" ${XPDFRC} > ${XPDFRC}.tmp
+ @MV@ -f ${XPDFRC}.tmp ${XPDFRC}
;;
*)
diff --git a/print/xpdf-greek/DESCR b/print/xpdf-greek/DESCR
index 0b0f760ae3e..744c2a76b60 100644
--- a/print/xpdf-greek/DESCR
+++ b/print/xpdf-greek/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
Greek PDF files.
diff --git a/print/xpdf-greek/Makefile b/print/xpdf-greek/Makefile
index bc82da2390e..cadef4ca513 100644
--- a/print/xpdf-greek/Makefile
+++ b/print/xpdf-greek/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:54 salo Exp $
#
DISTNAME= xpdf-greek
-PKGNAME= ${DISTNAME}-20020521
+PKGNAME= ${DISTNAME}-20020213
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 Greek
-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/greek
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/xpdf/greek
${INSTALL_DATA} ${WRKSRC}/ISO-8859-7.unicodeMap \
- ${X11PREFIX}/share/xpdf/greek
+ ${PREFIX}/share/xpdf/greek
post-install:
${CAT} ${WRKSRC}/add-to-xpdfrc >> ${PKG_SYSCONFDIR}/xpdfrc
diff --git a/print/xpdf-greek/PLIST b/print/xpdf-greek/PLIST
index 3b6b46b0257..1feb9f3d91b 100644
--- a/print/xpdf-greek/PLIST
+++ b/print/xpdf-greek/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:54 salo Exp $
share/xpdf/greek/ISO-8859-7.unicodeMap
@dirrm share/xpdf/greek
-@unexec ${RMDIR} %D/share/xpdf 2> /dev/null || ${TRUE}
diff --git a/print/xpdf-greek/distinfo b/print/xpdf-greek/distinfo
index f841b150d28..1f247e25f86 100644
--- a/print/xpdf-greek/distinfo
+++ b/print/xpdf-greek/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:54 salo Exp $
-SHA1 (xpdf-greek-20020521/xpdf-greek.tar.gz) = ff185ea7bedb1b912f1f56bad9bff3b36f75b785
-Size (xpdf-greek-20020521/xpdf-greek.tar.gz) = 1124 bytes
+SHA1 (xpdf-greek-20020213/xpdf-greek.tar.gz) = 42eef2df56674b636fadd6f6660b598f9b016758
+Size (xpdf-greek-20020213/xpdf-greek.tar.gz) = 1125 bytes
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
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
diff --git a/print/xpdf-korean/DEINSTALL b/print/xpdf-korean/DEINSTALL
index e6cc8a97e59..130b9fdfa0a 100644
--- a/print/xpdf-korean/DEINSTALL
+++ b/print/xpdf-korean/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:58 salo Exp $
PKGNAME=$1
STAGE=$2
-XPDFRC=${PKG_PREFIX}/etc/xpdfrc
+XPDFRC=@PKG_SYSCONFDIR@/xpdfrc
case ${STAGE} in
DEINSTALL)
;;
POST-DEINSTALL)
- sed -e "/orean/d" ${XPDFRC} > ${XPDFRC}.tmp
- sed -e "/ksc5601/d" ${XPDFRC}.tmp > ${XPDFRC}
- rm -f ${XPDFRC}.tmp
+ @SED@ -e "/orean/d" ${XPDFRC} > ${XPDFRC}.tmp
+ @SED@ -e "/ksc5601/d" ${XPDFRC}.tmp > ${XPDFRC}
+ @RM@ -f ${XPDFRC}.tmp
;;
*)
diff --git a/print/xpdf-korean/DESCR b/print/xpdf-korean/DESCR
index a7c0ddff8bf..5dfbe7b3adc 100644
--- a/print/xpdf-korean/DESCR
+++ b/print/xpdf-korean/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
Korean PDF files.
diff --git a/print/xpdf-korean/Makefile b/print/xpdf-korean/Makefile
index 71814db0daf..89af684208a 100644
--- a/print/xpdf-korean/Makefile
+++ b/print/xpdf-korean/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:58 salo Exp $
#
DISTNAME= xpdf-korean
-PKGNAME= ${DISTNAME}-20020521
+PKGNAME= ${DISTNAME}-20020401
CATEGORIES= print
MASTER_SITES= ftp://ftp.foolabs.com/pub/xpdf/
@@ -10,27 +10,28 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.foolabs.com/xpdf/
COMMENT= xpdf support files for Korean
-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/korean
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/xpdf/korean
${INSTALL_DATA} ${WRKSRC}/Adobe-Korea1.cidToUnicode \
- ${X11PREFIX}/share/xpdf/korean
+ ${PREFIX}/share/xpdf/korean
${INSTALL_DATA} ${WRKSRC}/ISO-2022-KR.unicodeMap \
- ${X11PREFIX}/share/xpdf/korean
- ${INSTALL_DATA_DIR} ${X11PREFIX}/share/xpdf/korean/CMap
- ${INSTALL_DATA} ${WRKSRC}/CMap/* ${X11PREFIX}/share/xpdf/korean/CMap
+ ${PREFIX}/share/xpdf/korean
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/xpdf/korean/CMap
+ ${INSTALL_DATA} ${WRKSRC}/CMap/* ${PREFIX}/share/xpdf/korean/CMap
post-install:
${CAT} ${WRKSRC}/add-to-xpdfrc >> ${PKG_SYSCONFDIR}/xpdfrc
diff --git a/print/xpdf-korean/PLIST b/print/xpdf-korean/PLIST
index 087cccbc125..53ce96a3794 100644
--- a/print/xpdf-korean/PLIST
+++ b/print/xpdf-korean/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/12/09 16:01:41 tron Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/03/25 14:06:59 salo Exp $
share/xpdf/korean/Adobe-Korea1.cidToUnicode
share/xpdf/korean/CMap/Adobe-Korea1-0
share/xpdf/korean/CMap/Adobe-Korea1-1
@@ -26,4 +26,3 @@ share/xpdf/korean/CMap/UniKS-UTF8-V
share/xpdf/korean/ISO-2022-KR.unicodeMap
@dirrm share/xpdf/korean/CMap
@dirrm share/xpdf/korean
-@unexec ${RMDIR} %D/share/xpdf 2> /dev/null || ${TRUE}
diff --git a/print/xpdf-korean/distinfo b/print/xpdf-korean/distinfo
index 266bd369d9b..7c6babd5bf7 100644
--- a/print/xpdf-korean/distinfo
+++ b/print/xpdf-korean/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:59 salo Exp $
-SHA1 (xpdf-korean-20020521/xpdf-korean.tar.gz) = f71ba8810bff346136f8e76892b6c60209f934f7
-Size (xpdf-korean-20020521/xpdf-korean.tar.gz) = 419081 bytes
+SHA1 (xpdf-korean-20020401/xpdf-korean.tar.gz) = 4af45a03d42a753b0b6c2754bc95023dc53e6776
+Size (xpdf-korean-20020401/xpdf-korean.tar.gz) = 419056 bytes
diff --git a/print/xpdf-latin2/DEINSTALL b/print/xpdf-latin2/DEINSTALL
index c7005a86a97..79a06675366 100644
--- a/print/xpdf-latin2/DEINSTALL
+++ b/print/xpdf-latin2/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:07:00 salo Exp $
PKGNAME=$1
STAGE=$2
-XPDFRC=${PKG_PREFIX}/etc/xpdfrc
+XPDFRC=@PKG_SYSCONFDIR@/xpdfrc
case ${STAGE} in
DEINSTALL)
;;
POST-DEINSTALL)
- sed -e "/atin2/d" ${XPDFRC} > ${XPDFRC}.tmp
- mv -f ${XPDFRC}.tmp ${XPDFRC}
+ @SED@ -e "/atin2/d" ${XPDFRC} > ${XPDFRC}.tmp
+ @MV@ -f ${XPDFRC}.tmp ${XPDFRC}
;;
*)
diff --git a/print/xpdf-latin2/DESCR b/print/xpdf-latin2/DESCR
index 90503d219ae..d5f87b5c3a0 100644
--- a/print/xpdf-latin2/DESCR
+++ b/print/xpdf-latin2/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
Latin2 PDF files.
diff --git a/print/xpdf-latin2/Makefile b/print/xpdf-latin2/Makefile
index d499f552135..c3cbd6b68f2 100644
--- a/print/xpdf-latin2/Makefile
+++ b/print/xpdf-latin2/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2002/11/08 10:15:27 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/25 14:07:00 salo Exp $
#
-DISTNAME= xpdf-latin2-2002-oct-22
-PKGNAME= xpdf-latin2-20021022
+DISTNAME= xpdf-latin2
+PKGNAME= ${DISTNAME}-20021022
+PKGREVISION= 1
CATEGORIES= print
MASTER_SITES= ftp://ftp.foolabs.com/pub/xpdf/
@@ -10,22 +11,24 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.foolabs.com/xpdf/
COMMENT= xpdf support files for Latin-2
-DEPENDS+= xpdf>=1.00:../../print/xpdf
+DEPENDS+= xpdf>=2.02:../../print/xpdf
-USE_X11BASE= yes
+USE_X11= yes
+USE_PKGINSTALL= yes
-WRKSRC= ${WRKDIR}/xpdf-latin2
+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/latin2
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/xpdf/latin2
${INSTALL_DATA} ${WRKSRC}/Latin2.unicodeMap \
- ${X11PREFIX}/share/xpdf/latin2
+ ${PREFIX}/share/xpdf/latin2
post-install:
${CAT} ${WRKSRC}/add-to-xpdfrc >> ${PKG_SYSCONFDIR}/xpdfrc
diff --git a/print/xpdf-latin2/PLIST b/print/xpdf-latin2/PLIST
index 113d9b525f0..db759806dcb 100644
--- a/print/xpdf-latin2/PLIST
+++ b/print/xpdf-latin2/PLIST
@@ -1,4 +1,3 @@
-@comment $NetBSD: PLIST,v 1.2 2002/12/09 16:01:41 tron Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/03/25 14:07:01 salo Exp $
share/xpdf/latin2/Latin2.unicodeMap
@dirrm share/xpdf/latin2
-@unexec ${RMDIR} %D/share/xpdf 2> /dev/null || ${TRUE}
diff --git a/print/xpdf-latin2/distinfo b/print/xpdf-latin2/distinfo
index b1263abd187..caeb50d0235 100644
--- a/print/xpdf-latin2/distinfo
+++ b/print/xpdf-latin2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2002/11/08 10:15:28 wiz Exp $
+$NetBSD: distinfo,v 1.3 2003/03/25 14:07:01 salo Exp $
-SHA1 (xpdf-latin2-2002-oct-22.tar.gz) = e5fbf01c758c670973a34e67d56790c0b9e9eda4
-Size (xpdf-latin2-2002-oct-22.tar.gz) = 1435 bytes
+SHA1 (xpdf-latin2-20021022/xpdf-latin2.tar.gz) = e5fbf01c758c670973a34e67d56790c0b9e9eda4
+Size (xpdf-latin2-20021022/xpdf-latin2.tar.gz) = 1435 bytes
diff --git a/print/xpdf-thai/DEINSTALL b/print/xpdf-thai/DEINSTALL
index 749990135db..bb27ad9d7b1 100644
--- a/print/xpdf-thai/DEINSTALL
+++ b/print/xpdf-thai/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:07:01 salo Exp $
PKGNAME=$1
STAGE=$2
-XPDFRC=${PKG_PREFIX}/etc/xpdfrc
+XPDFRC=@PKG_SYSCONFDIR@/xpdfrc
case ${STAGE} in
DEINSTALL)
;;
POST-DEINSTALL)
- sed -e "/hai/d" ${XPDFRC} > ${XPDFRC}.tmp
- mv -f ${XPDFRC}.tmp ${XPDFRC}
+ @SED@ -e "/hai/d" ${XPDFRC} > ${XPDFRC}.tmp
+ @MV@ -f ${XPDFRC}.tmp ${XPDFRC}
;;
*)
diff --git a/print/xpdf-thai/DESCR b/print/xpdf-thai/DESCR
index 6ecc19ea89d..e0efb5fd8cd 100644
--- a/print/xpdf-thai/DESCR
+++ b/print/xpdf-thai/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
Thai PDF files.
diff --git a/print/xpdf-thai/Makefile b/print/xpdf-thai/Makefile
index ebd668a9c2f..c319ed3d173 100644
--- a/print/xpdf-thai/Makefile
+++ b/print/xpdf-thai/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2002/09/19 19:21:40 kei Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/25 14:07:01 salo Exp $
#
DISTNAME= xpdf-thai
-PKGNAME= ${DISTNAME}-20020521
+PKGNAME= ${DISTNAME}-20020116
CATEGORIES= print
MASTER_SITES= ftp://ftp.foolabs.com/pub/xpdf/
@@ -10,25 +10,26 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.foolabs.com/xpdf/
COMMENT= xpdf support files for Thai
-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/thai
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/xpdf/thai
${INSTALL_DATA} ${WRKSRC}/TIS-620.unicodeMap \
- ${X11PREFIX}/share/xpdf/thai
+ ${PREFIX}/share/xpdf/thai
${INSTALL_DATA} ${WRKSRC}/Thai.nameToUnicode \
- ${X11PREFIX}/share/xpdf/thai
+ ${PREFIX}/share/xpdf/thai
post-install:
${CAT} ${WRKSRC}/add-to-xpdfrc >> ${PKG_SYSCONFDIR}/xpdfrc
diff --git a/print/xpdf-thai/PLIST b/print/xpdf-thai/PLIST
index 5563f3cf981..ddc6ac82647 100644
--- a/print/xpdf-thai/PLIST
+++ b/print/xpdf-thai/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/12/09 16:01:41 tron Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/03/25 14:07:02 salo Exp $
share/xpdf/thai/TIS-620.unicodeMap
share/xpdf/thai/Thai.nameToUnicode
@dirrm share/xpdf/thai
-@unexec ${RMDIR} %D/share/xpdf 2> /dev/null || ${TRUE}
diff --git a/print/xpdf-thai/distinfo b/print/xpdf-thai/distinfo
index 58fc6399385..2b30ccc1d02 100644
--- a/print/xpdf-thai/distinfo
+++ b/print/xpdf-thai/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:07:02 salo Exp $
-SHA1 (xpdf-thai-20020521/xpdf-thai.tar.gz) = a69389f3530ee5bb0acd0cda404e1d3374011b5d
-Size (xpdf-thai-20020521/xpdf-thai.tar.gz) = 1876 bytes
+SHA1 (xpdf-thai-20020116/xpdf-thai.tar.gz) = 93de04cb2211a7451d6e8f62ddef1748d2fa37f4
+Size (xpdf-thai-20020116/xpdf-thai.tar.gz) = 1873 bytes
diff --git a/print/xpdf-turkish/DEINSTALL b/print/xpdf-turkish/DEINSTALL
index 2b0942870ad..82590027115 100644
--- a/print/xpdf-turkish/DEINSTALL
+++ b/print/xpdf-turkish/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:07:03 salo Exp $
PKGNAME=$1
STAGE=$2
-XPDFRC=${PKG_PREFIX}/etc/xpdfrc
+XPDFRC=@PKG_SYSCONFDIR@/xpdfrc
case ${STAGE} in
DEINSTALL)
;;
POST-DEINSTALL)
- sed -e "/urkish/d" ${XPDFRC} > ${XPDFRC}.tmp
- mv -f ${XPDFRC}.tmp ${XPDFRC}
+ @SED@ -e "/urkish/d" ${XPDFRC} > ${XPDFRC}.tmp
+ @MV@ -f ${XPDFRC}.tmp ${XPDFRC}
;;
*)
diff --git a/print/xpdf-turkish/DESCR b/print/xpdf-turkish/DESCR
index b53073b4520..33c4e5f2fab 100644
--- a/print/xpdf-turkish/DESCR
+++ b/print/xpdf-turkish/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
Turkish PDF files.
diff --git a/print/xpdf-turkish/Makefile b/print/xpdf-turkish/Makefile
index b37a88b0e3d..d1fe1054756 100644
--- a/print/xpdf-turkish/Makefile
+++ b/print/xpdf-turkish/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2002/09/19 19:21:40 kei Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/25 14:07:04 salo Exp $
#
DISTNAME= xpdf-turkish
-PKGNAME= ${DISTNAME}-20020521
+PKGNAME= ${DISTNAME}-20020410
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 Turkish
-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/turkish
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/xpdf/turkish
${INSTALL_DATA} ${WRKSRC}/ISO-8859-9.unicodeMap \
- ${X11PREFIX}/share/xpdf/turkish
+ ${PREFIX}/share/xpdf/turkish
post-install:
${CAT} ${WRKSRC}/add-to-xpdfrc >> ${PKG_SYSCONFDIR}/xpdfrc
diff --git a/print/xpdf-turkish/PLIST b/print/xpdf-turkish/PLIST
index 2047e629218..17afe6b9c29 100644
--- a/print/xpdf-turkish/PLIST
+++ b/print/xpdf-turkish/PLIST
@@ -1,4 +1,3 @@
-@comment $NetBSD: PLIST,v 1.2 2002/12/09 16:01:41 tron Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/03/25 14:07:04 salo Exp $
share/xpdf/turkish/ISO-8859-9.unicodeMap
@dirrm share/xpdf/turkish
-@unexec ${RMDIR} %D/share/xpdf 2> /dev/null || ${TRUE}
diff --git a/print/xpdf-turkish/distinfo b/print/xpdf-turkish/distinfo
index 72422b6a12c..32c615b51b4 100644
--- a/print/xpdf-turkish/distinfo
+++ b/print/xpdf-turkish/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:07:04 salo Exp $
-SHA1 (xpdf-turkish-20020521/xpdf-turkish.tar.gz) = 32de29eff7cd0bbc08f4cccdeadb459c428e3f51
-Size (xpdf-turkish-20020521/xpdf-turkish.tar.gz) = 1140 bytes
+SHA1 (xpdf-turkish-20020410/xpdf-turkish.tar.gz) = 2a225c726ebef40f63902081604064bd8b4ae117
+Size (xpdf-turkish-20020410/xpdf-turkish.tar.gz) = 1140 bytes