- Update to 0.2.d.3 (0.2DrCox) [1]

  - Fixes issues with sqlite3 in ports [2]
- change USE_PYTHON to USE_PYTHON_BUILD
- Set USE_PYTHON_RUN only if python bindings are built
- Set sqlite dependency via USE_SQLITE
- Make the port PREFIX safe
- Add WITH_GNOMEVFS and WITH_FAM knobs with relevant plist subs.
  (These files were being installed for many users but were not in the
  pkg-plist.)
- Added a warning for the SAMBA, GNOMEVFS, and FAM plugins since upstream
  considers them experimental.
- Cleaned up the pkg-plist.
- Pet portlint

PR:		93691 [1], 93664 [2]
Submitted by:	maintainer [1]
Approved by:	portmgr (linimon)

3 files changed, 72 insertions, 38 deletions

diff --git a/audio/xmms2/Makefile b/audio/xmms2/Makefile
index ee988b952ba2..be9f879e20e5 100644
--- a/audio/xmms2/Makefile
+++ b/audio/xmms2/Makefile
@@ -6,25 +6,25 @@
 #
 
 PORTNAME=	xmms2
-PORTVERSION=	0.2.d.2
+PORTVERSION=	0.2.d.3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-0.2DrBombay
+DISTNAME=	${PORTNAME}-0.2DrCox
 
 MAINTAINER=	alex@foxybanana.com
 COMMENT=	Rewrite of xmms as a client/server system (developer release)
 
 BUILD_DEPENDS=	scons:${PORTSDIR}/devel/scons
-LIB_DEPENDS=	sqlite3.8:${PORTSDIR}/databases/sqlite3 \
-		mad.2:${PORTSDIR}/audio/libmad \
+LIB_DEPENDS=	mad.2:${PORTSDIR}/audio/libmad \
 		vorbis.3:${PORTSDIR}/audio/libvorbis
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
-USE_PYTHON=	yes
+USE_PYTHON_BUILD=	yes
 USE_BZIP2=	yes
 USE_GNOME=	glib20
+USE_SQLITE=	3
 INSTALLS_SHLIB=	yes
 
 MAN1=		xmms2.1
@@ -52,6 +52,7 @@ PLIST_SUB+=	SID="@comment "
 
 .if defined(WITH_PYTHON_BINDINGS)
 BUILD_DEPENDS+=	pyrex:${PORTSDIR}/devel/pyrex
+USE_PYTHON_RUN=	yes
 PLIST_SUB+=	PYTHON=""
 .else
 EXCLUDE+=	python
@@ -132,17 +133,49 @@ EXCLUDE+=	samba
 PLIST_SUB+=	SAMBA="@comment "
 .endif
 
+.if defined(WITH_GNOMEVFS)
+USE_GNOME+=	gnomevfs2
+PLIST_SUB+=	GNOMEVFS=""
+.else
+EXCLUDE+=	gnomevfs
+PLIST_SUB+=	GNOMEVFS="@comment "
+.endif
+
+.if defined(WITH_FAM)
+USE_FAM=	yes
+WANT_FAM_SYSTEM=gamin
+PLIST_SUB+=	FAM=""
+.else
+EXCLUDE+=	medialib-updater
+PLIST_SUB+=	FAM="@comment "
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500000
-BROKEN=	"Doesn't build on FreeBSD < 5.x"
+BROKEN=	Does not build on FreeBSD < 5.x
+.endif
+
+pre-everything::
+.if defined(WITH_SAMBA)
+	@${ECHO_MSG} "WARNING: Samba plugin is experimental and not fully working"
+	@${ECHO_MSG} ""
+.endif
+.if defined(WITH_GNOMEVFS)
+	@${ECHO_MSG} "WARNING: Gnome VFS plugin is experimental and not fully working"
+	@${ECHO_MSG} ""
+.endif
+.if defined(WITH_FAM)
+	@${ECHO_MSG} "WARNING: Fam plugin is experimental and not fully working"
+	@${ECHO_MSG} ""
 .endif
 
 do-build:
 	cd ${WRKSRC} && \
 		scons CC=${CC} LINKFLAGS="${LDFLAGS}" CCFLAGS="${CFLAGS}" \
 		LIBPATH=${LOCALBASE}/lib CPPPATH=${LOCALBASE}/include \
-		PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig EXCLUDE="${EXCLUDE}"
+		PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig EXCLUDE="${EXCLUDE}" \
+		PREFIX="${PREFIX}"
 
 do-install:
 	@cd ${WRKSRC} && scons install
diff --git a/audio/xmms2/distinfo b/audio/xmms2/distinfo
index 151b8dd7cba8..6f11cb84d59d 100644
--- a/audio/xmms2/distinfo
+++ b/audio/xmms2/distinfo
@@ -1,3 +1,3 @@
-SHA256 (xmms2-0.2DrBombay.tar.bz2) = c4845c2cd4cd629b586a674bddd303f6f8fb1fac73490af0bb9f76b1a0e354a2
-MD5 (xmms2-0.2DrBombay.tar.bz2) = 2477865f4e609f58e00d4ab27d8c4fbf
-SIZE (xmms2-0.2DrBombay.tar.bz2) = 950188
+MD5 (xmms2-0.2DrCox.tar.bz2) = b93b26d7c71c686595ad4bf1e212e95d
+SHA256 (xmms2-0.2DrCox.tar.bz2) = 8827ef77829e37212b0e09fa577d9147cb34a7fbc1cf8c1df6f01894cef78d75
+SIZE (xmms2-0.2DrCox.tar.bz2) = 951819
diff --git a/audio/xmms2/pkg-plist b/audio/xmms2/pkg-plist
index e2746d045eec..1a838ba9e82c 100644
--- a/audio/xmms2/pkg-plist
+++ b/audio/xmms2/pkg-plist
@@ -1,83 +1,84 @@
 bin/xmms2
-bin/xmms2d
-bin/xmms2-launcher
 bin/xmms2-et
+bin/xmms2-launcher
+%%FAM%%bin/xmms2-mlib-updater
+bin/xmms2d
 include/xmms2/xmms/xmms_config.h
 include/xmms2/xmms/xmms_decoder.h
 include/xmms2/xmms/xmms_decoderplugin.h
-include/xmms2/xmms/xmms_effectplugin.h
-include/xmms2/xmms/xmms_outputplugin.h
 include/xmms2/xmms/xmms_defs.h
 include/xmms2/xmms/xmms_effect.h
+include/xmms2/xmms/xmms_effectplugin.h
 include/xmms2/xmms/xmms_error.h
 include/xmms2/xmms/xmms_ipc.h
 include/xmms2/xmms/xmms_log.h
 include/xmms2/xmms/xmms_medialib.h
 include/xmms2/xmms/xmms_object.h
 include/xmms2/xmms/xmms_output.h
+include/xmms2/xmms/xmms_outputplugin.h
 include/xmms2/xmms/xmms_plsplugins.h
 include/xmms2/xmms/xmms_plugin.h
 include/xmms2/xmms/xmms_sample.h
 include/xmms2/xmms/xmms_transport.h
 include/xmms2/xmms/xmms_transportplugin.h
-include/xmms2/xmmsc/xmmsc_sockets.h
 include/xmms2/xmmsc/xmmsc_asyncns.h
+include/xmms2/xmmsc/xmmsc_errorcodes.h
+include/xmms2/xmmsc/xmmsc_idnumbers.h
 include/xmms2/xmmsc/xmmsc_inline.h
+include/xmms2/xmmsc/xmmsc_ipc_msg.h
+include/xmms2/xmmsc/xmmsc_ipc_transport.h
+include/xmms2/xmmsc/xmmsc_sockets.h
 include/xmms2/xmmsc/xmmsc_stdbool.h
 include/xmms2/xmmsc/xmmsc_stdint.h
 include/xmms2/xmmsc/xmmsc_stringport.h
 include/xmms2/xmmsc/xmmsc_unistd.h
-include/xmms2/xmmsc/xmmsc_errorcodes.h
-include/xmms2/xmmsc/xmmsc_idnumbers.h
-include/xmms2/xmmsc/xmmsc_ipc_msg.h
-include/xmms2/xmmsc/xmmsc_ipc_transport.h
 include/xmms2/xmmsc/xmmsc_util.h
 include/xmms2/xmmsclient/xmmsclient-cf.h
 include/xmms2/xmmsclient/xmmsclient-ecore.h
 include/xmms2/xmmsclient/xmmsclient-glib.h
 include/xmms2/xmmsclient/xmmsclient-qt.h
 include/xmms2/xmmsclient/xmmsclient.h
-lib/libxmmsclient-glib.a
-lib/libxmmsclient-glib.so
 %%ECORE%%lib/libxmmsclient-ecore.a
 %%ECORE%%lib/libxmmsclient-ecore.so
+lib/libxmmsclient-glib.a
+lib/libxmmsclient-glib.so
 lib/libxmmsclient.a
 lib/libxmmsclient.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xmmsclient.so
+%%RUBY%%%%RUBY_SITELIBDIR%%/xmmsclient_glib.so
+%%RUBY%%%%RUBY_SITELIBDIR%%/xmmsclient.so
 %%CURL%%lib/xmms2/libxmms_curl_http.so
 lib/xmms2/libxmms_diskwrite.so
 lib/xmms2/libxmms_eq.so
-%%SID%%lib/xmms2/libxmms_sid.so
-%%MUSEPACK%%lib/xmms2/libxmms_musepack.so
-%%JACK%%lib/xmms2/libxmms_jack.so
 %%FAAD%%lib/xmms2/libxmms_faad.so
 %%FLAC%%lib/xmms2/libxmms_flac.so
-%%MODPLUG%%lib/xmms2/libxmms_modplug.so
-%%SAMBA%%lib/xmms2/libxmms_samba.so
-lib/xmms2/libxmms_null.so
-%%RUBY%%%%RUBY_SITELIBDIR%%/xmmsclient_glib.so
-%%RUBY%%%%RUBY_SITELIBDIR%%/xmmsclient.so
-%%PYTHON%%lib/%%PYTHON_VERSION%%/site-packages/xmmsclient.so
 lib/xmms2/libxmms_file.so
+%%GNOMEVFS%%lib/xmms2/libxmms_gnomevfs.so
 lib/xmms2/libxmms_html.so
+%%JACK%%lib/xmms2/libxmms_jack.so
 lib/xmms2/libxmms_m3u.so
 lib/xmms2/libxmms_mad.so
+%%MODPLUG%%lib/xmms2/libxmms_modplug.so
+%%MUSEPACK%%lib/xmms2/libxmms_musepack.so
+lib/xmms2/libxmms_null.so
 lib/xmms2/libxmms_oss.so
-lib/xmms2/libxmms_vorbisfile.so
 lib/xmms2/libxmms_pls.so
 lib/xmms2/libxmms_replaygain.so
+%%SAMBA%%lib/xmms2/libxmms_samba.so
+%%SID%%lib/xmms2/libxmms_sid.so
+lib/xmms2/libxmms_vorbisfile.so
 lib/xmms2/libxmms_wave.so
-%%ECORE%%libdata/pkgconfig/xmms2-client-ecore.pc
-libdata/pkgconfig/xmms2-client-glib.pc
 libdata/pkgconfig/xmms2-client-ecore.pc
+libdata/pkgconfig/xmms2-client-glib.pc
 libdata/pkgconfig/xmms2-client.pc
 libdata/pkgconfig/xmms2-plugin.pc
 %%DATADIR%%/mind.in.a.box-lament_snipplet.ogg
 %%DATADIR%%/scripts/startup.d/xmms2-et-launcher.sh
-@dirrm include/xmms2/xmms
-@dirrm include/xmms2/xmmsc
-@dirrm include/xmms2/xmmsclient
-@dirrm include/xmms2
-@dirrm lib/xmms2
 @dirrm %%DATADIR%%/scripts/startup.d
 @dirrm %%DATADIR%%/scripts
 @dirrm %%DATADIR%%
+@dirrm lib/xmms2
+@dirrm include/xmms2/xmmsclient
+@dirrm include/xmms2/xmmsc
+@dirrm include/xmms2/xmms
+@dirrm include/xmms2