From owner-svn-ports-all@FreeBSD.ORG Sat Sep 6 10:37:56 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B2D29DEF; Sat, 6 Sep 2014 10:37:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8485F138B; Sat, 6 Sep 2014 10:37:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s86AbuF9018782; Sat, 6 Sep 2014 10:37:56 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s86AbuTK018781; Sat, 6 Sep 2014 10:37:56 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201409061037.s86AbuTK018781@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Sat, 6 Sep 2014 10:37:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r367411 - head/x11/libfm X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Sep 2014 10:37:56 -0000 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}