Date: Wed, 17 Mar 2010 16:42:36 +0100 (CET) From: Guido Falsi <mad@madpilot.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/144821: [patch] audio/xmms2 : update to version 0.7 DrNo. Message-ID: <20100317154236.480D81043@megatron.madpilot.net> Resent-Message-ID: <201003171550.o2HFo18T015316@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 144821
>Category: ports
>Synopsis: [patch] audio/xmms2 : update to version 0.7 DrNo.
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Mar 17 15:50:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Guido Falsi
>Release: FreeBSD 8.0-STABLE amd64
>Organization:
None
>Environment:
System: FreeBSD megatron.madpilot.net 8.0-STABLE FreeBSD 8.0-STABLE #11: Fri Feb 12 15:55:37 CET 2010 root@megatron.madpilot.net:/usr/obj/usr/src/sys/MEGATRON amd64
>Description:
Update to latest version 0.7 DrNo.
>How-To-Repeat:
>Fix:
diff -ruN xmms2.old/Makefile xmms2/Makefile
--- xmms2.old/Makefile 2010-03-17 14:52:39.999598203 +0100
+++ xmms2/Makefile 2010-03-17 15:23:15.701482661 +0100
@@ -6,11 +6,10 @@
#
PORTNAME?= xmms2
-PORTVERSION= 0.6
-PORTREVISION= 2
-DISTVERSIONSUFFIX=DrMattDestruction
+PORTVERSION= 0.7
+DISTVERSIONSUFFIX=DrNo
CATEGORIES?= audio
-MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20DrMattDestruction
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20${DISTVERSIONSUFFIX}
MAINTAINER= ports@FreeBSD.org
COMMENT?= Rewrite of xmms as a client/server system (developer release)
@@ -344,7 +343,7 @@
do-configure:
cd ${WRKSRC} && ./waf configure --conf-prefix=${LOCALBASE} \
- --prefix=${PREFIX} --with-mandir=${PREFIX}/man ${EXCLUDE}
+ --prefix=${PREFIX} --mandir=${PREFIX}/man ${EXCLUDE}
do-build:
cd ${WRKSRC} && ./waf build
diff -ruN xmms2.old/distinfo xmms2/distinfo
--- xmms2.old/distinfo 2010-03-17 14:52:39.999598203 +0100
+++ xmms2/distinfo 2010-03-17 15:04:52.559593882 +0100
@@ -1,3 +1,3 @@
-MD5 (xmms2-0.6DrMattDestruction.tar.bz2) = 954fb9c76b5db5e324a105e81b273200
-SHA256 (xmms2-0.6DrMattDestruction.tar.bz2) = 4fb4f469816d8a1a676f6660e370b0c73a07e3d7e59d07f57a43b67216291db8
-SIZE (xmms2-0.6DrMattDestruction.tar.bz2) = 1631304
+MD5 (xmms2-0.7DrNo.tar.bz2) = 60e50b591078acb6a85cd83de0f2b077
+SHA256 (xmms2-0.7DrNo.tar.bz2) = 59c58d9380e6b002920a8dc75f0fd4629ab175b82f29b6637f7816fdc9832b2c
+SIZE (xmms2-0.7DrNo.tar.bz2) = 1519973
diff -ruN xmms2.old/files/patch-src-plugins-airplay-wscript xmms2/files/patch-src-plugins-airplay-wscript
--- xmms2.old/files/patch-src-plugins-airplay-wscript 2010-03-17 14:52:39.998597801 +0100
+++ xmms2/files/patch-src-plugins-airplay-wscript 2010-03-17 15:14:44.973318834 +0100
@@ -1,9 +1,13 @@
---- src/plugins/airplay/wscript~
-+++ src/plugins/airplay/wscript
-@@ -1,11 +1,6 @@
+--- src/plugins/airplay/wscript.orig 2010-02-19 18:43:54.000000000 +0100
++++ src/plugins/airplay/wscript 2010-03-17 15:14:34.459359323 +0100
+@@ -1,15 +1,6 @@
from waftools.plugin import plugin
-def plugin_configure(conf):
+- # MinGW doesn't ship sys/select.h
+- if not conf.check_cc(header_name='sys/select.h'):
+- return False
+-
- if not conf.check_cfg(package="openssl", args="--cflags --libs", uselib_store="openssl"):
- return False
- return True
diff -ruN xmms2.old/files/patch-wscript xmms2/files/patch-wscript
--- xmms2.old/files/patch-wscript 2010-03-17 14:52:39.979598258 +0100
+++ xmms2/files/patch-wscript 2010-03-17 15:21:35.156791218 +0100
@@ -1,24 +1,27 @@
---- wscript~
-+++ wscript
-@@ -297,7 +297,7 @@ def configure(conf):
+--- wscript.orig 2010-02-19 18:43:54.000000000 +0100
++++ wscript 2010-03-17 15:21:16.184861151 +0100
+@@ -303,7 +303,7 @@
conf.env['PKGCONFIGDIR'] = Options.options.pkgconfigdir
print(conf.env['PKGCONFIGDIR'])
else:
-- conf.env['PKGCONFIGDIR'] = os.path.join(conf.env["PREFIX"], "lib", "pkgconfig")
+- conf.env['PKGCONFIGDIR'] = os.path.join(conf.env["LIBDIR"], "pkgconfig")
+ conf.env['PKGCONFIGDIR'] = os.path.join(conf.env["PREFIX"], "libdata", "pkgconfig")
if Options.options.config_prefix:
for dir in Options.options.config_prefix:
-@@ -476,12 +476,5 @@ def set_options(opt):
+@@ -480,15 +480,6 @@
opt.sub_options(o)
def shutdown():
-- if Options.commands['install'] and os.geteuid() == 0:
+- if Options.commands['install'] and (
+- Options.options.ldconfig or
+- (Options.options.ldconfig is None and os.geteuid() == 0)
+- ):
- ldconfig = '/sbin/ldconfig'
- if os.path.isfile(ldconfig):
- libprefix = Utils.subst_vars('${PREFIX}/lib', Build.bld.env)
- try: Utils.cmd_output(ldconfig + ' ' + libprefix)
- except: pass
--
+
if Options.options.run_tests:
- os.system(os.path.join(os.getenv('WAF_HOME'), "default/tests/test_xmmstypes"))
+ os.system(os.path.join(blddir, "default/tests/test_xmmstypes"))
diff -ruN xmms2.old/pkg-plist xmms2/pkg-plist
--- xmms2.old/pkg-plist 2010-03-17 14:52:40.000595812 +0100
+++ xmms2/pkg-plist 2010-03-17 16:22:31.000000000 +0100
@@ -22,7 +22,6 @@
%%INCLUDEDIR%%/xmms/xmms_plugin.h
%%INCLUDEDIR%%/xmms/xmms_sample.h
%%INCLUDEDIR%%/xmms/xmms_streamtype.h
-%%INCLUDEDIR%%/xmms/xmms_strfunc.h
%%INCLUDEDIR%%/xmms/xmms_util.h
%%INCLUDEDIR%%/xmms/xmms_xformplugin.h
%%INCLUDEDIR%%/xmmsc/xmmsc_compiler.h
@@ -70,8 +69,8 @@
lib/libxmmsclient-glib.so.1
lib/libxmmsclient-glib.so.1.0.0
lib/libxmmsclient.so
-lib/libxmmsclient.so.5
-lib/libxmmsclient.so.5.0.0
+lib/libxmmsclient.so.6
+lib/libxmmsclient.so.6.0.0
%%AIRPLAY%%%%LIBDIR%%/libxmms_airplay.so
%%AO%%%%LIBDIR%%/libxmms_ao.so
%%LIBDIR%%/libxmms_apefile.so
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100317154236.480D81043>