Update to tint2-0.11.

Added c++ to USE_LANGUAGES to appease CMake. Someone with CMake clue
should have a look at it.

ChangeLog:
- unhide tint2 panel when dragging something
- Set _NET_WM_ICON_GEOMETRY for every task
- strut_policy=minimum is possible even if autohide is disabled
- Added icons and a *.desktop file for tint2conf
- BSD fixes
- Add cmake build system
- Xrandr and Nvidia problems fixed
- Fix installation of examples
- added panel theme switcher 'tint2conf'
  with preview of each theme based on current config (size of monitor, task opened, ...)
- include tintwizard : theme editor
- autodetect composite manager and switch to real or fake transparency
  this feature needed a patch to xcompmgr
  see FAQ http://code.google.com/p/tint2/wiki/FAQ#How_to_configure_real_transparency_(xcompmgr)
- added 'strut_policy = none'
- drag n drop task re-ordering

5 files changed, 73 insertions, 35 deletions

diff --git a/x11/tint2/Makefile b/x11/tint2/Makefile
index 8cd3574c6b6..cdcf3e67a04 100644
--- a/x11/tint2/Makefile
+++ b/x11/tint2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2010/06/13 22:45:53 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2010/07/05 08:06:15 tnn Exp $
 
-DISTNAME=		tint2-0.9
-PKGREVISION=		2
+DISTNAME=		tint2-0.11
 CATEGORIES=		x11
 MASTER_SITES=		http://tint2.googlecode.com/files/
+EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		fernandotcl@gmail.com
 HOMEPAGE=		http://code.google.com/p/tint2/
@@ -12,35 +12,48 @@ LICENSE=		gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-GNU_CONFIGURE=		yes
+USE_LANGUAGES=		c c++ # XXX CMake. pkg does not really need c++
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake pkg-config
 
-PKG_SYSCONFSUBDIR=	xdg
 INSTALLATION_DIRS=	share/examples/tint2
-OWN_DIRS=		${PKG_SYSCONFDIR}/tint2
+OWN_DIRS=		${PKG_SYSCONFDIR}/xdg/tint2
 CONF_FILES=		${PREFIX}/share/examples/tint2/tint2rc \
-				${PKG_SYSCONFDIR}/tint2/tint2rc
+				${PKG_SYSCONFDIR}/xdg/tint2/tint2rc
+
+REPLACE_PYTHON+=	src/tint2conf/tintwizard.py
+
+CMAKE_OPTS+=	-DCMAKE_INSTALL_PREFIX=${PREFIX}
+CMAKE_OPTS+=	-DSYSCONFDIR=${PKG_SYSCONFDIR}
+CMAKE_OPTS+=	-DMANDIR=${PKGMANDIR}
+# Below rpath fix is copypasted from graphics/vtk.
+CMAKE_OPTS+=	-DCMAKE_INSTALL_RPATH:STRING=${PREFIX}/lib:${X11BASE}/lib${LIBABISUFFIX:Q}	\
+CMAKE_OPTS+=	-DCMAKE_SKIP_BUILD_RPATH:BOOL=ON		\
+CMAKE_OPTS+=	-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON	\
+CMAKE_OPTS+=	-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON
 
-CONFIGURE_ARGS+=	--disable-tint2conf
-CONFIGURE_ARGS+=	--disable-examples
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "Linux"
-CONFIGURE_ARGS+=	--enable-battery
+CMAKE_OPTS+=		-DENABLE_BATTERY=ON
 .else
-CONFIGURE_ARGS+=	--disable-battery
+CMAKE_OPTS+=		-DENABLE_BATTERY=OFF
 .endif
 
+do-configure:
+	cd ${WRKSRC} && ${PREFIX}/bin/cmake ${CMAKE_OPTS} .
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/sample/tint2rc \
 		${DESTDIR}${PREFIX}/share/examples/tint2
 
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pango/buildlink3.mk"
-.include "../../graphics/cairo/buildlink3.mk"
+.include "../../devel/cmake/buildlink3.mk"
 .include "../../graphics/imlib2/buildlink3.mk"
+.include "../../lang/python/application.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libXcomposite/buildlink3.mk"
 .include "../../x11/libXdamage/buildlink3.mk"
 .include "../../x11/libXinerama/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"
+.include "../../x11/py-gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/tint2/PLIST b/x11/tint2/PLIST
index 7ae3cb00b41..c70ccd3455b 100644
--- a/x11/tint2/PLIST
+++ b/x11/tint2/PLIST
@@ -1,9 +1,12 @@
-@comment $NetBSD: PLIST,v 1.2 2010/04/11 21:43:57 gls Exp $
+@comment $NetBSD: PLIST,v 1.3 2010/07/05 08:06:15 tnn Exp $
 bin/tint2
-man/man1/tint2.1
+bin/tint2conf
+bin/tintwizard.py
+share/applications/tint2conf.desktop
 share/doc/tint2/AUTHORS
 share/doc/tint2/ChangeLog
-share/doc/tint2/NEWS
 share/doc/tint2/README
 share/examples/tint2/tint2rc
+share/pixmaps/tint2conf.png
+share/pixmaps/tint2conf.svg
 share/tint2/default_icon.png
diff --git a/x11/tint2/distinfo b/x11/tint2/distinfo
index 58a7abbeceb..b1422307dda 100644
--- a/x11/tint2/distinfo
+++ b/x11/tint2/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2010/04/11 21:43:57 gls Exp $
+$NetBSD: distinfo,v 1.3 2010/07/05 08:06:15 tnn Exp $
 
-SHA1 (tint2-0.9.tar.gz) = fa69aaa924bb5a85cfa753946c8a6ebed79d73d8
-RMD160 (tint2-0.9.tar.gz) = 958a4850857e2b90fea72c48d32ca3d687d6bc74
-Size (tint2-0.9.tar.gz) = 206491 bytes
-SHA1 (patch-aa) = 104875afab897c052e7011f7b4ae03ab340bcd14
+SHA1 (tint2-0.11.tar.bz2) = 9752255529673dabf13e7437afd1cd0b39d9c92b
+RMD160 (tint2-0.11.tar.bz2) = f094e81aec1fae98a88e8392c4c9e6b5fecb6120
+Size (tint2-0.11.tar.bz2) = 91716 bytes
+SHA1 (patch-aa) = 2865cdb561d856615c607d589af9040bfc95e14b
+SHA1 (patch-ab) = 41d3059bc5d329a2f8ad55e05a43ef3e2e199fec
diff --git a/x11/tint2/patches/patch-aa b/x11/tint2/patches/patch-aa
index f69933a1497..d51d6480bef 100644
--- a/x11/tint2/patches/patch-aa
+++ b/x11/tint2/patches/patch-aa
@@ -1,14 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2010/04/11 21:43:57 gls Exp $
+$NetBSD: patch-aa,v 1.3 2010/07/05 08:06:15 tnn Exp $
 
-Do not automatically install samples
---- Makefile.in.orig	2010-01-28 11:16:45.000000000 +0000
-+++ Makefile.in
-@@ -237,7 +237,7 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- ACLOCAL_AMFLAGS = -I m4
--SUBDIRS = doc sample src
-+SUBDIRS = doc src
- dist_doc_DATA = AUTHORS ChangeLog NEWS README
- EXTRA_DIST = autogen.sh README.source
- dist_pkgdata_DATA = default_icon.png
+--- CMakeLists.txt.orig	2010-06-15 21:38:14.000000000 +0000
++++ CMakeLists.txt
+@@ -99,7 +99,7 @@ set_target_properties( tint2 PROPERTIES 
+ set_target_properties(tint2 PROPERTIES LINK_FLAGS "-pthread" )
+ 
+ install( TARGETS tint2 DESTINATION bin )
+-install( FILES sample/tint2rc DESTINATION ${SYSCONFDIR}/xdg/tint2 )
++#install( FILES sample/tint2rc DESTINATION ${SYSCONFDIR}/xdg/tint2 )
+ install( FILES default_icon.png DESTINATION ${DATADIR}/tint2 )
+ install( FILES AUTHORS ChangeLog README DESTINATION ${DOCDIR} )
+ install( FILES doc/tint2.1 DESTINATION ${MANDIR}/man1 )
diff --git a/x11/tint2/patches/patch-ab b/x11/tint2/patches/patch-ab
new file mode 100644
index 00000000000..dbdc665cda3
--- /dev/null
+++ b/x11/tint2/patches/patch-ab
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.3 2010/07/05 08:06:15 tnn Exp $
+
+--- src/tint2conf/main.c.orig	2010-06-16 15:11:43.000000000 +0000
++++ src/tint2conf/main.c
+@@ -417,7 +417,7 @@ static void menuApply()
+ 		copy_file(g_default_theme, g_path_config);
+ 
+ 		// restart panel
+-		system("killall -SIGUSR1 tint2");
++		system("pkill -SIGUSR1 tint2");
+ 	}
+ }
+ 
+@@ -580,7 +580,7 @@ void read_config()
+ 	}
+ 	g_width = 500;
+ 	g_height = 350;
+-	g_cmd_property = g_strconcat( "python ", INSTALL_PREFIX, "/bin/tintwizard.py", (void*)0 );
++	g_cmd_property = g_strconcat(INSTALL_PREFIX, "/bin/tintwizard.py", (void*)0 );
+ 
+ 	// load config
+ 	path = g_build_filename (g_get_user_config_dir(), "tint2", "tint2confrc", NULL);