Extra fixes and cleanup.

3 files changed, 2 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3f1d3788cf19..f82ef4b42be5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = netatalk-ddp
 	pkgdesc = A kernel-level implementation of AppleTalk, AFP, and PAP services
 	pkgver = 2.2.6
-	pkgrel = 2
+	pkgrel = 3
 	url = http://netatalk.sourceforge.net
-	install = netatalk-ddp.install
 	arch = i686
 	arch = x86_64
 	license = GPL
diff --git a/PKGBUILD b/PKGBUILD
index 9cce8f7bd43b..a79d33ff052f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,10 +5,9 @@
 # Contributor: William Udovich <nerdzrule7 at earthlink dot net>
 # Contributor: Farhan Yousaf <farhany at xaviya dot com>
 
-pkgbase=netatalk-ddp
 pkgname=netatalk-ddp
 pkgver=2.2.6
-pkgrel=2
+pkgrel=3
 pkgdesc='A kernel-level implementation of AppleTalk, AFP, and PAP services'
 arch=('i686' 'x86_64')
 url='http://netatalk.sourceforge.net'
@@ -26,7 +25,6 @@ backup=('etc/netatalk/afpd.conf'
 	'etc/netatalk/papd.conf'
 	'etc/pam.d/netatalk')
 options=('!libtool')
-install=$pkgname.install
 source=(https://svwh.dl.sourceforge.net/project/netatalk/netatalk/$pkgver/netatalk-$pkgver.tar.bz2 netatalk-invalid_dircache_entries.patch netatalk-current_vol.patch netatalk-uams_dhx_passwd.patch netatalk-uams_dhx_pam.patch netatalk-uams_randnum.patch netatalk-papd_print_cups.patch)
 md5sums=('cd8ca5be7ebb0ac42d5576f401a8a8ba'
          'e56ca98c7399916d73cd6de1beb4a567'
diff --git a/netatalk-ddp.install b/netatalk-ddp.install
deleted file mode 100644
index 1f9e26cd7d3a..000000000000
--- a/netatalk-ddp.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-	post_upgrade
-}
-post_upgrade() {
-	if [ "`grep -E '(cnid|atalkd|afpd)' /etc/rc.conf`" ];then
-	echo '>>> Detected old netatalk daemon entries in';
-	echo '>>> /etc/rc.conf, please replace these with';
-	echo '>>> "netatalk" before restarting!';
-	echo '>>>';
-	if [ -f /etc/avahi/services/adisk.service ] ||
-	[ -f /etc/avahi/services/afpd.service ];then
-	echo '>>> Detected old netatalk service files in';
-	echo '>>> /etc/avahi/services, please delete these';
-	echo '>>> before restarting!';fi
-}