-Add CONFLICTS with the each others.

-Add GNOME_DESKTOP_VERSION.

The libwnck probably will be changed, but I need to do more research to see
if I can resolve the conflicts between 2.x and 3.x.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@15786 df743ca5-7f9a-e211-a948-0013205c9059

5 files changed, 209 insertions, 1 deletions

diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile
new file mode 100644
index 000000000..d24ae0b33
--- /dev/null
+++ b/x11-toolkits/libwnck/Makefile
@@ -0,0 +1,42 @@
+# New ports collection makefile for:	libwnck
+# Date created:				12 April 2002
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD: ports/x11-toolkits/libwnck/Makefile,v 1.76 2010/12/04 07:34:20 ade Exp $
+#   $MCom: ports/x11-toolkits/libwnck/Makefile,v 1.133 2010/11/17 11:38:29 kwm Exp $
+#
+
+PORTNAME=	libwnck
+PORTVERSION=	2.30.6
+PORTREVISION?=	0
+CATEGORIES=	x11-toolkits gnome
+MASTER_SITES=	GNOME
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Library used for writing pagers and taskslists
+
+USE_BZIP2=	yes
+
+.if !defined(REFERENCE_PORT)
+
+BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
+LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification
+RUN_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
+
+CONFLICTS=	libwnck-3.[0-9]*
+
+USE_GETTEXT=	yes
+USE_XORG=	xres
+USE_GMAKE=	yes
+USE_GNOME=	gnomehack gtk20 ltverhack referencehack intlhack
+USE_BISON=	build
+USE_LDCONFIG=	yes
+USE_AUTOTOOLS=	libtool
+CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+.include <bsd.port.mk>
+
+.endif
diff --git a/x11-toolkits/libwnck/distinfo b/x11-toolkits/libwnck/distinfo
new file mode 100644
index 000000000..8ba015d70
--- /dev/null
+++ b/x11-toolkits/libwnck/distinfo
@@ -0,0 +1,2 @@
+SHA256 (gnome2/libwnck-2.30.6.tar.bz2) = 4d25984ed5cfe215eb650f960de634300a6cafc9d98bbc7caea8043b7cd96cc5
+SIZE (gnome2/libwnck-2.30.6.tar.bz2) = 724558
diff --git a/x11-toolkits/libwnck/pkg-descr b/x11-toolkits/libwnck/pkg-descr
new file mode 100644
index 000000000..685bf95e0
--- /dev/null
+++ b/x11-toolkits/libwnck/pkg-descr
@@ -0,0 +1,5 @@
+libwnck is a Window Navigator Construction Kit, i.e. a library used
+for writing pagers and taskslists.  It is needed for the 
+GNOME 2.0 desktop.
+
+WWW: http://www.gnome.org/
diff --git a/x11-toolkits/libwnck/pkg-plist b/x11-toolkits/libwnck/pkg-plist
new file mode 100644
index 000000000..6e8a07f1d
--- /dev/null
+++ b/x11-toolkits/libwnck/pkg-plist
@@ -0,0 +1,157 @@
+bin/wnck-urgency-monitor
+bin/wnckprop
+include/libwnck-1.0/libwnck/application.h
+include/libwnck-1.0/libwnck/class-group.h
+include/libwnck-1.0/libwnck/libwnck.h
+include/libwnck-1.0/libwnck/pager.h
+include/libwnck-1.0/libwnck/screen.h
+include/libwnck-1.0/libwnck/selector.h
+include/libwnck-1.0/libwnck/tasklist.h
+include/libwnck-1.0/libwnck/util.h
+include/libwnck-1.0/libwnck/window-action-menu.h
+include/libwnck-1.0/libwnck/window.h
+include/libwnck-1.0/libwnck/wnck-enum-types.h
+include/libwnck-1.0/libwnck/workspace.h
+lib/libwnck-1.a
+lib/libwnck-1.la
+lib/libwnck-1.so
+lib/libwnck-1.so.22
+libdata/pkgconfig/libwnck-1.0.pc
+lib/girepository-1.0/Wnck-1.0.typelib
+share/locale/am/LC_MESSAGES/libwnck.mo
+share/locale/ar/LC_MESSAGES/libwnck.mo
+share/locale/as/LC_MESSAGES/libwnck.mo
+share/locale/ast/LC_MESSAGES/libwnck.mo
+share/locale/az/LC_MESSAGES/libwnck.mo
+share/locale/be/LC_MESSAGES/libwnck.mo
+share/locale/be@latin/LC_MESSAGES/libwnck.mo
+share/locale/bg/LC_MESSAGES/libwnck.mo
+share/locale/bn/LC_MESSAGES/libwnck.mo
+share/locale/bn_IN/LC_MESSAGES/libwnck.mo
+share/locale/br/LC_MESSAGES/libwnck.mo
+share/locale/bs/LC_MESSAGES/libwnck.mo
+share/locale/ca/LC_MESSAGES/libwnck.mo
+share/locale/ca@valencia/LC_MESSAGES/libwnck.mo
+share/locale/crh/LC_MESSAGES/libwnck.mo
+share/locale/cs/LC_MESSAGES/libwnck.mo
+share/locale/cy/LC_MESSAGES/libwnck.mo
+share/locale/da/LC_MESSAGES/libwnck.mo
+share/locale/de/LC_MESSAGES/libwnck.mo
+share/locale/dz/LC_MESSAGES/libwnck.mo
+share/locale/el/LC_MESSAGES/libwnck.mo
+share/locale/en@shaw/LC_MESSAGES/libwnck.mo
+share/locale/en_CA/LC_MESSAGES/libwnck.mo
+share/locale/en_GB/LC_MESSAGES/libwnck.mo
+share/locale/eo/LC_MESSAGES/libwnck.mo
+share/locale/es/LC_MESSAGES/libwnck.mo
+share/locale/et/LC_MESSAGES/libwnck.mo
+share/locale/eu/LC_MESSAGES/libwnck.mo
+share/locale/fa/LC_MESSAGES/libwnck.mo
+share/locale/fi/LC_MESSAGES/libwnck.mo
+share/locale/fr/LC_MESSAGES/libwnck.mo
+share/locale/ga/LC_MESSAGES/libwnck.mo
+share/locale/gl/LC_MESSAGES/libwnck.mo
+share/locale/gu/LC_MESSAGES/libwnck.mo
+share/locale/he/LC_MESSAGES/libwnck.mo
+share/locale/hi/LC_MESSAGES/libwnck.mo
+share/locale/hr/LC_MESSAGES/libwnck.mo
+share/locale/hu/LC_MESSAGES/libwnck.mo
+share/locale/id/LC_MESSAGES/libwnck.mo
+share/locale/is/LC_MESSAGES/libwnck.mo
+share/locale/it/LC_MESSAGES/libwnck.mo
+share/locale/ja/LC_MESSAGES/libwnck.mo
+share/locale/ka/LC_MESSAGES/libwnck.mo
+share/locale/kk/LC_MESSAGES/libwnck.mo
+share/locale/kn/LC_MESSAGES/libwnck.mo
+share/locale/ko/LC_MESSAGES/libwnck.mo
+share/locale/ku/LC_MESSAGES/libwnck.mo
+share/locale/ky/LC_MESSAGES/libwnck.mo
+share/locale/li/LC_MESSAGES/libwnck.mo
+share/locale/lt/LC_MESSAGES/libwnck.mo
+share/locale/lv/LC_MESSAGES/libwnck.mo
+share/locale/mai/LC_MESSAGES/libwnck.mo
+share/locale/mi/LC_MESSAGES/libwnck.mo
+share/locale/mk/LC_MESSAGES/libwnck.mo
+share/locale/ml/LC_MESSAGES/libwnck.mo
+share/locale/mn/LC_MESSAGES/libwnck.mo
+share/locale/mr/LC_MESSAGES/libwnck.mo
+share/locale/ms/LC_MESSAGES/libwnck.mo
+share/locale/nb/LC_MESSAGES/libwnck.mo
+share/locale/ne/LC_MESSAGES/libwnck.mo
+share/locale/nl/LC_MESSAGES/libwnck.mo
+share/locale/nn/LC_MESSAGES/libwnck.mo
+share/locale/oc/LC_MESSAGES/libwnck.mo
+share/locale/or/LC_MESSAGES/libwnck.mo
+share/locale/pa/LC_MESSAGES/libwnck.mo
+share/locale/pl/LC_MESSAGES/libwnck.mo
+share/locale/pt/LC_MESSAGES/libwnck.mo
+share/locale/pt_BR/LC_MESSAGES/libwnck.mo
+share/locale/ro/LC_MESSAGES/libwnck.mo
+share/locale/ru/LC_MESSAGES/libwnck.mo
+share/locale/rw/LC_MESSAGES/libwnck.mo
+share/locale/si/LC_MESSAGES/libwnck.mo
+share/locale/sk/LC_MESSAGES/libwnck.mo
+share/locale/sl/LC_MESSAGES/libwnck.mo
+share/locale/sq/LC_MESSAGES/libwnck.mo
+share/locale/sr/LC_MESSAGES/libwnck.mo
+share/locale/sr@latin/LC_MESSAGES/libwnck.mo
+share/locale/sv/LC_MESSAGES/libwnck.mo
+share/locale/ta/LC_MESSAGES/libwnck.mo
+share/locale/te/LC_MESSAGES/libwnck.mo
+share/locale/th/LC_MESSAGES/libwnck.mo
+share/locale/tr/LC_MESSAGES/libwnck.mo
+share/locale/ug/LC_MESSAGES/libwnck.mo
+share/locale/uk/LC_MESSAGES/libwnck.mo
+share/locale/vi/LC_MESSAGES/libwnck.mo
+share/locale/wa/LC_MESSAGES/libwnck.mo
+share/locale/xh/LC_MESSAGES/libwnck.mo
+share/locale/zh_CN/LC_MESSAGES/libwnck.mo
+share/locale/zh_HK/LC_MESSAGES/libwnck.mo
+share/locale/zh_TW/LC_MESSAGES/libwnck.mo
+share/gir-1.0/Wnck-1.0.gir
+@dirrm include/libwnck-1.0/libwnck
+@dirrm include/libwnck-1.0
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mi/LC_MESSAGES
+@dirrmtry share/locale/mi
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
+@dirrmtry share/locale/ky/LC_MESSAGES
+@dirrmtry share/locale/ky
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/crh/LC_MESSAGES
+@dirrmtry share/locale/crh
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/x11-toolkits/libwnck3/Makefile b/x11-toolkits/libwnck3/Makefile
index 168225917..1720c14c5 100644
--- a/x11-toolkits/libwnck3/Makefile
+++ b/x11-toolkits/libwnck3/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/libwnck3/Makefile,v 1.4 2011/03/23 14:52:06 kwm Exp $
+#   $MCom: ports/x11-toolkits/libwnck3/Makefile,v 1.5 2011/04/05 17:58:41 kwm Exp $
 #
 
 PORTNAME=	libwnck
@@ -24,6 +24,8 @@ BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification
 RUN_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 
+CONFLICTS=	libwnck-2.[0-9]*
+
 USE_GETTEXT=	yes
 USE_XORG=	xres x11
 USE_GMAKE=	yes