From 2da832f2b3619837bede0b91a4bcd9fb65b61521 Mon Sep 17 00:00:00 2001 From: Barbara Guida Date: Thu, 1 May 2014 11:08:29 +0000 Subject: [PATCH] Fix pkg-plist when built without GNOME While here: - Fix a misspelled option in a test - Strip binaries PR: ports/189014 --- x11-wm/compiz/Makefile | 7 +++++-- x11-wm/compiz/pkg-plist | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/x11-wm/compiz/Makefile b/x11-wm/compiz/Makefile index 6884f3424db8..c0158cfab0af 100644 --- a/x11-wm/compiz/Makefile +++ b/x11-wm/compiz/Makefile @@ -2,7 +2,7 @@ PORTNAME= compiz PORTVERSION= 0.8.4 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= x11-wm MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/ @@ -117,7 +117,7 @@ PLIST_SUB+= GNOME="@comment " CONFIGURE_ARGS+= --enable-dbus BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:${PORTSDIR}/devel/dbus RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:${PORTSDIR}/devel/dbus -.if ${PORT_OPTIONS:MGTK} && ${PORT_OPTIONS:MGNOME} +.if ${PORT_OPTIONS:MGTK2} && ${PORT_OPTIONS:MGNOME} CONFIGURE_ARGS+= --enable-dbus-glib BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/dbus-glib-1.pc:${PORTSDIR}/devel/dbus-glib RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/dbus-glib-1.pc:${PORTSDIR}/devel/dbus-glib @@ -132,5 +132,8 @@ post-patch: post-install: ${INSTALL_SCRIPT} ${WRKDIR}/compiz-manager ${STAGEDIR}${PREFIX}/bin/compiz-manager +.if ${PORT_OPTIONS:MGNOME} + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/window-manager-settings/libcompiz.so +.endif .include diff --git a/x11-wm/compiz/pkg-plist b/x11-wm/compiz/pkg-plist index bcd349422bd2..720f476e398c 100644 --- a/x11-wm/compiz/pkg-plist +++ b/x11-wm/compiz/pkg-plist @@ -118,7 +118,7 @@ libdata/pkgconfig/libdecoration.pc %%GNOME%%window-manager-settings/libcompiz.a %%GNOME%%window-manager-settings/libcompiz.so %%GNOME%%@cwd %%RESETPREFIX%% -share/applications/compiz.desktop +%%GNOME%%share/applications/compiz.desktop share/locale/af/LC_MESSAGES/compiz.mo share/locale/ar/LC_MESSAGES/compiz.mo share/locale/bg/LC_MESSAGES/compiz.mo