From owner-freebsd-ports-bugs@FreeBSD.ORG Sun May 16 20:10:03 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ADCE71065677 for ; Sun, 16 May 2010 20:10:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (unknown [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 8331F8FC14 for ; Sun, 16 May 2010 20:10:03 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o4GKA3Qm005786 for ; Sun, 16 May 2010 20:10:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o4GKA3oS005785; Sun, 16 May 2010 20:10:03 GMT (envelope-from gnats) Date: Sun, 16 May 2010 20:10:03 GMT Message-Id: <201005162010.o4GKA3oS005785@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org From: MJBrune Cc: Subject: Re: ports/146642: audio/xmms2 maintainer change with update to 0.7 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: MJBrune List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 May 2010 20:10:03 -0000 The following reply was made to PR ports/146642; it has been noted by GNATS. From: MJBrune To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/146642: audio/xmms2 maintainer change with update to 0.7 Date: Sun, 16 May 2010 13:10:18 -0700 here is a another diff using diff -ru which should include that the patches are rem diff -ru /usr/ports/audio/xmms2/Makefile /home/james/src/xmms2/Makefile --- /usr/ports/audio/xmms2/Makefile 2010-05-04 11:28:22.000000000 +0000 +++ /home/james/src/xmms2/Makefile 2010-05-16 07:00:53.000000000 +0000 @@ -6,13 +6,12 @@ # PORTNAME?= xmms2 -PORTVERSION= 0.6 -PORTREVISION= 4 -DISTVERSIONSUFFIX=DrMattDestruction +PORTVERSION= 0.7 +DISTVERSIONSUFFIX=DrNo CATEGORIES?= audio -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20DrMattDestruction +MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20DrNo -MAINTAINER= ports@FreeBSD.org +MAINTAINER= admin@mjbrune.org COMMENT?= Rewrite of xmms as a client/server system (developer release) USE_BZIP2= yes @@ -344,7 +343,7 @@ do-configure: cd ${WRKSRC} && ./waf configure --conf-prefix=${LOCALBASE} \ - --prefix=${PREFIX} --with-mandir=${PREFIX}/man ${EXCLUDE} + --prefix=${PREFIX} --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig --mandir=${PREFIX}/man ${EXCLUDE} do-build: cd ${WRKSRC} && ./waf build diff -ru /usr/ports/audio/xmms2/distinfo /home/james/src/xmms2/distinfo --- /usr/ports/audio/xmms2/distinfo 2009-08-19 11:55:53.000000000 +0000 +++ /home/james/src/xmms2/distinfo 2010-05-16 20:05:05.000000000 +0000 @@ -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 Only in /usr/ports/audio/xmms2/files: patch-src-plugins-airplay-wscript diff -ru /usr/ports/audio/xmms2/files/patch-wscript /home/james/src/xmms2/files/patch-wscript --- /usr/ports/audio/xmms2/files/patch-wscript 2009-08-19 11:55:54.000000000 +0000 +++ /home/james/src/xmms2/files/patch-wscript 2010-05-16 06:30:02.000000000 +0000 @@ -1,19 +1,13 @@ --- wscript~ +++ wscript -@@ -297,7 +297,7 @@ def configure(conf): - 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["PREFIX"], "libdata", "pkgconfig") - - if Options.options.config_prefix: - for dir in Options.options.config_prefix: -@@ -476,12 +476,5 @@ def set_options(opt): +@@ -480,16 +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) @@ -21,4 +15,5 @@ - 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")) + os.system(os.path.join(blddir, "default/tests/test_server")) diff -ru /usr/ports/audio/xmms2/pkg-plist /home/james/src/xmms2/pkg-plist --- /usr/ports/audio/xmms2/pkg-plist 2009-08-19 11:55:53.000000000 +0000 +++ /home/james/src/xmms2/pkg-plist 2010-05-16 06:13:31.000000000 +0000 @@ -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 @@ -89,7 +88,6 @@ %%LIBDIR%%/libxmms_file.so %%FLAC%%%%LIBDIR%%/libxmms_flac.so %%LIBDIR%%/libxmms_flv.so -%%LIBDIR%%/libxmms_gme.so %%GVFS%%%%LIBDIR%%/libxmms_gvfs.so %%LIBDIR%%/libxmms_html.so %%ICES%%%%LIBDIR%%/libxmms_ices.so -- Michael James Brune 206-552-8572