- Update to 1.6 and unbreak.

- Drop MAINTAINERship

Feature safe:	yes
PR:		ports/148086
Submitted by:	olgeni
Approved by:	leeym

6 files changed, 32 insertions, 37 deletions

diff --git a/sysutils/fusefs-encfs/Makefile b/sysutils/fusefs-encfs/Makefile
index ab2f189dd94b..d3780b185ba3 100644
--- a/sysutils/fusefs-encfs/Makefile
+++ b/sysutils/fusefs-encfs/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	encfs
-PORTVERSION=	1.4.2
-PORTREVISION=	3
+PORTVERSION=	1.6
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 PKGNAMEPREFIX=	fusefs-
+DISTNAME=	${PORTNAME}-${PORTVERSION}-1
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	leeym@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An encrypted pass-through FUSE filesystem
 
 LIB_DEPENDS=	rlog:${PORTSDIR}/devel/rlog \
@@ -23,11 +23,10 @@ BUILD_DEPENDS=	${LOCALBASE}/include/fuse.h:${PORTSDIR}/sysutils/fusefs-libs
 
 WRKSRC=		${WRKDIR}/encfs-${PORTVERSION}
 
-BROKEN=		incompatible with newer boost.
-
 USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-boost-serialization=boost_serialization
+CONFIGURE_ARGS=	--with-boost-serialization=boost_serialization \
+		--with-boost-filesystem=boost_filesystem
 CONFIGURE_ENV=	LDFLAGS=-L${LOCALBASE}/lib CPPFLAGS=-I${LOCALBASE}/include
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
diff --git a/sysutils/fusefs-encfs/distinfo b/sysutils/fusefs-encfs/distinfo
index a34bcd8aebba..b52cdce3c10a 100644
--- a/sysutils/fusefs-encfs/distinfo
+++ b/sysutils/fusefs-encfs/distinfo
@@ -1,3 +1,3 @@
-MD5 (encfs-1.4.2.tgz) = 61e42ab2093b9797b9c669b9a1ff665b
-SHA256 (encfs-1.4.2.tgz) = 8d0ebd0037248939eb791b3b1e0476befd99526657948702f4d74724c6571ee9
-SIZE (encfs-1.4.2.tgz) = 893484
+MD5 (encfs-1.6-1.tgz) = db99570557cf432cca088748944fb74a
+SHA256 (encfs-1.6-1.tgz) = bc02036e3fe123742a3a2fb711f3f7000321b5a9b82517e34b6b456f0b8ba04c
+SIZE (encfs-1.6-1.tgz) = 930653
diff --git a/sysutils/fusefs-encfs/files/patch-encfs-FileUtils.cpp b/sysutils/fusefs-encfs/files/patch-encfs-FileUtils.cpp
deleted file mode 100644
index c92ed6bf34dc..000000000000
--- a/sysutils/fusefs-encfs/files/patch-encfs-FileUtils.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- encfs/FileUtils.cpp.orig	2008-04-14 03:13:23.000000000 +0400
-+++ encfs/FileUtils.cpp	2009-03-21 04:33:29.000000000 +0300
-@@ -61,6 +61,7 @@
- #include <boost/archive/xml_iarchive.hpp>
- #include <boost/archive/xml_oarchive.hpp>
- #include <boost/serialization/split_free.hpp>
-+#include <boost/serialization/binary_object.hpp>
- 
- using namespace rel;
- using namespace rlog;
diff --git a/sysutils/fusefs-encfs/files/patch-encfs-Makefile.in b/sysutils/fusefs-encfs/files/patch-encfs-Makefile.in
index 40c1d9f8f590..20ddda38aa60 100644
--- a/sysutils/fusefs-encfs/files/patch-encfs-Makefile.in
+++ b/sysutils/fusefs-encfs/files/patch-encfs-Makefile.in
@@ -1,11 +1,11 @@
---- encfs/Makefile.in.orig	2008-04-14 04:10:40.000000000 +0400
-+++ encfs/Makefile.in	2009-03-21 04:37:08.000000000 +0300
-@@ -279,7 +279,7 @@
- KDE_OPTIONS = qtonly
+--- encfs/Makefile.in.orig
++++ encfs/Makefile.in
+@@ -328,7 +328,7 @@
  ALL_INCLUDES = @RLOG_CFLAGS@ @OPENSSL_CFLAGS@ @BOOST_CPPFLAGS@
- ALL_LDFLAGS = @RLOG_LIBS@ @OPENSSL_LIBS@ @FUSE_LIBS@ \
--	@BOOST_SERIALIZATION_LIB@ $(am__append_2)
-+	@BOOST_SERIALIZATION_LIB@ $(am__append_2) -lboost_system
+ ALL_LDFLAGS = @RLOG_LIBS@ @OPENSSL_LIBS@ @FUSE_LIBS@ @BOOST_LDFLAGS@ \
+ 	@BOOST_SERIALIZATION_LIB@ @BOOST_FILESYSTEM_LIB@ \
+-	@BOOST_SYSTEM_LIB@ $(am__append_3)
++	@BOOST_SYSTEM_LIB@ $(am__append_3) -lboost_system
  INCLUDES = $(all_includes) -I../intl
- AM_CXXFLAGS = -DRLOG_COMPONENT="encfs" $(ALL_INCLUDES) $(am__append_1)
- lib_LTLIBRARIES = libencfs.la
+ AM_CXXFLAGS = -DRLOG_COMPONENT="encfs" $(ALL_INCLUDES) $(am__append_1) \
+ 	$(am__append_2)
diff --git a/sysutils/fusefs-encfs/pkg-descr b/sysutils/fusefs-encfs/pkg-descr
index e0cfe61db235..633631ffaaa2 100644
--- a/sysutils/fusefs-encfs/pkg-descr
+++ b/sysutils/fusefs-encfs/pkg-descr
@@ -4,4 +4,4 @@ pass-through filesystems, all data is encrypted and stored in the
 underlying filesystem.  Unlike loopback filesystems, there is no
 predetermined or pre-allocated filesystem size.
 
-WWW:	http://freshmeat.net/projects/encfs/
+WWW: http://www.arg0.net/encfs
diff --git a/sysutils/fusefs-encfs/pkg-plist b/sysutils/fusefs-encfs/pkg-plist
index e1425f650541..f7623299d612 100644
--- a/sysutils/fusefs-encfs/pkg-plist
+++ b/sysutils/fusefs-encfs/pkg-plist
@@ -1,10 +1,10 @@
 bin/encfs
 bin/encfsctl
 bin/encfssh
-lib/libencfs.a
-lib/libencfs.la
-lib/libencfs.so
-lib/libencfs.so.4
+%%LIB32DIR%%/libencfs.a
+%%LIB32DIR%%/libencfs.la
+%%LIB32DIR%%/libencfs.so
+%%LIB32DIR%%/libencfs.so.5
 %%NLS%%share/locale/ar/LC_MESSAGES/encfs.mo
 %%NLS%%share/locale/be/LC_MESSAGES/encfs.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/encfs.mo
@@ -13,9 +13,13 @@ lib/libencfs.so.4
 %%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_AT/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/en_AU/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/en_CA/LC_MESSAGES/encfs.mo
+%%NLS%%share/locale/en_GB/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
@@ -25,11 +29,11 @@ lib/libencfs.so.4
 %%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/hu_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
@@ -37,11 +41,11 @@ lib/libencfs.so.4
 %%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/oc/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
@@ -59,14 +63,16 @@ lib/libencfs.so.4
 %%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/oc/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/oc
 %%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/hu_HU/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/hu_HU
 %%NLS%%@dirrmtry share/locale/es_PE/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/es_PE
 %%NLS%%@dirrmtry share/locale/de_DE/LC_MESSAGES