minor changes & fixes to some dodir problems faced.

4 files changed, 10 insertions, 13 deletions

diff --git a/net-ftp/pure-ftpd/files/digest-pure-ftpd-0.98.8 b/net-ftp/pure-ftpd/files/digest-pure-ftpd-0.98.8
deleted file mode 100644
index 4e74f095e2d1..000000000000
--- a/net-ftp/pure-ftpd/files/digest-pure-ftpd-0.98.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 26f2455666304e5ac726e4d20dad0946 pure-ftpd-0.98.8.tar.gz
diff --git a/net-ftp/pure-ftpd/files/digest-pure-ftpd-0.99-r1 b/net-ftp/pure-ftpd/files/digest-pure-ftpd-0.99-r1
deleted file mode 100644
index 6101d513d14c..000000000000
--- a/net-ftp/pure-ftpd/files/digest-pure-ftpd-0.99-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5653e4ee557621069cb25d54c8477d71 pure-ftpd-0.99.tar.gz
diff --git a/net-ftp/pure-ftpd/files/digest-pure-ftpd-0.99 b/net-ftp/pure-ftpd/files/digest-pure-ftpd-0.99-r2
index 6101d513d14c..6101d513d14c 100644
--- a/net-ftp/pure-ftpd/files/digest-pure-ftpd-0.99
+++ b/net-ftp/pure-ftpd/files/digest-pure-ftpd-0.99-r2
diff --git a/net-ftp/pure-ftpd/pure-ftpd-0.99-r1.ebuild b/net-ftp/pure-ftpd/pure-ftpd-0.99-r2.ebuild
index 7af879c55091..32bf8c1bf3ea 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-0.99-r1.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-0.99-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Parag Mehta <pm@gentoo.org>
-#$HEADER$
+#$HEADER:$
 
 A=pure-ftpd-0.99.tar.gz
 S=${WORKDIR}/${P}
@@ -29,25 +29,20 @@ src_install () {
     dodoc COPYING ChangeLog README README.Configuration-File 
     dodoc README.Contrib README.LDAP README.Netfilter
     dodir /etc/pure-ftpd
+    dodir /home/ftp	
+    dodir /home/ftp/pub
+    dodir /home/ftp/incoming
     cp $S/configuration-file/*.pl ${D}/usr/sbin/
     cp $S/configuration-file/*.py ${D}/usr/sbin/
     cp $S/configuration-file/pure-ftpd.conf ${D}/etc/pure-ftpd/pure-ftpd.conf
     cp ${FILESDIR}/ftpusers ${D}/etc
     cp ${FILESDIR}/pure-ftpwho_html.py ${D}/usr/sbin/
     cp ${FILESDIR}/pure-ftp_xml_python.py ${D}/usr/sbin/
-    dodir /home/ftp	
-    dodir /home/ftp/pub
-    dodir /home/ftp/incoming
-    chown ftp.bin /home/ftp
-    chown ftp.bin /home/ftp/incoming
-    chmod 757 /home/ftp/incoming
-    chown -R root.root /home/ftp/pub
-    dosym /dev/null /etc/pure-ftpd/127.0.0.1
-    cp ${FILESDIR}/welcome.msg /home/ftp/
+    cp ${FILESDIR}/welcome.msg ${D}/home/ftp/
     echo -e "\033[1;42m\033[1;33m Please do no forget to run, the following syntax : \033[0m"
     echo -e "\033[1;42m\033[1;33m ebuild pure-ftpd-0.99-r1.ebuild config \033[0m"
     echo -e "\033[1;42m\033[1;33m This will add the necessary post install config to your system. \033[0m"
-    read
+    dosym /dev/null /etc/pure-ftpd/127.0.0.1
 }
 
 pkg_config() {
@@ -57,6 +52,10 @@ pkg_config() {
 	read
 	cat ${FILESDIR}/pftpd.inetd >> ${ROOT}/etc/inetd.conf
 	/etc/rc.d/init.d/svc-xinetd restart
+	chown ftp.bin /home/ftp
+    	chown ftp.bin /home/ftp/incoming
+    	chmod 757 /home/ftp/incoming
+    	chown -R root.root /home/ftp/pub
 	echo "Modifications applied."
 }