diff options
| -rw-r--r-- | ftp/proftpd/Makefile | 8 | ||||
| -rw-r--r-- | ftp/proftpd/files/patch-contrib-mod_ban.c | 10 | ||||
| -rw-r--r-- | ftp/proftpd/files/patch-contrib-mod_sftp-scp.c | 11 | ||||
| -rw-r--r-- | ftp/proftpd/files/patch-contrib-mod_tls.c | 10 | ||||
| -rw-r--r-- | ftp/proftpd/files/patch-src-inet.c | 22 | ||||
| -rw-r--r-- | ftp/proftpd/pkg-plist | 3 |
6 files changed, 62 insertions, 2 deletions
diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile index 814d6e3430ed..c8a536453331 100644 --- a/ftp/proftpd/Makefile +++ b/ftp/proftpd/Makefile @@ -7,6 +7,7 @@ PORTNAME= proftpd PORTVERSION= 1.3.3 +PORTREVISION= 1 CATEGORIES?= ftp MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \ ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \ @@ -42,7 +43,9 @@ CONFLICTS= proftpd-devel-1.[0-9].* USE_RC_SUBR= proftpd -CONFIGURE_ARGS= --localstatedir=/var/run \ +LOCALSTATEDIR?= /var/run + +CONFIGURE_ARGS= --localstatedir=${LOCALSTATEDIR} \ --with-pkgconfig=libdata/pkgconfig \ --sysconfdir=${PREFIX}/etc \ --disable-sendfile @@ -93,6 +96,8 @@ MODULES?= LIBDIRS?= INCLUDEDIRS?= +PLIST_SUB+= LOCALSTATEDIR="${LOCALSTATEDIR}" + .include <bsd.port.pre.mk> .if !defined(WITHOUT_RATIO) @@ -397,6 +402,7 @@ post-configure: post-install: @cd ${PREFIX}/etc/ && ${CP} -n proftpd.conf.sample proftpd.conf + @${MKDIR} ${LOCALSTATEDIR}/proftpd .if defined(WITH_SFTP) @cd ${PREFIX}/etc/proftpd && ${CP} -n dhparams.pem.sample dhparams.pem @cd ${PREFIX}/etc/proftpd && ${CP} -n blacklist.dat.sample blacklist.dat diff --git a/ftp/proftpd/files/patch-contrib-mod_ban.c b/ftp/proftpd/files/patch-contrib-mod_ban.c new file mode 100644 index 000000000000..7f7a9a9bfee0 --- /dev/null +++ b/ftp/proftpd/files/patch-contrib-mod_ban.c @@ -0,0 +1,10 @@ +--- contrib/mod_ban.c.orig 2010-04-08 16:31:51.305526124 +0200 ++++ contrib/mod_ban.c 2010-04-08 16:32:29.115825094 +0200 +@@ -1117,6 +1117,7 @@ + + #if defined(FREEBSD4) || defined(FREEBSD5) || \ + defined(FREEBSD6) || defined(FREEBSD7) || \ ++ defined(FREEBSD8) || defined(FREEBSD9) || \ + defined(DARWIN7) || defined(DARWIN8) || defined(DARWIN9) + optreset = 1; + opterr = 1; diff --git a/ftp/proftpd/files/patch-contrib-mod_sftp-scp.c b/ftp/proftpd/files/patch-contrib-mod_sftp-scp.c new file mode 100644 index 000000000000..54a7b056d7af --- /dev/null +++ b/ftp/proftpd/files/patch-contrib-mod_sftp-scp.c @@ -0,0 +1,11 @@ +--- contrib/mod_sftp/scp.c.orig 2010-04-08 16:50:19.950294512 +0200 ++++ contrib/mod_sftp/scp.c 2010-04-08 16:50:34.925959239 +0200 +@@ -1772,7 +1772,7 @@ + */ + + #if defined(FREEBSD4) || defined(FREEBSD5) || defined(FREEBSD6) || \ +- defined(FREEBSD7) || \ ++ defined(FREEBSD7) || defined(FREEBSD8) || defined(FREEBSD9) || \ + defined(DARWIN7) || defined(DARWIN8) || defined(DARWIN9) + optreset = 1; + opterr = 1; diff --git a/ftp/proftpd/files/patch-contrib-mod_tls.c b/ftp/proftpd/files/patch-contrib-mod_tls.c new file mode 100644 index 000000000000..c712376c3274 --- /dev/null +++ b/ftp/proftpd/files/patch-contrib-mod_tls.c @@ -0,0 +1,10 @@ +--- contrib/mod_tls.c.orig 2010-04-08 16:31:45.943822175 +0200 ++++ contrib/mod_tls.c 2010-04-08 16:32:44.490058910 +0200 +@@ -4812,6 +4812,7 @@ + /* All the fun portability of resetting getopt(3). */ + #if defined(FREEBSD4) || defined(FREEBSD5) || \ + defined(FREEBSD6) || defined(FREEBSD7) || \ ++ defined(FREEBSD8) || defined(FREEBSD9) || \ + defined(DARWIN7) || defined(DARWIN8) || defined(DARWIN9) + optreset = 1; + opterr = 1; diff --git a/ftp/proftpd/files/patch-src-inet.c b/ftp/proftpd/files/patch-src-inet.c new file mode 100644 index 000000000000..485e231cbe33 --- /dev/null +++ b/ftp/proftpd/files/patch-src-inet.c @@ -0,0 +1,22 @@ +--- src/inet.c.orig 2010-04-08 16:31:54.398256052 +0200 ++++ src/inet.c 2010-04-08 16:33:21.513206951 +0200 +@@ -226,7 +226,8 @@ + + #if defined(SOLARIS2) || defined(FREEBSD2) || defined(FREEBSD3) || \ + defined(FREEBSD4) || defined(FREEBSD5) || defined(FREEBSD6) || \ +- defined(FREEBSD7) || defined(__OpenBSD__) || defined(__NetBSD__) || \ ++ defined(FREEBSD7) || defined(FREEBSD8) || defined(FREEBSD9) || \ ++ defined(__OpenBSD__) || defined(__NetBSD__) || \ + defined(DARWIN6) || defined(DARWIN7) || defined(DARWIN8) || defined(DARWIN9) || defined(DARWIN10) || \ + defined(SCO3) || defined(CYGWIN) || defined(SYSV4_2MP) || \ + defined(SYSV5SCO_SV6) || defined(SYSV5UNIXWARE7) +@@ -244,7 +245,8 @@ + + #if defined(SOLARIS2) || defined(FREEBSD2) || defined(FREEBSD3) || \ + defined(FREEBSD4) || defined(FREEBSD5) || defined(FREEBSD6) || \ +- defined(FREEBSD7) || defined(__OpenBSD__) || defined(__NetBSD__) || \ ++ defined(FREEBSD7) || defined(FREEBSD8) || defined(FREEBSD9) || \ ++ defined(__OpenBSD__) || defined(__NetBSD__) || \ + defined(DARWIN6) || defined(DARWIN7) || defined(DARWIN8) || defined(DARWIN9) || defined(DARWIN10) || \ + defined(SCO3) || defined(CYGWIN) || defined(SYSV4_2MP) || \ + defined(SYSV5SCO_SV6) || defined(SYSV5UNIXWARE7) diff --git a/ftp/proftpd/pkg-plist b/ftp/proftpd/pkg-plist index 412fbff57e94..a9cce41ff7ad 100644 --- a/ftp/proftpd/pkg-plist +++ b/ftp/proftpd/pkg-plist @@ -3,7 +3,6 @@ bin/ftpdctl bin/ftptop bin/ftpwho bin/prxs - @unexec if cmp -s %D/etc/proftpd.conf %D/etc/proftpd.conf.sample; then rm -f %D/etc/proftpd.conf; fi etc/proftpd.conf.sample @exec cp -n %D/%F %B/proftpd.conf @@ -13,6 +12,7 @@ etc/proftpd.conf.sample %%SFTP%%@unexec if cmp -s %D/etc/proftpd/blacklist.dat %D/etc/proftpd/blacklist.dat.sample; then rm -f %D/etc/proftpd/blacklist.dat; fi %%SFTP%%etc/proftpd/blacklist.dat.sample %%SFTP%%@exec cp -n %D/%F %B/blacklist.dat +@exec mkdir %%LOCALSTATEDIR%%/proftpd include/proftpd/auth.h include/proftpd/bindings.h include/proftpd/buildstamp.h @@ -104,3 +104,4 @@ sbin/proftpd %%SFTP%%@dirrmtry etc/proftpd @dirrm include/proftpd @dirrmtry lib/proftpd +@unexec rmdir %%LOCALSTATEDIR%%/proftpd 2>/dev/null || true |