View | Details | Raw Unified | Return to bug 230894 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-25 / +37 lines)
Lines 2-8 Link Here
2
2
3
PORTNAME=	compiz
3
PORTNAME=	compiz
4
PORTVERSION=	0.8.8
4
PORTVERSION=	0.8.8
5
PORTREVISION=	7
5
PORTREVISION=	8
6
CATEGORIES=	x11-wm
6
CATEGORIES=	x11-wm
7
MASTER_SITES=	http://releases.compiz.org/${PORTVERSION}/
7
MASTER_SITES=	http://releases.compiz.org/${PORTVERSION}/
8
8
Lines 9-30 Link Here
9
MAINTAINER=	freebsd-ports@dan.me.uk
9
MAINTAINER=	freebsd-ports@dan.me.uk
10
COMMENT=	Compiz Composite/Window Manager
10
COMMENT=	Compiz Composite/Window Manager
11
11
12
LIB_DEPENDS=	libpng.so:graphics/png \
12
LICENSE=		GPLv2+ LGPL21+ MIT
13
LICENSE_COMB=		multi
14
LICENSE_FILE_GPLv2+ =	${WRKSRC}/COPYING.GPL
15
LICENSE_FILE_LGPL21+ =	${WRKSRC}/COPYING.LGPL
16
LICENSE_FILE_MIT=	${WRKSRC}/COPYING.MIT
17
18
LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
19
		libfreetype.so:print/freetype2 \
13
		libgtop-2.0.so:devel/libgtop \
20
		libgtop-2.0.so:devel/libgtop \
21
		libpng.so:graphics/png \
14
		libstartup-notification-1.so:x11/startup-notification
22
		libstartup-notification-1.so:x11/startup-notification
15
RUN_DEPENDS=	glxinfo:graphics/mesa-demos \
23
RUN_DEPENDS=	glxinfo:graphics/mesa-demos \
16
		nvidia-settings:x11/nvidia-settings
24
		nvidia-settings:x11/nvidia-settings
17
25
18
XORG_CAT=	app
26
USES=		gl gmake gnome libtool pathfix tar:bzip2
27
USE_GL=		gl glu
28
USE_GNOME=	cairo gconf2 intltool libxslt
29
USE_XORG=	ice sm x11 xcomposite xdamage xext xfixes xinerama \
30
		xorgproto xrandr xrender
31
USE_LDCONFIG=	yes
32
19
GNU_CONFIGURE=	yes
33
GNU_CONFIGURE=	yes
34
CONFIGURE_ARGS=	--disable-kde4 --disable-kde \
35
		--disable-gnome --disable-gnome-keybindings
36
CPPFLAGS+=	-I${LOCALBASE}/include
37
LIBS+=		-L${LOCALBASE}/lib
20
INSTALL_TARGET=	install-strip
38
INSTALL_TARGET=	install-strip
21
USES=		gettext gmake libtool pathfix tar:bzip2
22
USE_GL=		glu
23
USE_GNOME=	gconf2 libxslt intltool
24
USE_XORG=	xorgproto ice sm x11 xcomposite xdamage xext xfixes xinerama \
25
		xrandr xrender
26
USE_LDCONFIG=	yes
27
39
40
XORG_CAT=	app
41
28
GCONF_SCHEMAS=	gwd.schemas \
42
GCONF_SCHEMAS=	gwd.schemas \
29
		compiz-annotate.schemas \
43
		compiz-annotate.schemas \
30
		compiz-blur.schemas \
44
		compiz-blur.schemas \
Lines 59-74 Link Here
59
		compiz-wobbly.schemas \
73
		compiz-wobbly.schemas \
60
		compiz-zoom.schemas
74
		compiz-zoom.schemas
61
75
62
CONFIGURE_ARGS=	--disable-kde4 --disable-kde \
76
OPTIONS_DEFINE=	DBUS FUSE GTK2 METACITY NLS SVG
63
		--disable-gnome --disable-gnome-keybindings
77
OPTIONS_DEFAULT=DBUS      GTK2          NLS SVG
64
CPPFLAGS+=	-I${LOCALBASE}/include
65
LIBS+=		-L${LOCALBASE}/lib
66
78
67
OPTIONS_DEFINE=	SVG GTK2 METACITY DBUS FUSE
79
METACITY_DESC=		Enable Metacity support [broken since Metacity migrated to GTK+ 3]
68
OPTIONS_DEFAULT=	SVG GTK2 METACITY DBUS
80
METACITY_BROKEN=	Metacity support is broken.   Deselect the option METACITY to build
69
81
70
METACITY_DESC=	Enable Metacity support
71
72
SUB_FILES=		compiz-manager
82
SUB_FILES=		compiz-manager
73
DESKTOP_ENTRIES=	"Compiz Manager" \
83
DESKTOP_ENTRIES=	"Compiz Manager" \
74
			"Wrapper script for starting compiz" \
84
			"Wrapper script for starting compiz" \
Lines 87-95 Link Here
87
FUSE_CONFIGURE_ENABLE=	fuse
97
FUSE_CONFIGURE_ENABLE=	fuse
88
FUSE_USES=		fuse
98
FUSE_USES=		fuse
89
99
100
DBUS_CONFIGURE_ENABLE=	dbus
101
DBUS_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:devel/dbus
102
DBUS_RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:devel/dbus
103
104
NLS_CONFIGURE_ENABLE=	nls
105
NLS_USES=		gettext-runtime gettext-tools
106
90
.include <bsd.port.options.mk>
107
.include <bsd.port.options.mk>
91
108
92
.if !empty(PORT_OPTIONS:MMETACITY) && !empty(PORT_OPTIONS:MGNOME) && !empty(PORT_OPTIONS:MGTK2)
109
.if !empty(PORT_OPTIONS:MMETACITY) && !empty(PORT_OPTIONS:MGTK2)
93
CONFIGURE_ARGS+=	--enable-metacity
110
CONFIGURE_ARGS+=	--enable-metacity
94
USE_GNOME+=	metacity
111
USE_GNOME+=	metacity
95
.else
112
.else
Lines 96-112 Link Here
96
CONFIGURE_ARGS+=	--disable-metacity
113
CONFIGURE_ARGS+=	--disable-metacity
97
.endif
114
.endif
98
115
99
.if ${PORT_OPTIONS:MDBUS}
116
.if !empty(PORT_OPTIONS:MDBUS) && !empty(PORT_OPTIONS:MGTK2)
100
CONFIGURE_ARGS+=	--enable-dbus
101
BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:devel/dbus
102
RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:devel/dbus
103
.if ${PORT_OPTIONS:MGTK2} && ${PORT_OPTIONS:MGNOME}
104
CONFIGURE_ARGS+=	--enable-dbus-glib
117
CONFIGURE_ARGS+=	--enable-dbus-glib
105
BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dbus-glib-1.pc:devel/dbus-glib
118
BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dbus-glib-1.pc:devel/dbus-glib
106
RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dbus-glib-1.pc:devel/dbus-glib
119
RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dbus-glib-1.pc:devel/dbus-glib
107
.endif
108
.else
120
.else
109
CONFIGURE_ARGS+=	--disable-dbus --disable-dbus-glib
121
CONFIGURE_ARGS+=	--disable-dbus-glib
110
.endif
122
.endif
111
123
112
post-install:
124
post-install:
(-)files/patch-plugins_fuse.c (-2 / +2 lines)
Lines 1-5 Link Here
1
--- plugins/fuse.c.orig	Mon Apr  2 14:15:28 2007
1
--- plugins/fuse.c.orig	2010-05-21 11:18:14 UTC
2
+++ plugins/fuse.c	Mon May  7 20:07:09 2007
2
+++ plugins/fuse.c
3
@@ -28,6 +28,8 @@
3
@@ -28,6 +28,8 @@
4
 #include <errno.h>
4
 #include <errno.h>
5
 #include <poll.h>
5
 #include <poll.h>
(-)files/patch-src-Makefile.in (-3 / +3 lines)
Lines 1-6 Link Here
1
--- src/Makefile.in.orig	2014-06-02 19:14:25.669435783 +0100
1
--- src/Makefile.in.orig	2018-08-24 22:46:14 UTC
2
+++ src/Makefile.in	2014-06-02 19:14:34.064435780 +0100
2
+++ src/Makefile.in
3
@@ -292,7 +292,7 @@
3
@@ -292,7 +292,7 @@ INCLUDES = \
4
 	-DIMAGEDIR=\"$(imagedir)\"   \
4
 	-DIMAGEDIR=\"$(imagedir)\"   \
5
 	-DMETADATADIR=\"$(metadatadir)\"
5
 	-DMETADATADIR=\"$(metadatadir)\"
6
 
6
 
(-)pkg-plist (+2 lines)
Lines 32-37 Link Here
32
lib/compiz/libglib.so
32
lib/compiz/libglib.so
33
lib/compiz/libgnomecompat.a
33
lib/compiz/libgnomecompat.a
34
lib/compiz/libgnomecompat.so
34
lib/compiz/libgnomecompat.so
35
lib/compiz/libinotify.a
36
lib/compiz/libinotify.so
35
lib/compiz/libini.a
37
lib/compiz/libini.a
36
lib/compiz/libini.so
38
lib/compiz/libini.so
37
lib/compiz/libminimize.a
39
lib/compiz/libminimize.a

Return to bug 230894