summaryrefslogtreecommitdiffstats
path: root/x11-toolkits
diff options
context:
space:
mode:
authorkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2013-08-13 18:34:19 +0800
committerkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2013-08-13 18:34:19 +0800
commitc114910e393d1620e8eacaadc118f659ed8f4d09 (patch)
treea0a3068666472f9348c4ce914b121239997f8401 /x11-toolkits
parentc94a63707c178e0af40dde02ddcc706a87ad834a (diff)
downloadmarcuscom-ports-c114910e393d1620e8eacaadc118f659ed8f4d09.tar
marcuscom-ports-c114910e393d1620e8eacaadc118f659ed8f4d09.tar.gz
marcuscom-ports-c114910e393d1620e8eacaadc118f659ed8f4d09.tar.bz2
marcuscom-ports-c114910e393d1620e8eacaadc118f659ed8f4d09.tar.lz
marcuscom-ports-c114910e393d1620e8eacaadc118f659ed8f4d09.tar.xz
marcuscom-ports-c114910e393d1620e8eacaadc118f659ed8f4d09.tar.zst
marcuscom-ports-c114910e393d1620e8eacaadc118f659ed8f4d09.zip
Don't install tools in libwnck 3, this resolves conflict between libwnck and
libwnck 3. If needed the tools can be made into a slave port like done with vte git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18645 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11-toolkits')
-rw-r--r--x11-toolkits/libwnck/Makefile2
-rw-r--r--x11-toolkits/libwnck3/Makefile5
-rw-r--r--x11-toolkits/libwnck3/pkg-plist2
3 files changed, 2 insertions, 7 deletions
diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile
index 3eeaf274f..da6c57982 100644
--- a/x11-toolkits/libwnck/Makefile
+++ b/x11-toolkits/libwnck/Makefile
@@ -18,8 +18,6 @@ USE_XZ= yes
LIB_DEPENDS= startup-notification-1:${PORTSDIR}/x11/startup-notification
-CONFLICTS= libwnck-3.[0-9]*
-
USE_XORG= xres x11
USE_GNOME= gtk20 ltverhack referencehack intlhack introspection
USES= bison gettext gmake pathfix
diff --git a/x11-toolkits/libwnck3/Makefile b/x11-toolkits/libwnck3/Makefile
index a2b599866..cbfa3eec0 100644
--- a/x11-toolkits/libwnck3/Makefile
+++ b/x11-toolkits/libwnck3/Makefile
@@ -4,7 +4,7 @@
PORTNAME= libwnck
PORTVERSION= 3.4.5
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -18,14 +18,13 @@ USE_XZ= yes
LIB_DEPENDS= startup-notification-1:${PORTSDIR}/x11/startup-notification
-CONFLICTS= libwnck-2.[0-9]*
-
LATEST_LINK= libwnck3
USE_XORG= xres x11
USE_GNOME= gtk30 intlhack introspection ltverhack referencehack
USES= bison gettext gmake pathfix
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
+CONFIGURE_ARGS= --disable-tools
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/x11-toolkits/libwnck3/pkg-plist b/x11-toolkits/libwnck3/pkg-plist
index 48fface9a..cd6c43452 100644
--- a/x11-toolkits/libwnck3/pkg-plist
+++ b/x11-toolkits/libwnck3/pkg-plist
@@ -1,5 +1,3 @@
-bin/wnck-urgency-monitor
-bin/wnckprop
include/libwnck-3.0/libwnck/application.h
include/libwnck-3.0/libwnck/class-group.h
include/libwnck-3.0/libwnck/libwnck.h