summaryrefslogtreecommitdiff
path: root/wm
diff options
context:
space:
mode:
Diffstat (limited to 'wm')
-rw-r--r--wm/compiz/Makefile8
-rw-r--r--wm/compiz/distinfo3
-rw-r--r--wm/compiz/patches/patch-aa13
3 files changed, 21 insertions, 3 deletions
diff --git a/wm/compiz/Makefile b/wm/compiz/Makefile
index 87b891149da..b843a1112c0 100644
--- a/wm/compiz/Makefile
+++ b/wm/compiz/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2007/06/05 05:37:37 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2007/07/16 09:39:20 drochner Exp $
#
DISTNAME= compiz-0.4.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= wm x11
MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
EXTRACT_SUFX= .tar.bz2
@@ -52,6 +52,10 @@ PLIST_SUBST+= KDE=""
PLIST_SUBST+= KDE="@comment "
.endif
+# While we don't use threads, we link against libpthread because
+# some plugins do it.
+.include "../../mk/pthread.buildlink3.mk"
+
.include "../../devel/GConf2/schemas.mk"
.include "../../sysutils/dbus/buildlink3.mk"
.include "../../sysutils/dbus-glib/buildlink3.mk"
diff --git a/wm/compiz/distinfo b/wm/compiz/distinfo
index c8d672c62eb..dccc4f02849 100644
--- a/wm/compiz/distinfo
+++ b/wm/compiz/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.2 2007/04/17 21:54:35 drochner Exp $
+$NetBSD: distinfo,v 1.3 2007/07/16 09:39:20 drochner Exp $
SHA1 (compiz-0.4.0.tar.bz2) = b2eaec6bcb0513dcd7d8c62c45aa84b218c9e7be
RMD160 (compiz-0.4.0.tar.bz2) = dbfd9874b28bac61954887e33b4cba126acca141
Size (compiz-0.4.0.tar.bz2) = 900099 bytes
+SHA1 (patch-aa) = 229e308c58cdf1ba916de218475224420324dcf4
diff --git a/wm/compiz/patches/patch-aa b/wm/compiz/patches/patch-aa
new file mode 100644
index 00000000000..0c22ad34c05
--- /dev/null
+++ b/wm/compiz/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2007/07/16 09:39:20 drochner Exp $
+
+--- src/Makefile.in.orig 2007-07-15 10:23:02.000000000 +0200
++++ src/Makefile.in
+@@ -269,7 +269,7 @@ INCLUDES = \
+ -DPLUGINDIR=\"$(plugindir)\" \
+ -DIMAGEDIR=\"$(imagedir)\"
+
+-compiz_LDADD = @COMPIZ_LIBS@ @GL_LIBS@ -lm
++compiz_LDADD = @COMPIZ_LIBS@ @GL_LIBS@ -lm ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
+ compiz_LDFLAGS = -export-dynamic
+ compiz_SOURCES = \
+ main.c \