[arch-commits] CVS update of extra/editors/bluefish (3 files)

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 13:56:07
  Author: jgc
    Path: /home/cvs-extra/extra/editors/bluefish

Modified: PKGBUILD (1.26 -> 1.27) bluefish.install (1.1 -> 1.2)
 Removed: no_gnomeui.patch (1.1)

upgpkg: bluefish 1.0.7-2
Move to /usr, remove obsolete patch


------------------+
 PKGBUILD         |   27 ++++++++++++++-------------
 bluefish.install |    4 ++--
 no_gnomeui.patch |   31 -------------------------------
 3 files changed, 16 insertions(+), 46 deletions(-)


Index: extra/editors/bluefish/PKGBUILD
diff -u extra/editors/bluefish/PKGBUILD:1.26 extra/editors/bluefish/PKGBUILD:1.27
--- extra/editors/bluefish/PKGBUILD:1.26	Sat Nov 11 05:25:12 2006
+++ extra/editors/bluefish/PKGBUILD	Sun Apr 22 13:56:06 2007
@@ -1,29 +1,30 @@
-# $Id: PKGBUILD,v 1.26 2006/11/11 10:25:12 arjan Exp $
-# Maintainer: arjan <arjan at archlinux.org>
+# $Id: PKGBUILD,v 1.27 2007/04/22 17:56:06 jgc Exp $
+# Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
 
 pkgname=bluefish
 pkgver=1.0.7
-pkgrel=1
+pkgrel=2
 pkgdesc="Programmer's HTML editor written using GTK"
 arch=(i686 x86_64)
 url="http://bluefish.openoffice.nl/"
-depends=('pcre>=6.6-2' 'aspell>=0.60.4-2' 'libgnomeui>=2.16.0-1')
+depends=('pcre>=6.6-2' 'aspell>=0.60.4-2' 'libgnomeui>=2.18.1-2' 'desktop-file-utils' 'shared-mime-info')
+makedepends=('pkgconfig')
+license=('GPL')
 install=bluefish.install
-source=(http://www.bennewitz.com/bluefish/stable/source/$pkgname-$pkgver.tar.bz2)
+source=(http://www.bennewitz.com/bluefish/stable/source/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('2c3b3c9c8f8e32b9473dfd879f216dea')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  #patch -Np0 -i $startdir/src/no_gnomeui.patch || return 1
-  ./configure --prefix=/opt/gnome \
-    --with-freedesktop_org-menu=/opt/gnome/share/applications \
-    --with-freedesktop_org-mime=/opt/gnome/share/mime \
+  cd ${startdir}/src/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --with-freedesktop_org-menu=/usr/share/applications \
+    --with-freedesktop_org-mime=/usr/share/mime \
     --without-gnome2_4-mime \
     --without-gnome2_4-appreg \
-    --with-icon-path=/opt/gnome/share/pixmaps \
+    --with-icon-path=/usr/share/pixmaps \
     --disable-update-databases
   make || return 1
-  make DESTDIR=$startdir/pkg install
-  install -m644 $startdir/src/$pkgname-$pkgver/data/bluefish.desktop $startdir/pkg/opt/gnome/share/applications/bluefish.desktop
+  make DESTDIR=${startdir}/pkg install
+  install -m644 ${startdir}/src/${pkgname}-${pkgver}/data/bluefish.desktop ${startdir}/pkg/usr/share/applications/bluefish.desktop
 }
Index: extra/editors/bluefish/bluefish.install
diff -u extra/editors/bluefish/bluefish.install:1.1 extra/editors/bluefish/bluefish.install:1.2
--- extra/editors/bluefish/bluefish.install:1.1	Mon Jan 24 10:28:18 2005
+++ extra/editors/bluefish/bluefish.install	Sun Apr 22 13:56:06 2007
@@ -1,6 +1,6 @@
 post_install() {
-  update-desktop-database /opt/gnome/share/applications > /dev/null 2>&1
-  update-mime-database /opt/gnome/share/mime > /dev/null 2>&1
+  update-desktop-database -q
+  update-mime-database usr/share/mime > /dev/null
 }
 
 post_upgrade() {
Index: extra/editors/bluefish/no_gnomeui.patch
diff -u extra/editors/bluefish/no_gnomeui.patch:1.1 extra/editors/bluefish/no_gnomeui.patch:removed
--- extra/editors/bluefish/no_gnomeui.patch:1.1	Thu Feb  3 07:35:09 2005
+++ extra/editors/bluefish/no_gnomeui.patch	Sun Apr 22 13:56:07 2007
@@ -1,31 +0,0 @@
---- configure.old	2005-02-03 12:07:04.000000000 +0000
-+++ configure	2005-02-03 12:09:23.000000000 +0000
-@@ -3429,17 +3429,20 @@
- 	echo "no"
- fi
- 
--echo -n "checking for libgnomeui >= 2.6... "
--if pkg-config libgnomeui-2.0 --atleast-version=2.6 ; then
--	cat >>confdefs.h <<\_ACEOF
-+if test "${with_libgnomeui+set}" = set; then
-+  withval="$with_libgnomeui"
-+  echo -n "checking for libgnomeui >= 2.6... "
-+  if pkg-config libgnomeui-2.0 --atleast-version=2.6 ; then
-+    cat >>confdefs.h <<\_ACEOF
- #define HAVE_ATLEAST_GNOMEUI_2_6 1
- _ACEOF
- 
--	LIBS="$LIBS `pkg-config --libs libgnomeui-2.0`"
--	CFLAGS="$CFLAGS `pkg-config --cflags libgnomeui-2.0`"
--	echo "yes"
--else
--	echo "no"
-+    LIBS="$LIBS `pkg-config --libs libgnomeui-2.0`"
-+    CFLAGS="$CFLAGS `pkg-config --cflags libgnomeui-2.0`"
-+    echo "yes"
-+  else
-+    echo "no"
-+  fi
- fi
- 
- # Extract the first word of "pcre-config", so it can be a program name with args.