- Fix preserve original *.conf files - Remove dependency for x11/startup-notification - Add dependency for lang/vala - Trim REINPLACE_CMD, remove for lang/vala Generated and tested manually, tested with port test, sent with FreeBSD Port Tools 0.99_8 (mode: change, diff: ports) How-To-Repeat: These dependencies to change have me told Upstream.
Responsible Changed From-To: freebsd-ports-bugs->wg I'll take it.
Author: wg Date: Wed Jul 3 12:41:28 2013 New Revision: 322226 URL: http://svnweb.freebsd.org/changeset/ports/322226 Log: x11/libfm: preserve conf files - Fix preservation of conf files - Fix dependencies PR: ports/180110 Submitted by: nemysis <nemysis@gmx.ch> (maintainer) Modified: head/x11/libfm/Makefile Modified: head/x11/libfm/Makefile ============================================================================== --- head/x11/libfm/Makefile Wed Jul 3 12:38:31 2013 (r322225) +++ head/x11/libfm/Makefile Wed Jul 3 12:41:28 2013 (r322226) @@ -12,8 +12,8 @@ COMMENT= The libFM backend library to PC LICENSE= GPLv2 -LIB_DEPENDS= startup-notification-1:${PORTSDIR}/x11/startup-notification \ - menu-cache:${PORTSDIR}/x11/menu-cache +BUILD_DEPENDS= valac:${PORTSDIR}/lang/vala +LIB_DEPENDS= menu-cache:${PORTSDIR}/x11/menu-cache USES= pkgconfig USE_GNOME= gnomehack gtk20 @@ -36,8 +36,6 @@ NLS_USES= gettext .include <bsd.port.options.mk> post-patch: - @${REINPLACE_CMD} -e 's|^VALAC.*|VALAC=""|' \ - ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|-DG_DISABLE_DEPRECATED||g' \ ${WRKSRC}/src/Makefile.in @${REINPLACE_CMD} -e \ @@ -54,14 +52,11 @@ pre-install: @(cd ${WRKDIR}/libfm-${PORTVERSION} && ${CHMOD} 755 install-sh) post-install: - ${MKDIR} ${PREFIX}/etc/xdg/libfm + @${MKDIR} ${PREFIX}/etc/xdg/libfm ${INSTALL_DATA} ${WRKSRC}/data/libfm.conf ${PREFIX}/etc/xdg/libfm/libfm.conf.sample ${INSTALL_DATA} ${WRKSRC}/data/pref-apps.conf ${PREFIX}/etc/xdg/libfm/pref-apps.conf.sample -.if ! exists(${PREFIX}/etc/xdg/libfm/libfm.conf) - ${INSTALL_DATA} ${WRKSRC}/data/libfm.conf ${PREFIX}/etc/xdg/libfm/libfm.conf -.endif -.if ! exists(${PREFIX}/etc/xdg/libfm/pref-apps.conf) - ${INSTALL_DATA} ${WRKSRC}/data/pref-apps.conf ${PREFIX}/etc/xdg/libfm/pref-apps.conf -.endif - + @[ -f ${PREFIX}/etc/xdg/libfm/libfm.conf ] || \ + ${INSTALL_DATA} ${WRKSRC}/data/libfm.conf ${PREFIX}/etc/xdg/libfm/libfm.conf + @[ -f ${PREFIX}/etc/xdg/libfm/pref-apps.conf ] || \ + ${INSTALL_DATA} ${WRKSRC}/data/pref-apps.conf ${PREFIX}/etc/xdg/libfm/pref-apps.conf .include <bsd.port.mk> _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed. Thanks!