Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 25 Sep 2014 17:03:23 +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: r369275 - in head/sysutils/fusefs-simple-mtpfs: . files
Message-ID:  <201409251703.s8PH3NhB080878@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tijl
Date: Thu Sep 25 17:03:22 2014
New Revision: 369275
URL: http://svnweb.freebsd.org/changeset/ports/369275
QAT: https://qat.redports.org/buildarchive/r369275/

Log:
  - Convert to USES=autoreconf
  - Replace MAKE_ENV=V=1 with CONFIGURE_ARGS=--disable-silent-rules
  - improve |automountd -d| output a bit by not redirecting stderr
  - s/simple-mtpfs/${PORTNAME}/ to save from typos in future
  - add a comment about why /etc/autofs doesn't install under PREFIX yet
  
  PR:		193882
  Submitted by:	Jan Beich <jbeich@vfemail.net> (maintainer)

Modified:
  head/sysutils/fusefs-simple-mtpfs/Makefile
  head/sysutils/fusefs-simple-mtpfs/files/special_simple-mtpfs.in

Modified: head/sysutils/fusefs-simple-mtpfs/Makefile
==============================================================================
--- head/sysutils/fusefs-simple-mtpfs/Makefile	Thu Sep 25 16:53:43 2014	(r369274)
+++ head/sysutils/fusefs-simple-mtpfs/Makefile	Thu Sep 25 17:03:22 2014	(r369275)
@@ -2,7 +2,7 @@
 
 PORTNAME=	simple-mtpfs
 PORTVERSION=	0.2.s20140709
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 PKGNAMEPREFIX=	fusefs-
 
@@ -18,14 +18,13 @@ GH_ACCOUNT=	phatina
 GH_TAGNAME=	${GH_COMMIT}
 GH_COMMIT=	74dfce6
 
-USES=		compiler:c++11-lib fuse pkgconfig
-USE_AUTOTOOLS=	aclocal autoconf autoheader automake
-AUTOMAKE_ARGS=	--add-missing
+USES=		autoreconf compiler:c++11-lib fuse pkgconfig
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-silent-rules
 MAKEFILE=	makefile
-MAKE_ENV=	V=1
 INSTALL_TARGET=	install-strip
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib
 PLIST_FILES=	bin/${PORTNAME} \
 		man/man1/${PORTNAME}.1.gz
 PORTDOCS=	AUTHORS NEWS README.md
@@ -36,9 +35,10 @@ OPTIONS_DEFINE=	DOCS
 CONFIGURE_ENV+=	LIBUSB1_CFLAGS=" " LIBUSB1_LIBS="-lusb"
 .endif
 
+# XXX move to PREFIX when bug 193596 lands
 .if exists(/etc/autofs)
-PLIST_FILES+=	/etc/autofs/special_simple-mtpfs
-SUB_FILES+=	special_simple-mtpfs
+PLIST_FILES+=	/etc/autofs/special_${PORTNAME}
+SUB_FILES+=	special_${PORTNAME}
 .endif
 
 post-install:
@@ -46,7 +46,8 @@ post-install:
 	${INSTALL_DATA} ${PORTDOCS:C|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 .if exists(/etc/autofs)
 	@${MKDIR} ${STAGEDIR}/etc/autofs
-	${INSTALL_SCRIPT} ${WRKDIR}/special_simple-mtpfs ${STAGEDIR}/etc/autofs
+	${INSTALL_SCRIPT} ${WRKDIR}/special_${PORTNAME} \
+		${STAGEDIR}/etc/autofs
 .endif
 
 .include <bsd.port.mk>

Modified: head/sysutils/fusefs-simple-mtpfs/files/special_simple-mtpfs.in
==============================================================================
--- head/sysutils/fusefs-simple-mtpfs/files/special_simple-mtpfs.in	Thu Sep 25 16:53:43 2014	(r369274)
+++ head/sysutils/fusefs-simple-mtpfs/files/special_simple-mtpfs.in	Thu Sep 25 17:03:22 2014	(r369275)
@@ -4,7 +4,7 @@
 # /mtp		-simple-mtpfs	-allow_other
 #
 
-out=$(%%PREFIX%%/bin/simple-mtpfs --list-devices 2>&1)
+out=$(%%PREFIX%%/bin/simple-mtpfs --list-devices)
 [ $? -eq 0 ] || exit 1
 
 if [ $# -eq 0 ]; then



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