aboutsummaryrefslogtreecommitdiffstats
path: root/ftp/proftpd
diff options
context:
space:
mode:
authoritetcu <itetcu@FreeBSD.org>2006-05-20 17:52:39 +0800
committeritetcu <itetcu@FreeBSD.org>2006-05-20 17:52:39 +0800
commit688383d379822af56c3ba24479382a8c266a6ead (patch)
tree588ae1691ae8d5ad305154456f34e02a7dcef237 /ftp/proftpd
parent12f7cdb4da9daed704c1c3277539df47668671ae (diff)
downloadfreebsd-ports-gnome-688383d379822af56c3ba24479382a8c266a6ead.tar.gz
freebsd-ports-gnome-688383d379822af56c3ba24479382a8c266a6ead.tar.zst
freebsd-ports-gnome-688383d379822af56c3ba24479382a8c266a6ead.zip
- 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')
-rw-r--r--ftp/proftpd/Makefile26
1 files changed, 18 insertions, 8 deletions
diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile
index 0e6fa9b77d96..4147ba2b4386 100644
--- a/ftp/proftpd/Makefile
+++ b/ftp/proftpd/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
0.html for specific upgrading instructions, and the up-to-date list of known issues. This release features commits by avl, ahze, bland, marcus, mezz, and myself. The FreeBSD GNOME Team would like to thank Anders F Bjorklund for doing the initual packagekit porting. And the following contributors & testers for there help with this release: Eric L. Chen Vladimir Grebenschikov Sergio de Almeida Lenzi DomiX walder crsd Kevin Oberman Michal Varga Pavel Plesov Bapt kevin and ITetcu for two exp-run PR: ports/143852 ports/145347 ports/144980 ports/145830 ports/145511 * - update to 1.4.1dinoex2010-03-281-1/+1 | | | | | Reviewed by: exp8 run on pointyhat Supported by: miwi * - update to jpeg-8dinoex2010-02-051-0/+1 | * Update to 2.28.2.kwm2009-12-193-4/+22 | * Presenting GNOME 2.28.1 for FreeBSD. The official release notes for thismarcus2009-11-293-8/+52 | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | release can be found at http://library.gnome.org/misc/release-notes/2.28/ . Officially, this is mostly a polishing release in preparation for GNOME 3.0 due in about a year. On the FreeBSD front, though, a lot went into this release. Major thanks goes to kwm and avl who did a lot of the porting work for this release. In particular, kwm brought in Evolution MAPI support for better Microsoft Exchange integration. Avl made sure that the new gobject introspection repository ports were nicely compartmentalized so that large dependencies aren't brought in wholesale. But, every GNOME team member (ahze, avl, bland, kwm, mezz, and myself) contributed to this release. Other major improvements include an updated HAL with better volume probing code, ufsid integration, and support for volume names containing spaces (big thanks to J.R. Oldroyd); a new WebKit; updated AbiWord; an updated Gimp; and a preview of the new GNOME Shell project (thanks to Pawel Worach). The FreeBSD GNOME Team would like to that the following additional contributors to this release whose patches and testing really helped make it a success: Andrius Morkunas Dominique Goncalves Eric L. Chen J.R. Oldroyd Joseph S. Atkinson Li Pawel Worach Romain Tartière Thomas Vogt Yasuda Keisuke Rui Paulo Martin Wilke (and an extra shout out to miwi and pav for pointyhat runs) We would like to send this release out to Alexander Loginov (avl) in hopes that he feels better soon. PR: 136676 136967 138872 (obsolete with new epiphany-webkit) 139160 134737 139941 140097 140838 140929 * - bump all port that indirectly depends on libjpeg and have not yet been ↵dinoex2009-07-311-0/+1 | | | | | | bumped or updated Requested by: edwin * Update to 2.26.3.avl2009-07-032-4/+4 | | | | | Reviewed by: mezz (GNOME team) Approved by: glarkin (mentor) * Update to 2.26.2.marcus2009-05-193-4/+43 | * Presenting GNOME 2.26 for FreeBSD. Seemarcus2009-04-103-8/+51 | | | | | | | | | | | | | http://library.gnome.org/misc/release-notes/2.26/ for a list of what's new. On the FreeBSD front, we introduced a port of libxul 1.9 as an alternative for Firefox 2.0 as a Gecko provider. Almost all of the Gecko consumers can make use of this provider by setting: WITH_GECKO=libxul The GNOME 2.26 port was done by ahze, kwm, marcus, and mezz with contributions by Joseph S. Atkinson, Peter Wemm, Eric L. Chen, Martin Matuska, Craig Butler, and Pawel Worach. * Update to 2.24.3.marcus2009-01-132-4/+4 | * Presenting GNOME 2.24 for FreeBSD.marcus2009-01-103-18/+24 | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://library.gnome.org/misc/release-notes/2.24/ for the general release notes. On the FreeBSD front, this release introduces Fuse support in HAL, adds multi-CPU support to libgtop, WebKit updates, and fixes some long-standing seahorse and gnome-keyring bugs. The documentation updates to the website are forthcoming. This release features commits by adamw, ahze, kwm, mezz, and myself. It would not have been possible without are contributors and testers: Alexander Loginov Craig Butler [1] Dmitry Marakasov [6] Eric L. Chen Joseph S. Atkinson Kris Moore Lapo Luchini [7] Nikos Ntarmos Pawel Worach Romain Tartiere TAOKA Fumiyoshi [3] Yasuda Keisuke Zyl aZ [4] bf [2] [5] Florent Thoumie Peter Wemm pluknet PR: 125857 [1] 126993 [2] 130031 [3] 127399 [4] 127661 [5] 124302 [6] 129570 [7] 129936 123790 * Update to 2.22.3.mezz2008-07-013-5/+6 | * Bump portrevision due to upgrade of devel/gettext.edwin2008-06-061-0/+1 | | | | | | | | | | The affected ports are the ones with gettext as a run-dependency according to ports/INDEX-7 (5007 of them) and the ones with USE_GETTEXT in Makefile (29 of them). PR: ports/124340 Submitted by: edwin@ Approved by: portmgr (pav) * Fix typos.olgeni2008-06-051-1/+1 | * Update to 2.22.2.mezz2008-05-272-4/+4 | * Update to 2.22.1.marcus2008-04-073-4/+5 |