Initial import of wbar-2.2.2.

Just a simple and highly customizable quick-launch tool.

Features
* It's coded in C++
* It uses Imlib2 to do the image processing
* It rides just on top of Xlib, no other toolkits.

9 files changed, 172 insertions, 0 deletions

diff --git a/wm/wbar/DESCR b/wm/wbar/DESCR
new file mode 100644
index 00000000000..d23960f0b03
--- /dev/null
+++ b/wm/wbar/DESCR
@@ -0,0 +1,6 @@
+Just a simple and highly customizable quick-launch tool.
+
+Features
+* It's coded in C++
+* It uses Imlib2 to do the image processing
+* It rides just on top of Xlib, no other toolkits.
diff --git a/wm/wbar/Makefile b/wm/wbar/Makefile
new file mode 100644
index 00000000000..184be3d8cc2
--- /dev/null
+++ b/wm/wbar/Makefile
@@ -0,0 +1,37 @@
+# $NetBSD: Makefile,v 1.1.1.1 2011/06/18 15:16:24 wiz Exp $
+#
+
+DISTNAME=	wbar-2.2.2
+CATEGORIES=	wm
+MASTER_SITES=	http://wbar.googlecode.com/files/
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://code.google.com/p/wbar/
+COMMENT=	Simple and highly customizable quick-launch tool
+LICENSE=	gnu-gpl-v3
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+GNU_CONFIGURE=	yes
+USE_LANGUAGES=	c c++
+USE_TOOLS+=	gmake gsed:build intltool pkg-config
+
+BUILDLINK_TRANSFORM+=	rm:-Werror
+PKG_SYSCONFSUBDIR=	wbar
+CONF_FILES+=		${PREFIX}/share/examples/wbar/wbar.cfg ${PKG_SYSCONFDIR}/wbar.cfg
+
+SUBST_CLASSES+=		sed
+SUBST_FILES.sed+=	configure
+SUBST_SED.sed=		-e "s/sed -i/gsed -i/"
+SUBST_STAGE.sed=	post-extract
+SUBST_MESSAGE.sed=	Needs GNU sed.
+
+# trick pkgsrc into real gsed, needed for "sed -i"
+TOOLS_PLATFORM.gsed=	#empty
+
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
+.include "../../graphics/imlib2/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/wm/wbar/PLIST b/wm/wbar/PLIST
new file mode 100644
index 00000000000..df5679a989e
--- /dev/null
+++ b/wm/wbar/PLIST
@@ -0,0 +1,23 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2011/06/18 15:16:24 wiz Exp $
+bin/wbar
+bin/wbar-config
+man/es/man1/wbar-config.1
+man/es/man1/wbar.1
+man/man1/wbar-config.1
+man/man1/wbar.1
+share/applications/wbar.desktop
+share/examples/wbar/wbar.cfg
+share/locale/de/LC_MESSAGES/wbar.mo
+share/locale/es/LC_MESSAGES/wbar.mo
+share/locale/fi/LC_MESSAGES/wbar.mo
+share/pixmaps/wbar.png
+share/pixmaps/wbar/anjuta.png
+share/pixmaps/wbar/bluefish.png
+share/pixmaps/wbar/gimp.png
+share/pixmaps/wbar/ooffice.png
+share/pixmaps/wbar/osxbarback.png
+share/pixmaps/wbar/pidgin.png
+share/pixmaps/wbar/synaptic.png
+share/pixmaps/wbar/terminal.png
+share/pixmaps/wbar/wbar.png
+share/wbar/glade/wbar.glade
diff --git a/wm/wbar/distinfo b/wm/wbar/distinfo
new file mode 100644
index 00000000000..1acc41e0bb9
--- /dev/null
+++ b/wm/wbar/distinfo
@@ -0,0 +1,10 @@
+$NetBSD: distinfo,v 1.1.1.1 2011/06/18 15:16:24 wiz Exp $
+
+SHA1 (wbar-2.2.2.tar.gz) = 66b41b06e65e02b42eec36c4e5ec8fb68f670697
+RMD160 (wbar-2.2.2.tar.gz) = a9f6bcc29678d2011c38aab720ff7e692d4e92b4
+Size (wbar-2.2.2.tar.gz) = 369592 bytes
+SHA1 (patch-configure) = 59426913069f00cb174148a23164062f1dbc6a94
+SHA1 (patch-etc_Makefile.in) = 0222395e313218aa9ba1b9f5430c69f6c7c552c7
+SHA1 (patch-src_Makefile.am) = dbc2f2305f5dd43216ff60ed6c0292436847acea
+SHA1 (patch-src_Makefile.in) = 44a317b86d08cb468cf0d561397a49e4fa4b27f4
+SHA1 (patch-src_utils_OptParser.cc) = 923de61055dd0e9fb5cd4f1d386ab06d056e302b
diff --git a/wm/wbar/patches/patch-configure b/wm/wbar/patches/patch-configure
new file mode 100644
index 00000000000..8652c2bac9c
--- /dev/null
+++ b/wm/wbar/patches/patch-configure
@@ -0,0 +1,24 @@
+$NetBSD: patch-configure,v 1.1.1.1 2011/06/18 15:16:24 wiz Exp $
+
+Fix paths for pkgsrc.
+
+--- configure.orig	2011-05-20 16:15:55.000000000 +0000
++++ configure
+@@ -4609,7 +4609,7 @@ cat >>confdefs.h <<_ACEOF
+ _ACEOF
+ 
+ 
+-DEFAULT_CONFIGDIR="$SYSCONFDIR/default/wbar"
++DEFAULT_CONFIGDIR="$SYSCONFDIR/wbar"
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -4617,7 +4617,7 @@ cat >>confdefs.h <<_ACEOF
+ _ACEOF
+ 
+ 
+-AUTOSTARTDIR="$SYSCONFDIR/xdg/autostart"
++AUTOSTARTDIR="$prefix/share/applications"
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
diff --git a/wm/wbar/patches/patch-etc_Makefile.in b/wm/wbar/patches/patch-etc_Makefile.in
new file mode 100644
index 00000000000..39f9e0c18ae
--- /dev/null
+++ b/wm/wbar/patches/patch-etc_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-etc_Makefile.in,v 1.1.1.1 2011/06/18 15:16:24 wiz Exp $
+
+Install config to example directory.
+
+--- etc/Makefile.in.orig	2011-05-20 16:15:57.000000000 +0000
++++ etc/Makefile.in
+@@ -201,7 +201,7 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ CLEANFILES = *~ $(wbardesktop:.desktop.in.in=.desktop)
+-defaultdir = @DEFAULT_CONFIGDIR@
++defaultdir = @prefix@/share/examples/wbar
+ default_DATA = $(wbarcfg:.cfg.in=.cfg)
+ autostartdir = @AUTOSTARTDIR@
+ autostart_DATA = $(wbardesktop:.desktop.in.in=.desktop)
diff --git a/wm/wbar/patches/patch-src_Makefile.am b/wm/wbar/patches/patch-src_Makefile.am
new file mode 100644
index 00000000000..22256951064
--- /dev/null
+++ b/wm/wbar/patches/patch-src_Makefile.am
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_Makefile.am,v 1.1.1.1 2011/06/18 15:16:24 wiz Exp $
+
+Uses symbols from libintl, so link against it.
+http://code.google.com/p/wbar/issues/detail?id=56
+
+--- src/Makefile.am.orig	2011-05-08 22:39:25.000000000 +0000
++++ src/Makefile.am
+@@ -52,7 +52,7 @@ $(top_srcdir)/src/utils/OptParser.h \
+ $(top_srcdir)/src/utils/i18n.h
+ 
+ wbar_CXXFLAGS = @modules_CFLAGS@
+-wbar_LDADD = @modules_LIBS@
++wbar_LDADD = @modules_LIBS@ @INTLLIBS@
+ 
+ if WBAR_CONFIG
+ wbar_config_CXXFLAGS = @gui_modules_CFLAGS@
diff --git a/wm/wbar/patches/patch-src_Makefile.in b/wm/wbar/patches/patch-src_Makefile.in
new file mode 100644
index 00000000000..59d676ac0cc
--- /dev/null
+++ b/wm/wbar/patches/patch-src_Makefile.in
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_Makefile.in,v 1.1.1.1 2011/06/18 15:16:24 wiz Exp $
+
+Uses symbols from libintl, so link against it.
+http://code.google.com/p/wbar/issues/detail?id=56
+
+--- src/Makefile.in.orig	2011-05-20 16:15:57.000000000 +0000
++++ src/Makefile.in
+@@ -272,7 +272,7 @@ $(top_srcdir)/src/utils/OptParser.h \
+ $(top_srcdir)/src/utils/i18n.h
+ 
+ wbar_CXXFLAGS = @modules_CFLAGS@
+-wbar_LDADD = @modules_LIBS@
++wbar_LDADD = @modules_LIBS@ @INTLLIBS@
+ @WBAR_CONFIG_TRUE@wbar_config_CXXFLAGS = @gui_modules_CFLAGS@
+ @WBAR_CONFIG_TRUE@wbar_config_LDADD = @gui_modules_LIBS@
+ all: all-am
diff --git a/wm/wbar/patches/patch-src_utils_OptParser.cc b/wm/wbar/patches/patch-src_utils_OptParser.cc
new file mode 100644
index 00000000000..9a75132d6d9
--- /dev/null
+++ b/wm/wbar/patches/patch-src_utils_OptParser.cc
@@ -0,0 +1,25 @@
+$NetBSD: patch-src_utils_OptParser.cc,v 1.1.1.1 2011/06/18 15:16:24 wiz Exp $
+
+Use more portable getopt_long instead of getopt_long_only.
+http://code.google.com/p/wbar/issues/detail?id=55
+
+--- src/utils/OptParser.cc.orig	2011-05-08 20:11:22.000000000 +0000
++++ src/utils/OptParser.cc
+@@ -48,7 +48,7 @@ bool OptParser::isSet(Options opt)
+     {
+         int option_index = 0;
+ 
+-        c = getopt_long_only(argc, argv, "hcv", long_options, &option_index);
++        c = getopt_long(argc, argv, "hcv", long_options, &option_index);
+         if (c == -1) break;
+         if (option_index == (int)opt) return true;
+         if (c == (int) HELP && opt == HELP) return true;
+@@ -71,7 +71,7 @@ std::string OptParser::getArg(Options op
+     {
+         int option_index = 0;
+ 
+-        c = getopt_long_only(argc, argv, "hcv", long_options, &option_index);
++        c = getopt_long(argc, argv, "hcv", long_options, &option_index);
+         if (c == -1) break;
+         if (!optarg) continue;
+         if (option_index == (int)opt) return optarg;