5 files changed, 100 insertions, 91 deletions

diff --git a/sysutils/fusefs-encfs/Makefile b/sysutils/fusefs-encfs/Makefile
index 0c9e66c22607..90c851578168 100644
--- a/sysutils/fusefs-encfs/Makefile
+++ b/sysutils/fusefs-encfs/Makefile
@@ -6,18 +6,17 @@
 #
 
 PORTNAME=	encfs
-PORTVERSION=	1.3.2
-PORTREVISION=	1
+PORTVERSION=	1.4.2
 CATEGORIES=	sysutils
-MASTER_SITES=	http://arg0.net/users/vgough/download/
+MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 PKGNAMEPREFIX=	fusefs-
-DISTNAME=	encfs-${PORTVERSION}-1
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	trasz@FreeBSD.org
+MAINTAINER=	leeym@FreeBSD.org
 COMMENT=	An encrypted pass-through FUSE filesystem
 
-LIB_DEPENDS=	rlog:${PORTSDIR}/devel/rlog
+LIB_DEPENDS=	rlog:${PORTSDIR}/devel/rlog \
+		boost_serialization:${PORTSDIR}/devel/boost
 RUN_DEPENDS=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
 BUILD_DEPENDS=	${LOCALBASE}/include/fuse.h:${PORTSDIR}/sysutils/fusefs-libs
 
@@ -25,12 +24,19 @@ WRKSRC=		${WRKDIR}/encfs-${PORTVERSION}
 
 USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS=-L${LOCALBASE}/lib
+CONFIGURE_ARGS=	--with-boost-serialization=boost_serialization
+CONFIGURE_ENV=	LDFLAGS=-L${LOCALBASE}/lib CPPFLAGS=-I${LOCALBASE}/include
 CFLAGS+=	${PTHREAD_LIBS} -liconv
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
+
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.else
 USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.endif
 
 MAN1=		encfs.1 encfsctl.1
 
diff --git a/sysutils/fusefs-encfs/distinfo b/sysutils/fusefs-encfs/distinfo
index bf262180a695..a34bcd8aebba 100644
--- a/sysutils/fusefs-encfs/distinfo
+++ b/sysutils/fusefs-encfs/distinfo
@@ -1,3 +1,3 @@
-MD5 (encfs-1.3.2-1.tgz) = 71482dbe0e158ee9ba522ae637337230
-SHA256 (encfs-1.3.2-1.tgz) = 3825cf0724fcfdc4bd8073227f4437c3b25056571fb94709ba463fb1f70d0a85
-SIZE (encfs-1.3.2-1.tgz) = 711838
+MD5 (encfs-1.4.2.tgz) = 61e42ab2093b9797b9c669b9a1ff665b
+SHA256 (encfs-1.4.2.tgz) = 8d0ebd0037248939eb791b3b1e0476befd99526657948702f4d74724c6571ee9
+SIZE (encfs-1.4.2.tgz) = 893484
diff --git a/sysutils/fusefs-encfs/files/patch-encfs-PtrImpl.h b/sysutils/fusefs-encfs/files/patch-encfs-PtrImpl.h
deleted file mode 100644
index 5ae806b7cd6c..000000000000
--- a/sysutils/fusefs-encfs/files/patch-encfs-PtrImpl.h
+++ /dev/null
@@ -1,36 +0,0 @@
---- encfs/PtrImpl.h.orig	Wed Feb 14 22:36:56 2007
-+++ encfs/PtrImpl.h	Thu Jun 14 18:04:10 2007
-@@ -26,6 +26,20 @@
- 
- #include "OpaqueValue.h"
- 
-+#include "config.h"
-+#if defined(HAVE_ATOMIC_GCC) || defined(HAVE_ATOMIC_GCC_PRIVATE)
-+#if (__GNUC__ >= 4 && __GNUC_MINOR__ >= 2)
-+#include <ext/atomicity.h>
-+#else
-+#include <bits/atomicity.h>
-+#endif
-+#define HAVE_ATOMIC_FUNCS
-+#endif
-+
-+#if defined(HAVE_ATOMIC_GCC_PRIVATE)
-+using namespace __gnu_cxx;
-+#endif
-+
- namespace rel
- {
- 
-@@ -55,7 +69,12 @@
- 	virtual void destroy() =0;
- 
-     protected:
-+
-+#ifdef HAVE_ATOMIC_FUNCS
-+	volatile _Atomic_word refCnt;
-+#else
- 	int refCnt;
-+#endif
-     };
-     
-     /*
diff --git a/sysutils/fusefs-encfs/files/patch-encfs__encfsctl.cpp b/sysutils/fusefs-encfs/files/patch-encfs__encfsctl.cpp
new file mode 100644
index 000000000000..c282e2f4f600
--- /dev/null
+++ b/sysutils/fusefs-encfs/files/patch-encfs__encfsctl.cpp
@@ -0,0 +1,13 @@
+--- encfs/encfsctl.cpp.orig	2008-05-22 02:37:48.000000000 -0700
++++ encfs/encfsctl.cpp	2008-05-22 02:37:57.000000000 -0700
+@@ -36,9 +36,9 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #ifdef __FreeBSD__
+-#include <libintl.h>
++#include "gettext.h"
+ #endif
+ 
+ #include "i18n.h"
+ 
diff --git a/sysutils/fusefs-encfs/pkg-plist b/sysutils/fusefs-encfs/pkg-plist
index e204e7f28a57..e1425f650541 100644
--- a/sysutils/fusefs-encfs/pkg-plist
+++ b/sysutils/fusefs-encfs/pkg-plist
@@ -1,49 +1,75 @@
 bin/encfs
 bin/encfsctl
 bin/encfssh
-lib/libencfs.so.2
-lib/libencfs.so
 lib/libencfs.a
 lib/libencfs.la
-share/locale/bg/LC_MESSAGES/encfs.mo
-share/locale/da/LC_MESSAGES/encfs.mo
-share/locale/de/LC_MESSAGES/encfs.mo
-share/locale/es/LC_MESSAGES/encfs.mo
-share/locale/es_ES/LC_MESSAGES/encfs.mo
-share/locale/fr/LC_MESSAGES/encfs.mo
-share/locale/he/LC_MESSAGES/encfs.mo
-share/locale/hr/LC_MESSAGES/encfs.mo
-share/locale/hu/LC_MESSAGES/encfs.mo
-share/locale/id/LC_MESSAGES/encfs.mo
-share/locale/it/LC_MESSAGES/encfs.mo
-share/locale/ja/LC_MESSAGES/encfs.mo
-share/locale/nb/LC_MESSAGES/encfs.mo
-share/locale/nl/LC_MESSAGES/encfs.mo
-share/locale/pt_BR/LC_MESSAGES/encfs.mo
-share/locale/pt_PT/LC_MESSAGES/encfs.mo
-share/locale/ru/LC_MESSAGES/encfs.mo
-share/locale/sv/LC_MESSAGES/encfs.mo
-share/locale/tr/LC_MESSAGES/encfs.mo
-share/locale/ca/LC_MESSAGES/encfs.mo
-share/locale/cs/LC_MESSAGES/encfs.mo
-share/locale/de_CH/LC_MESSAGES/encfs.mo
-share/locale/de_DE/LC_MESSAGES/encfs.mo
-share/locale/fi/LC_MESSAGES/encfs.mo
-share/locale/fr_FR/LC_MESSAGES/encfs.mo
-share/locale/hu_HU/LC_MESSAGES/encfs.mo
-share/locale/ko/LC_MESSAGES/encfs.mo
-share/locale/pl/LC_MESSAGES/encfs.mo
-share/locale/pt/LC_MESSAGES/encfs.mo
-share/locale/ro/LC_MESSAGES/encfs.mo
-share/locale/te/LC_MESSAGES/encfs.mo
-share/locale/es_PE/LC_MESSAGES/encfs.mo
-@dirrmtry share/locale/hu_HU/LC_MESSAGES
-@dirrmtry share/locale/hu_HU
-@dirrmtry share/locale/de_CH/LC_MESSAGES
-@dirrmtry share/locale/de_CH
-@dirrmtry share/locale/de_DE/LC_MESSAGES
-@dirrmtry share/locale/de_DE
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/es_PE/LC_MESSAGES
-@dirrmtry share/locale/es_PE
+lib/libencfs.so
+lib/libencfs.so.4
+%%NLS%%share/locale/ar/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/be/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/bs/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/da/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/de/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/de_CH/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/de_DE/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/el/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/es/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/es_ES/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/es_PE/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/et/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/fr_FR/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/gu/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/he/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/hi/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/id/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/it/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/mr/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/nds/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/nn/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/pt_PT/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/ta/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/te/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/zh_HK/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/encfs.mo
+%%NLS%%@dirrmtry share/locale/zh_HK/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/zh_HK
+%%NLS%%@dirrmtry share/locale/te/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/te
+%%NLS%%@dirrmtry share/locale/nds/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/nds
+%%NLS%%@dirrmtry share/locale/mr/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/mr
+%%NLS%%@dirrmtry share/locale/es_PE/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/es_PE
+%%NLS%%@dirrmtry share/locale/de_DE/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/de_DE
+%%NLS%%@dirrmtry share/locale/de_CH/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/de_CH