diff options
| author | mharo <mharo@FreeBSD.org> | 2005-10-10 13:38:26 +0800 |
|---|---|---|
| committer | mharo <mharo@FreeBSD.org> | 2005-10-10 13:38:26 +0800 |
| commit | 5bfd14bad6257171ea5f733e4ab72a8ed31d625f (patch) | |
| tree | 7778f675fc621346ed606156a434861cc1920ee2 | |
| parent | 4f643242d9c027e925a01c650cfd55def7b90362 (diff) | |
| download | freebsd-ports-gnome-5bfd14bad6257171ea5f733e4ab72a8ed31d625f.tar.gz freebsd-ports-gnome-5bfd14bad6257171ea5f733e4ab72a8ed31d625f.tar.zst freebsd-ports-gnome-5bfd14bad6257171ea5f733e4ab72a8ed31d625f.zip | |
86623
mod_ifsession should be the last in modules list
Matus UHLAR - fantomas <uhlar@fantomas.sk>
85675
Add reload command to rc.d/proftpd.sh script
Patrick Gibson <patrick@retrix.com>
85616
Added mod_radius
Boris Kovalenko <boris@tagnet.ru>
| -rw-r--r-- | ftp/proftpd-devel/Makefile | 20 | ||||
| -rw-r--r-- | ftp/proftpd-devel/files/proftpd.sh.in | 2 | ||||
| -rw-r--r-- | ftp/proftpd/Makefile | 20 | ||||
| -rw-r--r-- | ftp/proftpd/files/proftpd.sh.in | 2 |
4 files changed, 30 insertions, 14 deletions
diff --git a/ftp/proftpd-devel/Makefile b/ftp/proftpd-devel/Makefile index 00863adb9752..cb28a199e78b 100644 --- a/ftp/proftpd-devel/Makefile +++ b/ftp/proftpd-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= proftpd DISTVERSION= 1.3.0rc2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= ftp MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \ ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \ @@ -50,16 +50,13 @@ OPTIONS= IPV6 "Use IPv6" off \ README "Include mod_readme" on \ RATIO "Include mod_ratio" on \ REWRITE "Include mod_rewrite" on \ - WRAP "Include mod_wrap" on + WRAP "Include mod_wrap" on \ + RADIUS "Include mod_radius" off MODULES?= .include <bsd.port.pre.mk> -.if defined(WITH_IFSESSION) -MODULES:=${MODULES}:mod_ifsession -.endif - .if defined(WITH_RATIO) MODULES:=${MODULES}:mod_ratio .endif @@ -76,6 +73,10 @@ MODULES:=${MODULES}:mod_rewrite MODULES:=${MODULES}:mod_wrap .endif +.if defined(WITH_RADIUS) +MODULES:=${MODULES}:mod_radius +.endif + .if defined(WITH_SETPASSENT) CONFIGURE_ARGS+= --enable-force-setpassent .endif @@ -93,7 +94,7 @@ CONFIGURE_ARGS+= --disable-ipv6 .endif #allow user to override -MODULES?= mod_ifsession:mod_ratio:mod_readme:mod_rewrite:mod_wrap +MODULES?= mod_ratio:mod_readme:mod_rewrite:mod_wrap:mod_ifsession INCLUDEDIRS= LIBDIRS= @@ -145,6 +146,11 @@ MODULES:=${MODULES}:mod_quotatab_sql .endif .endif +# mod_ifsession should be the last item in the modules list +.if defined(WITH_IFSESSION) +MODULES:=${MODULES}:mod_ifsession +.endif + # Keep this here below, in case similar constructs need to be made CONFIGURE_ENV+= "LIBS=${PROFTPD_LIBS}" diff --git a/ftp/proftpd-devel/files/proftpd.sh.in b/ftp/proftpd-devel/files/proftpd.sh.in index b36f36dcb992..442cacbec11e 100644 --- a/ftp/proftpd-devel/files/proftpd.sh.in +++ b/ftp/proftpd-devel/files/proftpd.sh.in @@ -37,5 +37,7 @@ stop_postcmd() proftpd_enable=${proftpd_enable:-"NO"} proftpd_flags=${proftpd_flags:-""} +extra_commands="reload" + load_rc_config $name run_rc_command "$1" diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile index 00863adb9752..cb28a199e78b 100644 --- a/ftp/proftpd/Makefile +++ b/ftp/proftpd/Makefile @@ -7,7 +7,7 @@ PORTNAME= proftpd DISTVERSION= 1.3.0rc2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= ftp MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \ ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \ @@ -50,16 +50,13 @@ OPTIONS= IPV6 "Use IPv6" off \ README "Include mod_readme" on \ RATIO "Include mod_ratio" on \ REWRITE "Include mod_rewrite" on \ - WRAP "Include mod_wrap" on + WRAP "Include mod_wrap" on \ + RADIUS "Include mod_radius" off MODULES?= .include <bsd.port.pre.mk> -.if defined(WITH_IFSESSION) -MODULES:=${MODULES}:mod_ifsession -.endif - .if defined(WITH_RATIO) MODULES:=${MODULES}:mod_ratio .endif @@ -76,6 +73,10 @@ MODULES:=${MODULES}:mod_rewrite MODULES:=${MODULES}:mod_wrap .endif +.if defined(WITH_RADIUS) +MODULES:=${MODULES}:mod_radius +.endif + .if defined(WITH_SETPASSENT) CONFIGURE_ARGS+= --enable-force-setpassent .endif @@ -93,7 +94,7 @@ CONFIGURE_ARGS+= --disable-ipv6 .endif #allow user to override -MODULES?= mod_ifsession:mod_ratio:mod_readme:mod_rewrite:mod_wrap +MODULES?= mod_ratio:mod_readme:mod_rewrite:mod_wrap:mod_ifsession INCLUDEDIRS= LIBDIRS= @@ -145,6 +146,11 @@ MODULES:=${MODULES}:mod_quotatab_sql .endif .endif +# mod_ifsession should be the last item in the modules list +.if defined(WITH_IFSESSION) +MODULES:=${MODULES}:mod_ifsession +.endif + # Keep this here below, in case similar constructs need to be made CONFIGURE_ENV+= "LIBS=${PROFTPD_LIBS}" diff --git a/ftp/proftpd/files/proftpd.sh.in b/ftp/proftpd/files/proftpd.sh.in index b36f36dcb992..442cacbec11e 100644 --- a/ftp/proftpd/files/proftpd.sh.in +++ b/ftp/proftpd/files/proftpd.sh.in @@ -37,5 +37,7 @@ stop_postcmd() proftpd_enable=${proftpd_enable:-"NO"} proftpd_flags=${proftpd_flags:-""} +extra_commands="reload" + load_rc_config $name run_rc_command "$1" |