[arch-commits] Commit in xzgv/repos (4 files)

[Allan McRae]

    Date: Thursday, August 6, 2009 @ 10:16:53
  Author: allan
Revision: 49371

Merged revisions 356,49369 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/xzgv/trunk

........
  r356 | aaron | 2008-04-19 08:56:27 +1000 (Sat, 19 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r49369 | allan | 2009-08-07 00:14:12 +1000 (Fri, 07 Aug 2009) | 1 line
  
  upgpkg: xzgv 0.9.1-1
........

Added:
  xzgv/repos/extra-x86_64/xzgv-infoinstall.patch
    (from rev 49369, xzgv/trunk/xzgv-infoinstall.patch)
  xzgv/repos/extra-x86_64/xzgv.install
    (from rev 49369, xzgv/trunk/xzgv.install)
Modified:
  xzgv/repos/extra-x86_64/	(properties)
  xzgv/repos/extra-x86_64/PKGBUILD

------------------------+
 PKGBUILD               |   44 ++++++++++++++++++++++----------------------
 xzgv-infoinstall.patch |   23 +++++++++++++++++++++++
 xzgv.install           |   22 ++++++++++++++++++++++
 3 files changed, 67 insertions(+), 22 deletions(-)


Property changes on: xzgv/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /xzgv/trunk:1
   + /xzgv/trunk:1-49370

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-08-06 14:15:18 UTC (rev 49370)
+++ extra-x86_64/PKGBUILD	2009-08-06 14:16:53 UTC (rev 49371)
@@ -1,34 +1,34 @@
 # $Id$
 # Maintainer: Alexander Baldeck <alexander at archlinux.org>
 # Contributor: dorphell <dorphell at archlinux.org>
+
 pkgname=xzgv
-pkgver=0.9
+pkgver=0.9.1
 pkgrel=1
-pkgdesc="xzgv is a GTK+/Imlib-based picture viewer for X"
-arch=(i686 x86_64)
+pkgdesc="A GTK+/Imlib-based picture viewer for X"
+arch=('i686' 'x86_64')
+url="http://rus.members.beeb.net/xzgv.html"
+license=('GPL')
 depends=('gtk2')
 makedepends=('pkgconfig')
-license=('GPL')
-source=(http://downloads.sourceforge.net/sourceforge/xzgv/${pkgname}-${pkgver}.tar.gz)
-url="http://rus.members.beeb.net/xzgv.html"
+install=xzgv.install
+source=(http://downloads.sourceforge.net/sourceforge/xzgv/${pkgname}-${pkgver}.tar.gz
+        xzgv-infoinstall.patch)
+md5sums=('d6452ebd4911d986fa1176086afb6e33'
+         '5578f2d2521f060fec127cc07f69b578')
 
 build() {
-   cd ${startdir}/src/${pkgname}-${pkgver}
-   if [ "${CARCH}" = "x86_64" ]; then
-     # from gentoo
-    sed -i -e "s:-O2 -Wall:${CFLAGS}:" config.mk
-    case "${ARCH}" in "x86");; *)
-     sed -i -e "s/CFLAGS+=-DINTERP_MMX/#&/" config.mk;;
-    esac
-   fi
-   
+   cd ${srcdir}/${pkgname}-${pkgver}
+   patch -Np1 -i $srcdir/xzgv-infoinstall.patch
+
    make all || return 1
-   cd src
-   make BINDIR=${startdir}/pkg/usr/bin \
-        MANDIR=${startdir}/pkg/usr/man/man1 \
+}
+
+package() {   
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make BINDIR=${pkgdir}/usr/bin \
+        MANDIR=${pkgdir}/usr/share/man/man1 \
+        INFODIR=${pkgdir}/usr/share/info \
         install
+}
 
-   cd ../doc
-   install -D -m644 xzgv.1 $startdir/pkg/usr/man/man1/xzgv.1
-}
-md5sums=('7e2dfad595c97c2abbb392b61ea69f1b')

Copied: xzgv/repos/extra-x86_64/xzgv-infoinstall.patch (from rev 49369, xzgv/trunk/xzgv-infoinstall.patch)
===================================================================
--- extra-x86_64/xzgv-infoinstall.patch	                        (rev 0)
+++ extra-x86_64/xzgv-infoinstall.patch	2009-08-06 14:16:53 UTC (rev 49371)
@@ -0,0 +1,23 @@
+diff -Naur xzgv-0.9.1-old/Makefile xzgv-0.9.1/Makefile
+--- xzgv-0.9.1-old/Makefile	2009-05-01 07:58:36.000000000 +1000
++++ xzgv-0.9.1/Makefile	2009-08-06 23:58:04.000000000 +1000
+@@ -23,7 +23,7 @@
+ 
+ 
+ 
+-all: src man
++all: src man info
+ 
+ src: xzgv
+ 
+diff -Naur xzgv-0.9.1-old/doc/Makefile xzgv-0.9.1/doc/Makefile
+--- xzgv-0.9.1-old/doc/Makefile	2007-12-24 06:49:03.000000000 +1000
++++ xzgv-0.9.1/doc/Makefile	2009-08-07 00:01:20.000000000 +1000
+@@ -39,7 +39,6 @@
+ install: installdirs
+ 	install xzgv.1 $(MANDIR)
+ 	install -m 644 xzgv.info.gz $(INFODIR)
+-	install-info --infodir=$(INFODIR) xzgv.info.gz
+ 
+ uninstall:
+ 	$(RM) $(MANDIR)/xzgv.1

Copied: xzgv/repos/extra-x86_64/xzgv.install (from rev 49369, xzgv/trunk/xzgv.install)
===================================================================
--- extra-x86_64/xzgv.install	                        (rev 0)
+++ extra-x86_64/xzgv.install	2009-08-06 14:16:53 UTC (rev 49371)
@@ -0,0 +1,22 @@
+infodir=/usr/share/info
+filelist=(xzgv.info)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+# vim:set ts=2 sw=2 et: