[arch-commits] Commit in gtk/repos (3 files)

[Jan de Groot]

    Date: Wednesday, June 3, 2009 @ 06:26:04
  Author: jgc
Revision: 41340

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

........
  r356 | aaron | 2008-04-19 00:56:27 +0200 (Sat, 19 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r41339 | jgc | 2009-06-03 12:25:24 +0200 (Wed, 03 Jun 2009) | 5 lines
  
  upgpkg: gtk 1.2.10-9
      Fix dependencies
  Add makedepend on libxt
  Handle info files
  Fix man/info path locations
........

Added:
  gtk/repos/extra-x86_64/gtk.install
    (from rev 41339, gtk/trunk/gtk.install)
Modified:
  gtk/repos/extra-x86_64/	(properties)
  gtk/repos/extra-x86_64/PKGBUILD

-------------+
 PKGBUILD    |   27 +++++++++++++++------------
 gtk.install |   19 +++++++++++++++++++
 2 files changed, 34 insertions(+), 12 deletions(-)


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

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-06-03 10:25:24 UTC (rev 41339)
+++ extra-x86_64/PKGBUILD	2009-06-03 10:26:04 UTC (rev 41340)
@@ -4,29 +4,32 @@
 
 pkgname=gtk
 pkgver=1.2.10
-pkgrel=8
+pkgrel=9
 pkgdesc="The GTK+ toolkit"
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
 license=('LGPL')
-depends=('libxi' 'glib')
+depends=('libxi' 'glib' 'sh' 'texinfo')
+makedepends=('libxt')
 options=('!libtool')
-source=(ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-$pkgver.tar.gz \
+install=gtk.install
+source=(ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-$pkgver.tar.gz
 	aclocal-fixes.patch)
 md5sums=('4d5cb2fc7fb7830e4af9747a36bfce20' 'c59d4906602d99a7468f7334b6fc3b4e')
 sha1sums=('a5adcb909257da01ae4d4761e1d41081d06e4d7c' 'b034e33efb85d27f3f3fb082c404e3b6ea79259f')
 
 build() {
-  cd $startdir/src/gtk+-$pkgver
-  if [ "$CARCH" == "x86_64" ]; then
+  cd "${srcdir}/gtk+-${pkgver}"
+  if [ "${CARCH}" = "x86_64" ]; then
     rm config.guess config.sub
-    ln -s /usr/share/libtool/config.guess config.guess
-    ln -s /usr/share/libtool/config.sub config.sub
+    ln -s /usr/share/libtool/config/config.guess config.guess
+    ln -s /usr/share/libtool/config/config.sub config.sub
   fi
-  patch -Np0 -i ${startdir}/src/aclocal-fixes.patch || return 1
-  ./configure --prefix=/usr --sysconfdir=/etc --with-xinput=xfree
+  patch -Np0 -i "${srcdir}/aclocal-fixes.patch" || return 1
+  ./configure --prefix=/usr --sysconfdir=/etc \
+    --mandir=/usr/share/man --infodir=/usr/share/info \
+    --with-xinput=xfree || return 1
   make || return 1
-  make DESTDIR=$startdir/pkg install
-  cd $startdir/pkg/usr/include
-  ln -s gtk-1.2/gtk gtk
+  make DESTDIR="${pkgdir}" install || return 1
+  rm -f "${pkgdir}/usr/share/info/dir"
 }

Copied: gtk/repos/extra-x86_64/gtk.install (from rev 41339, gtk/trunk/gtk.install)
===================================================================
--- extra-x86_64/gtk.install	                        (rev 0)
+++ extra-x86_64/gtk.install	2009-06-03 10:26:04 UTC (rev 41340)
@@ -0,0 +1,19 @@
+infofiles="gdk.info gtk.info gtk.info-1 gtk.info-2 gtk.info-3 gtk.info-4 gtk.info-5 gtk.info-6"
+
+info_dir=/usr/share/info
+
+post_install() {
+  for inf in ${infofiles}; do
+    install-info ${info_dir}/${inf} ${info_dir}/dir
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  for inf in ${infofiles}; do
+    install-info --delete ${info_dir}/${inf} ${info_dir}/dir
+  done
+}