modernize

2 files changed, 33 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3510e306f3b6..dbbb3dab4bd4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,7 +7,7 @@ pkgbase = mod_auth_kerb
 	arch = x86_64
 	license = custom
 	depends = apache>=2.0
-	depends = heimdal
+	depends = krb5
 	source = http://downloads.sourceforge.net/project/modauthkerb/mod_auth_kerb/mod_auth_kerb-5.4/mod_auth_kerb-5.4.tar.gz
 	source = auth_kerb.conf
 	source = mod_auth_kerb.patch
diff --git a/PKGBUILD b/PKGBUILD
index 2eb68fe72d2c..88b632254b50 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,6 @@
+# Contributor: Mantas Mikulėnas <grawity@gmail.com>
 # Contributor: Nahum Shalman <nshalman at elys dot com>
-# Maintainer: Brad Arrington <bradla8 at yahoo.com>
+# Contributor: Brad Arrington <bradla8 at yahoo.com>
 
 pkgname=mod_auth_kerb
 pkgver=5.4
@@ -9,33 +10,40 @@ arch=('i686' 'x86_64')
 #url="http://sourceforge.net/projects/mod_auth_kerb/"
 url="http://sourceforge.net/projects/modauthkerb/files/mod_auth_kerb/mod_auth_kerb-5.4/mod_auth_kerb-5.4.tar.gz/download"
 license=('custom')
-groups=()
-depends=('apache>=2.0' 'heimdal')
-makedepends=()
-optdepends=()
-conflicts=()
-replaces=()
-options=()
-install=
-source=(http://downloads.sourceforge.net/project/modauthkerb/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz auth_kerb.conf mod_auth_kerb.patch mod_auth_kerb_compile.patch)
-noextract=()
+depends=('apache>=2.0' 'krb5')
+source=(http://downloads.sourceforge.net/project/modauthkerb/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz
+        auth_kerb.conf
+        mod_auth_kerb.patch
+        mod_auth_kerb_compile.patch)
 md5sums=('642b81763ad3ca81dba359cb952da5e3'
          '399f8ab44947ac79f23f718c4ca9a527'
          '3a4ed51a6bfb949fc588148074e1df5a'
          '051f97f87667c92db00f34d20404261d')
 
+prepare() {
+  cd "$pkgname-$pkgver"
+
+  #patch -p0 < "$srcdir/mod_auth_kerb.patch"
+  patch -p1 < "$srcdir/mod_auth_kerb_compile.patch"
+}
+
 build() {
-     cd $startdir/src/$pkgname-$pkgver
-     #patch -p0 < $startdir/$pkgname.patch
-     patch -p1 < $startdir/mod_auth_kerb_compile.patch
-     ./configure --without-krb4 --with-apache=$startdir/pkg
-
-     mkdir -p $startdir/pkg/usr/lib/httpd/modules
-     mkdir -p $startdir/pkg/etc/httpd/conf
-     mkdir -p $startdir/pkg/usr/share/licenses/$pkgname/
-
-     make || return 1
-     install -m 755 src/.libs/$pkgname.so $startdir/pkg/usr/lib/httpd/modules || return 1
-     install -m 644 $startdir/src/auth_kerb.conf $startdir/pkg/etc/httpd/conf/auth_kerb.conf.sample || return 1
-     install -m 644 LICENSE $startdir/pkg/usr/share/licenses/$pkgname/ || return 1
+  cd "$pkgname-$pkgver"
+
+  ./configure --without-krb4 --with-apache="$pkgdir"
+  make
 }
+
+package() {
+  cd "$pkgname-$pkgver"
+
+  mkdir -p "$pkgdir/usr/lib/httpd/modules"
+  mkdir -p "$pkgdir/etc/httpd/conf"
+  mkdir -p "$pkgdir/usr/share/licenses/$pkgname"
+
+  install -m 755 "src/.libs/$pkgname.so"  "$pkgdir/usr/lib/httpd/modules"
+  install -m 644 "$srcdir/auth_kerb.conf" "$pkgdir/etc/httpd/conf/auth_kerb.conf.sample"
+  install -m 644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/"
+}
+
+# vim: ts=2:sw=2:et:nowrap