diff options
author | flz <flz@FreeBSD.org> | 2005-06-23 02:48:39 +0800 |
---|---|---|
committer | flz <flz@FreeBSD.org> | 2005-06-23 02:48:39 +0800 |
commit | 866defa5e4d70250f8a52660dbb31f7d72d11039 (patch) | |
tree | 5e50223325e20b24b546b6a52ec178ebf08eef27 /ftp/proftpd-devel | |
parent | 305f45aa5d79d3256120c6f7cb89fe1a3bfa32ee (diff) | |
download | freebsd-ports-gnome-866defa5e4d70250f8a52660dbb31f7d72d11039.tar.gz freebsd-ports-gnome-866defa5e4d70250f8a52660dbb31f7d72d11039.tar.zst freebsd-ports-gnome-866defa5e4d70250f8a52660dbb31f7d72d11039.zip |
- Use USE_RC_SUBR's true force.
- Use default do-install target.
- Install ftpdctl.
- Fix scoreboard issue.
- Move proftpd binary from ${PREFIX}/libexec/ to ${PREFIX}/sbin.
Approved by: mharo
Diffstat (limited to 'ftp/proftpd-devel')
-rw-r--r-- | ftp/proftpd-devel/Makefile | 66 | ||||
-rw-r--r-- | ftp/proftpd-devel/files/patch-sample-configurations_basic.conf (renamed from ftp/proftpd-devel/files/patch-aa) | 14 | ||||
-rw-r--r-- | ftp/proftpd-devel/files/proftpd.sh.in (renamed from ftp/proftpd-devel/files/proftpd.sh) | 2 | ||||
-rw-r--r-- | ftp/proftpd-devel/pkg-plist | 11 |
4 files changed, 32 insertions, 61 deletions
diff --git a/ftp/proftpd-devel/Makefile b/ftp/proftpd-devel/Makefile index 7d17cc3e9493..005128af0415 100644 --- a/ftp/proftpd-devel/Makefile +++ b/ftp/proftpd-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= proftpd PORTVERSION= 1.2.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= ftp MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \ ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \ @@ -16,14 +16,13 @@ MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \ ftp://proftpd.networkedsystems.co.uk/distrib/source/ \ ftp://ftp.ethereal.com/mirrors/ftp.proftpd.org/distrib/source/ \ ftp://mirror.cybercomm.nl/pub/proftpd/distrib/source/ -DISTNAME= ${PORTNAME}-1.2.10 MAINTAINER?= mharo@FreeBSD.org COMMENT?= Highly configurable ftp daemon MAN1= ftpcount.1 ftpwho.1 ftptop.1 MAN5= xferlog.5 -MAN8= proftpd.8 ftpshut.8 +MAN8= proftpd.8 ftpshut.8 ftpdctl.8 PORTDOCSdoc= Configuration.html faq.html PORTDOCScontrib=mod_ifsession.html mod_radius.html mod_rewrite.html \ @@ -33,19 +32,12 @@ PORTDOCS= ${PORTDOCSdoc} ${PORTDOCScontrib} USE_GMAKE= yes GNU_CONFIGURE= yes USE_BZIP2= yes +USE_REINPLACE= yes -SED_SCRIPT= -e 's|%%PREFIX%%|${PREFIX}|g' - -USE_RC_SUBR= yes -RC_DIR= ${PREFIX}/etc/rc.d -RC_SUFX= .sh -SED_SCRIPT+= -e 's|%%RC_SUBR%%|${RC_SUBR}|g' \ - -e 's|%%RC_DIR%%|${RC_DIR}|g' \ - -e 's|%%RC_SUFX%%|${RC_SUFX}|g' -PLIST_SUB+= RC_DIR=${RC_DIR} \ - RC_SUFX=${RC_SUFX} +USE_RC_SUBR= proftpd.sh CONFIGURE_ARGS= --localstatedir=/var/run \ + --sysconfdir=${EXAMPLESDIR}/etc \ --disable-sendfile OPTIONS= IPV6 "Use IPv6" off \ @@ -175,47 +167,15 @@ pre-configure: @${ECHO_MSG} "==> Configuring with ${MODULES}" post-configure: - @${MV} ${WRKSRC}/Make.rules ${WRKSRC}/Make.rules.pre_sed - @${SED} -e 's: -lnsl::' \ - < ${WRKSRC}/Make.rules.pre_sed > ${WRKSRC}/Make.rules - - @${MV} ${WRKSRC}/src/proftpd.8 ${WRKSRC}/src/proftpd.8.pre_sed - @${SED} -e 's:/usr/sbin/proftpd:${PREFIX}/libexec/proftpd:' \ - -e 's:/usr/sbin:${PREFIX}/sbin:' \ + ${REINPLACE_CMD} -e 's: -lnsl::' ${WRKSRC}/Make.rules + ${REINPLACE_CMD} -e 's:/usr/sbin:${PREFIX}/sbin:' \ -e 's:/usr/bin:${PREFIX}/bin:' \ - < ${WRKSRC}/src/proftpd.8.pre_sed > ${WRKSRC}/src/proftpd.8 - - @${MV} ${WRKSRC}/utils/ftpshut.8 ${WRKSRC}/utils/ftpshut.8.pre_sed - @${SED} -e 's:/usr/sbin:${PREFIX}/sbin:' \ - -e 's:/etc:/var/run:' \ - < ${WRKSRC}/utils/ftpshut.8.pre_sed > ${WRKSRC}/utils/ftpshut.8 - - @${MV} ${WRKSRC}/utils/ftpcount.1 ${WRKSRC}/utils/ftpcount.1.pre_sed - @${SED} -e 's:/usr/bin:${PREFIX}/bin:' \ - < ${WRKSRC}/utils/ftpcount.1.pre_sed > ${WRKSRC}/utils/ftpcount.1 - -post-build: - @${SED} ${SED_SCRIPT} ${FILESDIR}/proftpd.sh > ${WRKSRC}/proftpd.sh - -do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/ftpcount ${PREFIX}/bin/ftpcount - @${INSTALL_PROGRAM} ${WRKSRC}/ftpwho ${PREFIX}/bin/ftpwho - @${INSTALL_PROGRAM} ${WRKSRC}/ftptop ${PREFIX}/bin/ftptop - @${INSTALL_PROGRAM} ${WRKSRC}/proftpd ${PREFIX}/libexec/proftpd - @${INSTALL_PROGRAM} ${WRKSRC}/ftpshut ${PREFIX}/sbin/ftpshut - @${INSTALL_MAN} ${WRKSRC}/utils/ftpcount.1 ${PREFIX}/man/man1/ftpcount.1 - @${INSTALL_MAN} ${WRKSRC}/utils/ftpwho.1 ${PREFIX}/man/man1/ftpwho.1 - @${INSTALL_MAN} ${WRKSRC}/utils/ftptop.1 ${PREFIX}/man/man1/ftptop.1 - @${INSTALL_MAN} ${WRKSRC}/src/xferlog.5 ${PREFIX}/man/man5/xferlog.5 - @${INSTALL_MAN} ${WRKSRC}/utils/ftpshut.8 ${PREFIX}/man/man8/ftpshut.8 - @${INSTALL_MAN} ${WRKSRC}/src/proftpd.8 ${PREFIX}/man/man8/proftpd.8 - @${INSTALL_DATA} \ - ${WRKSRC}/sample-configurations/basic.conf ${PREFIX}/etc/proftpd.conf.default - @if [ ! -f ${PREFIX}/etc/proftpd.conf ]; then \ - ${INSTALL_DATA} \ - ${WRKSRC}/sample-configurations/basic.conf ${PREFIX}/etc/proftpd.conf; \ - fi - @${INSTALL_SCRIPT} ${WRKSRC}/proftpd.sh ${PREFIX}/etc/rc.d/proftpd${RC_SUFX} + ${WRKSRC}/src/proftpd.8 ${WRKSRC}/utils/ftpshut.8 \ + ${WRKSRC}/utils/ftpcount.1 + +post-install: + [ -f ${PREFIX}/etc/proftpd.conf ] || \ + ${CP} ${EXAMPLESDIR}/etc/proftpd.conf ${PREFIX}/etc/proftpd.conf .if !defined(NOPORTDOCS) @${MKDIR} ${PREFIX}/share/doc/proftpd diff --git a/ftp/proftpd-devel/files/patch-aa b/ftp/proftpd-devel/files/patch-sample-configurations_basic.conf index 9b91108061d1..fa3f8dfc355e 100644 --- a/ftp/proftpd-devel/files/patch-aa +++ b/ftp/proftpd-devel/files/patch-sample-configurations_basic.conf @@ -1,5 +1,5 @@ ---- ./sample-configurations/basic.conf.orig Tue Feb 18 03:16:20 2003 -+++ ./sample-configurations/basic.conf Thu Mar 13 11:54:35 2003 +--- sample-configurations/basic.conf.orig Fri Jun 17 15:10:06 2005 ++++ sample-configurations/basic.conf Fri Jun 17 15:10:43 2005 @@ -1,3 +1,7 @@ +# +# To have more informations about Proftpd configuration @@ -8,7 +8,15 @@ # This is a basic ProFTPD configuration file (rename it to # 'proftpd.conf' for actual use. It establishes a single server # and a single anonymous login. It assumes that you have a user/group -@@ -37,23 +41,29 @@ +@@ -6,6 +10,7 @@ + ServerName "ProFTPD Default Installation" + ServerType standalone + DefaultServer on ++ScoreboardFile /var/run/proftpd.scoreboard + + # Port 21 is the standard FTP port. + Port 21 +@@ -40,23 +45,29 @@ # A basic anonymous configuration, no upload directories. If you do not # want anonymous users, simply delete this entire <Anonymous> section. diff --git a/ftp/proftpd-devel/files/proftpd.sh b/ftp/proftpd-devel/files/proftpd.sh.in index 244e80cb9346..b36f36dcb992 100644 --- a/ftp/proftpd-devel/files/proftpd.sh +++ b/ftp/proftpd-devel/files/proftpd.sh.in @@ -21,7 +21,7 @@ name=proftpd rcvar=`set_rcvar` -command=%%PREFIX%%/libexec/proftpd +command=%%PREFIX%%/sbin/proftpd pidfile=/var/run/proftpd.pid required_files=%%PREFIX%%/etc/proftpd.conf diff --git a/ftp/proftpd-devel/pkg-plist b/ftp/proftpd-devel/pkg-plist index 2418335488d6..61c08dc01ad8 100644 --- a/ftp/proftpd-devel/pkg-plist +++ b/ftp/proftpd-devel/pkg-plist @@ -1,9 +1,12 @@ -@unexec if cmp -s %D/etc/proftpd.conf %D/etc/proftpd.conf.default; then rm -f %D/etc/proftpd.conf; fi bin/ftpcount +bin/ftpdctl bin/ftptop bin/ftpwho -etc/proftpd.conf.default -etc/rc.d/proftpd%%RC_SUFX%% +@unexec if cmp -s %D/etc/proftpd.conf %D/%%EXAMPLESDIR%%/etc/proftpd.conf; then rm -f %D/etc/proftpd.conf; fi +%%EXAMPLESDIR%%/etc/proftpd.conf @exec if [ ! -f %D/etc/proftpd.conf ] ; then cp -p %D/%F %B/proftpd.conf; fi -libexec/proftpd sbin/ftpshut +sbin/in.proftpd +sbin/proftpd +@dirrm %%EXAMPLESDIR%%/etc +@dirrm %%EXAMPLESDIR%% |