diff options
| author | itetcu <itetcu@FreeBSD.org> | 2006-05-20 09:52:39 +0000 |
|---|---|---|
| committer | itetcu <itetcu@FreeBSD.org> | 2006-05-20 09:52:39 +0000 |
| commit | 688383d379822af56c3ba24479382a8c266a6ead (patch) | |
| tree | 588ae1691ae8d5ad305154456f34e02a7dcef237 /ftp/proftpd-devel | |
| parent | 12f7cdb4da9daed704c1c3277539df47668671ae (diff) | |
| download | FreeBSD-ports-688383d379822af56c3ba24479382a8c266a6ead.zip FreeBSD-ports-688383d379822af56c3ba24479382a8c266a6ead.tar.gz | |
- mark broken on 4.x if libgnugetopt is installed [1], [2]
- re-add LDAP TLS support [1]
- fix options handling [1]
PR: ports/97369 [1], ports/97341 [2]
Reported by: Frank Altpeter <frank@altpeter.de> [2]
Submitted by: maintainer [1]
Approved by: lawrance (mentor)
Diffstat (limited to 'ftp/proftpd-devel')
| -rw-r--r-- | ftp/proftpd-devel/Makefile | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/ftp/proftpd-devel/Makefile b/ftp/proftpd-devel/Makefile index 0e6fa9b..4147ba2 100644 --- a/ftp/proftpd-devel/Makefile +++ b/ftp/proftpd-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= proftpd DISTVERSION= 1.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= ftp MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \ ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \ @@ -41,6 +41,7 @@ CONFIGURE_ARGS= --localstatedir=/var/run \ OPTIONS= IPV6 "Use IPv6" off \ LDAP "Use LDAP" off \ + LDAP_TLS "Use LDAP TLS (Requires LDAP)" off\ MYSQL "Use MySQL" off \ POSTGRESQL "Use Postgres" off \ OPENSSL "Include mod_tls" off \ @@ -52,23 +53,29 @@ OPTIONS= IPV6 "Use IPv6" off \ WRAP "Include mod_wrap" on \ RADIUS "Include mod_radius" off +MODULES?= + .include <bsd.port.pre.mk> -MODULES?= +.if ${OSVERSION} < 500000 +.if exists (${LOCALBASE}/include/getopt.h) +BROKEN= Does not build when libgnugetopt is installed +.endif +.endif -.if defined(WITH_RATIO) +.if !defined(WITHOUT_RATIO) MODULES:=${MODULES}:mod_ratio .endif -.if defined(WITH_README) +.if !defined(WITHOUT_README) MODULES:=${MODULES}:mod_readme .endif -.if defined(WITH_REWRITE) +.if !defined(WITHOUT_REWRITE) MODULES:=${MODULES}:mod_rewrite .endif -.if defined(WITH_WRAP) +.if !defined(WITHOUT_WRAP) MODULES:=${MODULES}:mod_wrap .endif @@ -88,7 +95,7 @@ CONFIGURE_ARGS+= --disable-auth-pam CONFIGURE_ARGS+= --enable-ipv6 .endif -.if defined(WITHOUT_IPV6) +.if !defined(WITH_IPV6) CONFIGURE_ARGS+= --disable-ipv6 .endif @@ -125,6 +132,9 @@ USE_OPENSSL= yes .include <${PORTSDIR}/Mk/bsd.openssl.mk> PROFTPD_LIBS+= -lssl -lcrypto -L${LOCALBASE}/lib MODULES:=${MODULES}:mod_tls +.if defined(WITH_LDAP_TLS) +EXTRA_PATCHES=${FILESDIR}/extra_patch-ldap-tls-mod_ldap.c +.endif .endif .if defined(WITH_CTRLS) @@ -146,7 +156,7 @@ MODULES:=${MODULES}:mod_quotatab_sql .endif # mod_ifsession should be the last item in the modules list -.if defined(WITH_IFSESSION) +.if !defined(WITHOUT_IFSESSION) MODULES:=${MODULES}:mod_ifsession .endif |
