Update to 2.2.1:

* Made the underscores disappear correctly (James Roberts-Thomson)
* xmms plugin breakdown and breakup (Philipp Matthias Hahn)
* configure.in xinerama patch (Julio Merino)
* configure.in -> configure.ac conversion (Philipp Matthias Hahn)

7 files changed, 28 insertions, 38 deletions

diff --git a/x11/xosd/Makefile b/x11/xosd/Makefile
index 301ccab8cc6..7100e10bddb 100644
--- a/x11/xosd/Makefile
+++ b/x11/xosd/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/04/12 12:14:15 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2003/04/22 19:06:11 jmmv Exp $
 #
 
 .include "Makefile.common"
 
-PKGREVISION=		1
 COMMENT=		Library to display shaped text on your X display
 
 CONFIGURE_ENV+=		XOSD_XMMS_PLUGIN=NO
diff --git a/x11/xosd/Makefile.common b/x11/xosd/Makefile.common
index 910aea38916..94f1f8749c5 100644
--- a/x11/xosd/Makefile.common
+++ b/x11/xosd/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.1 2003/04/12 12:14:15 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.2 2003/04/22 19:06:11 jmmv Exp $
 #
 
-DISTNAME=	xosd-2.2.0
+DISTNAME=	xosd-2.2.1
 CATEGORIES=	x11
 MASTER_SITES=	http://www.ignavus.net/
 
diff --git a/x11/xosd/PLIST b/x11/xosd/PLIST
index 80b1f01ec73..4073c6229f1 100644
--- a/x11/xosd/PLIST
+++ b/x11/xosd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/04/12 12:14:15 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/04/22 19:06:12 jmmv Exp $
 bin/osd_cat
 bin/xosd-config
 include/xosd.h
@@ -6,7 +6,7 @@ lib/libxosd.a
 lib/libxosd.la
 lib/libxosd.so
 lib/libxosd.so.4
-lib/libxosd.so.4.0
+lib/libxosd.so.4.1
 man/man1/osd_cat.1
 man/man1/xosd-config.1
 man/man3/xosd.3
diff --git a/x11/xosd/buildlink2.mk b/x11/xosd/buildlink2.mk
index cf4b9ff8b9b..d68729a0c6e 100644
--- a/x11/xosd/buildlink2.mk
+++ b/x11/xosd/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/04/12 13:23:13 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/04/22 19:06:12 jmmv Exp $
 #
 # This Makefile fragment is included by packages that use xosd.
 #
@@ -9,7 +9,7 @@
 XOSD_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			xosd
-BUILDLINK_DEPENDS.xosd?=		xosd>=2.2.0nb1
+BUILDLINK_DEPENDS.xosd?=		xosd>=2.2.1
 BUILDLINK_PKGSRCDIR.xosd?=		../../x11/xosd
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xosd=xosd
diff --git a/x11/xosd/distinfo b/x11/xosd/distinfo
index 88ffbeae5f3..c42bb0d46bb 100644
--- a/x11/xosd/distinfo
+++ b/x11/xosd/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2003/04/12 12:14:16 jmmv Exp $
+$NetBSD: distinfo,v 1.4 2003/04/22 19:06:12 jmmv Exp $
 
-SHA1 (xosd-2.2.0.tar.gz) = 49b10d0fb0ac69fba264952f4ae7b9fe5a14018c
-Size (xosd-2.2.0.tar.gz) = 292278 bytes
-SHA1 (patch-aa) = 6a6c36eb1c7d8153116190a4406946f12483fbe5
-SHA1 (patch-ab) = 95d6bc91b873d4170d5c2aa8ad2c71f42dc451bc
+SHA1 (xosd-2.2.1.tar.gz) = adadaf105a72a2a6d30d17253b1a4d13e26dd5bd
+Size (xosd-2.2.1.tar.gz) = 294755 bytes
+SHA1 (patch-aa) = 0d3f003e6465d9c6b9af4cdfc1992ab403bdc3cb
+SHA1 (patch-ab) = e32cc6675f4758183488d1d00d45d1b93d08d0e1
diff --git a/x11/xosd/patches/patch-aa b/x11/xosd/patches/patch-aa
index ea693b994fa..01dbf1c1bdf 100644
--- a/x11/xosd/patches/patch-aa
+++ b/x11/xosd/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1 2003/04/12 12:14:16 jmmv Exp $
+$NetBSD: patch-aa,v 1.2 2003/04/22 19:06:12 jmmv Exp $
 
---- configure.orig	2003-04-01 05:30:19.000000000 +0200
+--- configure.orig	Tue Apr 15 00:53:54 2003
 +++ configure
-@@ -9098,6 +9098,7 @@ CFLAGS="$CFLAGS $X_CFLAGS -Wall"
+@@ -9100,6 +9100,7 @@ CFLAGS="$CFLAGS $X_CFLAGS -Wall"
  M4DATADIR="$datadir/aclocal"
  
  
@@ -10,21 +10,11 @@ $NetBSD: patch-aa,v 1.1 2003/04/12 12:14:16 jmmv Exp $
  
  # Check whether --with-gtk-prefix or --without-gtk-prefix was given.
  if test "${with_gtk_prefix+set}" = set; then
-@@ -9403,6 +9404,7 @@ rm -f conftest.$ac_objext conftest$ac_ex
+@@ -9406,6 +9407,7 @@ echo "$as_me: WARNING: *** GTK+ >= 1.2.2
  
    rm -f conf.gtktest
  
 +fi
  
- echo "$as_me:$LINENO: checking for main in -lX11" >&5
- echo $ECHO_N "checking for main in -lX11... $ECHO_C" >&6
-@@ -10343,6 +10345,9 @@ else
-   HAVE_XINERAMA_FALSE=
- fi
- 
-+else
-+  HAVE_XINERAMA_TRUE='#'
-+  HAVE_XINERAMA_FALSE=
- fi
- 
- 
+ echo "$as_me:$LINENO: checking for XInitThreads in -lX11" >&5
+ echo $ECHO_N "checking for XInitThreads in -lX11... $ECHO_C" >&6
diff --git a/x11/xosd/patches/patch-ab b/x11/xosd/patches/patch-ab
index 3fea354fad3..e1c92e419fa 100644
--- a/x11/xosd/patches/patch-ab
+++ b/x11/xosd/patches/patch-ab
@@ -1,21 +1,22 @@
-$NetBSD: patch-ab,v 1.1 2003/04/12 12:14:16 jmmv Exp $
+$NetBSD: patch-ab,v 1.2 2003/04/22 19:06:12 jmmv Exp $
 
---- src/xmms_plugin/Makefile.in.orig	2003-04-12 13:49:42.000000000 +0200
+--- src/xmms_plugin/Makefile.in.orig	Tue Apr 15 00:53:52 2003
 +++ src/xmms_plugin/Makefile.in
-@@ -153,14 +153,14 @@ xmmsplugindir = ${XMMS_PLUGIN_DIR}
+@@ -166,7 +166,7 @@ xmmsplugindir = @XMMS_PLUGIN_DIR@
+ xmmsplugin_LTLIBRARIES = $(am__append_1) $(am__append_2)
  
- xmmsplugin_LTLIBRARIES = libxmms_osd.la
- libxmms_osd_la_SOURCES = xmms_osd.c
+ libxmms_osd_la_SOURCES = xmms_osd.c dlg_config.c dlg_font.c dlg_colour.c xmms_osd.h
 -libxmms_osd_la_LIBADD = $(top_builddir)/src/libxosd/libxosd.la
 +libxmms_osd_la_LIBADD = -lxosd
  libxmms_osd_la_LDFLAGS = -module -avoid-version @GDK_PIXBUF_LIBS@
- subdir = src/xmms_plugin
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ 
+ libxmms_osd_old_la_SOURCES = xmms_osd.c dlg_config_old.c dlg_font.c dlg_colour.c xmms_osd.h
+@@ -177,7 +177,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/m
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(xmmsplugin_LTLIBRARIES)
  
 -libxmms_osd_la_DEPENDENCIES = $(top_builddir)/src/libxosd/libxosd.la
 +libxmms_osd_la_DEPENDENCIES =
- am_libxmms_osd_la_OBJECTS = xmms_osd.lo
+ am_libxmms_osd_la_OBJECTS = xmms_osd.lo dlg_config.lo dlg_font.lo \
+ 	dlg_colour.lo
  libxmms_osd_la_OBJECTS = $(am_libxmms_osd_la_OBJECTS)
-