ports/180110: [MAINTAINER] x11/libfm: Fix preserve original *.conf files, adjust deps
nemysis
nemysis at gmx.ch
Sat Jun 29 22:20:00 UTC 2013
>Number: 180110
>Category: ports
>Synopsis: [MAINTAINER] x11/libfm: Fix preserve original *.conf files, adjust deps
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Jun 29 22:20:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: nemysis
>Release: FreeBSD 9.1-RELEASE-p8 amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.1-RELEASE-p8 FreeBSD 9.1-RELEASE-p8 #0: Tue Jun 18 15:25:28 UTC 2013
>Description:
- 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.
>Fix:
--- libfm-1.1.0_1.patch begins here ---
diff -ruN /usr/ports/x11/libfm/Makefile ./Makefile
--- /usr/ports/x11/libfm/Makefile 2013-06-22 16:05:41.000000000 +0200
+++ ./Makefile 2013-06-29 23:07:58.000000000 +0200
@@ -12,8 +12,8 @@
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 @@
.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 @@
@(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>
--- libfm-1.1.0_1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list