From david@dyn-ns.net  Tue Jan  3 23:30:44 2006
Return-Path: <david@dyn-ns.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id B176016A422;
	Tue,  3 Jan 2006 23:30:44 +0000 (GMT)
	(envelope-from david@dyn-ns.net)
Received: from smtp2-g19.free.fr (smtp2-g19.free.fr [212.27.42.28])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2E97A43D45;
	Tue,  3 Jan 2006 23:30:44 +0000 (GMT)
	(envelope-from david@dyn-ns.net)
Received: from canelle.lan (unknown [81.56.175.127])
	by smtp2-g19.free.fr (Postfix) with ESMTP id 22EAF521CC;
	Wed,  4 Jan 2006 00:30:42 +0100 (CET)
Message-Id: <1136331043.73796@canelle.lan>
Date: Wed, 4 Jan 2006 00:30:43 +0100
From: "David Le Brun" <david@dyn-ns.net>
To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@freebsd.org>
Cc: perky@FreeBSD.org
Subject: misc/xosd : Fixed pkg-plist, added SHA256 checksum
X-Send-Pr-Version: gtk-send-pr 0.4.6 
X-GNATS-Notify:

>Number:         91285
>Category:       ports
>Synopsis:       misc/xosd : Fixed pkg-plist, added SHA256 checksum
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    novel
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jan 03 23:40:05 GMT 2006
>Closed-Date:    Fri Feb 10 17:22:23 GMT 2006
>Last-Modified:  Fri Feb 10 17:22:23 GMT 2006
>Originator:     David Le Brun
>Release:        FreeBSD 6.0-STABLE i386
>Organization:
>Environment:


System: FreeBSD 6.0-STABLE #1: Wed Nov  2 23:09:46 CET 2005
    root@canelle.lan:/usr/obj/usr/src/sys/CANELLE



>Description:


Various fixes:
- Added SHA256 checksum
- Making portlint happy (use of %%DATADIR%%)
- gtk stuff is not required when xmms plugin is not build

Maintainer (perky@FreeBSD.org) is CC'ed


>How-To-Repeat:





>Fix:


--- xosd.patch begins here ---
diff -ruN xosd.old/Makefile xosd/Makefile
--- xosd.old/Makefile	Tue Nov 30 16:19:58 2004
+++ xosd/Makefile	Wed Jan  4 00:25:16 2006
@@ -7,6 +7,7 @@
 
 PORTNAME=	xosd
 PORTVERSION=	2.2.12
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	http://www.ignavus.net/ \
 		${MASTER_SITE_LOCAL}
@@ -15,20 +16,16 @@
 MAINTAINER=	perky@FreeBSD.org
 COMMENT=	X On-Screen-Display Library and XMMS plug-in
 
-LIB_DEPENDS=	gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
-
 XMMS_CONFIG?=	${X11BASE}/bin/xmms-config
 USE_BZIP2=	yes
 USE_GETOPT_LONG=yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	LIBS=${PTHREAD_LIBS}' -L${LOCALBASE}/lib' \
 		CFLAGS='${CFLAGS}' X11BASE='${X11BASE}' \
-		GTK_CONFIG='${GTK_CONFIG}' GLIB_CONFIG='${GLIB_CONFIG}' \
 		XMMS_PLUGINDIR=${X11BASE}/lib/xmms
 
 MAN1=		osd_cat.1 xosd-config.1
@@ -44,10 +41,13 @@
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_XMMS)
-LIB_DEPENDS+=	xmms.4:${PORTSDIR}/multimedia/xmms
+USE_GNOME=	gtk12
+LIB_DEPENDS+=	xmms.4:${PORTSDIR}/multimedia/xmms \
+		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
+CONFIGURE_ENV+=	GTK_CONFIG='${GTK_CONFIG}' GLIB_CONFIG='${GLIB_CONFIG}'
 PLIST_SUB=	WITH_XMMS=""
 .else
-CONFIGURE_ARGS=	--disable-new-plugin
+CONFIGURE_ARGS=	--disable-gtktest --disable-gdk_pixbuftest --disable-new-plugin
 PLIST_SUB=	WITH_XMMS="@comment "
 .endif
 
diff -ruN xosd.old/distinfo xosd/distinfo
--- xosd.old/distinfo	Tue Nov 30 16:19:58 2004
+++ xosd/distinfo	Wed Jan  4 00:24:28 2006
@@ -1,2 +1,3 @@
 MD5 (xosd-2.2.12.tar.bz2) = 756d714cec908e4d4c956ff0e7dcd4c4
+SHA256 (xosd-2.2.12.tar.bz2) = 1c077e59b7a7064aa1f6f0c49c1a5a461c7927a7bdae3983a216cc27302d12a5
 SIZE (xosd-2.2.12.tar.bz2) = 287514
diff -ruN xosd.old/pkg-plist xosd/pkg-plist
--- xosd.old/pkg-plist	Sat Sep 27 18:39:14 2003
+++ xosd/pkg-plist	Wed Jan  4 00:18:16 2006
@@ -6,16 +6,15 @@
 lib/libxosd.so
 lib/libxosd.so.4
 share/aclocal/libxosd.m4
-share/xosd/bottom-left.png
-share/xosd/bottom-right.png
-share/xosd/bottom.png
-share/xosd/centre.png
-share/xosd/left.png
-share/xosd/right.png
-share/xosd/top-left.png
-share/xosd/top-right.png
-share/xosd/top.png
-@dirrm share/xosd
-@cwd %%X11BASE%%
+%%DATADIR%%/bottom-left.png
+%%DATADIR%%/bottom-right.png
+%%DATADIR%%/bottom.png
+%%DATADIR%%/centre.png
+%%DATADIR%%/left.png
+%%DATADIR%%/right.png
+%%DATADIR%%/top-left.png
+%%DATADIR%%/top-right.png
+%%DATADIR%%/top.png
+@dirrm %%DATADIR%%
 %%WITH_XMMS%%lib/xmms/General/libxmms_osd.la
 %%WITH_XMMS%%lib/xmms/General/libxmms_osd.so
--- xosd.patch ends here ---



>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->perky 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue Jan 3 23:48:10 UTC 2006 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=91285 
Responsible-Changed-From-To: perky->novel 
Responsible-Changed-By: novel 
Responsible-Changed-When: Fri Feb 10 16:19:09 UTC 2006 
Responsible-Changed-Why:  
I will take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=91285 
State-Changed-From-To: open->closed 
State-Changed-By: novel 
State-Changed-When: Fri Feb 10 17:22:11 UTC 2006 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=91285 
>Unformatted:
