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)

2 files changed, 16 insertions, 25 deletions

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)
-