webalizer-xtended: updated pkg 2.23 RB29

git-svn-id: http://svn.kraehen.org/aur@63 04e22907-73ef-438a-a52f-a971dc6d3b47

3 files changed, 78 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5ff1f58ccacb..60d0b4b58586 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,25 @@
 pkgbase = webalizer-xtended
-	pkgdesc = A web statistics generator patched to report 404 errors as well.
-	pkgver = 2.01
-	pkgrel = 2
-	url = http://www.patrickfrei.ch/webalizer/
+	pkgdesc = A web server log file analysis program producing HTML reports, xtended
+	pkgver = 2.23.05.20111101
+	pkgrel = 1
+	url = http://www.patricfrei.ch/webalizer/
+	install = webalizer.install
 	arch = i686
 	arch = x86_64
 	license = GPL
+	depends = db
 	depends = gd
 	depends = geoip
+	provides = webalizer
 	conflicts = webalizer
-	replaces = webalizer
-	source = ftp://ftp.mrunix.net/pub/webalizer/old/webalizer-2.01-10-src.tgz
-	source = http://www.patrickfrei.ch/webalizer/rb24/webalizer-2.01-10-RB24-patch.tar.gz
-	md5sums = 9217595005aec46a505e1fb349052a8e
-	md5sums = d73c08c94f1e4bbbfa0be9e3c1de089c
+	source = ftp://ftp.mrunix.net/pub/webalizer/webalizer-2.23-05-src.tgz
+	source = http://www.patrickfrei.ch/webalizer/rb29/webalizer-2.23-05-RB29-patch.tar.gz
+	source = ftp://ftp.mrunix.net/pub/webalizer/geodb/webalizer-geodb-20111101.tgz
+	source = ftp://ftp.mrunix.net/pub/webalizer/webalizer-flags.tgz
+	md5sums = 304338cf3b1e9389123380d5f7d88d58
+	md5sums = d9d7b686f4a7791437fce33a6f0c47e5
+	md5sums = 1a00df39f7c1f25ed0f8962e5bbd5874
+	md5sums = 2605387b6076b8bdc0ec41b8655095c1
 
 pkgname = webalizer-xtended
 
diff --git a/PKGBUILD b/PKGBUILD
index c558cc2c48ba..d418da2ae9a4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,58 @@
-# Based on the official webalizer PKGBUILD Maintained by: Travis Willard <travisw@wmpub.ca>
-# Webalizer Xtended PKGBUILD maintanier: Jeff Anderson <jefferya@programmerq.net>
+# Contributor: megadriver <megadriver at gmx dot com>
+# Contributor: Jamie Nguyen <jamie AT tomoyolinux.co.uk>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=webalizer-xtended
-pkgver=2.01
-pkgrel=2
-pkgdesc="A web statistics generator patched to report 404 errors as well."
-url="http://www.patrickfrei.ch/webalizer/"
-license="GPL"
+_geodbver=20111101
+pkgver=2.23.05.${_geodbver}
+_pkgver=2.23-05
+_patchver=29
+pkgrel=1
+pkgdesc="A web server log file analysis program producing HTML reports, xtended"
 arch=('i686' 'x86_64')
-depends=('gd' 'geoip')
-makedepends=()
-replaces=(webalizer)
-conflicts=(webalizer)
-source=(ftp://ftp.mrunix.net/pub/webalizer/old/webalizer-$pkgver-10-src.tgz \
-	http://www.patrickfrei.ch/webalizer/rb24/webalizer-$pkgver-10-RB24-patch.tar.gz)
-md5sums=('9217595005aec46a505e1fb349052a8e'
-         'd73c08c94f1e4bbbfa0be9e3c1de089c')
-
+#url="http://www.webalizer.com/"
+url="http://www.patricfrei.ch/webalizer/"
+license=('GPL')
+depends=('db' 'gd' 'geoip')
+provides=('webalizer')
+conflicts=('webalizer')
+install=webalizer.install
+source=("ftp://ftp.mrunix.net/pub/webalizer/webalizer-${_pkgver}-src.tgz"
+	"http://www.patrickfrei.ch/webalizer/rb${_patchver}/webalizer-${_pkgver}-RB${_patchver}-patch.tar.gz"
+        "ftp://ftp.mrunix.net/pub/webalizer/geodb/webalizer-geodb-${_geodbver}.tgz"
+        "ftp://ftp.mrunix.net/pub/webalizer/webalizer-flags.tgz")
+md5sums=('304338cf3b1e9389123380d5f7d88d58'
+         'd9d7b686f4a7791437fce33a6f0c47e5'
+         '1a00df39f7c1f25ed0f8962e5bbd5874'
+         '2605387b6076b8bdc0ec41b8655095c1')
+        
 build() {
-  cd $startdir/src/webalizer-$pkgver-10
-  patch -p1 < $startdir/src/webalizer-$pkgver-10-RB24-patch
-  ./configure --prefix=/usr --enable-geoip
-  make || return 1
+  cd "${srcdir}/webalizer-${_pkgver}"
+  patch -p1 < ${srcdir}/webalizer-${_pkgver}-RB${_patchver}-patch
 
-  # Set up our directory structure
-  install -d -m755 $startdir/pkg/usr/bin $startdir/pkg/usr/share/man/man1 \
-                   $startdir/pkg/etc
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --datarootdir=/usr/share \
+    --enable-bz2 \
+    --enable-geoip
+  make
+}
 
-  make prefix=$startdir/pkg/usr datarootdir=$startdir/pkg/usr/share \
-       ETCDIR=$startdir/pkg/etc install
+package() {
+  cd "${srcdir}/webalizer-${_pkgver}"
 
-  cd $startdir/pkg/usr/bin
-  rm -fr webazolver
-  ln -s webalizer webazolver
-}
+  # install webalizer
+  make DESTDIR="${pkgdir}" install
 
+  # install geolocation database (GeoDB)
+  install -m755 -d "${pkgdir}/usr/share/GeoDB"
+  install -m644 "${srcdir}/GeoDB.dat" "${pkgdir}/usr/share/GeoDB/GeoDB.dat"
+
+  # install flags
+  cd "${srcdir}/flags"
+  install -m755 -d "${pkgdir}/usr/share/webalizer/flags"
+  for i in *.png; do
+    install -m644 ${i} "${pkgdir}/usr/share/webalizer/flags/${i}"
+  done
+}
diff --git a/webalizer.install b/webalizer.install
new file mode 100644
index 000000000000..2c32888b0bfc
--- /dev/null
+++ b/webalizer.install
@@ -0,0 +1,13 @@
+post_install () {
+	echo
+	echo " * Geolocation can be enabled with the following options:"
+	echo "     GeoDB yes"
+	echo "     GeoDBDatabase /usr/share/GeoGB/GeoDB.dat"
+	echo "     GeoIP yes"
+	echo "     GeoIPDatabase /usr/share/GeoIP/GeoIP.dat"
+	echo
+	echo " * Display of country flags can be enabled with the following options:"
+	echo "     CountryFlags yes"
+	echo "     FlagDir /usr/share/webalizer/flags"
+	echo
+}