ports/117288: [PATCH] x11-wm/compiz: Add in KDE support, clean up pkg-plist

Naram Qashat cyberbotx at cyberbotx.com
Thu Oct 18 06:40:02 UTC 2007 

>Number:         117288
>Category:       ports
>Synopsis:       [PATCH] x11-wm/compiz: Add in KDE support, clean up pkg-plist
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Oct 18 06:40:01 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator:     Naram Qashat
>Release:        FreeBSD 6.2-RELEASE-p8 i386
>Organization:
>Environment:
System: FreeBSD kirby.cyberbotx.com 6.2-RELEASE-p8 FreeBSD 6.2-RELEASE-p8 #12: Sun Oct 14 16:14:35 EDT 2007
>Description:
- Add KDE support (unfortunatly uses a kludge due to bsd.kde.mk only being
  included when bsd.port.pre.mk is included)
- Fix pkg-plist to be in correct order
- Correct OPTIONS handling (this includes Gnome support needs GTK, Metacity requires Gnome)

Port maintainer (rnoland at 2hip.net) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- compiz-0.5.2_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/x11-wm/compiz/Makefile /kirby/shared/ports/compiz/Makefile
--- /usr/ports/x11-wm/compiz/Makefile	Mon Oct  1 15:46:56 2007
+++ /kirby/shared/ports/compiz/Makefile	Thu Oct 18 01:52:44 2007
@@ -7,7 +7,7 @@
 
 PORTNAME=	compiz
 PORTVERSION=	0.5.2
-#PORTREVISION=	1
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 
 MAINTAINER=	rnoland at 2hip.net
@@ -69,17 +69,18 @@
 		METACITY "Enable Metacity support" on \
 		GNOME "Enable Gnome support" on \
 		DBUS "Enable DBUS support" on \
-		FUSEFS "Enable fusefs support" off
+		FUSEFS "Enable fusefs support" off \
+		KDE "Enable KDE support" off
 
 # No KDE support for now...
-CONFIGURE_ARGS=	--disable-kde
+#CONFIGURE_ARGS=	--disable-kde
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|libpng|libpng12|' ${WRKSRC}/configure
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_RSVG)
+.if !defined(WITHOUT_RSVG)
 CONFIGURE_ARGS+=	--enable-librsvg
 USE_GNOME+=		librsvg2
 PLIST_SUB+=		RSVG=""
@@ -88,7 +89,7 @@
 PLIST_SUB+=		RSVG="@comment "
 .endif
 
-.if defined(WITH_METACITY) || defined(WITH_GTK) || defined(WITH_GNOME)
+.if !defined(WITHOUT_GTK)
 CONFIGURE_ARGS+=	--enable-gtk
 USE_GNOME+=	 glib20 libwnck
 PLIST_SUB+=	GTK=""
@@ -97,14 +98,14 @@
 PLIST_SUB+=	GTK="@comment "
 .endif
 
-.if defined(WITH_METACITY) || defined(WITH_GNOME)
+.if !defined(WITHOUT_METACITY) && !defined(WITHOUT_GNOME) && !defined(WITHOUT_GTK)
 CONFIGURE_ARGS+=	--enable-metacity
 USE_GNOME+=	metacity
 .else
 CONFIGURE_ARGS+=	--disable-metacity
 .endif
 
-.if defined(WITH_GNOME)
+.if !defined(WITHOUT_GNOME) && !defined(WITHOUT_GTK)
 CONFIGURE_ARGS+=	--enable-gnome
 USE_GNOME+=	 gnomecontrolcenter2
 WINDOWSETTINGSDATADIR=	\
@@ -119,10 +120,10 @@
 PLIST_SUB+=	GNOME="@comment "
 .endif
 
-.if defined(WITH_DBUS)
+.if !defined(WITHOUT_DBUS)
 CONFIGURE_ARGS+=	--enable-dbus
 BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:${PORTSDIR}/devel/dbus
-.if defined(WITH_GTK) || defined(WITH_GNOME)
+.if !defined(WITHOUT_GTK) && !defined(WITHOUT_GNOME)
 CONFIGURE_ARGS+=	--enable-dbus-glib
 BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dbus-glib-1.pc:${PORTSDIR}/devel/dbus-glib
 .endif
@@ -139,6 +140,17 @@
 .else
 CONFIGURE_ARGS+=	--disable-fuse
 PLIST_SUB+=		FUSEFS="@comment "
+.endif
+
+.if defined(WITH_KDE)
+USE_KDELIBS_VER=	3
+CONFIGURE_ARGS+=	--enable-kde
+PLIST_SUB+=	KDE=""
+# allow bsd.kde.mk to be included after bsd.port.mk
+.include "${PORTSDIR}/Mk/bsd.kde.mk"
+.else
+CONFIGURE_ARGS+=	--disable-kde
+PLIST_SUB+=	KDE="@comment "
 .endif
 
 .include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/x11-wm/compiz/pkg-plist /kirby/shared/ports/compiz/pkg-plist
--- /usr/ports/x11-wm/compiz/pkg-plist	Thu Aug 23 10:46:27 2007
+++ /kirby/shared/ports/compiz/pkg-plist	Thu Oct 18 01:44:27 2007
@@ -1,113 +1,114 @@
 @comment $FreeBSD: ports/x11-wm/compiz/pkg-plist,v 1.2 2007/08/22 15:55:03 flz Exp $
 bin/compiz
 %%GTK%%bin/gtk-window-decorator
+%%KDE%%bin/kde-window-decorator
 include/compiz/compiz.h
 include/compiz/cube.h
 include/compiz/decoration.h
 include/compiz/scale.h
-lib/libdecoration.so.0
-lib/libdecoration.so
-lib/libdecoration.la
-lib/libdecoration.a
-lib/compiz/libgconf.so
-lib/compiz/libgconf.la
-lib/compiz/libgconf.a
-lib/compiz/libglib.so
-lib/compiz/libglib.la
-lib/compiz/libglib.a
-lib/compiz/libdecoration.so
-lib/compiz/libdecoration.la
+lib/compiz/libannotate.a
+lib/compiz/libannotate.la
+lib/compiz/libannotate.so
+lib/compiz/libblur.a
+lib/compiz/libblur.la
+lib/compiz/libblur.so
+lib/compiz/libclone.a
+lib/compiz/libclone.la
+lib/compiz/libclone.so
+lib/compiz/libcube.a
+lib/compiz/libcube.la
+lib/compiz/libcube.so
+%%DBUS%%lib/compiz/libdbus.a
+%%DBUS%%lib/compiz/libdbus.la
+%%DBUS%%lib/compiz/libdbus.so
 lib/compiz/libdecoration.a
-lib/compiz/libwobbly.so
-lib/compiz/libwobbly.la
-lib/compiz/libwobbly.a
-lib/compiz/libfade.so
-lib/compiz/libfade.la
+lib/compiz/libdecoration.la
+lib/compiz/libdecoration.so
 lib/compiz/libfade.a
-%%FUSEFS%%lib/compiz/libfs.so
-%%FUSEFS%%lib/compiz/libfs.la
+lib/compiz/libfade.la
+lib/compiz/libfade.so
 %%FUSEFS%%lib/compiz/libfs.a
-lib/compiz/libminimize.so
-lib/compiz/libminimize.la
+%%FUSEFS%%lib/compiz/libfs.la
+%%FUSEFS%%lib/compiz/libfs.so
+lib/compiz/libgconf.a
+lib/compiz/libgconf.la
+lib/compiz/libgconf.so
+lib/compiz/libglib.a
+lib/compiz/libglib.la
+lib/compiz/libglib.so
+lib/compiz/libini.a
+lib/compiz/libini.la
+lib/compiz/libini.so
 lib/compiz/libminimize.a
-lib/compiz/libcube.so
-lib/compiz/libcube.la
-lib/compiz/libcube.a
-lib/compiz/librotate.so
-lib/compiz/librotate.la
-lib/compiz/librotate.a
-lib/compiz/libzoom.so
-lib/compiz/libzoom.la
-lib/compiz/libzoom.a
-lib/compiz/libscale.so
-lib/compiz/libscale.la
-lib/compiz/libscale.a
-lib/compiz/libmove.so
-lib/compiz/libmove.la
+lib/compiz/libminimize.la
+lib/compiz/libminimize.so
 lib/compiz/libmove.a
-lib/compiz/libresize.so
-lib/compiz/libresize.la
-lib/compiz/libresize.a
-lib/compiz/libplace.so
-lib/compiz/libplace.la
+lib/compiz/libmove.la
+lib/compiz/libmove.so
 lib/compiz/libplace.a
-%%DBUS%%lib/compiz/libdbus.so
-%%DBUS%%lib/compiz/libdbus.la
-%%DBUS%%lib/compiz/libdbus.a
-lib/compiz/libswitcher.so
-lib/compiz/libswitcher.la
-lib/compiz/libswitcher.a
-lib/compiz/libwater.so
-lib/compiz/libwater.la
-lib/compiz/libwater.a
-lib/compiz/libscreenshot.so
-lib/compiz/libscreenshot.la
-lib/compiz/libscreenshot.a
-lib/compiz/libplane.so
-lib/compiz/libplane.la
+lib/compiz/libplace.la
+lib/compiz/libplace.so
 lib/compiz/libplane.a
-lib/compiz/libclone.so
-lib/compiz/libclone.la
-lib/compiz/libclone.a
-lib/compiz/libpng.so
-lib/compiz/libpng.la
+lib/compiz/libplane.la
+lib/compiz/libplane.so
 lib/compiz/libpng.a
-lib/compiz/libblur.so
-lib/compiz/libblur.la
-lib/compiz/libblur.a
-lib/compiz/libregex.so
-lib/compiz/libregex.la
+lib/compiz/libpng.la
+lib/compiz/libpng.so
 lib/compiz/libregex.a
-lib/compiz/libvideo.so
-lib/compiz/libvideo.la
-lib/compiz/libvideo.a
-lib/compiz/libini.so
-lib/compiz/libini.la
-lib/compiz/libini.a
-%%RSVG%%lib/compiz/libsvg.so
-%%RSVG%%lib/compiz/libsvg.la
+lib/compiz/libregex.la
+lib/compiz/libregex.so
+lib/compiz/libresize.a
+lib/compiz/libresize.la
+lib/compiz/libresize.so
+lib/compiz/librotate.a
+lib/compiz/librotate.la
+lib/compiz/librotate.so
+lib/compiz/libscale.a
+lib/compiz/libscale.la
+lib/compiz/libscale.so
+lib/compiz/libscreenshot.a
+lib/compiz/libscreenshot.la
+lib/compiz/libscreenshot.so
 %%RSVG%%lib/compiz/libsvg.a
-lib/compiz/libannotate.so
-lib/compiz/libannotate.la
-lib/compiz/libannotate.a
-libdata/pkgconfig/compiz.pc
+%%RSVG%%lib/compiz/libsvg.la
+%%RSVG%%lib/compiz/libsvg.so
+lib/compiz/libswitcher.a
+lib/compiz/libswitcher.la
+lib/compiz/libswitcher.so
+lib/compiz/libvideo.a
+lib/compiz/libvideo.la
+lib/compiz/libvideo.so
+lib/compiz/libwater.a
+lib/compiz/libwater.la
+lib/compiz/libwater.so
+lib/compiz/libwobbly.a
+lib/compiz/libwobbly.la
+lib/compiz/libwobbly.so
+lib/compiz/libzoom.a
+lib/compiz/libzoom.la
+lib/compiz/libzoom.so
+lib/libdecoration.a
+lib/libdecoration.la
+lib/libdecoration.so
+lib/libdecoration.so.0
 libdata/pkgconfig/compiz-cube.pc
-libdata/pkgconfig/compiz-scale.pc
 libdata/pkgconfig/compiz-gconf.pc
+libdata/pkgconfig/compiz-scale.pc
+libdata/pkgconfig/compiz.pc
 libdata/pkgconfig/libdecoration.pc
-%%DATADIR%%/icon.png
-%%DATADIR%%/freedesktop.png
-%%DATADIR%%/core.xml
 %%DATADIR%%/annotate.xml
 %%DATADIR%%/blur.xml
 %%DATADIR%%/clone.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%%/icon.png
 %%DATADIR%%/ini.xml
 %%DATADIR%%/inotify.xml
 %%DATADIR%%/minimize.xml
@@ -119,6 +120,7 @@
 %%DATADIR%%/resize.xml
 %%DATADIR%%/rotate.xml
 %%DATADIR%%/scale.xml
+%%DATADIR%%/schemas.xslt
 %%DATADIR%%/screenshot.xml
 %%DATADIR%%/svg.xml
 %%DATADIR%%/switcher.xml
@@ -126,13 +128,12 @@
 %%DATADIR%%/water.xml
 %%DATADIR%%/wobbly.xml
 %%DATADIR%%/zoom.xml
-%%DATADIR%%/schemas.xslt
 %%GNOME%%@cwd %%WINDOWSETTINGSDATADIR%%
 %%GNOME%%share/gnome/wm-properties/compiz.desktop
 %%GNOME%%@cwd %%WINDOWSETTINGSLIBDIR%%
-%%GNOME%%window-manager-settings/libcompiz.so
-%%GNOME%%window-manager-settings/libcompiz.la
 %%GNOME%%window-manager-settings/libcompiz.a
+%%GNOME%%window-manager-settings/libcompiz.la
+%%GNOME%%window-manager-settings/libcompiz.so
 %%GNOME%%@cwd
 share/locale/af/LC_MESSAGES/compiz.mo
 share/locale/ar/LC_MESSAGES/compiz.mo
@@ -146,6 +147,7 @@
 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/fi/LC_MESSAGES/compiz.mo
@@ -160,9 +162,12 @@
 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/pa/LC_MESSAGES/compiz.mo
@@ -179,26 +184,10 @@
 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/en_US/LC_MESSAGES/compiz.mo
-share/locale/km/LC_MESSAGES/compiz.mo
-share/locale/lo/LC_MESSAGES/compiz.mo
-share/locale/mr/LC_MESSAGES/compiz.mo
-share/locale/xh/LC_MESSAGES/compiz.mo
 share/locale/zu/LC_MESSAGES/compiz.mo
- at dirrmtry share/locale/lo/LC_MESSAGES
- at dirrmtry share/locale/lo
- at dirrmtry share/locale/en_US/LC_MESSAGES
- at dirrmtry share/locale/en_US
- at dirrmtry share/locale/km/LC_MESSAGES
- at dirrmtry share/locale/km
- at dirrmtry share/locale/mr/LC_MESSAGES
- at dirrmtry share/locale/mr
- at dirrmtry share/locale/xh/LC_MESSAGES
- at dirrmtry share/locale/xh
- at dirrmtry share/locale/zu/LC_MESSAGES
- at dirrmtry share/locale/zu
- at dirrmtry %%DATADIR%%
- at dirrmtry lib/compiz
- at dirrmtry include/compiz
+ at dirrm %%DATADIR%%
+ at dirrm lib/compiz
+ at dirrm include/compiz
--- compiz-0.5.2_1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list