aboutsummaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
authorTijl Coosemans <tijl@FreeBSD.org>2014-03-05 11:01:24 +0000
committerTijl Coosemans <tijl@FreeBSD.org>2014-03-05 11:01:24 +0000
commitb57f1f574b39e5a64a9b6a269ddd82b793c8a68f (patch)
tree6d45a16437eb8bda5b8018c6699481a8314429a5 /sysutils
parent06123cf23d8da873489e0cc9f4709dff313ec138 (diff)
downloadports-b57f1f574b39e5a64a9b6a269ddd82b793c8a68f.tar.gz
ports-b57f1f574b39e5a64a9b6a269ddd82b793c8a68f.zip
Notes
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/fusefs-encfs/Makefile27
-rw-r--r--sysutils/fusefs-encfs/files/patch-encfs-Makefile.in11
-rw-r--r--sysutils/fusefs-encfs/pkg-plist12
3 files changed, 18 insertions, 32 deletions
diff --git a/sysutils/fusefs-encfs/Makefile b/sysutils/fusefs-encfs/Makefile
index b8c1b7c9ea14..92e1bf5490cb 100644
--- a/sysutils/fusefs-encfs/Makefile
+++ b/sysutils/fusefs-encfs/Makefile
@@ -3,7 +3,7 @@
PORTNAME= encfs
PORTVERSION= 1.7.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
PKGNAMEPREFIX= fusefs-
@@ -17,30 +17,23 @@ LIB_DEPENDS= librlog.so:${PORTSDIR}/devel/rlog \
WRKSRC= ${WRKDIR}/encfs-${PORTVERSION}
-USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-boost-serialization=boost_serialization \
+ --with-boost-system=boost_system \
--with-boost-filesystem=boost_filesystem
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-USES= fuse
-USE_GMAKE= yes
+USES= fuse gmake libtool pkgconfig
USE_LDCONFIG= yes
-
-NO_STAGE= yes
+USE_OPENSSL= yes
OPTIONS_DEFINE= NLS
+OPTIONS_SUB= yes
+NLS_USES= gettext
+NLS_CONFIGURE_ENABLE= nls
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+= gettext
-PLIST_SUB+= NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+= NLS="@comment "
-.endif
-
-MAN1= encfs.1 encfsctl.1
+post-patch:
+ @${FIND} ${WRKSRC}/encfs -type f | ${XARGS} ${REINPLACE_CMD} -E \
+ 's/(^|[[:space:]])(shared_ptr)/\1boost::\2/g'
.include <bsd.port.mk>
diff --git a/sysutils/fusefs-encfs/files/patch-encfs-Makefile.in b/sysutils/fusefs-encfs/files/patch-encfs-Makefile.in
deleted file mode 100644
index 20ddda38aa60..000000000000
--- a/sysutils/fusefs-encfs/files/patch-encfs-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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_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) \
- $(am__append_2)
diff --git a/sysutils/fusefs-encfs/pkg-plist b/sysutils/fusefs-encfs/pkg-plist
index f31915e72046..792d5c145ab1 100644
--- a/sysutils/fusefs-encfs/pkg-plist
+++ b/sysutils/fusefs-encfs/pkg-plist
@@ -1,10 +1,12 @@
bin/encfs
bin/encfsctl
bin/encfssh
-%%LIB32DIR%%/libencfs.a
-%%LIB32DIR%%/libencfs.la
-%%LIB32DIR%%/libencfs.so
-%%LIB32DIR%%/libencfs.so.6
+lib/libencfs.la
+lib/libencfs.so
+lib/libencfs.so.6
+lib/libencfs.so.6.0.1
+man/man1/encfs.1.gz
+man/man1/encfsctl.1.gz
%%NLS%%share/locale/ar/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/be/LC_MESSAGES/encfs.mo
%%NLS%%share/locale/bg/LC_MESSAGES/encfs.mo
@@ -63,6 +65,8 @@ bin/encfssh
%%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