Index: head/ftp/proftpd/Makefile =================================================================== --- head/ftp/proftpd/Makefile (revision 137881) +++ head/ftp/proftpd/Makefile (revision 137882) @@ -1,234 +1,194 @@ # New ports collection makefile for: proftpd # Date created: 26 January 1998 # Whom: Stephane Legrand # # $FreeBSD$ # 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/ \ ftp://ftp.dataguard.no/ftp/pub/proftpd/distrib/source/ \ ftp://spirit.bentel.sk/mirrors/Proftpd/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 \ mod_tls.html mod_wrap.html ftpasswd.html 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= proftpd.sh -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} - CONFIGURE_ARGS= --localstatedir=/var/run \ + --sysconfdir=${EXAMPLESDIR}/etc \ --disable-sendfile OPTIONS= IPV6 "Use IPv6" off \ LDAP "Use LDAP" off \ MYSQL "Use MySQL" off \ POSTGRESQL "Use Postgres" off \ OPENSSL "Include mod_tls" off \ QUOTA "Include mod_quota" off \ IFSESSION "Include mod_ifsession" on \ README "Include mod_readme" on \ RATIO "Include mod_ratio" on \ REWRITE "Include mod_rewrite" on \ WRAP "Include mod_wrap" on MODULES?= .include .if defined(WITH_IFSESSION) MODULES:=${MODULES}:mod_ifsession .endif .if defined(WITH_RATIO) MODULES:=${MODULES}:mod_ratio .endif .if defined(WITH_README) MODULES:=${MODULES}:mod_readme .endif .if defined(WITH_REWRITE) MODULES:=${MODULES}:mod_rewrite .endif .if defined(WITH_WRAP) MODULES:=${MODULES}:mod_wrap .endif .if defined(WITH_SETPASSENT) CONFIGURE_ARGS+= --enable-force-setpassent .endif .if defined(WITHOUT_PAM) CONFIGURE_ARGS+= --disable-auth-pam .endif .if defined(WITH_IPV6) CONFIGURE_ARGS+= --enable-ipv6 .endif .if defined(WITHOUT_IPV6) CONFIGURE_ARGS+= --disable-ipv6 .endif #allow user to override MODULES?= mod_ifsession:mod_ratio:mod_readme:mod_rewrite:mod_wrap INCLUDEDIRS= LIBDIRS= .if defined(WITH_OPENSSL) USE_OPENSSL= yes MODULES:=${MODULES}:mod_tls .endif .if defined(WITH_LDAP) USE_OPENLDAP= yes MODULES:=${MODULES}:mod_ldap INCLUDEDIRS:=${INCLUDEDIRS}:${PREFIX}/include LIBDIRS:=${LIBDIRS}:${PREFIX}/lib .endif .if defined(WITH_MYSQL) USE_MYSQL= yes MODULES:=${MODULES}:mod_sql:mod_sql_mysql INCLUDEDIRS:=${INCLUDEDIRS}:${PREFIX}/include LIBDIRS:=${LIBDIRS}:${PREFIX}/lib/mysql .endif .if defined(WITH_POSTGRESQL) USE_PGSQL= yes MODULES:=${MODULES}:mod_sql:mod_sql_postgres INCLUDEDIRS:=${INCLUDEDIRS}:${PREFIX}/include LIBDIRS:=${LIBDIRS}:${PREFIX}/lib .endif .if defined(WITH_OPENSSL) CFLAGS+= -DHAVE_OPENSSL USE_OPENSSL= yes PROFTPD_LIBS+= -lssl -lcrypto .endif .if defined(WITH_CTRLS) CONFIGURE_ARGS+= --enable-ctrls MAN8+= ftpdctl.8 .else .endif .if defined(WITH_QUOTA) MODULES:=${MODULES}:mod_quotatab:mod_quotatab_file .if defined(WITH_LDAP) MODULES:=${MODULES}:mod_quotatab_ldap .endif .if defined(WITH_POSTGRESQL) || defined(WITH_MYSQL) MODULES:=${MODULES}:mod_quotatab_sql .endif .endif # Keep this here below, in case similar constructs need to be made CONFIGURE_ENV+= "LIBS=${PROFTPD_LIBS}" .if !empty(MODULES) CONFIGURE_ARGS+= --with-modules=${MODULES} .endif .if !empty(INCLUDEDIRS) CONFIGURE_ARGS+= --with-includes=${INCLUDEDIRS} .endif .if !empty(LIBDIRS) CONFIGURE_ARGS+= --with-libraries=${LIBDIRS} .endif MODULES!=${ECHO} ${MODULES} | ${SED} -e 's,^:,,' -e 's,:$$,,' 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 + ${WRKSRC}/src/proftpd.8 ${WRKSRC}/utils/ftpshut.8 \ + ${WRKSRC}/utils/ftpcount.1 - @${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} +post-install: + [ -f ${PREFIX}/etc/proftpd.conf ] || \ + ${CP} ${EXAMPLESDIR}/etc/proftpd.conf ${PREFIX}/etc/proftpd.conf .if !defined(NOPORTDOCS) @${MKDIR} ${PREFIX}/share/doc/proftpd .for f in ${PORTDOCSdoc} @${INSTALL_DATA} ${WRKSRC}/doc/${f} ${PREFIX}/share/doc/proftpd .endfor .for f in ${PORTDOCScontrib} @${INSTALL_DATA} ${WRKSRC}/contrib/${f} ${PREFIX}/share/doc/proftpd .endfor .endif .if !defined(WITHOUT_PAM) @${CAT} ${PKGMESSAGE} .endif .include Property changes on: head/ftp/proftpd/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.74 \ No newline at end of property +1.75 \ No newline at end of property Index: head/ftp/proftpd/files/patch-aa =================================================================== --- head/ftp/proftpd/files/patch-aa (revision 137881) +++ head/ftp/proftpd/files/patch-aa (nonexistent) @@ -1,60 +0,0 @@ ---- ./sample-configurations/basic.conf.orig Tue Feb 18 03:16:20 2003 -+++ ./sample-configurations/basic.conf Thu Mar 13 11:54:35 2003 -@@ -1,3 +1,7 @@ -+# -+# To have more informations about Proftpd configuration -+# look at : http://www.proftpd.org/ -+# - # 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 @@ - - # A basic anonymous configuration, no upload directories. If you do not - # want anonymous users, simply delete this entire section. -- -- User ftp -- Group ftp -- -- # We want clients to be able to login with "anonymous" as well as "ftp" -- UserAlias anonymous ftp -- -- # Limit the maximum number of anonymous logins -- MaxClients 10 -- -- # We want 'welcome.msg' displayed at login, and '.message' displayed -- # in each newly chdired directory. -- DisplayLogin welcome.msg -- DisplayFirstChdir .message -- -- # Limit WRITE everywhere in the anonymous chroot -- -- DenyAll -- -- -+######################################################################### -+# # -+# Uncomment lines with only one # to allow basic anonymous access # -+# # -+######################################################################### -+ -+# -+# User ftp -+# Group ftp -+ -+ ### We want clients to be able to login with "anonymous" as well as "ftp" -+ # UserAlias anonymous ftp -+ -+ ### Limit the maximum number of anonymous logins -+ # MaxClients 10 -+ -+ ### We want 'welcome.msg' displayed at login, and '.message' displayed -+ ### in each newly chdired directory. -+ # DisplayLogin welcome.msg -+ # DisplayFirstChdir .message -+ -+ ### Limit WRITE everywhere in the anonymous chroot -+ # -+ # DenyAll -+ # -+# Property changes on: head/ftp/proftpd/files/patch-aa ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.5 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/ftp/proftpd/files/proftpd.sh =================================================================== --- head/ftp/proftpd/files/proftpd.sh (revision 137881) +++ head/ftp/proftpd/files/proftpd.sh (nonexistent) @@ -1,41 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: proftpd -# REQUIRE: DAEMON -# BEFORE: LOGIN -# KEYWORD: FreeBSD shutdown - -# -# Add the following lines to /etc/rc.conf to enable proftpd: -# -#proftpd_enable="YES" -# -# See proftpd(8) for flags -# - -. %%RC_SUBR%% - -name=proftpd -rcvar=`set_rcvar` - -command=%%PREFIX%%/libexec/proftpd -pidfile=/var/run/proftpd.pid -required_files=%%PREFIX%%/etc/proftpd.conf - -stop_postcmd=stop_postcmd - -stop_postcmd() -{ - rm -f $pidfile -} - -# set defaults - -proftpd_enable=${proftpd_enable:-"NO"} -proftpd_flags=${proftpd_flags:-""} - -load_rc_config $name -run_rc_command "$1" Property changes on: head/ftp/proftpd/files/proftpd.sh ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/ftp/proftpd/files/patch-sample-configurations_basic.conf =================================================================== --- head/ftp/proftpd/files/patch-sample-configurations_basic.conf (nonexistent) +++ head/ftp/proftpd/files/patch-sample-configurations_basic.conf (revision 137882) @@ -0,0 +1,68 @@ +--- 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 ++# look at : http://www.proftpd.org/ ++# + # 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 +@@ -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 section. +- +- User ftp +- Group ftp +- +- # We want clients to be able to login with "anonymous" as well as "ftp" +- UserAlias anonymous ftp +- +- # Limit the maximum number of anonymous logins +- MaxClients 10 +- +- # We want 'welcome.msg' displayed at login, and '.message' displayed +- # in each newly chdired directory. +- DisplayLogin welcome.msg +- DisplayFirstChdir .message +- +- # Limit WRITE everywhere in the anonymous chroot +- +- DenyAll +- +- ++######################################################################### ++# # ++# Uncomment lines with only one # to allow basic anonymous access # ++# # ++######################################################################### ++ ++# ++# User ftp ++# Group ftp ++ ++ ### We want clients to be able to login with "anonymous" as well as "ftp" ++ # UserAlias anonymous ftp ++ ++ ### Limit the maximum number of anonymous logins ++ # MaxClients 10 ++ ++ ### We want 'welcome.msg' displayed at login, and '.message' displayed ++ ### in each newly chdired directory. ++ # DisplayLogin welcome.msg ++ # DisplayFirstChdir .message ++ ++ ### Limit WRITE everywhere in the anonymous chroot ++ # ++ # DenyAll ++ # ++# Property changes on: head/ftp/proftpd/files/patch-sample-configurations_basic.conf ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/ftp/proftpd/files/proftpd.sh.in =================================================================== --- head/ftp/proftpd/files/proftpd.sh.in (nonexistent) +++ head/ftp/proftpd/files/proftpd.sh.in (revision 137882) @@ -0,0 +1,41 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# PROVIDE: proftpd +# REQUIRE: DAEMON +# BEFORE: LOGIN +# KEYWORD: FreeBSD shutdown + +# +# Add the following lines to /etc/rc.conf to enable proftpd: +# +#proftpd_enable="YES" +# +# See proftpd(8) for flags +# + +. %%RC_SUBR%% + +name=proftpd +rcvar=`set_rcvar` + +command=%%PREFIX%%/sbin/proftpd +pidfile=/var/run/proftpd.pid +required_files=%%PREFIX%%/etc/proftpd.conf + +stop_postcmd=stop_postcmd + +stop_postcmd() +{ + rm -f $pidfile +} + +# set defaults + +proftpd_enable=${proftpd_enable:-"NO"} +proftpd_flags=${proftpd_flags:-""} + +load_rc_config $name +run_rc_command "$1" Property changes on: head/ftp/proftpd/files/proftpd.sh.in ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Index: head/ftp/proftpd/pkg-plist =================================================================== --- head/ftp/proftpd/pkg-plist (revision 137881) +++ head/ftp/proftpd/pkg-plist (revision 137882) @@ -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%% Property changes on: head/ftp/proftpd/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.12 \ No newline at end of property +1.13 \ No newline at end of property Index: head/ftp/proftpd-devel/Makefile =================================================================== --- head/ftp/proftpd-devel/Makefile (revision 137881) +++ head/ftp/proftpd-devel/Makefile (revision 137882) @@ -1,234 +1,194 @@ # New ports collection makefile for: proftpd # Date created: 26 January 1998 # Whom: Stephane Legrand # # $FreeBSD$ # 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/ \ ftp://ftp.dataguard.no/ftp/pub/proftpd/distrib/source/ \ ftp://spirit.bentel.sk/mirrors/Proftpd/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 \ mod_tls.html mod_wrap.html ftpasswd.html 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= proftpd.sh -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} - CONFIGURE_ARGS= --localstatedir=/var/run \ + --sysconfdir=${EXAMPLESDIR}/etc \ --disable-sendfile OPTIONS= IPV6 "Use IPv6" off \ LDAP "Use LDAP" off \ MYSQL "Use MySQL" off \ POSTGRESQL "Use Postgres" off \ OPENSSL "Include mod_tls" off \ QUOTA "Include mod_quota" off \ IFSESSION "Include mod_ifsession" on \ README "Include mod_readme" on \ RATIO "Include mod_ratio" on \ REWRITE "Include mod_rewrite" on \ WRAP "Include mod_wrap" on MODULES?= .include .if defined(WITH_IFSESSION) MODULES:=${MODULES}:mod_ifsession .endif .if defined(WITH_RATIO) MODULES:=${MODULES}:mod_ratio .endif .if defined(WITH_README) MODULES:=${MODULES}:mod_readme .endif .if defined(WITH_REWRITE) MODULES:=${MODULES}:mod_rewrite .endif .if defined(WITH_WRAP) MODULES:=${MODULES}:mod_wrap .endif .if defined(WITH_SETPASSENT) CONFIGURE_ARGS+= --enable-force-setpassent .endif .if defined(WITHOUT_PAM) CONFIGURE_ARGS+= --disable-auth-pam .endif .if defined(WITH_IPV6) CONFIGURE_ARGS+= --enable-ipv6 .endif .if defined(WITHOUT_IPV6) CONFIGURE_ARGS+= --disable-ipv6 .endif #allow user to override MODULES?= mod_ifsession:mod_ratio:mod_readme:mod_rewrite:mod_wrap INCLUDEDIRS= LIBDIRS= .if defined(WITH_OPENSSL) USE_OPENSSL= yes MODULES:=${MODULES}:mod_tls .endif .if defined(WITH_LDAP) USE_OPENLDAP= yes MODULES:=${MODULES}:mod_ldap INCLUDEDIRS:=${INCLUDEDIRS}:${PREFIX}/include LIBDIRS:=${LIBDIRS}:${PREFIX}/lib .endif .if defined(WITH_MYSQL) USE_MYSQL= yes MODULES:=${MODULES}:mod_sql:mod_sql_mysql INCLUDEDIRS:=${INCLUDEDIRS}:${PREFIX}/include LIBDIRS:=${LIBDIRS}:${PREFIX}/lib/mysql .endif .if defined(WITH_POSTGRESQL) USE_PGSQL= yes MODULES:=${MODULES}:mod_sql:mod_sql_postgres INCLUDEDIRS:=${INCLUDEDIRS}:${PREFIX}/include LIBDIRS:=${LIBDIRS}:${PREFIX}/lib .endif .if defined(WITH_OPENSSL) CFLAGS+= -DHAVE_OPENSSL USE_OPENSSL= yes PROFTPD_LIBS+= -lssl -lcrypto .endif .if defined(WITH_CTRLS) CONFIGURE_ARGS+= --enable-ctrls MAN8+= ftpdctl.8 .else .endif .if defined(WITH_QUOTA) MODULES:=${MODULES}:mod_quotatab:mod_quotatab_file .if defined(WITH_LDAP) MODULES:=${MODULES}:mod_quotatab_ldap .endif .if defined(WITH_POSTGRESQL) || defined(WITH_MYSQL) MODULES:=${MODULES}:mod_quotatab_sql .endif .endif # Keep this here below, in case similar constructs need to be made CONFIGURE_ENV+= "LIBS=${PROFTPD_LIBS}" .if !empty(MODULES) CONFIGURE_ARGS+= --with-modules=${MODULES} .endif .if !empty(INCLUDEDIRS) CONFIGURE_ARGS+= --with-includes=${INCLUDEDIRS} .endif .if !empty(LIBDIRS) CONFIGURE_ARGS+= --with-libraries=${LIBDIRS} .endif MODULES!=${ECHO} ${MODULES} | ${SED} -e 's,^:,,' -e 's,:$$,,' 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 + ${WRKSRC}/src/proftpd.8 ${WRKSRC}/utils/ftpshut.8 \ + ${WRKSRC}/utils/ftpcount.1 - @${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} +post-install: + [ -f ${PREFIX}/etc/proftpd.conf ] || \ + ${CP} ${EXAMPLESDIR}/etc/proftpd.conf ${PREFIX}/etc/proftpd.conf .if !defined(NOPORTDOCS) @${MKDIR} ${PREFIX}/share/doc/proftpd .for f in ${PORTDOCSdoc} @${INSTALL_DATA} ${WRKSRC}/doc/${f} ${PREFIX}/share/doc/proftpd .endfor .for f in ${PORTDOCScontrib} @${INSTALL_DATA} ${WRKSRC}/contrib/${f} ${PREFIX}/share/doc/proftpd .endfor .endif .if !defined(WITHOUT_PAM) @${CAT} ${PKGMESSAGE} .endif .include Property changes on: head/ftp/proftpd-devel/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.74 \ No newline at end of property +1.75 \ No newline at end of property Index: head/ftp/proftpd-devel/files/patch-aa =================================================================== --- head/ftp/proftpd-devel/files/patch-aa (revision 137881) +++ head/ftp/proftpd-devel/files/patch-aa (nonexistent) @@ -1,60 +0,0 @@ ---- ./sample-configurations/basic.conf.orig Tue Feb 18 03:16:20 2003 -+++ ./sample-configurations/basic.conf Thu Mar 13 11:54:35 2003 -@@ -1,3 +1,7 @@ -+# -+# To have more informations about Proftpd configuration -+# look at : http://www.proftpd.org/ -+# - # 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 @@ - - # A basic anonymous configuration, no upload directories. If you do not - # want anonymous users, simply delete this entire section. -- -- User ftp -- Group ftp -- -- # We want clients to be able to login with "anonymous" as well as "ftp" -- UserAlias anonymous ftp -- -- # Limit the maximum number of anonymous logins -- MaxClients 10 -- -- # We want 'welcome.msg' displayed at login, and '.message' displayed -- # in each newly chdired directory. -- DisplayLogin welcome.msg -- DisplayFirstChdir .message -- -- # Limit WRITE everywhere in the anonymous chroot -- -- DenyAll -- -- -+######################################################################### -+# # -+# Uncomment lines with only one # to allow basic anonymous access # -+# # -+######################################################################### -+ -+# -+# User ftp -+# Group ftp -+ -+ ### We want clients to be able to login with "anonymous" as well as "ftp" -+ # UserAlias anonymous ftp -+ -+ ### Limit the maximum number of anonymous logins -+ # MaxClients 10 -+ -+ ### We want 'welcome.msg' displayed at login, and '.message' displayed -+ ### in each newly chdired directory. -+ # DisplayLogin welcome.msg -+ # DisplayFirstChdir .message -+ -+ ### Limit WRITE everywhere in the anonymous chroot -+ # -+ # DenyAll -+ # -+# Property changes on: head/ftp/proftpd-devel/files/patch-aa ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.5 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/ftp/proftpd-devel/files/proftpd.sh =================================================================== --- head/ftp/proftpd-devel/files/proftpd.sh (revision 137881) +++ head/ftp/proftpd-devel/files/proftpd.sh (nonexistent) @@ -1,41 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: proftpd -# REQUIRE: DAEMON -# BEFORE: LOGIN -# KEYWORD: FreeBSD shutdown - -# -# Add the following lines to /etc/rc.conf to enable proftpd: -# -#proftpd_enable="YES" -# -# See proftpd(8) for flags -# - -. %%RC_SUBR%% - -name=proftpd -rcvar=`set_rcvar` - -command=%%PREFIX%%/libexec/proftpd -pidfile=/var/run/proftpd.pid -required_files=%%PREFIX%%/etc/proftpd.conf - -stop_postcmd=stop_postcmd - -stop_postcmd() -{ - rm -f $pidfile -} - -# set defaults - -proftpd_enable=${proftpd_enable:-"NO"} -proftpd_flags=${proftpd_flags:-""} - -load_rc_config $name -run_rc_command "$1" Property changes on: head/ftp/proftpd-devel/files/proftpd.sh ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/ftp/proftpd-devel/files/patch-sample-configurations_basic.conf =================================================================== --- head/ftp/proftpd-devel/files/patch-sample-configurations_basic.conf (nonexistent) +++ head/ftp/proftpd-devel/files/patch-sample-configurations_basic.conf (revision 137882) @@ -0,0 +1,68 @@ +--- 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 ++# look at : http://www.proftpd.org/ ++# + # 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 +@@ -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 section. +- +- User ftp +- Group ftp +- +- # We want clients to be able to login with "anonymous" as well as "ftp" +- UserAlias anonymous ftp +- +- # Limit the maximum number of anonymous logins +- MaxClients 10 +- +- # We want 'welcome.msg' displayed at login, and '.message' displayed +- # in each newly chdired directory. +- DisplayLogin welcome.msg +- DisplayFirstChdir .message +- +- # Limit WRITE everywhere in the anonymous chroot +- +- DenyAll +- +- ++######################################################################### ++# # ++# Uncomment lines with only one # to allow basic anonymous access # ++# # ++######################################################################### ++ ++# ++# User ftp ++# Group ftp ++ ++ ### We want clients to be able to login with "anonymous" as well as "ftp" ++ # UserAlias anonymous ftp ++ ++ ### Limit the maximum number of anonymous logins ++ # MaxClients 10 ++ ++ ### We want 'welcome.msg' displayed at login, and '.message' displayed ++ ### in each newly chdired directory. ++ # DisplayLogin welcome.msg ++ # DisplayFirstChdir .message ++ ++ ### Limit WRITE everywhere in the anonymous chroot ++ # ++ # DenyAll ++ # ++# Property changes on: head/ftp/proftpd-devel/files/patch-sample-configurations_basic.conf ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/ftp/proftpd-devel/files/proftpd.sh.in =================================================================== --- head/ftp/proftpd-devel/files/proftpd.sh.in (nonexistent) +++ head/ftp/proftpd-devel/files/proftpd.sh.in (revision 137882) @@ -0,0 +1,41 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# PROVIDE: proftpd +# REQUIRE: DAEMON +# BEFORE: LOGIN +# KEYWORD: FreeBSD shutdown + +# +# Add the following lines to /etc/rc.conf to enable proftpd: +# +#proftpd_enable="YES" +# +# See proftpd(8) for flags +# + +. %%RC_SUBR%% + +name=proftpd +rcvar=`set_rcvar` + +command=%%PREFIX%%/sbin/proftpd +pidfile=/var/run/proftpd.pid +required_files=%%PREFIX%%/etc/proftpd.conf + +stop_postcmd=stop_postcmd + +stop_postcmd() +{ + rm -f $pidfile +} + +# set defaults + +proftpd_enable=${proftpd_enable:-"NO"} +proftpd_flags=${proftpd_flags:-""} + +load_rc_config $name +run_rc_command "$1" Property changes on: head/ftp/proftpd-devel/files/proftpd.sh.in ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Index: head/ftp/proftpd-devel/pkg-plist =================================================================== --- head/ftp/proftpd-devel/pkg-plist (revision 137881) +++ head/ftp/proftpd-devel/pkg-plist (revision 137882) @@ -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%% Property changes on: head/ftp/proftpd-devel/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.12 \ No newline at end of property +1.13 \ No newline at end of property