Do not build nor install the example xmms plugin. This dramatically

shrinks the dependancy tree for this simple library.  Bump PKGREVISION to 1.
Take maintainership.

8 files changed, 89 insertions, 29 deletions

diff --git a/x11/xosd/DESCR b/x11/xosd/DESCR
index f6e1672c13a..8a3fb9222f7 100644
--- a/x11/xosd/DESCR
+++ b/x11/xosd/DESCR
@@ -1,4 +1,4 @@
 XOSD is a simple library to display shaped text on your X display,
-like a TV On Screen Display. It also contains an XMMS plugin, and
-a simple example program that can display system logs overlayed on
-your desktop. 
+like a TV On Screen Display.  Aside from the library, this package
+contains a simple example program that can display system logs
+overlayed on your desktop. 
diff --git a/x11/xosd/Makefile b/x11/xosd/Makefile
index 662da60278a..301ccab8cc6 100644
--- a/x11/xosd/Makefile
+++ b/x11/xosd/Makefile
@@ -1,23 +1,12 @@
-# $NetBSD: Makefile,v 1.3 2003/04/12 09:21:24 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2003/04/12 12:14:15 jmmv Exp $
 #
 
-DISTNAME=	xosd-2.2.0
-CATEGORIES=	x11
-MASTER_SITES=	http://www.ignavus.net/
+.include "Makefile.common"
 
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.ignavus.net/software.html
-COMMENT=	Library to display shaped text on your X display
+PKGREVISION=		1
+COMMENT=		Library to display shaped text on your X display
 
-GNU_CONFIGURE=		yes
-USE_BUILDLINK2=		yes
-USE_LIBTOOL=		yes
-USE_X11=		yes
+CONFIGURE_ENV+=		XOSD_XMMS_PLUGIN=NO
+CONFIGURE_ARGS+=	--disable-new-plugin
 
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool ${WRKSRC}/libtool-disable-static
-
-.include "../../audio/xmms/buildlink2.mk"
-.include "../../graphics/gdk-pixbuf/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
-.include "../../mk/pthread.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xosd/Makefile.common b/x11/xosd/Makefile.common
new file mode 100644
index 00000000000..910aea38916
--- /dev/null
+++ b/x11/xosd/Makefile.common
@@ -0,0 +1,23 @@
+# $NetBSD: Makefile.common,v 1.1 2003/04/12 12:14:15 jmmv Exp $
+#
+
+DISTNAME=	xosd-2.2.0
+CATEGORIES=	x11
+MASTER_SITES=	http://www.ignavus.net/
+
+MAINTAINER=	jmmv@netbsd.org
+HOMEPAGE=	http://www.ignavus.net/software.html
+
+DISTINFO_FILE=		${.CURDIR}/../../x11/xosd/distinfo
+PATCHDIR=		${.CURDIR}/../../x11/xosd/patches
+
+GNU_CONFIGURE=		yes
+USE_BUILDLINK2=		yes
+USE_LIBTOOL=		yes
+USE_X11=		yes
+
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool ${WRKSRC}/libtool-disable-static
+
+CONFIGURE_ARGS+=	--disable-xinerama
+
+.include "../../mk/pthread.buildlink2.mk"
diff --git a/x11/xosd/PLIST b/x11/xosd/PLIST
index dd6531afa65..80b1f01ec73 100644
--- a/x11/xosd/PLIST
+++ b/x11/xosd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2003/04/12 09:21:24 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/04/12 12:14:15 jmmv Exp $
 bin/osd_cat
 bin/xosd-config
 include/xosd.h
@@ -7,9 +7,6 @@ lib/libxosd.la
 lib/libxosd.so
 lib/libxosd.so.4
 lib/libxosd.so.4.0
-lib/xmms/General/libxmms_osd.a
-lib/xmms/General/libxmms_osd.la
-lib/xmms/General/libxmms_osd.so
 man/man1/osd_cat.1
 man/man1/xosd-config.1
 man/man3/xosd.3
@@ -38,4 +35,3 @@ share/xosd/top-left.png
 share/xosd/top-right.png
 share/xosd/top.png
 @dirrm share/xosd
-@comment in xmms: @dirrm lib/xmms/General
diff --git a/x11/xosd/buildlink2.mk b/x11/xosd/buildlink2.mk
index a141ac959ef..ced3e891467 100644
--- a/x11/xosd/buildlink2.mk
+++ b/x11/xosd/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/04/12 09:21:24 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/04/12 12:14:16 jmmv Exp $
 #
 # This Makefile fragment is included by packages that use xosd.
 #
@@ -9,14 +9,13 @@
 XOSD_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			xosd
-BUILDLINK_DEPENDS.xosd?=		xosd>=2.2.0
+BUILDLINK_DEPENDS.xosd?=		xosd>=2.2.0nb1
 BUILDLINK_PKGSRCDIR.xosd?=		../../x11/xosd
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xosd=xosd
 BUILDLINK_PREFIX.xosd_DEFAULT=	${LOCALBASE}
 BUILDLINK_FILES.xosd+=	include/xosd.h
 BUILDLINK_FILES.xosd+=	lib/libxosd.*
-BUILDLINK_FILES.xosd+=	lib/xmms/General/libxmms_osd.*
 
 .include "../../audio/xmms/buildlink2.mk"
 .include "../../graphics/gdk-pixbuf/buildlink2.mk"
diff --git a/x11/xosd/distinfo b/x11/xosd/distinfo
index 30e35f2eda7..88ffbeae5f3 100644
--- a/x11/xosd/distinfo
+++ b/x11/xosd/distinfo
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.2 2003/04/12 09:21:25 jmmv Exp $
+$NetBSD: distinfo,v 1.3 2003/04/12 12:14:16 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
diff --git a/x11/xosd/patches/patch-aa b/x11/xosd/patches/patch-aa
new file mode 100644
index 00000000000..ea693b994fa
--- /dev/null
+++ b/x11/xosd/patches/patch-aa
@@ -0,0 +1,30 @@
+$NetBSD: patch-aa,v 1.1 2003/04/12 12:14:16 jmmv Exp $
+
+--- configure.orig	2003-04-01 05:30:19.000000000 +0200
++++ configure
+@@ -9098,6 +9098,7 @@ CFLAGS="$CFLAGS $X_CFLAGS -Wall"
+ M4DATADIR="$datadir/aclocal"
+ 
+ 
++if [ "$XOSD_XMMS_PLUGIN" = "YES" ]; then
+ 
+ # 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
+ 
+   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
+ 
+ 
diff --git a/x11/xosd/patches/patch-ab b/x11/xosd/patches/patch-ab
new file mode 100644
index 00000000000..3fea354fad3
--- /dev/null
+++ b/x11/xosd/patches/patch-ab
@@ -0,0 +1,21 @@
+$NetBSD: patch-ab,v 1.1 2003/04/12 12:14:16 jmmv Exp $
+
+--- src/xmms_plugin/Makefile.in.orig	2003-04-12 13:49:42.000000000 +0200
++++ src/xmms_plugin/Makefile.in
+@@ -153,14 +153,14 @@ xmmsplugindir = ${XMMS_PLUGIN_DIR}
+ 
+ xmmsplugin_LTLIBRARIES = libxmms_osd.la
+ libxmms_osd_la_SOURCES = xmms_osd.c
+-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
+ 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
+ libxmms_osd_la_OBJECTS = $(am_libxmms_osd_la_OBJECTS)
+