[Midnightbsd-cvs] mports [17081] trunk/x11-wm/compiz: compiz 0.8.8

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Sep 13 23:14:17 EDT 2014


Revision: 17081
          http://svnweb.midnightbsd.org/mports/?rev=17081
Author:   laffer1
Date:     2014-09-13 23:14:16 -0400 (Sat, 13 Sep 2014)
Log Message:
-----------
compiz 0.8.8

Modified Paths:
--------------
    trunk/x11-wm/compiz/Makefile
    trunk/x11-wm/compiz/distinfo
    trunk/x11-wm/compiz/pkg-plist

Added Paths:
-----------
    trunk/x11-wm/compiz/files/patch-src-Makefile.in

Removed Paths:
-------------
    trunk/x11-wm/compiz/files/patch-gtk_window-decorator_gtk-window-decorator.c
    trunk/x11-wm/compiz/files/patch-plugins_png.c

Modified: trunk/x11-wm/compiz/Makefile
===================================================================
--- trunk/x11-wm/compiz/Makefile	2014-09-14 03:12:31 UTC (rev 17080)
+++ trunk/x11-wm/compiz/Makefile	2014-09-14 03:14:16 UTC (rev 17081)
@@ -1,8 +1,8 @@
 # $MidnightBSD$
 
 PORTNAME=	compiz
-PORTVERSION=	0.8.4
-PORTREVISION=	3
+PORTVERSION=	0.8.8
+PORTREVISION=	0
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://releases.compiz.org/${PORTVERSION}/
 
@@ -10,24 +10,21 @@
 COMMENT=	Compiz Composite/Window Manager
 LICENSE=	agg
 
-LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
-		gtop-2.0.7:${PORTSDIR}/devel/libgtop \
-		startup-notification-1.0:${PORTSDIR}/x11/startup-notification
+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
-USE_BZIP2=	yes
-#USE_TGZ=	yes
-USE_GMAKE=	yes
-USE_GETTEXT=	yes
+INSTALL_TARGET=	install-strip
+USES=		gettext gmake libtool pathfix tar:bzip2
 USE_GL=		glu
 USE_GNOME=	gconf2 libxslt
-USE_PATHFIX=	yes
-USE_XORG=	xcomposite xfixes xdamage xrandr xrender ice sm xinerama glproto
+USE_XORG=	glproto ice sm x11 xcomposite xdamage xext xfixes xinerama \
+		xrandr xrender
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool
 
 GCONF_SCHEMAS=	gwd.schemas \
 		compiz-annotate.schemas \
@@ -63,10 +60,10 @@
 		compiz-wobbly.schemas \
 		compiz-zoom.schemas
 
-CONFIGURE_ARGS=	--disable-kde4
+CONFIGURE_ARGS=	--disable-kde4 --disable-kde
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
-OPTIONS_DEFINE=	SVG GTK2 METACITY GNOME DBUS FUSE KDE3
+OPTIONS_DEFINE=	SVG GTK2 METACITY GNOME DBUS FUSE
 OPTIONS_DEFAULT=	SVG GTK2 METACITY GNOME DBUS
 
 METACITY_DESC=	Enable Metacity support
@@ -79,31 +76,17 @@
 			"System;Core;" \
 			false
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|libpng|libpng15|' -e 's|gnome-desktop-2.0|gnome-desktop-2.0 gconf-2.0|g' \
-		${WRKSRC}/configure
+OPTIONS_SUB=	yes
+SVG_CONFIGURE_ENABLE=	librsvg
+SVG_USE=	GNOME=librsvg2
 
-post-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/compiz-manager ${PREFIX}/bin/compiz-manager
-.include <bsd.port.pre.mk>
+GTK2_CONFIGURE_ENABLE=	gtk
+GTK2_USE=	GNOME=glib20,libwnck
 
-.if ${PORT_OPTIONS:MSVG}
-CONFIGURE_ARGS+=	--enable-librsvg
-USE_GNOME+=		librsvg2
-PLIST_SUB+=		RSVG=""
-.else
-CONFIGURE_ARGS+=	--disable-librsvg
-PLIST_SUB+=		RSVG="@comment "
-.endif
+FUSE_CONFIGURE_ENABLE=	fuse
+FUSE_USES=		fuse
 
-.if ${PORT_OPTIONS:MGTK2}
-CONFIGURE_ARGS+=	--enable-gtk
-USE_GNOME+=	 glib20 libwnck
-PLIST_SUB+=	GTK2=""
-.else
-CONFIGURE_ARGS+=	--disable-gtk
-PLIST_SUB+=	GTK2="@comment "
-.endif
+.include <bsd.port.options.mk>
 
 .if !empty(PORT_OPTIONS:MMETACITY) && !empty(PORT_OPTIONS:MGNOME) && !empty(PORT_OPTIONS:MGTK2)
 CONFIGURE_ARGS+=	--enable-metacity
@@ -133,35 +116,23 @@
 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
 .endif
-PLIST_SUB+=	DBUS=""
 .else
 CONFIGURE_ARGS+=	--disable-dbus --disable-dbus-glib
-PLIST_SUB+=	DBUS="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MFUSE}
-CONFIGURE_ARGS+=	--enable-fuse
-USES+=			fuse
-PLIST_SUB+=		FUSE=""
-.else
-CONFIGURE_ARGS+=	--disable-fuse
-PLIST_SUB+=		FUSE="@comment "
-.endif
+post-patch:
+	@${REINPLACE_CMD} -e 's|libpng|libpng15|' -e 's|gnome-desktop-2.0|gnome-desktop-2.0 gconf-2.0|g' \
+		${WRKSRC}/configure
 
-.if ${PORT_OPTIONS:MKDE3}
-USE_KDEBASE_VER=	3
-CONFIGURE_ARGS+=	--enable-kde
-PLIST_SUB+=	KDE3=""
-# allow bsd.kde.mk to be included after bsd.port.mk
-.include "${PORTSDIR}/Mk/bsd.kde.mk"
-.else
-CONFIGURE_ARGS+=	--disable-kde
-PLIST_SUB+=	KDE3="@comment "
+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.post.mk>
+.include <bsd.port.mk>

Modified: trunk/x11-wm/compiz/distinfo
===================================================================
--- trunk/x11-wm/compiz/distinfo	2014-09-14 03:12:31 UTC (rev 17080)
+++ trunk/x11-wm/compiz/distinfo	2014-09-14 03:14:16 UTC (rev 17081)
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/compiz-0.8.4.tar.bz2) = b02bf0d2ad3ddf5dbf82ff3eb3174f3f9336bde1c5dffd44cfc007fb7e2fe924
-SIZE (xorg/app/compiz-0.8.4.tar.bz2) = 1131583
+SHA256 (xorg/app/compiz-0.8.8.tar.bz2) = 3ba555b0d6d536850a227d37d6ebc5cd5b15ee5bad83d7956529a27b870977e3
+SIZE (xorg/app/compiz-0.8.8.tar.bz2) = 1123892

Deleted: trunk/x11-wm/compiz/files/patch-gtk_window-decorator_gtk-window-decorator.c
===================================================================
--- trunk/x11-wm/compiz/files/patch-gtk_window-decorator_gtk-window-decorator.c	2014-09-14 03:12:31 UTC (rev 17080)
+++ trunk/x11-wm/compiz/files/patch-gtk_window-decorator_gtk-window-decorator.c	2014-09-14 03:14:16 UTC (rev 17081)
@@ -1,233 +0,0 @@
---- gtk/window-decorator/gtk-window-decorator.c.orig	2009-08-15 03:24:40.000000000 -0400
-+++ gtk/window-decorator/gtk-window-decorator.c	2010-11-24 15:21:52.000000000 -0500
-@@ -380,7 +380,7 @@ typedef struct _decor {
-     guint	      button_states[BUTTON_NUM];
-     GdkPixmap	      *pixmap;
-     GdkPixmap	      *buffer_pixmap;
--    GdkGC	      *gc;
-+    cairo_t           *cr;
-     decor_layout_t    border_layout;
-     decor_context_t   *context;
-     decor_shadow_t    *shadow;
-@@ -918,6 +918,17 @@ button_state_paint (cairo_t	  *cr,
- }
- 
- static void
-+copy_to_front_buffer (decor_t *d)
-+{
-+    if (!d->buffer_pixmap)
-+	return;
-+
-+    cairo_set_operator (d->cr, CAIRO_OPERATOR_SOURCE);
-+    gdk_cairo_set_source_pixmap (d->cr, d->buffer_pixmap, 0, 0);
-+    cairo_paint (d->cr);
-+}
-+
-+static void
- draw_window_decoration (decor_t *d)
- {
-     cairo_t       *cr;
-@@ -1298,16 +1309,7 @@ draw_window_decoration (decor_t *d)
- 
-     cairo_destroy (cr);
- 
--    if (d->buffer_pixmap)
--	gdk_draw_drawable  (d->pixmap,
--			    d->gc,
--			    d->buffer_pixmap,
--			    0,
--			    0,
--			    0,
--			    0,
--			    d->width,
--			    d->height);
-+    copy_to_front_buffer (d);
- 
-     if (d->prop_xid)
-     {
-@@ -2103,16 +2105,7 @@ meta_draw_window_decoration (decor_t *d)
- 	XRenderFreePicture (xdisplay, src);
-     }
- 
--    if (d->buffer_pixmap)
--	gdk_draw_drawable  (d->pixmap,
--			    d->gc,
--			    d->buffer_pixmap,
--			    0,
--			    0,
--			    0,
--			    0,
--			    d->width,
--			    d->height);
-+    copy_to_front_buffer (d);
- 
-     if (d->prop_xid)
-     {
-@@ -2361,18 +2354,9 @@ draw_switcher_background (decor_t *d)
- 				      alpha);
- 
-     cairo_stroke (cr);
--
-     cairo_destroy (cr);
- 
--    gdk_draw_drawable (d->pixmap,
--		       d->gc,
--		       d->buffer_pixmap,
--		       0,
--		       0,
--		       0,
--		       0,
--		       d->width,
--		       d->height);
-+    copy_to_front_buffer (d);
- 
-     pixel = ((((a * style->bg[GTK_STATE_NORMAL].blue ) >> 24) & 0x0000ff) |
- 	     (((a * style->bg[GTK_STATE_NORMAL].green) >> 16) & 0x00ff00) |
-@@ -2439,15 +2423,7 @@ draw_switcher_foreground (decor_t *d)
- 
-     cairo_destroy (cr);
- 
--    gdk_draw_drawable  (d->pixmap,
--			d->gc,
--			d->buffer_pixmap,
--			0,
--			0,
--			0,
--			0,
--			d->width,
--			d->height);
-+    copy_to_front_buffer (d);
- }
- 
- static void
-@@ -2671,7 +2647,7 @@ get_window_prop (Window xwindow,
-     gdk_error_trap_push ();
- 
-     type = None;
--    result = XGetWindowProperty (gdk_display,
-+    result = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
- 				 xwindow,
- 				 atom,
- 				 0, G_MAXLONG,
-@@ -3512,15 +3488,15 @@ update_window_decoration_size (WnckWindo
-     if (d->buffer_pixmap)
- 	g_object_unref (G_OBJECT (d->buffer_pixmap));
- 
--    if (d->gc)
--	g_object_unref (G_OBJECT (d->gc));
--
-     if (d->picture)
- 	XRenderFreePicture (xdisplay, d->picture);
- 
-+    if (d->cr)
-+	cairo_destroy (d->cr);
-+
-     d->pixmap	     = pixmap;
-     d->buffer_pixmap = buffer_pixmap;
--    d->gc	     = gdk_gc_new (pixmap);
-+    d->cr            = gdk_cairo_create (pixmap);
- 
-     d->picture = picture;
- 
-@@ -3642,6 +3618,7 @@ update_switcher_window (WnckWindow *win,
-     {
- 	g_object_ref (G_OBJECT (switcher_pixmap));
- 	d->pixmap = switcher_pixmap;
-+	d->cr = gdk_cairo_create (switcher_pixmap);
-     }
- 
-     if (!d->buffer_pixmap && switcher_buffer_pixmap)
-@@ -3729,9 +3706,6 @@ update_switcher_window (WnckWindow *win,
- 
-     if (width == d->width && height == d->height)
-     {
--	if (!d->gc)
--	    d->gc = gdk_gc_new (d->pixmap);
--
- 	if (!d->picture)
- 	    d->picture =
- 		XRenderCreatePicture (xdisplay,
-@@ -3765,8 +3739,8 @@ update_switcher_window (WnckWindow *win,
-     if (d->buffer_pixmap)
- 	g_object_unref (G_OBJECT (d->buffer_pixmap));
- 
--    if (d->gc)
--	g_object_unref (G_OBJECT (d->gc));
-+    if (d->cr)
-+	cairo_destroy (d->cr);
- 
-     if (d->picture)
- 	XRenderFreePicture (xdisplay, d->picture);
-@@ -3782,7 +3756,7 @@ update_switcher_window (WnckWindow *win,
- 
-     d->pixmap	     = pixmap;
-     d->buffer_pixmap = buffer_pixmap;
--    d->gc	     = gdk_gc_new (pixmap);
-+    d->cr            = gdk_cairo_create (pixmap);
- 
-     d->picture = XRenderCreatePicture (xdisplay, GDK_PIXMAP_XID (buffer_pixmap),
- 				       xformat, 0, NULL);
-@@ -3817,10 +3791,10 @@ remove_frame_window (WnckWindow *win)
- 	d->buffer_pixmap = NULL;
-     }
- 
--    if (d->gc)
-+    if (d->cr)
-     {
--	g_object_unref (G_OBJECT (d->gc));
--	d->gc = NULL;
-+	cairo_destroy (d->cr);
-+	d->cr = NULL;
-     }
- 
-     if (d->picture)
-@@ -4233,7 +4207,7 @@ show_tooltip (const char *text)
- static void
- hide_tooltip (void)
- {
--    if (GTK_WIDGET_VISIBLE (tip_window))
-+    if (gtk_widget_get_visible (tip_window))
- 	g_get_current_time (&tooltip_last_popdown);
- 
-     gtk_widget_hide (tip_window);
-@@ -4966,7 +4940,7 @@ force_quit_dialog_realize (GtkWidget *di
-     WnckWindow *win = data;
- 
-     gdk_error_trap_push ();
--    XSetTransientForHint (gdk_display,
-+    XSetTransientForHint (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
- 			  GDK_WINDOW_XID (dialog->window),
- 			  wnck_window_get_xid (win));
-     gdk_display_sync (gdk_display_get_default ());
-@@ -4982,11 +4956,11 @@ get_client_machine (Window xwindow)
-     int    format, result;
-     char   *retval;
- 
--    atom = XInternAtom (gdk_display, "WM_CLIENT_MACHINE", FALSE);
-+    atom = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), "WM_CLIENT_MACHINE", FALSE);
- 
-     gdk_error_trap_push ();
- 
--    result = XGetWindowProperty (gdk_display,
-+    result = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
- 				 xwindow, atom,
- 				 0, G_MAXLONG,
- 				 FALSE, XA_STRING, &type, &format, &nitems,
-@@ -5038,7 +5012,7 @@ kill_window (WnckWindow *win)
-     }
- 
-     gdk_error_trap_push ();
--    XKillClient (gdk_display, wnck_window_get_xid (win));
-+    XKillClient (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), wnck_window_get_xid (win));
-     gdk_display_sync (gdk_display_get_default ());
-     gdk_error_trap_pop ();
- }
-@@ -5623,7 +5597,7 @@ static int
- update_shadow (void)
- {
-     decor_shadow_options_t opt;
--    Display		   *xdisplay = gdk_display;
-+    Display		   *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
-     GdkDisplay		   *display = gdk_display_get_default ();
-     GdkScreen		   *screen = gdk_display_get_default_screen (display);
- 

Deleted: trunk/x11-wm/compiz/files/patch-plugins_png.c
===================================================================
--- trunk/x11-wm/compiz/files/patch-plugins_png.c	2014-09-14 03:12:31 UTC (rev 17080)
+++ trunk/x11-wm/compiz/files/patch-plugins_png.c	2014-09-14 03:14:16 UTC (rev 17081)
@@ -1,29 +0,0 @@
---- plugins/png.c.orig	2009-09-01 07:38:22.000000000 +0200
-+++ plugins/png.c	2010-04-03 22:08:10.000000000 +0200
-@@ -102,7 +102,7 @@
- 
-     /* expand gray bit depth if needed */
-     if (color_type == PNG_COLOR_TYPE_GRAY && depth < 8)
--	png_set_gray_1_2_4_to_8 (png);
-+	png_set_expand_gray_1_2_4_to_8 (png);
- 
-     /* transform transparency to alpha */
-     if (png_get_valid(png, info, PNG_INFO_tRNS))
-@@ -167,7 +167,7 @@
-     Bool	  status;
- 
-     sig_bytes = fread (png_sig, 1, PNG_SIG_SIZE, file);
--    if (png_check_sig (png_sig, sig_bytes) == 0)
-+    if (!png_sig_cmp (png_sig, 0, sig_bytes) == 0)
- 	return FALSE;
- 
-     png = png_create_read_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
-@@ -218,7 +218,7 @@
-     Bool		status;
- 
-     memcpy (png_sig, buffer, PNG_SIG_SIZE);
--    if (png_check_sig (png_sig, PNG_SIG_SIZE) == 0)
-+    if (!png_sig_cmp (png_sig, 0, PNG_SIG_SIZE) == 0)
- 	return FALSE;
- 
-     png = png_create_read_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);

Added: trunk/x11-wm/compiz/files/patch-src-Makefile.in
===================================================================
--- trunk/x11-wm/compiz/files/patch-src-Makefile.in	                        (rev 0)
+++ trunk/x11-wm/compiz/files/patch-src-Makefile.in	2014-09-14 03:14:16 UTC (rev 17081)
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig	2014-06-02 19:14:25.669435783 +0100
++++ src/Makefile.in	2014-06-02 19:14:34.064435780 +0100
+@@ -292,7 +292,7 @@
+ 	-DIMAGEDIR=\"$(imagedir)\"   \
+ 	-DMETADATADIR=\"$(metadatadir)\"
+ 
+-compiz_LDADD = @COMPIZ_LIBS@ @GL_LIBS@ -lm -ldl
++compiz_LDADD = @COMPIZ_LIBS@ @GL_LIBS@ -lm
+ compiz_LDFLAGS = -export-dynamic -pthread
+ compiz_SOURCES = \
+ 	main.c	   \

Modified: trunk/x11-wm/compiz/pkg-plist
===================================================================
--- trunk/x11-wm/compiz/pkg-plist	2014-09-14 03:12:31 UTC (rev 17080)
+++ trunk/x11-wm/compiz/pkg-plist	2014-09-14 03:14:16 UTC (rev 17081)
@@ -1,8 +1,6 @@
- at comment $FreeBSD$
 bin/compiz
 bin/compiz-manager
 %%GTK2%%bin/gtk-window-decorator
-%%KDE3%%bin/kde-window-decorator
 include/compiz/compiz.h
 include/compiz/compiz-common.h
 include/compiz/compiz-core.h
@@ -11,96 +9,67 @@
 include/compiz/compiz-scale.h
 include/compiz/decoration.h
 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/libcommands.a
-lib/compiz/libcommands.la
 lib/compiz/libcommands.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/libdecoration.la
 lib/compiz/libdecoration.so
 lib/compiz/libfade.a
-lib/compiz/libfade.la
 lib/compiz/libfade.so
 %%FUSE%%lib/compiz/libfs.a
-%%FUSE%%lib/compiz/libfs.la
 %%FUSE%%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/libgnomecompat.a
-lib/compiz/libgnomecompat.la
 lib/compiz/libgnomecompat.so
 lib/compiz/libini.a
-lib/compiz/libini.la
 lib/compiz/libini.so
 lib/compiz/libminimize.a
-lib/compiz/libminimize.la
 lib/compiz/libminimize.so
 lib/compiz/libmove.a
-lib/compiz/libmove.la
 lib/compiz/libmove.so
 lib/compiz/libobs.a
-lib/compiz/libobs.la
 lib/compiz/libobs.so
 lib/compiz/libplace.a
-lib/compiz/libplace.la
 lib/compiz/libplace.so
 lib/compiz/libpng.a
-lib/compiz/libpng.la
 lib/compiz/libpng.so
 lib/compiz/libregex.a
-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
-%%RSVG%%lib/compiz/libsvg.la
-%%RSVG%%lib/compiz/libsvg.so
+%%SVG%%lib/compiz/libsvg.a
+%%SVG%%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
+lib/libdecoration.so.0.0.0
 libdata/pkgconfig/compiz-cube.pc
 libdata/pkgconfig/compiz-gconf.pc
 libdata/pkgconfig/compiz-scale.pc
@@ -147,10 +116,9 @@
 %%GNOME%%share/gnome-control-center/keybindings/50-compiz-key.xml
 %%GNOME%%@cwd %%WINDOWSETTINGSLIBDIR%%
 %%GNOME%%window-manager-settings/libcompiz.a
-%%GNOME%%window-manager-settings/libcompiz.la
 %%GNOME%%window-manager-settings/libcompiz.so
-%%GNOME%%@cwd
-share/applications/compiz.desktop
+%%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
@@ -207,7 +175,6 @@
 share/locale/zh_CN/LC_MESSAGES/compiz.mo
 share/locale/zh_TW/LC_MESSAGES/compiz.mo
 share/locale/zu/LC_MESSAGES/compiz.mo
- at dirrmtry share/applications
 @dirrmtry share/locale/en_US/LC_MESSAGES
 @dirrmtry share/locale/en_US
 @dirrmtry share/locale/lo/LC_MESSAGES



More information about the Midnightbsd-cvs mailing list