[arch-commits] Commit in htdig/repos (extra-i686 extra-i686/PKGBUILD)

[Giovanni Scafora]

    Date: Saturday, April 25, 2009 @ 12:57:03
  Author: giovanni
Revision: 36614

Merged revisions 36612 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/htdig/trunk

........
  r36612 | giovanni | 2009-04-25 09:47:17 -0700 (sab, 25 apr 2009) | 1 line
  
  upgpkg: htdig 3.2.0b6-6
........

Modified:
  htdig/repos/extra-i686/	(properties)
  htdig/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)


Property changes on: htdig/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /htdig/trunk:1-36609
   + /htdig/trunk:1-36613

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-04-25 16:48:27 UTC (rev 36613)
+++ extra-i686/PKGBUILD	2009-04-25 16:57:03 UTC (rev 36614)
@@ -4,13 +4,13 @@
 
 pkgname=htdig
 pkgver=3.2.0b6
-pkgrel=5
+pkgrel=6
 pkgdesc="A complete world wide web indexing and searching system for a domain or intranet."
 url="http://www.htdig.org"
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('gcc-libs' 'zlib' 'bash')
-options=('!libtool')
+options=('!libtool' '!emptydirs')
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2
         gcc4.3.patch
 	quoting.patch)
@@ -29,12 +29,11 @@
               --with-config-dir=/etc/htdig \
               --with-default-config-file=/etc/htdig/htdig.conf \
               --with-database-dir=/var/lib/htdig/db \
-              --with-cgi-bin-dir=/srv/http/cgi-bin \
-              --with-search-dir=/srv/http/htdocs/htdig \
-              --with-image-dir=/srv/http/htdocs/htdig
+              --with-cgi-bin-dir=/usr/bin \
+	      --with-common-dir=/usr/share/doc/htdig \
+	      --with-search-dir=/usr/share/doc/htdig \
+	      --with-image-dir=/usr/share/doc/htdig
   make || return 1
   make DESTDIR=${pkgdir} install
-
-  ln -s /srv/http/cgi-bin/htsearch ${pkgdir}/usr/bin || return 1
 }