Index: head/x11-wm/compiz/Makefile =================================================================== --- head/x11-wm/compiz/Makefile (revision 369887) +++ head/x11-wm/compiz/Makefile (revision 369888) @@ -1,138 +1,119 @@ # $FreeBSD$ PORTNAME= compiz PORTVERSION= 0.8.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/ MAINTAINER= freebsd-ports@dan.me.uk COMMENT= Compiz Composite/Window Manager LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png \ libgtop-2.0.so:${PORTSDIR}/devel/libgtop \ libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification RUN_DEPENDS= glxinfo:${PORTSDIR}/graphics/mesa-demos \ nvidia-settings:${PORTSDIR}/x11/nvidia-settings XORG_CAT= app GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USES= gettext gmake libtool pathfix tar:bzip2 USE_GL= glu USE_GNOME= gconf2 libxslt USE_XORG= glproto ice sm x11 xcomposite xdamage xext xfixes xinerama \ xrandr xrender USE_LDCONFIG= yes GCONF_SCHEMAS= gwd.schemas \ compiz-annotate.schemas \ compiz-blur.schemas \ compiz-clone.schemas \ compiz-commands.schemas \ compiz-core.schemas \ compiz-cube.schemas \ compiz-dbus.schemas \ compiz-decoration.schemas \ compiz-fade.schemas \ compiz-fs.schemas \ compiz-gconf.schemas \ compiz-glib.schemas \ compiz-gnomecompat.schemas \ compiz-ini.schemas \ compiz-inotify.schemas \ compiz-kconfig.schemas \ compiz-minimize.schemas \ compiz-move.schemas \ compiz-obs.schemas \ compiz-place.schemas \ compiz-png.schemas \ compiz-regex.schemas \ compiz-resize.schemas \ compiz-rotate.schemas \ compiz-scale.schemas \ compiz-screenshot.schemas \ compiz-svg.schemas \ compiz-switcher.schemas \ compiz-video.schemas \ compiz-water.schemas \ compiz-wobbly.schemas \ compiz-zoom.schemas -CONFIGURE_ARGS= --disable-kde4 --disable-kde +CONFIGURE_ARGS= --disable-kde4 --disable-kde \ + --disable-gnome --disable-gnome-keybindings CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib -OPTIONS_DEFINE= SVG GTK2 METACITY GNOME DBUS FUSE -OPTIONS_DEFAULT= SVG GTK2 METACITY GNOME DBUS +OPTIONS_DEFINE= SVG GTK2 METACITY DBUS FUSE +OPTIONS_DEFAULT= SVG GTK2 METACITY DBUS METACITY_DESC= Enable Metacity support SUB_FILES= compiz-manager DESKTOP_ENTRIES= "Compiz Manager" \ "Wrapper script for starting compiz" \ "" \ "compiz-manager" \ "System;Core;" \ false OPTIONS_SUB= yes SVG_CONFIGURE_ENABLE= librsvg SVG_USE= GNOME=librsvg2 GTK2_CONFIGURE_ENABLE= gtk GTK2_USE= GNOME=glib20,libwnck FUSE_CONFIGURE_ENABLE= fuse FUSE_USES= fuse .include .if !empty(PORT_OPTIONS:MMETACITY) && !empty(PORT_OPTIONS:MGNOME) && !empty(PORT_OPTIONS:MGTK2) CONFIGURE_ARGS+= --enable-metacity USE_GNOME+= metacity .else CONFIGURE_ARGS+= --disable-metacity .endif -.if ${PORT_OPTIONS:MGNOME} && ${PORT_OPTIONS:MGTK2} -CONFIGURE_ARGS+= --enable-gnome \ - --enable-gnome-keybindings -USE_GNOME+= gnomecontrolcenter2 -WINDOWSETTINGSDATADIR= \ - `pkg-config --variable=prefix gnome-window-settings-2.0` -WINDOWSETTINGSLIBDIR= \ - `pkg-config --variable=libdir gnome-window-settings-2.0` -PLIST_SUB+= GNOME="" \ - WINDOWSETTINGSDATADIR="${WINDOWSETTINGSDATADIR}" \ - WINDOWSETTINGSLIBDIR="${WINDOWSETTINGSLIBDIR}" -.else -CONFIGURE_ARGS+= --disable-gnome \ - --disable-gnome-keybindings -PLIST_SUB+= GNOME="@comment " -.endif - .if ${PORT_OPTIONS:MDBUS} 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: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 .endif .else CONFIGURE_ARGS+= --disable-dbus --disable-dbus-glib .endif post-patch: - @${REINPLACE_CMD} -e 's|libpng|libpng15|' -e 's|gnome-desktop-2.0|gnome-desktop-2.0 gconf-2.0|g' \ + @${REINPLACE_CMD} -e 's|libpng|libpng15|' \ ${WRKSRC}/configure 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 Index: head/x11-wm/compiz/pkg-plist =================================================================== --- head/x11-wm/compiz/pkg-plist (revision 369887) +++ head/x11-wm/compiz/pkg-plist (revision 369888) @@ -1,184 +1,168 @@ bin/compiz bin/compiz-manager %%GTK2%%bin/gtk-window-decorator include/compiz/compiz.h include/compiz/compiz-common.h include/compiz/compiz-core.h include/compiz/compiz-cube.h include/compiz/compiz-plugin.h include/compiz/compiz-scale.h include/compiz/decoration.h lib/compiz/libannotate.a lib/compiz/libannotate.so lib/compiz/libblur.a lib/compiz/libblur.so lib/compiz/libclone.a lib/compiz/libclone.so lib/compiz/libcommands.a lib/compiz/libcommands.so lib/compiz/libcube.a lib/compiz/libcube.so %%DBUS%%lib/compiz/libdbus.a %%DBUS%%lib/compiz/libdbus.so lib/compiz/libdecoration.a lib/compiz/libdecoration.so lib/compiz/libfade.a lib/compiz/libfade.so %%FUSE%%lib/compiz/libfs.a %%FUSE%%lib/compiz/libfs.so lib/compiz/libgconf.a lib/compiz/libgconf.so lib/compiz/libglib.a lib/compiz/libglib.so lib/compiz/libgnomecompat.a lib/compiz/libgnomecompat.so lib/compiz/libini.a lib/compiz/libini.so lib/compiz/libminimize.a lib/compiz/libminimize.so lib/compiz/libmove.a lib/compiz/libmove.so lib/compiz/libobs.a lib/compiz/libobs.so lib/compiz/libplace.a lib/compiz/libplace.so lib/compiz/libpng.a lib/compiz/libpng.so lib/compiz/libregex.a lib/compiz/libregex.so lib/compiz/libresize.a lib/compiz/libresize.so lib/compiz/librotate.a lib/compiz/librotate.so lib/compiz/libscale.a lib/compiz/libscale.so lib/compiz/libscreenshot.a lib/compiz/libscreenshot.so %%SVG%%lib/compiz/libsvg.a %%SVG%%lib/compiz/libsvg.so lib/compiz/libswitcher.a lib/compiz/libswitcher.so lib/compiz/libvideo.a lib/compiz/libvideo.so lib/compiz/libwater.a lib/compiz/libwater.so lib/compiz/libwobbly.a lib/compiz/libwobbly.so lib/compiz/libzoom.a lib/compiz/libzoom.so lib/libdecoration.a lib/libdecoration.so lib/libdecoration.so.0 lib/libdecoration.so.0.0.0 libdata/pkgconfig/compiz-cube.pc libdata/pkgconfig/compiz-gconf.pc libdata/pkgconfig/compiz-scale.pc libdata/pkgconfig/compiz.pc libdata/pkgconfig/libdecoration.pc %%DATADIR%%/annotate.xml %%DATADIR%%/blur.xml %%DATADIR%%/clone.xml %%DATADIR%%/commands.xml %%DATADIR%%/core.xml %%DATADIR%%/cube.xml %%DATADIR%%/dbus.xml %%DATADIR%%/decoration.xml %%DATADIR%%/fade.xml %%DATADIR%%/freedesktop.png %%DATADIR%%/fs.xml %%DATADIR%%/gconf.xml %%DATADIR%%/glib.xml %%DATADIR%%/gnomecompat.xml %%DATADIR%%/icon.png %%DATADIR%%/ini.xml %%DATADIR%%/inotify.xml %%DATADIR%%/kconfig.xml %%DATADIR%%/minimize.xml %%DATADIR%%/move.xml %%DATADIR%%/obs.xml %%DATADIR%%/place.xml %%DATADIR%%/png.xml %%DATADIR%%/regex.xml %%DATADIR%%/resize.xml %%DATADIR%%/rotate.xml %%DATADIR%%/scale.xml %%DATADIR%%/schemas.xslt %%DATADIR%%/screenshot.xml %%DATADIR%%/svg.xml %%DATADIR%%/switcher.xml %%DATADIR%%/video.xml %%DATADIR%%/water.xml %%DATADIR%%/wobbly.xml %%DATADIR%%/zoom.xml -%%GNOME%%@cwd %%WINDOWSETTINGSDATADIR%% -%%GNOME%%share/gnome/wm-properties/compiz-wm.desktop -%%GNOME%%share/gnome-control-center/keybindings/50-compiz-desktop-key.xml -%%GNOME%%share/gnome-control-center/keybindings/50-compiz-key.xml -%%GNOME%%@cwd %%WINDOWSETTINGSLIBDIR%% -%%GNOME%%window-manager-settings/libcompiz.a -%%GNOME%%window-manager-settings/libcompiz.so -%%GNOME%%@cwd %%RESETPREFIX%% -%%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 share/locale/bn/LC_MESSAGES/compiz.mo share/locale/bn_IN/LC_MESSAGES/compiz.mo share/locale/bs/LC_MESSAGES/compiz.mo share/locale/ca/LC_MESSAGES/compiz.mo share/locale/cs/LC_MESSAGES/compiz.mo share/locale/cy/LC_MESSAGES/compiz.mo share/locale/da/LC_MESSAGES/compiz.mo share/locale/de/LC_MESSAGES/compiz.mo share/locale/el/LC_MESSAGES/compiz.mo share/locale/en_GB/LC_MESSAGES/compiz.mo share/locale/en_US/LC_MESSAGES/compiz.mo share/locale/es/LC_MESSAGES/compiz.mo share/locale/et/LC_MESSAGES/compiz.mo share/locale/eu/LC_MESSAGES/compiz.mo share/locale/fi/LC_MESSAGES/compiz.mo share/locale/fr/LC_MESSAGES/compiz.mo share/locale/gl/LC_MESSAGES/compiz.mo share/locale/gu/LC_MESSAGES/compiz.mo share/locale/he/LC_MESSAGES/compiz.mo share/locale/hi/LC_MESSAGES/compiz.mo share/locale/hr/LC_MESSAGES/compiz.mo share/locale/hu/LC_MESSAGES/compiz.mo share/locale/id/LC_MESSAGES/compiz.mo share/locale/it/LC_MESSAGES/compiz.mo share/locale/ja/LC_MESSAGES/compiz.mo share/locale/ka/LC_MESSAGES/compiz.mo share/locale/km/LC_MESSAGES/compiz.mo share/locale/ko/LC_MESSAGES/compiz.mo share/locale/lo/LC_MESSAGES/compiz.mo share/locale/lt/LC_MESSAGES/compiz.mo share/locale/mk/LC_MESSAGES/compiz.mo share/locale/mr/LC_MESSAGES/compiz.mo share/locale/nb/LC_MESSAGES/compiz.mo share/locale/nl/LC_MESSAGES/compiz.mo share/locale/or/LC_MESSAGES/compiz.mo share/locale/pa/LC_MESSAGES/compiz.mo share/locale/pl/LC_MESSAGES/compiz.mo share/locale/pt/LC_MESSAGES/compiz.mo share/locale/pt_BR/LC_MESSAGES/compiz.mo share/locale/ro/LC_MESSAGES/compiz.mo share/locale/ru/LC_MESSAGES/compiz.mo share/locale/sk/LC_MESSAGES/compiz.mo share/locale/sl/LC_MESSAGES/compiz.mo share/locale/sr/LC_MESSAGES/compiz.mo share/locale/sv/LC_MESSAGES/compiz.mo share/locale/ta/LC_MESSAGES/compiz.mo share/locale/tr/LC_MESSAGES/compiz.mo share/locale/uk/LC_MESSAGES/compiz.mo share/locale/vi/LC_MESSAGES/compiz.mo share/locale/xh/LC_MESSAGES/compiz.mo share/locale/zh_CN/LC_MESSAGES/compiz.mo share/locale/zh_TW/LC_MESSAGES/compiz.mo share/locale/zu/LC_MESSAGES/compiz.mo -@dirrmtry share/locale/en_US/LC_MESSAGES -@dirrmtry share/locale/en_US -@dirrmtry share/locale/lo/LC_MESSAGES -@dirrmtry share/locale/lo -@dirrm %%DATADIR%% -@dirrm lib/compiz -@dirrm include/compiz