From bogorodskiy@inbox.ru  Mon Jan 10 17:06:36 2005
Return-Path: <bogorodskiy@inbox.ru>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 9784916A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 10 Jan 2005 17:06:36 +0000 (GMT)
Received: from mx1.mail.ru (mx1.mail.ru [194.67.23.121])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1156343D31
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 10 Jan 2005 17:06:36 +0000 (GMT)
	(envelope-from bogorodskiy@inbox.ru)
Received: from [217.23.66.70] (port=65198 helo=localhost)
	by mx1.mail.ru with esmtp 
	id 1Co2zx-000HG7-00
	for FreeBSD-gnats-submit@freebsd.org; Mon, 10 Jan 2005 20:06:33 +0300
Message-Id: <E1Co2zx-000HG7-00.bogorodskiy-inbox-ru@mx1.mail.ru>
Date: Mon, 10 Jan 2005 20:06:33 +0300
From: Roman Bogorodskiy <bogorodskiy@inbox.ru>
Reply-To: Roman Bogorodskiy <bogorodskiy@inbox.ru>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [ maintainer ] audio/xmms-scrobbler: add WITH_XMMS and WITH_BMP knobs, minor fixes
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         76062
>Category:       ports
>Synopsis:       [ maintainer ] audio/xmms-scrobbler: add WITH_XMMS and WITH_BMP knobs, minor fixes
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 10 17:10:23 GMT 2005
>Closed-Date:    Fri Jan 14 19:17:47 GMT 2005
>Last-Modified:  Fri Jan 14 19:17:47 GMT 2005
>Originator:     Roman Bogorodskiy
>Release:        FreeBSD 5.3-RELEASE-p2 i386
>Organization:
>Environment:
System: FreeBSD lame.novel.ru 5.3-RELEASE-p2 FreeBSD 5.3-RELEASE-p2 #3: Sat Dec 11 21:01:26 MSK 2004 root@lame.novel.ru:/usr/obj/usr/src/sys/MIRRORBOX i386


>Description:
	Some tweaks for audio/xmms-scrobbler:
	- add WITH_XMMS and WITH_BMP knobs to allow users to choose 
	which plugin they actually want.
	- remove pkg-plist, use PLIST_FILES instead
	- COMMENT: s/bmp/BMP
	- bump PORTREVISION

	Removed files: pkg-plist

>How-To-Repeat:
>Fix:

--- port.xmms-scrobbler.diff begins here ---
diff -ru xmms-scrobbler.orig/Makefile xmms-scrobbler/Makefile
--- xmms-scrobbler.orig/Makefile	Mon Jan 10 19:02:05 2005
+++ xmms-scrobbler/Makefile	Mon Jan 10 19:53:56 2005
@@ -6,23 +6,59 @@
 
 PORTNAME=	xmms-scrobbler
 PORTVERSION=	0.3.6
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://static.audioscrobbler.com/plugins/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	XMMS and bmp plugin for Audioscrobbler.com
+COMMENT=	XMMS and BMP plugin for Audioscrobbler.com
 
-LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms \
-		beep.2:${PORTSDIR}/multimedia/beep-media-player \
-		musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
+LIB_DEPENDS=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
 		curl.3:${PORTSDIR}/ftp/curl
 
 GNU_CONFIGURE=	yes
-USE_GNOME=	gtk12 gtk20
 USE_BZIP2=	yes
+USE_GNOME=	#	
 USE_X_PREFIX=	yes
 USE_LIBTOOL_VER=15
 USE_GMAKE=	yes
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 
-.include <bsd.port.mk>
+PLIST_FILES=	%%BMP%%lib/bmp/General/libbmp_scrobbler.so \
+		%%XMMS%%lib/xmms/General/libxmms_scrobbler.so
+
+OPTIONS=	XMMS "XMMS plugin" on \
+		BMP "BMP plugin" on \
+		APE "prefer APE tags to ID3v2" off 
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITH_XMMS) && !defined(WITH_BMP)
+# if we have no WITH_XMMS or WITH_BMP defined build both plugins
+WITH_BMP=yes
+WITH_XMMS=yes
+.endif
+
+.if defined(WITH_XMMS)
+USE_GNOME+=	gtk12
+LIB_DEPENDS+=	xmms.4:${PORTSDIR}/multimedia/xmms
+PLIST_SUB+=	XMMS=""
+.else
+CONFIGURE_ARGS+=	--disable-xmms-plugin
+PLIST_SUB+=	XMMS="@comment "
+.endif
+
+.if defined(WITH_BMP)
+USE_GNOME+=	gtk20
+LIB_DEPENDS+=	beep.2:${PORTSDIR}/multimedia/beep-media-player
+PLIST_SUB+=	BMP=""
+.else
+CONFIGURE_ARGS+=	--disable-bmp-plugin
+PLIST_SUB+=	BMP="@comment "
+.endif
+
+.if defined(WITH_APE)
+CONFIGURE_ARGS+=	--enable-prefer-ape
+.endif
+
+.include <bsd.port.post.mk>
--- port.xmms-scrobbler.diff ends here ---


>Release-Note:
>Audit-Trail:

From: Michael Johnson <ahze@ahze.net>
To: freebsd-gnats-submit@FreeBSD.org, bogorodskiy@inbox.ru
Cc:  
Subject: Re: ports/76062: [ maintainer ] audio/xmms-scrobbler: add WITH_XMMS and WITH_BMP knobs, minor fixes
Date: Wed, 12 Jan 2005 00:49:49 -0500

 Just a suggestion, but making a slave port audio/bmp-scrobbler with the 
 master port being audio/xmms-scrobbler would be better than adding a 
 WITH_BMP knob.
 This way people can use xmms or bmp with scrobbler plugin with out 
 having to install/deinstall with different knobs.
 
 Michael

From: Roman Bogorodskiy <bogorodskiy@gmail.com>
To: Michael Johnson <ahze@ahze.net>
Cc: freebsd-gnats-submit@FreeBSD.org, bogorodskiy@inbox.ru
Subject: Re: ports/76062: [ maintainer ] audio/xmms-scrobbler: add WITH_XMMS and WITH_BMP knobs, minor fixes
Date: Wed, 12 Jan 2005 09:40:35 +0300

 --2fHTh5uZTiUOsy+g
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
  Michael wrote:
 
 > Just a suggestion, but making a slave port audio/bmp-scrobbler with the=
 =20
 > master port being audio/xmms-scrobbler would be better than adding a=20
 > WITH_BMP knob.
 > This way people can use xmms or bmp with scrobbler plugin with out=20
 > having to install/deinstall with different knobs.
 
 I don't really think it would be difficult for users to select from the
 OPTIONS's dialog which plugin they want, and at any point it's much
 better than mading users build both plugins (and you should remember
 that if somebody who e.g. don't use BMP and gtk20 he/she would have to
 download lots of gtk20 stuff just to make compile something that he/she
 simply doesn't need). Anyway, if you think I should do the slave port,
 I'll try to dig into that, 'cause I've never made slave ports yet. ;)
 
 -Roman Bogorodskiy
 
 --2fHTh5uZTiUOsy+g
 Content-Type: application/pgp-signature
 Content-Disposition: inline
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (FreeBSD)
 
 iQCVAwUBQeTGY4B0WzgdqspGAQJXBAP+JgOKJlvB5jF1U8ycxghfjNXfkYN8jAuk
 4sRLwMisrHjM987sOzOutQYs4wHk09g+JSqT3jomBHH4q3JexER69q2A97Gj1Z1Q
 mmcw3mckGfx4430gwFcmdSZ0DWv1Ojjx5eMKzy1Q2CJFX+qSeH/ViIRQ1VruIAcP
 r7gHArvBWtw=
 =n4JK
 -----END PGP SIGNATURE-----
 
 --2fHTh5uZTiUOsy+g--
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Fri Jan 14 19:17:37 GMT 2005 
State-Changed-Why:  
Resurrected in ports/76252 

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