[arch-commits] Commit in dansguardian/repos (3 files)

[Giovanni Scafora]

    Date: Saturday, February 21, 2009 @ 15:13:42
  Author: giovanni
Revision: 27440

Merged revisions 356,2304,27436 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/dansguardian/trunk

........
  r356 | aaron | 2008-04-18 15:56:27 -0700 (ven, 18 apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r2304 | paul | 2008-05-30 22:00:40 -0700 (ven, 30 mag 2008) | 2 lines
  
  Added licenses for 64 packages.
........
  r27436 | kevin | 2009-02-21 11:50:04 -0800 (sab, 21 feb 2009) | 1 line
  
  upgpkg: dansguardian 2.10.0.3-1
........

Modified:
  dansguardian/repos/extra-x86_64/	(properties)
  dansguardian/repos/extra-x86_64/PKGBUILD
  dansguardian/repos/extra-x86_64/dansguardian.install

----------------------+
 PKGBUILD             |   32 ++++++++++++++++----------------
 dansguardian.install |   18 ------------------
 2 files changed, 16 insertions(+), 34 deletions(-)


Property changes on: dansguardian/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /dansguardian/trunk:1
   + /dansguardian/trunk:1-27439

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-02-21 19:53:30 UTC (rev 27439)
+++ extra-x86_64/PKGBUILD	2009-02-21 20:13:42 UTC (rev 27440)
@@ -3,28 +3,28 @@
 # Contributor: Manolis Tzanidakis
 
 pkgname=dansguardian
-pkgver=2.8.0.6
+pkgver=2.10.0.3
 pkgrel=1
 pkgdesc="Squid plugin for web content filtering."
 arch=(i686 x86_64)
 url="http://dansguardian.org"
-depends=('squid' 'zlib')
+arch=('i686' 'x86_64')
+license=('GPL2')
+depends=('squid' 'pcre' 'zlib')
 install=$pkgname.install
-backup=(etc/dansguardian/dansguardian.conf)
-source=(http://usmirror.dansguardian.org/downloads/2/Stable/$pkgname-$pkgver.source.tar.gz \
-	dansguardian)
-md5sums=('aa619607198f37a528dbb65e4a503beb' 'a65a2cb6309670ad8978f1544907d290')
+backup=(etc/dansguardian/dansguardian.conf etc/dansguardian/dansguardianf1.conf)
+source=(http://dansguardian.org/downloads/2/Stable/${pkgname}-${pkgver}.tar.gz
+dansguardian)
+md5sums=('68c8e9a97a3b58d2467a19cb15db5599' 'a65a2cb6309670ad8978f1544907d290')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix="" --runas_usr=proxy \
-      --runas_grp=proxy --installprefix=$startdir/pkg \
-      --sysvdir=/etc/rc.d
-  /usr/bin/make || return 1
-  /bin/mkdir -p $startdir/pkg/etc/logrotate.d
-  /usr/bin/make install
-  /bin/rm -rf $startdir/pkg/etc/rc.d*
-  /bin/install -D -m755 $startdir/dansguardian \
-      $startdir/pkg/etc/rc.d/dansguardian
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix="/usr" --with-proxyuser=proxy --with-proxygroup=proxy \
+              --sysconfdir=/etc --localstatedir=/var --enable-email
+  make || return 1
+  make DESTDIR=${pkgdir} install
+
+  install -D data/scripts/dansguardian ${pkgdir}/etc/logrotate.d/dansguardian
+  install -D -m755 ${srcdir}/dansguardian ${pkgdir}/etc/rc.d/dansguardian
 }
 # vim: ts=2 sw=2 et ft=sh

Modified: extra-x86_64/dansguardian.install
===================================================================
--- extra-x86_64/dansguardian.install	2009-02-21 19:53:30 UTC (rev 27439)
+++ extra-x86_64/dansguardian.install	2009-02-21 20:13:42 UTC (rev 27440)
@@ -6,21 +6,3 @@
   echo "--------------------------------------------------"
   chown -R proxy.proxy var/log/dansguardian 
 }
-
-post_upgrade() {
-  /bin/true
-}
-
-pre_remove() {
-  /bin/ture
-}
-
-post_remove() {
-  /bin/ture
-}
-
-op=$1
-shift
-
-$op $*
-# vim: ts=2 sw=2 et ft=sh