Date: Tue, 24 Dec 2013 09:33:29 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337325 - in branches/2014Q1/deskutils/cairo-dock-plugins: . files Message-ID: <201312240933.rBO9XTr1014670@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Tue Dec 24 09:33:29 2013 New Revision: 337325 URL: http://svnweb.freebsd.org/changeset/ports/337325 Log: MFH: r337323 - Fix build - Do not reinplace binary files (*.wav, *.jpg...) - Stage support PR: ports/184944 Submitted by: Ivan Klymenko (maintainer) Approved by: portmgr (implicit) Added: branches/2014Q1/deskutils/cairo-dock-plugins/files/ - copied from r337323, head/deskutils/cairo-dock-plugins/files/ Modified: branches/2014Q1/deskutils/cairo-dock-plugins/Makefile branches/2014Q1/deskutils/cairo-dock-plugins/pkg-plist Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/deskutils/cairo-dock-plugins/Makefile ============================================================================== --- branches/2014Q1/deskutils/cairo-dock-plugins/Makefile Tue Dec 24 09:32:47 2013 (r337324) +++ branches/2014Q1/deskutils/cairo-dock-plugins/Makefile Tue Dec 24 09:33:29 2013 (r337325) @@ -18,16 +18,14 @@ DATADIR= ${PREFIX}/share/cairo-dock ICONS_PACKAGE= cairo-dock-plugins-png-icons GNU_CONFIGURE= yes -USE_GMAKE= yes -USE_GNOME= gnomehack glib20 gtk20 librsvg2 libxml2 +USE_GNOME= glib20 gtk20 librsvg2 libxml2 USE_LDCONFIG= yes USE_PYTHON= yes USE_XORG= xrender -USE_DOS2UNIX= YES USES= cmake gettext pkgconfig LDFLAGS+= -L${LOCALBASE}/lib PLIST_SUB+= PYVER="${PYTHON_VERSION:S/thon//}" -CMAKE_ARGS+= -Dinstall-pc-path:STRING="${LOCALBASE}/libdata/pkgconfig" +CMAKE_ARGS+= -DROOT_PREFIX:PATH=${STAGEDIR} OPTIONS_DEFINE= XFCE_INTEGRATION ALSA_MIXER GMENU \ KEYBOARD_INDICATOR IMPULSE \ @@ -44,14 +42,15 @@ WEBLETS_DESC= Weblets applet OPTIONS_SUB= yes -NO_STAGE= yes .include <bsd.port.options.mk> post-patch: @${CP} -R ${WRKDIR}/${ICONS_PACKAGE}/* ${WRKSRC} - @${FIND} ${WRKSRC} -type f -name "*" | ${XARGS} ${REINPLACE_CMD} -i.orig -e \ + @${FIND} ${WRKSRC} -type f \( -name "*.c" -o -name "*.conf" \ + -o -name netspeed -o -name nvidia-config -o -name "*.sh" \ + -o -name "*.rb" \) | ${XARGS} ${REINPLACE_CMD} -i.orig -e \ 's|/bin/bash|${LOCALBASE}/bin/bash|g; \ - s|/usr/bin/python|${LOCALBASE}/bin/python|g; \ + s|/usr/bin/python|${PYTHON_CMD}|g; \ s|/usr/bin/ruby|${LOCALBASE}/bin/ruby|g; \ s|/usr/share/applications|${LOCALBASE}/share/applications|g; \ s|/usr/share/cairo-dock|${LOCALBASE}/share/cairo-dock|g' Modified: branches/2014Q1/deskutils/cairo-dock-plugins/pkg-plist ============================================================================== --- branches/2014Q1/deskutils/cairo-dock-plugins/pkg-plist Tue Dec 24 09:32:47 2013 (r337324) +++ branches/2014Q1/deskutils/cairo-dock-plugins/pkg-plist Tue Dec 24 09:33:29 2013 (r337325) @@ -45,7 +45,6 @@ lib/cairo-dock/libcd-weather.so lib/cairo-dock/libcd-wifi.so lib/cairo-dock/libcd_gnome-integration.so lib/libCDApplet.so -lib/pkgconfig/CDApplet.pc %%XFCE_INTEGRATION%%lib/cairo-dock/libcd_xfce-integration.so %%PYTHON_SITELIBDIR%%/CDApplet.py %%PYTHON_SITELIBDIR%%/CDApplet.pyc @@ -55,6 +54,7 @@ lib/pkgconfig/CDApplet.pc %%PYTHON_SITELIBDIR%%/CDBashApplet-1.0-%%PYVER%%.egg-info %%PYTHON_SITELIBDIR%%/CairoDock.py %%PYTHON_SITELIBDIR%%/CairoDock.pyc +libdata/pkgconfig/CDApplet.pc share/locale/he/LC_MESSAGES/cairo-dock-plugins.mo share/locale/hr/LC_MESSAGES/cairo-dock-plugins.mo share/locale/fr/LC_MESSAGES/cairo-dock-plugins.mo @@ -485,7 +485,6 @@ share/cairo-dock/plug-ins/Xgamma/icon.pn share/cairo-dock/plug-ins/Xgamma/preview.jpg share/vala/vapi/CDApplet.vapi share/vala/vapi/CDApplet.deps -@dirrmtry lib/pkgconfig @dirrm share/cairo-dock/plug-ins/clock/digital/default @dirrm share/cairo-dock/plug-ins/clock/digital @dirrm share/cairo-dock/plug-ins/clock/themes/default
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312240933.rBO9XTr1014670>