From dfda14d1539763bc9ae9ae25e803d98c8255cf74 Mon Sep 17 00:00:00 2001 From: shattered Date: Tue, 3 Feb 2009 19:59:41 +0000 Subject: Update to 2.2.14, enable Xinerama support, delint. Changes: 2.2.14: Timeout Bigfix Patch (P Hahn) Documentation Patch (P Hahn) Beep Plugin Security Patch (P Hahn) 2.2.13: buffer overflow patch (P Hahn) timeout patch (P Hahn) x window select patch (P Hahn) x event patch (P Hahn) synchronous update patch (P Hahn) beep media player plugin (G Washk) OK by wiz@. --- x11/xosd/Makefile | 4 ++-- x11/xosd/Makefile.common | 14 +++++++------- x11/xosd/distinfo | 10 +++++----- x11/xosd/patches/patch-ac | 8 ++++---- 4 files changed, 18 insertions(+), 18 deletions(-) (limited to 'x11/xosd') diff --git a/x11/xosd/Makefile b/x11/xosd/Makefile index d02e021e34d..3a43d929f11 100644 --- a/x11/xosd/Makefile +++ b/x11/xosd/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2008/07/14 12:56:20 joerg Exp $ +# $NetBSD: Makefile,v 1.11 2009/02/03 19:59:41 shattered Exp $ # -PKGREVISION= 2 +#PKGREVISION= 1 PKG_DESTDIR_SUPPORT= user-destdir diff --git a/x11/xosd/Makefile.common b/x11/xosd/Makefile.common index 71302dc4751..54dba218573 100644 --- a/x11/xosd/Makefile.common +++ b/x11/xosd/Makefile.common @@ -1,9 +1,10 @@ -# $NetBSD: Makefile.common,v 1.23 2007/01/12 14:59:16 abs Exp $ +# $NetBSD: Makefile.common,v 1.24 2009/02/03 19:59:41 shattered Exp $ +# +# used by x11/xmms-osd/Makefile -DISTNAME= xosd-2.2.12 +DISTNAME= xosd-2.2.14 CATEGORIES= x11 -MASTER_SITES= http://www.ignavus.net/ -EXTRACT_SUFX= .tar.bz2 +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libxosd/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.ignavus.net/software.html @@ -16,19 +17,18 @@ USE_LIBTOOL= yes SHLIBTOOL_OVERRIDE= libtool-disable-static -CONFIGURE_ARGS+= --disable-xinerama - # Avoid an ICE on sparc64 with gcc2 CONFIGURE_ENV+= F77=${FALSE:Q} SUBST_CLASSES+= fixme SUBST_STAGE.fixme= post-patch SUBST_FILES.fixme= configure -SUBST_SED.fixme= -e "s|-lpthread|${PTHREAD_LIBS}|g" +SUBST_SED.fixme= -e "s|-lpthread|"${PTHREAD_LIBS:M*:Q}"|g" PTHREAD_AUTO_VARS= yes .include "../../mk/pthread.buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" +.include "../../x11/libXinerama/buildlink3.mk" .include "../../x11/xextproto/buildlink3.mk" diff --git a/x11/xosd/distinfo b/x11/xosd/distinfo index 73be543e5db..b396ea75f5b 100644 --- a/x11/xosd/distinfo +++ b/x11/xosd/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.11 2005/02/23 17:36:24 wiz Exp $ +$NetBSD: distinfo,v 1.12 2009/02/03 19:59:41 shattered Exp $ -SHA1 (xosd-2.2.12.tar.bz2) = d300426c735c38bb26bb84668f699243251d4b50 -RMD160 (xosd-2.2.12.tar.bz2) = 4041b3bbfacde999c6bb2e715baeaeeed1becec3 -Size (xosd-2.2.12.tar.bz2) = 287514 bytes +SHA1 (xosd-2.2.14.tar.gz) = 1d459a62239c9fe842d835bb7f60eb2edd7c979f +RMD160 (xosd-2.2.14.tar.gz) = 8a39756c5a46f2897be9bbd47dd86770f42ed648 +Size (xosd-2.2.14.tar.gz) = 418331 bytes SHA1 (patch-aa) = 11399ad28cd5602905d6aff60eacb1e3f50f0a36 SHA1 (patch-ab) = 435084167cafb81f6b87d9e11b57fc021583610f -SHA1 (patch-ac) = 7f18d750094cec5c02a953fed1a2173f5d5a306b +SHA1 (patch-ac) = cede5f442c9896548f1179f20b8e89540b68d4ec diff --git a/x11/xosd/patches/patch-ac b/x11/xosd/patches/patch-ac index 1c2b008dc27..13075e53063 100644 --- a/x11/xosd/patches/patch-ac +++ b/x11/xosd/patches/patch-ac @@ -1,12 +1,12 @@ -$NetBSD: patch-ac,v 1.2 2004/08/27 09:18:12 adam Exp $ +$NetBSD: patch-ac,v 1.3 2009/02/03 19:59:42 shattered Exp $ ---- src/Makefile.in.orig 2004-08-26 22:16:24.000000000 +0000 +--- src/Makefile.in.orig 2004-11-17 19:30:22.000000000 +0000 +++ src/Makefile.in -@@ -217,7 +217,8 @@ osd_cat_LDADD = libxosd/libxosd.la +@@ -231,7 +231,8 @@ osd_cat_LDADD = libxosd/libxosd.la testprog_LDADD = libxosd/libxosd.la include_HEADERS = xosd.h AM_CFLAGS = ${GTK_CFLAGS} --SUBDIRS = libxosd xmms_plugin +-SUBDIRS = libxosd xmms_plugin bmp_plugin +@BUILD_NEW_PLUGIN_TRUE@SUBDIRS = libxosd xmms_plugin +@BUILD_NEW_PLUGIN_FALSE@SUBDIRS = libxosd all: all-recursive -- cgit v1.2.3