diff options
| -rw-r--r-- | ftp/proftpd-devel/Makefile | 10 | ||||
| -rw-r--r-- | ftp/proftpd-devel/files/extra-patch-module-mod_ldap.c | 31 | ||||
| -rw-r--r-- | ftp/proftpd/Makefile | 10 | ||||
| -rw-r--r-- | ftp/proftpd/files/extra-patch-module-mod_ldap.c | 31 |
4 files changed, 6 insertions, 76 deletions
diff --git a/ftp/proftpd-devel/Makefile b/ftp/proftpd-devel/Makefile index b84903971b44..0e6fa9b77d96 100644 --- a/ftp/proftpd-devel/Makefile +++ b/ftp/proftpd-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= proftpd DISTVERSION= 1.3.0 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= ftp MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \ ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \ @@ -52,10 +52,10 @@ OPTIONS= IPV6 "Use IPv6" off \ WRAP "Include mod_wrap" on \ RADIUS "Include mod_radius" off -MODULES?= - .include <bsd.port.pre.mk> +MODULES?= + .if defined(WITH_RATIO) MODULES:=${MODULES}:mod_ratio .endif @@ -125,10 +125,6 @@ USE_OPENSSL= yes .include <${PORTSDIR}/Mk/bsd.openssl.mk> PROFTPD_LIBS+= -lssl -lcrypto -L${LOCALBASE}/lib MODULES:=${MODULES}:mod_tls - -.if defined(WITH_LDAP) -EXTRA_PATCHES=${FILESDIR}/extra-patch-module-mod_ldap.c -.endif .endif .if defined(WITH_CTRLS) diff --git a/ftp/proftpd-devel/files/extra-patch-module-mod_ldap.c b/ftp/proftpd-devel/files/extra-patch-module-mod_ldap.c deleted file mode 100644 index 632264c44c44..000000000000 --- a/ftp/proftpd-devel/files/extra-patch-module-mod_ldap.c +++ /dev/null @@ -1,31 +0,0 @@ ---- contrib/mod_ldap.c Fri Apr 21 10:31:23 2006 -+++ contrib/mod_ldap.c Fri Apr 21 10:31:43 2006 -@@ -55,7 +55,7 @@ - * after connecting to the LDAP server. If TLS cannot be enabled, the LDAP - * connection will fail. - */ --/* #define USE_LDAP_TLS */ -+#define USE_LDAP_TLS - - /* Uncomment this if you have OpenSSL and wish to verify non-crypt() - * password hashes locally with OpenSSL. You'll also need to edit--- contrib/mod_ldap.c Fri Apr 21 10:31:23 2006 -+++ contrib/mod_ldap.c Fri Apr 21 10:31:43 2006 -@@ -55,7 +55,7 @@ - * after connecting to the LDAP server. If TLS cannot be enabled, the LDAP - * connection will fail. - */ --/* #define USE_LDAP_TLS */ -+#define USE_LDAP_TLS - - /* Uncomment this if you have OpenSSL and wish to verify non-crypt() - * password hashes locally with OpenSSL. You'll also need to edit--- contrib/mod_ldap.c Fri Apr 21 10:31:23 2006 -+++ contrib/mod_ldap.c Fri Apr 21 10:31:43 2006 -@@ -55,7 +55,7 @@ - * after connecting to the LDAP server. If TLS cannot be enabled, the LDAP - * connection will fail. - */ --/* #define USE_LDAP_TLS */ -+#define USE_LDAP_TLS - - /* Uncomment this if you have OpenSSL and wish to verify non-crypt() - * password hashes locally with OpenSSL. You'll also need to edit diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile index b84903971b44..0e6fa9b77d96 100644 --- a/ftp/proftpd/Makefile +++ b/ftp/proftpd/Makefile @@ -7,7 +7,7 @@ PORTNAME= proftpd DISTVERSION= 1.3.0 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= ftp MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \ ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \ @@ -52,10 +52,10 @@ OPTIONS= IPV6 "Use IPv6" off \ WRAP "Include mod_wrap" on \ RADIUS "Include mod_radius" off -MODULES?= - .include <bsd.port.pre.mk> +MODULES?= + .if defined(WITH_RATIO) MODULES:=${MODULES}:mod_ratio .endif @@ -125,10 +125,6 @@ USE_OPENSSL= yes .include <${PORTSDIR}/Mk/bsd.openssl.mk> PROFTPD_LIBS+= -lssl -lcrypto -L${LOCALBASE}/lib MODULES:=${MODULES}:mod_tls - -.if defined(WITH_LDAP) -EXTRA_PATCHES=${FILESDIR}/extra-patch-module-mod_ldap.c -.endif .endif .if defined(WITH_CTRLS) diff --git a/ftp/proftpd/files/extra-patch-module-mod_ldap.c b/ftp/proftpd/files/extra-patch-module-mod_ldap.c deleted file mode 100644 index 632264c44c44..000000000000 --- a/ftp/proftpd/files/extra-patch-module-mod_ldap.c +++ /dev/null @@ -1,31 +0,0 @@ ---- contrib/mod_ldap.c Fri Apr 21 10:31:23 2006 -+++ contrib/mod_ldap.c Fri Apr 21 10:31:43 2006 -@@ -55,7 +55,7 @@ - * after connecting to the LDAP server. If TLS cannot be enabled, the LDAP - * connection will fail. - */ --/* #define USE_LDAP_TLS */ -+#define USE_LDAP_TLS - - /* Uncomment this if you have OpenSSL and wish to verify non-crypt() - * password hashes locally with OpenSSL. You'll also need to edit--- contrib/mod_ldap.c Fri Apr 21 10:31:23 2006 -+++ contrib/mod_ldap.c Fri Apr 21 10:31:43 2006 -@@ -55,7 +55,7 @@ - * after connecting to the LDAP server. If TLS cannot be enabled, the LDAP - * connection will fail. - */ --/* #define USE_LDAP_TLS */ -+#define USE_LDAP_TLS - - /* Uncomment this if you have OpenSSL and wish to verify non-crypt() - * password hashes locally with OpenSSL. You'll also need to edit--- contrib/mod_ldap.c Fri Apr 21 10:31:23 2006 -+++ contrib/mod_ldap.c Fri Apr 21 10:31:43 2006 -@@ -55,7 +55,7 @@ - * after connecting to the LDAP server. If TLS cannot be enabled, the LDAP - * connection will fail. - */ --/* #define USE_LDAP_TLS */ -+#define USE_LDAP_TLS - - /* Uncomment this if you have OpenSSL and wish to verify non-crypt() - * password hashes locally with OpenSSL. You'll also need to edit |