From be0de462c131d8d10277d90b9e137d3ef4a6a115 Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Wed, 26 Aug 2009 11:54:46 +0000
Subject: Update to 1.2.0: A few long-waiting packaging fixes, one man page
 fix. The screensaver.h header file was moved from the scrnsaverproto module
 to here, clients should not be affected though.

---
 x11/libXScrnSaver/Makefile | 7 +++++--
 x11/libXScrnSaver/PLIST    | 3 ++-
 x11/libXScrnSaver/distinfo | 8 ++++----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/x11/libXScrnSaver/Makefile b/x11/libXScrnSaver/Makefile
index 5652e2033a0..0eb336ecd0e 100644
--- a/x11/libXScrnSaver/Makefile
+++ b/x11/libXScrnSaver/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2008/05/24 21:45:15 tnn Exp $
+# $NetBSD: Makefile,v 1.5 2009/08/26 11:54:46 wiz Exp $
 #
 
-DISTNAME=		libXScrnSaver-1.1.3
+DISTNAME=		libXScrnSaver-1.2.0
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_XORG:=lib/}
 EXTRACT_SUFX=		.tar.bz2
@@ -13,6 +13,8 @@ COMMENT=		X11 Screen Saver Library
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+CONFLICTS+=		scrnsaverproto<1.2.0
+
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		pkg-config
@@ -27,6 +29,7 @@ CONFIGURE_ARGS+=	--disable-malloc0returnsnull
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
+BUILDLINK_API_DEPENDS.scrnsaverproto+=	scrnsaverproto>=1.2.0
 .include "../../x11/scrnsaverproto/buildlink3.mk"
 .include "../../x11/xextproto/buildlink3.mk"
 
diff --git a/x11/libXScrnSaver/PLIST b/x11/libXScrnSaver/PLIST
index 2532e19242d..e7bad24044f 100644
--- a/x11/libXScrnSaver/PLIST
+++ b/x11/libXScrnSaver/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/12/27 12:23:15 joerg Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/08/26 11:54:46 wiz Exp $
+include/X11/extensions/scrnsaver.h
 lib/libXss.la
 lib/pkgconfig/xscrnsaver.pc
 man/man3/XScreenSaverAllocInfo.3
diff --git a/x11/libXScrnSaver/distinfo b/x11/libXScrnSaver/distinfo
index 73be45d42ba..b5e7e7f7b7f 100644
--- a/x11/libXScrnSaver/distinfo
+++ b/x11/libXScrnSaver/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2008/04/17 21:21:58 wiz Exp $
+$NetBSD: distinfo,v 1.3 2009/08/26 11:54:46 wiz Exp $
 
-SHA1 (libXScrnSaver-1.1.3.tar.bz2) = c4589ca80623b7c87648cccf1591a8d42a4b4544
-RMD160 (libXScrnSaver-1.1.3.tar.bz2) = 7beecf684faad4948b139e71201a628cb60ce874
-Size (libXScrnSaver-1.1.3.tar.bz2) = 219568 bytes
+SHA1 (libXScrnSaver-1.2.0.tar.bz2) = ea2935eb67efa77fd90372337f2d782a8ef74cea
+RMD160 (libXScrnSaver-1.2.0.tar.bz2) = 7b749f61d77e4022fbe081fe4039b302c6b4b509
+Size (libXScrnSaver-1.2.0.tar.bz2) = 248744 bytes
-- 
cgit v1.2.3