Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 5 Mar 2014 11:01:24 +0000 (UTC)
From:      Tijl Coosemans <tijl@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r347105 - in head/sysutils/fusefs-encfs: . files
Message-ID:  <201403051101.s25B1Oi2057714@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tijl
Date: Wed Mar  5 11:01:24 2014
New Revision: 347105
URL: http://svnweb.freebsd.org/changeset/ports/347105
QAT: https://qat.redports.org/buildarchive/r347105/

Log:
  - USES=gmake libtool pkgconfig.
  - Replace a patch with --with-boost-system=boost_system in CONFIGURE_ARGS.
  - Add USE_OPENSSL=yes.
  - Staging.
  - Use option helpers.
  - Fix build with libc++ by replacing shared_ptr with boost::shared_ptr.
  
  PR:		ports/185943

Deleted:
  head/sysutils/fusefs-encfs/files/patch-encfs-Makefile.in
Modified:
  head/sysutils/fusefs-encfs/Makefile
  head/sysutils/fusefs-encfs/pkg-plist

Modified: head/sysutils/fusefs-encfs/Makefile
==============================================================================
--- head/sysutils/fusefs-encfs/Makefile	Wed Mar  5 10:43:54 2014	(r347104)
+++ head/sysutils/fusefs-encfs/Makefile	Wed Mar  5 11:01:24 2014	(r347105)
@@ -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}/deve
 
 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
-
-.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
+OPTIONS_SUB=	yes
+NLS_USES=	gettext
+NLS_CONFIGURE_ENABLE=	nls
+
+post-patch:
+	@${FIND} ${WRKSRC}/encfs -type f | ${XARGS} ${REINPLACE_CMD} -E \
+		's/(^|[[:space:]])(shared_ptr)/\1boost::\2/g'
 
 .include <bsd.port.mk>

Modified: head/sysutils/fusefs-encfs/pkg-plist
==============================================================================
--- head/sysutils/fusefs-encfs/pkg-plist	Wed Mar  5 10:43:54 2014	(r347104)
+++ head/sysutils/fusefs-encfs/pkg-plist	Wed Mar  5 11:01:24 2014	(r347105)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403051101.s25B1Oi2057714>