svn commit: r352745 - head/x11-wm/compiz

[Barbara Guida]

Author: bar
Date: Thu May  1 11:08:29 2014
New Revision: 352745
URL: http://svnweb.freebsd.org/changeset/ports/352745
QAT: https://qat.redports.org/buildarchive/r352745/

Log:
  Fix pkg-plist when built without GNOME
  
  While here:
  - Fix a misspelled option in a test
  - Strip binaries
  
  PR:		ports/189014

Modified:
  head/x11-wm/compiz/Makefile
  head/x11-wm/compiz/pkg-plist

Modified: head/x11-wm/compiz/Makefile
==============================================================================
--- head/x11-wm/compiz/Makefile	Thu May  1 10:44:16 2014	(r352744)
+++ head/x11-wm/compiz/Makefile	Thu May  1 11:08:29 2014	(r352745)
@@ -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 <bsd.port.mk>

Modified: head/x11-wm/compiz/pkg-plist
==============================================================================
--- head/x11-wm/compiz/pkg-plist	Thu May  1 10:44:16 2014	(r352744)
+++ head/x11-wm/compiz/pkg-plist	Thu May  1 11:08:29 2014	(r352745)
@@ -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