[arch-commits] Commit in fwbuilder/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Eric Belanger]

    Date: Friday, October 3, 2008 @ 20:16:36
  Author: eric
Revision: 14127

fixing svn conflict

Modified:
  fwbuilder/repos/extra-x86_64/	(properties)
  fwbuilder/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)


Property changes on: fwbuilder/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /fwbuilder/trunk:1
   + /fwbuilder/trunk:1-14126

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-10-04 00:14:47 UTC (rev 14126)
+++ extra-x86_64/PKGBUILD	2008-10-04 00:16:36 UTC (rev 14127)
@@ -3,28 +3,27 @@
 # Maintainer: Kevin Piche <kevin at archlinux.org>
 
 pkgname=fwbuilder
-pkgver=2.1.17
+pkgver=3.0.0
 pkgrel=1
 pkgdesc="Object-oriented GUI and set of compilers for various firewall platforms"
 arch=(i686 x86_64)
 license=('GPL')
-depends=("libfwbuilder>=$pkgver" 'gcc-libs' 'qt3>=3.3.5')
-options=('!makeflags')
+depends=("libfwbuilder>=$pkgver" 'qt>=4.3')
 source=(http://dl.sourceforge.net/sourceforge/fwbuilder/$pkgname-$pkgver.tar.gz)
-md5sums=('6ac3e9c5663382271287df71e7a30239')
 url="http://www.fwbuilder.org/"
+md5sums=('f1032f4ebc8263224d7e829a204e8d5e')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
-. /etc/profile.d/qt3.sh
-  [ "$CARCH" = "x86_64" ] && ARCH="-64"
-  export QMAKESPEC=/opt/qt/mkspecs/linux-g++$ARCH/
+#. /etc/profile.d/qt3.sh
+#  [ "$CARCH" = "x86_64" ] && ARCH="-64"
+#  export QMAKESPEC=/opt/qt/mkspecs/linux-g++$ARCH/
   ./configure --prefix=/usr
   # fix the lib paths
-  [ "$CARCH" = "x86_64" ] &&  sed -i "s#lib64#lib#g" \
-	{src/fwbedit/Makefile,src/fwblookup/Makefile,src/gui/Makefile,src/ipt/Makefile,src/pf/Makefile,src/ipf/Makefile,src/ipfw/Makefile}
-  sed -i "s#/usr/bin/install#/bin/install#" po/Makefile
-  sed -i 's# $(DDIR)# $(INSTALL_ROOT)$(DDIR)#' po/Makefile
+#  [ "$CARCH" = "x86_64" ] &&  sed -i "s#lib64#lib#g" \
+#	{src/fwbedit/Makefile,src/fwblookup/Makefile,src/gui/Makefile,src/ipt/Makefile,src/pf/Makefile,src/ipf/Makefile,src/ipfw/Makefile}
+  #sed -i "s#/usr/bin/install#/bin/install#" po/Makefile
+#  sed -i 's# $(DDIR)# $(INSTALL_ROOT)$(DDIR)#' po/Makefile
   make || return 1
   #make prefix=$startdir/pkg/usr install
   make INSTALL_ROOT=$startdir/pkg install