Attachment #104609 for bug #144821




#

PORTNAME?=	xmms2
PORTVERSION=	0.7
DISTVERSIONSUFFIX=DrNo
DISTVERSIONSUFFIX=DrMattDestruction
CATEGORIES?=	audio
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20${DISTVERSIONSUFFIX}

MAINTAINER=	ports@FreeBSD.org
COMMENT?=	Rewrite of xmms as a client/server system (developer release)


do-configure:
	cd ${WRKSRC} && ./waf configure --conf-prefix=${LOCALBASE} \
		--prefix=${PREFIX} --mandir=${PREFIX}/man ${EXCLUDE}

do-build:
	cd ${WRKSRC} && ./waf build

Lines 1-3 Link Here

(-)xmms2/distinfo (-3 / +3 lines)
1	MD5 (xmms2-0.6DrMattDestruction.tar.bz2) = 954fb9c76b5db5e324a105e81b273200	1	MD5 (xmms2-0.7DrNo.tar.bz2) = 60e50b591078acb6a85cd83de0f2b077
2	SHA256 (xmms2-0.6DrMattDestruction.tar.bz2) = 4fb4f469816d8a1a676f6660e370b0c73a07e3d7e59d07f57a43b67216291db8	2	SHA256 (xmms2-0.7DrNo.tar.bz2) = 59c58d9380e6b002920a8dc75f0fd4629ab175b82f29b6637f7816fdc9832b2c
3	SIZE (xmms2-0.6DrMattDestruction.tar.bz2) = 1631304	3	SIZE (xmms2-0.7DrNo.tar.bz2) = 1519973

Lines 1-9 Link Here

(-)xmms2/files/patch-src-plugins-airplay-wscript (-3 / +7 lines)
1	--- src/plugins/airplay/wscript~	1	--- src/plugins/airplay/wscript.orig 2010-02-19 18:43:54.000000000 +0100
2	+++ src/plugins/airplay/wscript	2	+++ src/plugins/airplay/wscript 2010-03-17 15:14:34.459359323 +0100
3	@@ -1,11 +1,6 @@	3	@@ -1,15 +1,6 @@
4	from waftools.plugin import plugin	4	from waftools.plugin import plugin
5		5
6	-def plugin_configure(conf):	6	-def plugin_configure(conf):
		7	- # MinGW doesn't ship sys/select.h
		8	- if not conf.check_cc(header_name='sys/select.h'):
		9	- return False
		10	-
7	- if not conf.check_cfg(package="openssl", args="--cflags --libs", uselib_store="openssl"):	11	- if not conf.check_cfg(package="openssl", args="--cflags --libs", uselib_store="openssl"):
8	- return False	12	- return False
9	- return True	13	- return True




--- 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["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:
@@ -480,15 +480,6 @@
         opt.sub_options(o)
 
 def shutdown():
-    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(blddir, "default/tests/test_xmmstypes"))

Lines 22-28 Link Here

(-)xmms2/pkg-plist (-3 / +2 lines)
22	%%INCLUDEDIR%%/xmms/xmms_plugin.h	22	%%INCLUDEDIR%%/xmms/xmms_plugin.h
23	%%INCLUDEDIR%%/xmms/xmms_sample.h	23	%%INCLUDEDIR%%/xmms/xmms_sample.h
24	%%INCLUDEDIR%%/xmms/xmms_streamtype.h	24	%%INCLUDEDIR%%/xmms/xmms_streamtype.h
25	%%INCLUDEDIR%%/xmms/xmms_strfunc.h
26	%%INCLUDEDIR%%/xmms/xmms_util.h	25	%%INCLUDEDIR%%/xmms/xmms_util.h
27	%%INCLUDEDIR%%/xmms/xmms_xformplugin.h	26	%%INCLUDEDIR%%/xmms/xmms_xformplugin.h
28	%%INCLUDEDIR%%/xmmsc/xmmsc_compiler.h	27	%%INCLUDEDIR%%/xmmsc/xmmsc_compiler.h
Lines 70-77 Link Here
70	lib/libxmmsclient-glib.so.1	69	lib/libxmmsclient-glib.so.1
71	lib/libxmmsclient-glib.so.1.0.0	70	lib/libxmmsclient-glib.so.1.0.0
72	lib/libxmmsclient.so	71	lib/libxmmsclient.so
73	lib/libxmmsclient.so.5	72	lib/libxmmsclient.so.6
74	lib/libxmmsclient.so.5.0.0	73	lib/libxmmsclient.so.6.0.0
75	%%AIRPLAY%%%%LIBDIR%%/libxmms_airplay.so	74	%%AIRPLAY%%%%LIBDIR%%/libxmms_airplay.so
76	%%AO%%%%LIBDIR%%/libxmms_ao.so	75	%%AO%%%%LIBDIR%%/libxmms_ao.so
77	%%LIBDIR%%/libxmms_apefile.so	76	%%LIBDIR%%/libxmms_apefile.so

Return to bug 144821

Lines 6-16 Link Here

(-)xmms2/Makefile (-5 / +4 lines)
6	#	6	#
7		7
8	PORTNAME?= xmms2	8	PORTNAME?= xmms2
9	PORTVERSION= 0.6	9	PORTVERSION= 0.7
10	PORTREVISION= 2	10	DISTVERSIONSUFFIX=DrNo
11	DISTVERSIONSUFFIX=DrMattDestruction
12	CATEGORIES?= audio	11	CATEGORIES?= audio
13	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20DrMattDestruction	12	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20${DISTVERSIONSUFFIX}
14		13
15	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= ports@FreeBSD.org
16	COMMENT?= Rewrite of xmms as a client/server system (developer release)	15	COMMENT?= Rewrite of xmms as a client/server system (developer release)
Lines 344-350 Link Here
344		343
345	do-configure:	344	do-configure:
346	cd ${WRKSRC} && ./waf configure --conf-prefix=${LOCALBASE} \	345	cd ${WRKSRC} && ./waf configure --conf-prefix=${LOCALBASE} \
347	--prefix=${PREFIX} --with-mandir=${PREFIX}/man ${EXCLUDE}	346	--prefix=${PREFIX} --mandir=${PREFIX}/man ${EXCLUDE}
348		347
349	do-build:	348	do-build:
350	cd ${WRKSRC} && ./waf build	349	cd ${WRKSRC} && ./waf build

Lines 1-24 Link Here

(-)xmms2/files/patch-wscript (-8 / +11 lines)
1	--- wscript~	1	--- wscript.orig 2010-02-19 18:43:54.000000000 +0100
2	+++ wscript	2	+++ wscript 2010-03-17 15:21:16.184861151 +0100
3	@@ -297,7 +297,7 @@ def configure(conf):	3	@@ -303,7 +303,7 @@
4	conf.env['PKGCONFIGDIR'] = Options.options.pkgconfigdir	4	conf.env['PKGCONFIGDIR'] = Options.options.pkgconfigdir
5	print(conf.env['PKGCONFIGDIR'])	5	print(conf.env['PKGCONFIGDIR'])
6	else:	6	else:
7	- conf.env['PKGCONFIGDIR'] = os.path.join(conf.env["PREFIX"], "lib", "pkgconfig")	7	- conf.env['PKGCONFIGDIR'] = os.path.join(conf.env["LIBDIR"], "pkgconfig")
8	+ conf.env['PKGCONFIGDIR'] = os.path.join(conf.env["PREFIX"], "libdata", "pkgconfig")	8	+ conf.env['PKGCONFIGDIR'] = os.path.join(conf.env["PREFIX"], "libdata", "pkgconfig")
9		9
10	if Options.options.config_prefix:	10	if Options.options.config_prefix:
11	for dir in Options.options.config_prefix:	11	for dir in Options.options.config_prefix:
12	@@ -476,12 +476,5 @@ def set_options(opt):	12	@@ -480,15 +480,6 @@
13	opt.sub_options(o)	13	opt.sub_options(o)
14		14
15	def shutdown():	15	def shutdown():
16	- if Options.commands['install'] and os.geteuid() == 0:	16	- if Options.commands['install'] and (
		17	- Options.options.ldconfig or
		18	- (Options.options.ldconfig is None and os.geteuid() == 0)
		19	- ):
17	- ldconfig = '/sbin/ldconfig'	20	- ldconfig = '/sbin/ldconfig'
18	- if os.path.isfile(ldconfig):	21	- if os.path.isfile(ldconfig):
19	- libprefix = Utils.subst_vars('${PREFIX}/lib', Build.bld.env)	22	- libprefix = Utils.subst_vars('${PREFIX}/lib', Build.bld.env)
20	- try: Utils.cmd_output(ldconfig + ' ' + libprefix)	23	- try: Utils.cmd_output(ldconfig + ' ' + libprefix)
21	- except: pass	24	- except: pass
22	-	25
23	if Options.options.run_tests:	26	if Options.options.run_tests:
24	os.system(os.path.join(os.getenv('WAF_HOME'), "default/tests/test_xmmstypes"))	27	os.system(os.path.join(blddir, "default/tests/test_xmmstypes"))