Update to 2.2.2:

- Misc xosd patches (Philipp Matthias Hahn)
- configure.ac libxinerama.pic or libxinerama patch (Philipp Matthias Hahn)

5 files changed, 24 insertions, 9 deletions

diff --git a/x11/xosd/Makefile b/x11/xosd/Makefile
index 30afae19d3d..a9869ea1535 100644
--- a/x11/xosd/Makefile
+++ b/x11/xosd/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.6 2003/05/02 11:57:34 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/06/29 11:45:00 jmmv Exp $
 #
 
 .include "Makefile.common"
-PKGREVISION=		1
 
 COMMENT=		Library to display shaped text on your X display
 
 CONFIGURE_ENV+=		XOSD_XMMS_PLUGIN=NO
+CONFIGURE_ARGS+=	--disable-gdk_pixbuftest
 CONFIGURE_ARGS+=	--disable-new-plugin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xosd/Makefile.common b/x11/xosd/Makefile.common
index 94f1f8749c5..7d717e44634 100644
--- a/x11/xosd/Makefile.common
+++ b/x11/xosd/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.2 2003/04/22 19:06:11 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.3 2003/06/29 11:45:01 jmmv Exp $
 #
 
-DISTNAME=	xosd-2.2.1
+DISTNAME=	xosd-2.2.2
 CATEGORIES=	x11
 MASTER_SITES=	http://www.ignavus.net/
 
diff --git a/x11/xosd/buildlink2.mk b/x11/xosd/buildlink2.mk
index a4457519780..bcc894c145c 100644
--- a/x11/xosd/buildlink2.mk
+++ b/x11/xosd/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.6 2003/05/02 11:57:34 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2003/06/29 11:45:01 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.1nb1
+BUILDLINK_DEPENDS.xosd?=		xosd>=2.2.2
 BUILDLINK_PKGSRCDIR.xosd?=		../../x11/xosd
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xosd=xosd
diff --git a/x11/xosd/distinfo b/x11/xosd/distinfo
index c42bb0d46bb..87165a90fec 100644
--- a/x11/xosd/distinfo
+++ b/x11/xosd/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.4 2003/04/22 19:06:12 jmmv Exp $
+$NetBSD: distinfo,v 1.5 2003/06/29 11:45:01 jmmv Exp $
 
-SHA1 (xosd-2.2.1.tar.gz) = adadaf105a72a2a6d30d17253b1a4d13e26dd5bd
-Size (xosd-2.2.1.tar.gz) = 294755 bytes
+SHA1 (xosd-2.2.2.tar.gz) = 60d06c79752478baf94521016ac5d5ffca392298
+Size (xosd-2.2.2.tar.gz) = 295184 bytes
 SHA1 (patch-aa) = 0d3f003e6465d9c6b9af4cdfc1992ab403bdc3cb
 SHA1 (patch-ab) = e32cc6675f4758183488d1d00d45d1b93d08d0e1
+SHA1 (patch-ac) = cc28d482cf7b8db2a3c3f74efc70aa22e9bfc043
diff --git a/x11/xosd/patches/patch-ac b/x11/xosd/patches/patch-ac
new file mode 100644
index 00000000000..3a1202303ea
--- /dev/null
+++ b/x11/xosd/patches/patch-ac
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.1 2003/06/29 11:45:02 jmmv Exp $
+
+--- src/Makefile.in.orig	2003-06-27 06:14:43.000000000 +0200
++++ src/Makefile.in
+@@ -165,7 +165,8 @@ include_HEADERS = xosd.h
+ 
+ AM_CFLAGS = ${GTK_CFLAGS}
+ 
+-SUBDIRS = libxosd xmms_plugin
++@BUILD_NEW_PLUGIN_TRUE@SUBDIRS = libxosd xmms_plugin
++@BUILD_NEW_PLUGIN_FALSE@SUBDIRS = libxosd
+ subdir = src
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs