- Update to 1.3.3a

Feature safe:	yes

4 files changed, 10 insertions, 49 deletions

diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile
index bfee8ce40ea5..d23d700ff053 100644
--- a/ftp/proftpd/Makefile
+++ b/ftp/proftpd/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	proftpd
-PORTVERSION=	1.3.3
-PORTREVISION=	5
+DISTVERSION=	1.3.3a
 CATEGORIES?=	ftp
 MASTER_SITES=	ftp://ftp.proftpd.org/distrib/source/ \
 		ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \
diff --git a/ftp/proftpd/distinfo b/ftp/proftpd/distinfo
index f19e5832e338..afd4c6b0fd8a 100644
--- a/ftp/proftpd/distinfo
+++ b/ftp/proftpd/distinfo
@@ -1,6 +1,6 @@
-MD5 (proftpd-1.3.3.tar.bz2) = 3951244f1940f0a40e8af142a9cf67fe
-SHA256 (proftpd-1.3.3.tar.bz2) = 793f2bde2ab5aeb86a68349118d87bb151ba1278987612b7a12872110f9d759c
-SIZE (proftpd-1.3.3.tar.bz2) = 4132650
+MD5 (proftpd-1.3.3a.tar.bz2) = 55ae8b32c9f5c00340188b7094c36ffc
+SHA256 (proftpd-1.3.3a.tar.bz2) = c1f73e7b189c22fe2f33a0cd6f9d3f3ad10ee73c23a1347cd13daf87fea729f7
+SIZE (proftpd-1.3.3a.tar.bz2) = 4157983
 MD5 (mod_clamav-0.11rc.tar.gz) = 42e560ec0bd5964e13fad1b2bb7afe21
 SHA256 (mod_clamav-0.11rc.tar.gz) = 87630eb1866066d6320ee711897d8998b8f4915c0498b2e78cc0464abd34855a
 SIZE (mod_clamav-0.11rc.tar.gz) = 5115
diff --git a/ftp/proftpd/files/patch-src-wtmp.c b/ftp/proftpd/files/patch-src-wtmp.c
index 639332a410a8..afd717708886 100644
--- a/ftp/proftpd/files/patch-src-wtmp.c
+++ b/ftp/proftpd/files/patch-src-wtmp.c
@@ -1,47 +1,6 @@
---- src/wtmp.c.orig	2009-02-18 19:24:50.000000000 +0100
-+++ src/wtmp.c	2010-05-13 16:18:54.711790750 +0200
-@@ -37,7 +37,9 @@
-   int res = 0;
- 
- #if ((defined(SVR4) || defined(__SVR4)) || \
--    (defined(__NetBSD__) && defined(HAVE_UTMPX_H))) && \
-+    ((defined(__NetBSD__) || \
-+     (defined(__FreeBSD_version) && __FreeBSD_version >= 900007)) && \
-+      defined(HAVE_UTMPX_H))) && \
-     !(defined(LINUX) || defined(__hpux) || defined (_AIX))
-   /* This "auxilliary" utmp doesn't exist under linux. */
- 
-@@ -51,8 +53,17 @@
- 
-   static int fdx = -1;
- 
--#if !defined(WTMPX_FILE) && defined(_PATH_WTMPX)
--# define WTMPX_FILE _PATH_WTMPX
-+#if !defined(WTMPX_FILE)
-+# if defined(_PATH_WTMPX)
-+#   define WTMPX_FILE _PATH_WTMPX
-+# elif defined(_PATH_UTMPX)
-+#   define WTMPX_FILE _PATH_UTMPX
-+# else
-+/* This path works for FreeBSD; not sure what to do for other platforms which
-+ * don't define _PATH_WTMPX or _PATH_UTMPX.
-+ */
-+#   define WTMPX_FILE "/var/log/utx.log"
-+# endif
- #endif
- 
-   if (fdx < 0 &&
-@@ -80,7 +91,8 @@
- #if defined(__NetBSD__) && defined(HAVE_UTMPX_H)
-     memcpy(&utx.ut_ss, pr_netaddr_get_inaddr(ip), sizeof(utx.ut_ss));
-     gettimeofday(&utx.ut_tv, NULL);
--
-+#elif defined(__FreeBSD_version) && __FreeBSD_version >= 900007 && defined(HAVE_UTMPX_H)
-+    gettimeofday(&utx.ut_tv, NULL);
- #else /* SVR4 */
-     utx.ut_syslen = strlen(utx.ut_host)+1;
- 
-@@ -113,7 +125,9 @@
+--- src/wtmp.c.orig	2010-07-05 09:52:50.147213835 +0200
++++ src/wtmp.c	2010-07-05 09:53:25.075513542 +0200
+@@ -126,7 +126,9 @@
    }
  
  #else /* Non-SVR4 systems */
diff --git a/ftp/proftpd/pkg-plist b/ftp/proftpd/pkg-plist
index dd4245de0c90..8acac40efc35 100644
--- a/ftp/proftpd/pkg-plist
+++ b/ftp/proftpd/pkg-plist
@@ -84,12 +84,14 @@ sbin/proftpd
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/proftpd.mo
 %%NLS%%share/locale/en_US/LC_MESSAGES/proftpd.mo
 %%NLS%%share/locale/it_IT/LC_MESSAGES/proftpd.mo
+%%NLS%%share/locale/ja_JP/LC_MESSAGES/proftpd.mo
 %%NLS%%share/locale/ru_RU/LC_MESSAGES/proftpd.mo
 %%NLS%%share/locale/bg_BG/LC_MESSAGES/proftpd.mo
 %%NLS%%share/locale/fr_FR/LC_MESSAGES/proftpd.mo
 %%NLS%%share/locale/ko_KR/LC_MESSAGES/proftpd.mo
 %%NLS%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/en_US/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ja_JP/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/it_IT/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/ru_RU/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/bg_BG/LC_MESSAGES
@@ -97,6 +99,7 @@ sbin/proftpd
 %%NLS%%@dirrmtry share/locale/zh_CN
 %%NLS%%@dirrmtry share/locale/zh_TW
 %%NLS%%@dirrmtry share/locale/en_US
+%%NLS%%@dirrmtry share/locale/ja_JP
 %%NLS%%@dirrmtry share/locale/it_IT
 %%NLS%%@dirrmtry share/locale/ru_RU
 %%NLS%%@dirrmtry share/locale/bg_BG