[arch-commits] CVS update of extra/editors/gphpedit (PKGBUILD gphpedit.install)

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 13:57:17
  Author: jgc
    Path: /home/cvs-extra/extra/editors/gphpedit

Modified: PKGBUILD (1.9 -> 1.10) gphpedit.install (1.1 -> 1.2)

upgpkg: gphpedit 0.9.91-2
Move to /usr


------------------+
 PKGBUILD         |   28 +++++++++++-----------------
 gphpedit.install |    7 ++-----
 2 files changed, 13 insertions(+), 22 deletions(-)


Index: extra/editors/gphpedit/PKGBUILD
diff -u extra/editors/gphpedit/PKGBUILD:1.9 extra/editors/gphpedit/PKGBUILD:1.10
--- extra/editors/gphpedit/PKGBUILD:1.9	Wed Aug  9 16:16:53 2006
+++ extra/editors/gphpedit/PKGBUILD	Sun Apr 22 13:57:17 2007
@@ -1,32 +1,26 @@
-# $Id: PKGBUILD,v 1.9 2006/08/09 20:16:53 andyrtr Exp $
+# $Id: PKGBUILD,v 1.10 2007/04/22 17:57:17 jgc Exp $
 # Maintainer: tobias <tobias at archlinux.org>
 # Contributor: Tobias Kieslich <tobias at justdreams.de>
 
 pkgname=gphpedit
 pkgver=0.9.91
-pkgrel=1
+pkgrel=2
 pkgdesc="a scintilla/gnome based editor specialized on php-files"
 arch=(i686 x86_64)
-depends=('libgnomeui' 'libart-lgpl' 'libgtkhtml' 'gnome-vfs' 'desktop-file-utils')
+license=('GPL')
+depends=('libgnomeui>=2.18.1-2' 'libgtkhtml>=2.11.0' 'desktop-file-utils')
 url="http://www.gphpedit.org/"
-install=$pkgname.install
-source=(http://www.gphpedit.org/download/files/$pkgname-$pkgver.tar.gz)
+install=gphpedit.install
+source=(http://www.gphpedit.org/download/files/${pkgname}-${pkgver}.tar.gz)
 md5sums=('eecd29e66b415246408b285f4edcb6a0')
 
 build() {
-  export MAKEFLAGS="-j1"
-  [ -f /etc/profile.d/gnome.sh ] && . /etc/profile.d/gnome.sh
-  cd $startdir/src/$pkgname-$pkgver
-   # this is a gnome app, therefore it has to go to /opt/gnome
-   # several hardcoded pathes needs to be fixed manually
-   # http://www.gphpedit.org/bugs/bug_view.php?id=61
-  for patchfile in src/calltip.c src/main.h src/main_window.c gphpedit.desktop.in ; do 
-    sed -i 's|\/usr\/|/opt/gnome/|' $patchfile
-  done
-  ./configure --prefix=/opt/gnome
+  cd ${startdir}/src/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
   make || return 1
-  make DESTDIR=$startdir/pkg install
+  make DESTDIR=${startdir}/pkg install
+
   # extend MimeType declaration
   echo "MimeType=application/x-php;text-x-php-text/x-php-source;" >> \
-    $startdir/pkg/opt/gnome/share/applications/$pkgname.desktop
+    ${startdir}/pkg/usr/share/applications/gphpedit.desktop
 }
Index: extra/editors/gphpedit/gphpedit.install
diff -u extra/editors/gphpedit/gphpedit.install:1.1 extra/editors/gphpedit/gphpedit.install:1.2
--- extra/editors/gphpedit/gphpedit.install:1.1	Wed Nov 24 12:15:51 2004
+++ extra/editors/gphpedit/gphpedit.install	Sun Apr 22 13:57:17 2007
@@ -1,6 +1,5 @@
 post_install() {
-  echo "update desktop mime database..."
-  update-desktop-database
+  update-desktop-database -q
 }
 
 post_upgrade() {
@@ -11,10 +10,8 @@
   /bin/true
 }
 
-# arg 1:  the old package version
 post_remove() {
-  echo "update desktop mime database..."
-  update-desktop-database
+  post_install
 }
 
 op=$1