Attachment 147612 Details for Bug 193882 – improve

[patch] improve

improve.diff (text/plain), 1.78 KB, created by Jan Beich on 2014-09-23 19:09:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2014-09-23 19:09:29 UTC

Size: 1.78 KB

patch

obsolete

>Index: sysutils/fusefs-simple-mtpfs/Makefile
>===================================================================
>--- sysutils/fusefs-simple-mtpfs/Makefile	(revision 369112)
>+++ sysutils/fusefs-simple-mtpfs/Makefile	(working copy)
>@@ -18,9 +18,8 @@ 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
> MAKEFILE=	makefile
> MAKE_ENV=	V=1
> INSTALL_TARGET=	install-strip
>@@ -36,9 +35,11 @@ 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_DIRS+=	/etc/autofs
>+PLIST_FILES+=	/etc/autofs/special_${PORTNAME}
>+SUB_FILES+=	special_${PORTNAME}
> .endif
> 
> post-install:
>@@ -46,7 +47,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>
>Index: sysutils/fusefs-simple-mtpfs/files/special_simple-mtpfs.in
>===================================================================
>--- sysutils/fusefs-simple-mtpfs/files/special_simple-mtpfs.in	(revision 369112)
>+++ sysutils/fusefs-simple-mtpfs/files/special_simple-mtpfs.in	(working copy)
>@@ -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

Actions: View | Diff

Attachments on bug 193882: 147612 | 147613