[arch-commits] Commit in xpdf-chinese-simplified/trunk (2 files)

[Gaetan Bisson]

    Date: Wednesday, November 10, 2010 @ 18:41:59
  Author: bisson
Revision: 98531

- include missing cidToUnicode files
- refresh the install script

Modified:
  xpdf-chinese-simplified/trunk/PKGBUILD
  xpdf-chinese-simplified/trunk/xpdf-chinese-simplified.install

---------------------------------+
 PKGBUILD                        |   28 ++++++++++++++--------------
 xpdf-chinese-simplified.install |   23 ++---------------------
 2 files changed, 16 insertions(+), 35 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-11-10 23:41:39 UTC (rev 98530)
+++ PKGBUILD	2010-11-10 23:41:59 UTC (rev 98531)
@@ -4,32 +4,32 @@
 
 pkgname=xpdf-chinese-simplified
 pkgver=20040427
-pkgrel=4
-pkgdesc="Adds support for simplified Chinese fonts to xpdf"
+pkgrel=5
+pkgdesc='Adds support for simplified Chinese fonts to xpdf'
 arch=('any')
-url="http://www.foolabs.com/xpdf/"
+url='http://www.foolabs.com/xpdf/'
 license=('GPL2' 'custom')
 depends=('xpdf')
 install=$pkgname.install
-source=(ftp://ftp.foolabs.com/pub/xpdf/$pkgname.tar.gz LICENSE)
-md5sums=('6c3b04008000948e62530b8582e7f37c' '80107f7a1cb3e6c7f2cbd1875a57b430')
+source=("ftp://ftp.foolabs.com/pub/xpdf/$pkgname.tar.gz" 'LICENSE')
+md5sums=('6c3b04008000948e62530b8582e7f37c'
+         '80107f7a1cb3e6c7f2cbd1875a57b430')
 
 build() {
-  cd $srcdir/$pkgname
-  install -dm755 $pkgdir/usr/share/xpdf/CMap
-  install -m644 -t $pkgdir/usr/share/xpdf *.unicodeMap
-  install -m644 -t $pkgdir/usr/share/xpdf/CMap CMap/*
+  cd "$srcdir/$pkgname"
+  install -m755 -d "$pkgdir"/usr/share/xpdf/CMap
+  install -m644 -t "$pkgdir"/usr/share/xpdf *.{cidToUnicode,unicodeMap}
+  install -m644 -t "$pkgdir"/usr/share/xpdf/CMap CMap/*
 
- # relocate language specific files
+  # relocate language specific files
   sed -i 's|/usr/local/share/xpdf/chinese-simplified|/usr/share/xpdf|' add-to-xpdfrc
- # X-Fonts are no longer supported by xpdf
+  # X-Fonts are no longer supported by xpdf
   sed -i 's|^displayCIDFontX.*$||' add-to-xpdfrc
   cat >> add-to-xpdfrc << END_OF_RC_TWEAK
 displayCIDFontTT	Adobe-GB1	/usr/share/fonts/TTF/Vera.ttf
 
 END_OF_RC_TWEAK
 
-  install -Dm644 add-to-xpdfrc $pkgdir/etc/xpdf/$pkgname
-
-  install -Dm644 ${srcdir}/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+  install -Dm644 add-to-xpdfrc "$pkgdir/etc/xpdf/$pkgname"
+  install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }

Modified: xpdf-chinese-simplified.install
===================================================================
--- xpdf-chinese-simplified.install	2010-11-10 23:41:39 UTC (rev 98530)
+++ xpdf-chinese-simplified.install	2010-11-10 23:41:59 UTC (rev 98531)
@@ -4,10 +4,7 @@
 _pkgname=xpdf-chinese-simplified
 
 post_install() {
- # we check if rc is already included in /etc/xpdfrc
-  echo "make $_pkgname config file known to global xpdf config ..."
-  cat etc/xpdfrc | grep -v /etc/xpdf/$_pkgname >/tmp/.pacxpdf
-  mv /tmp/.pacxpdf etc/xpdfrc
+  sed -i "/\/etc\/xpdf\/$_pkgname/d" etc/xpdfrc
   echo "include /etc/xpdf/$_pkgname" >> etc/xpdfrc
   cat << EOM
 
@@ -23,22 +20,6 @@
 EOM
 }
 
-post_upgrade() {
-  post_install $1
-}
-
 pre_remove() {
-  cat etc/xpdfrc | grep -v /etc/xpdf/$_pkgname >/tmp/.pacxpdf
-  mv /tmp/.pacxpdf etc/xpdfrc
-  chmod 644 etc/xpdfrc
+  sed -i "/\/etc\/xpdf\/$_pkgname/d" etc/xpdfrc
 }
-
-post_remove() {
-  /bin/true
-}
-
-
-op=$1
-shift
-
-$op $*