6 files changed, 73 insertions, 67 deletions

diff --git a/ftp/ncftpd/Makefile b/ftp/ncftpd/Makefile
index 06f07dc5a281..a7c17a65cd53 100644
--- a/ftp/ncftpd/Makefile
+++ b/ftp/ncftpd/Makefile
@@ -6,34 +6,47 @@
 #
 
 PORTNAME=	ncftpd
-PORTVERSION=	2.8.3
+PORTVERSION=	2.8.5
 CATEGORIES=	ftp
-MASTER_SITES=	${MASTER_SITE_LOCAL} \
-		ftp://ftp.ncftp.com/ncftpd/${PORTVERSION}/ \
-		ftp://ftp.nl.uu.net/pub/unix/ftp/ncftpd/${PORTVERSION}/
-MASTER_SITE_SUBDIR=	miwi
-DISTNAME=	${PORTNAME}-${PORTVERSION}-freebsd${BINVER}-${ARCH}-export
+MASTER_SITES=	ftp://ftp.ncftp.com/ncftpd/${PORTVERSION}/ \
+		ftp://ftp.nl.uu.net/pub/unix/ftp/ncftpd/${PORTVERSION}/ \
+		LOCAL/beech
+DISTNAME=	${PORTNAME}-${PORTVERSION}-freebsd${BINVER}-${DIST_ARCH}-export
 
 MAINTAINER=	beech@FreeBSD.org
-COMMENT=	A well known commercial FTP daemon with a 30-day evaluation license
+COMMENT=	Commercial FTP daemon with a 30-day evaluation license
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-ONLY_FOR_ARCHS=	i386
+ONLY_FOR_ARCHS=	i386 amd64
 NO_BUILD=	YES
 LICENSE=	shareware
 RESTRICTED=	30 day evaluation license
 
+USE_RC_SUBR=	ncftpd.sh
+SUB_FILES=	pkg-message
+
+PORTDOCS=	install.html README README.freebsd LICENSE
+
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 600000
+.if ${OSVERSION} >= 700000
+BINVER=		7.0
+.elif ${OSVERSION} >= 600000
 BINVER=		6.0
 .else
-BINVER=		5.4
-.else
 BROKEN=		FreeBSD version too old
 .endif
 
+.if ${ARCH} == amd64
+DIST_ARCH=	x86_64
+.if ${BINVER} == "6.0"
+BINVER=		6.2
+.endif
+.else
+DIST_ARCH=	i386
+.endif
+
 do-install:
 	${MKDIR} ${PREFIX}/etc/ncftpd
 	${INSTALL_PROGRAM} ${WRKSRC}/ncftpd ${PREFIX}/sbin
@@ -43,16 +56,13 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ncftpd_spy ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/conf/general.cf-dist ${PREFIX}/etc/ncftpd
 	${INSTALL_DATA} ${WRKSRC}/conf/domain.cf-dist ${PREFIX}/etc/ncftpd
-	${INSTALL_SCRIPT} ${SCRIPTDIR}/ncftpd.sh ${PREFIX}/etc/rc.d
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/ncftpd
-	${INSTALL_DATA} ${WRKSRC}/install.html ${PREFIX}/share/doc/ncftpd
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/ncftpd
-	${INSTALL_DATA} ${WRKSRC}/README.freebsd ${PREFIX}/share/doc/ncftpd
-	${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/share/doc/ncftpd
+	@${INSTALL} -d ${DOCSDIR}
+	@ cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
-	@${SED} -e 's,%%PREFIX%%,${PREFIX},' ${PKGMESSAGE}
+
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/ftp/ncftpd/distinfo b/ftp/ncftpd/distinfo
index 6fb9c747a731..0799317a06f7 100644
--- a/ftp/ncftpd/distinfo
+++ b/ftp/ncftpd/distinfo
@@ -1,9 +1,12 @@
-MD5 (ncftpd-2.8.3-freebsd4.11-i386-export.tar.gz) = e75be6725230604cf666de09466c1f6c
-SHA256 (ncftpd-2.8.3-freebsd4.11-i386-export.tar.gz) = 909ab2e0ce16f82d8ee78b3d4545035285221df30cbdbe3fce44a3c0da95e40f
-SIZE (ncftpd-2.8.3-freebsd4.11-i386-export.tar.gz) = 385276
-MD5 (ncftpd-2.8.3-freebsd5.4-i386-export.tar.gz) = c031cc4938459b1f8aa43decf2f599b3
-SHA256 (ncftpd-2.8.3-freebsd5.4-i386-export.tar.gz) = 9f73ea925cddac0ca10ec19652058a234c62c93c8d09b1006ad487bfce93c7a9
-SIZE (ncftpd-2.8.3-freebsd5.4-i386-export.tar.gz) = 391507
-MD5 (ncftpd-2.8.3-freebsd6.0-i386-export.tar.gz) = 7bea3ded25bcb1025b6a7fe0727027dd
-SHA256 (ncftpd-2.8.3-freebsd6.0-i386-export.tar.gz) = 17cbf7233794644242642b67f40fa8f569892af224c2d1660a1d3c760ac11029
-SIZE (ncftpd-2.8.3-freebsd6.0-i386-export.tar.gz) = 389686
+MD5 (ncftpd-2.8.5-freebsd6.0-i386-export.tar.gz) = 372bde47f753a5e49b19d9bac185abf1
+SHA256 (ncftpd-2.8.5-freebsd6.0-i386-export.tar.gz) = bd2990fc4ae96a5fb314adaab023e84e6994b2f64c0b0a1660b03bb9826cb178
+SIZE (ncftpd-2.8.5-freebsd6.0-i386-export.tar.gz) = 395805
+MD5 (ncftpd-2.8.5-freebsd6.2-x86_64-export.tar.gz) = 10ac67c60f54547dcfa3721364119790
+SHA256 (ncftpd-2.8.5-freebsd6.2-x86_64-export.tar.gz) = 33e182e5e75f7820c3d0b0feea6d821f618eb39e55e757c3e3e6ee7970011be1
+SIZE (ncftpd-2.8.5-freebsd6.2-x86_64-export.tar.gz) = 440519
+MD5 (ncftpd-2.8.5-freebsd7.0-i386-export.tar.gz) = 90c2918f99db64900647b7de8c698818
+SHA256 (ncftpd-2.8.5-freebsd7.0-i386-export.tar.gz) = 6d894075619d85129ee3a4792c6e96f0a74261de83fe9e2714344388933bf59d
+SIZE (ncftpd-2.8.5-freebsd7.0-i386-export.tar.gz) = 355738
+MD5 (ncftpd-2.8.5-freebsd7.0-x86_64-export.tar.gz) = d75cb8c38fd5efb1d0c0e429ff717a9e
+SHA256 (ncftpd-2.8.5-freebsd7.0-x86_64-export.tar.gz) = c3b333101c1d09d709e0065d831904ecd26cdf61c7911aca42d0d474892d9377
+SIZE (ncftpd-2.8.5-freebsd7.0-x86_64-export.tar.gz) = 379457
diff --git a/ftp/ncftpd/files/ncftpd.sh.in b/ftp/ncftpd/files/ncftpd.sh.in
new file mode 100644
index 000000000000..88fa2bc8bffd
--- /dev/null
+++ b/ftp/ncftpd/files/ncftpd.sh.in
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+# PROVIDE: ncftpd
+# REQUIRE: DAEMON
+#
+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
+# to enable ncftpd:
+#
+# ncftpd_enable="YES"
+# ncftpd_flags="-dq"	# Not required
+# ncftpd_config="/path/to/general.cf /path/to/domain.cf" # Not required
+#
+
+. %%RC_SUBR%%
+
+name="ncftpd"
+rcvar=`set_rcvar`
+
+load_rc_config $name
+: ${ncftpd_enable:="NO"}
+: ${ncftpd_flags:="-dq"}
+: ${ncftpd_config:="%%PREFIX%%/etc/ncftpd/general.cf %%PREFIX%%/etc/ncftpd/domain.cf"}
+
+command=%%PREFIX%%/sbin/${name}
+required_files="${ncftpd_config}"
+command_args="${ncftpd_flags} ${ncftpd_config}"
+
+run_rc_command "$1"
diff --git a/ftp/ncftpd/pkg-message b/ftp/ncftpd/files/pkg-message.in
index e390fab02815..f689fadefed4 100644
--- a/ftp/ncftpd/pkg-message
+++ b/ftp/ncftpd/files/pkg-message.in
@@ -1,3 +1,5 @@
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+
 NOTE: This is commercial software that only supplies you with
 an evaluation license valid for 30 days from the date of installation.
 Please read the LICENSE in "%%PREFIX%%/share/doc/ncftpd" before
@@ -10,3 +12,5 @@ in the absence of an FTP user.  For details see the installation help file
 
 Remove "-dist" from the filenames of the configuration files in
 "%%PREFIX%%/etc/ncftpd" and edit them to suit.
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
diff --git a/ftp/ncftpd/pkg-plist b/ftp/ncftpd/pkg-plist
index 4866ef3b219a..168940cc0e7e 100644
--- a/ftp/ncftpd/pkg-plist
+++ b/ftp/ncftpd/pkg-plist
@@ -3,12 +3,6 @@ bin/ncftpd_edquota
 bin/ncftpd_passwd
 bin/ncftpd_repquota
 bin/ncftpd_spy
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.freebsd
-%%PORTDOCS%%%%DOCSDIR%%/install.html
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-etc/rc.d/ncftpd.sh
 etc/ncftpd/general.cf-dist
 etc/ncftpd/domain.cf-dist
-@dirrm etc/ncftpd
+@dirrmtry etc/ncftpd
diff --git a/ftp/ncftpd/scripts/ncftpd.sh b/ftp/ncftpd/scripts/ncftpd.sh
deleted file mode 100644
index 24030cdfe188..000000000000
--- a/ftp/ncftpd/scripts/ncftpd.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
-	case $(dirname $0) in
-	.)
-	    PREFIX=$(pwd)
-	    ;;
-	*)
-	    echo "$0: Cannot determine the PREFIX" >&2
-	    exit 1
-	    ;;
-esac
-fi
-
-args="${PREFIX}/etc/ncftpd/general.cf ${PREFIX}/etc/ncftpd/domain.cf"
-
-case "$1" in
-start)
-        if [ -x ${PREFIX}/sbin/ncftpd ]; then
-		echo -n ' ncftpd'
-		${PREFIX}/sbin/ncftpd -d $args
-	fi
-        ;;
-stop)
-        killall ncftpd && echo -n ' ncftpd'
-        ;;
-*)
-        echo "Usage: `basename $0` {start|stop}" >&2
-        exit 64
-        ;;
-esac
-
-exit 0