svn commit: r367411 - head/x11/libfm

[Tijl Coosemans]

Author: tijl
Date: Sat Sep  6 10:37:55 2014
New Revision: 367411
URL: http://svnweb.freebsd.org/changeset/ports/367411
QAT: https://qat.redports.org/buildarchive/r367411/

Log:
  - USE_AUTOTOOLS contains aclocal but not autoconf which leaves configure
    out of date and causes make (build phase) to run autoconf, erasing any
    configure patches.  Then make reruns configure.  Instead of adding
    autoconf to USE_AUTOTOOLS avoid USE_AUTOTOOLS altogether by patching
    Makefile.in instead of Makefile.am.
  - Use INSTALL_TARGET=install-strip and USES=pathfix
  
  Reported by:	antoine

Modified:
  head/x11/libfm/Makefile

Modified: head/x11/libfm/Makefile
==============================================================================
--- head/x11/libfm/Makefile	Sat Sep  6 09:49:51 2014	(r367410)
+++ head/x11/libfm/Makefile	Sat Sep  6 10:37:55 2014	(r367411)
@@ -16,15 +16,15 @@ BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSD
 LIB_DEPENDS=	libmenu-cache.so:${PORTSDIR}/x11/menu-cache \
 		libexif.so:${PORTSDIR}/graphics/libexif
 
-USES=		desktop-file-utils fam gmake pkgconfig shared-mime-info tar:xz libtool
+USES=		desktop-file-utils fam gmake libtool pathfix pkgconfig \
+		shared-mime-info tar:xz
 USE_GNOME=	gtk20
-USE_AUTOTOOLS=	aclocal automake libtoolize:env
-CONFIGURE_ARGS+=--sysconfdir=${LOCALBASE}/etc
-MAKE_ENV=	INSTALL_STRIP_FLAG=${STRIP}
 USE_LDCONFIG=	yes
-
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--sysconfdir=${LOCALBASE}/etc
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
 
 PORTDOCS=	AUTHORS NEWS README
 
@@ -41,14 +41,9 @@ PLIST_SUB+=	VER=4
 post-patch:
 	@${REINPLACE_CMD} -e 's|-DG_DISABLE_DEPRECATED||' \
 		${WRKSRC}/src/Makefile.in
-	@${REINPLACE_CMD} -e '/^pkgconfigdir/s|$$(libdir)|$$(prefix)/libdata|; \
-		s|libfm-gtk3.pc||' \
-		${WRKSRC}/Makefile.am
-	@${REINPLACE_CMD} -e '/libfm.conf/ d' ${WRKSRC}/data/Makefile.am
 
 post-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/xdg/libfm
-	${INSTALL_DATA} ${WRKSRC}/data/libfm.conf \
+	${MV} ${STAGEDIR}${PREFIX}/etc/xdg/libfm/libfm.conf \
 		${STAGEDIR}${PREFIX}/etc/xdg/libfm/libfm.conf.sample
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}