Bug 126492

Summary: audio/musicpd may depends on libsamplerate
Product: Ports & Packages Reporter: Henry Hu <henry.hu.sh>
Component: Individual Port(s)Assignee: Dmitry Marakasov <amdmi3>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   

Description Henry Hu 2008-08-13 07:30:01 UTC 
audio/musicpd checks for libsamplerate in configure.
So if you install libsamplerate first, and install musicpd, and remove libsamplerate, musicpd would be unusable.
But it's not a config option, nor a dependecy.

Fix: 

Add libsamplerate as a dependecy or a config option.
How-To-Repeat: 1. Install audio/libsamplerate
2. Install audio/musicpd
3. Remove audio/libsamplerate
4. run mpd
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2008-08-13 07:30:09 UTC 
Maintainer of audio/musicpd,

Please note that PR ports/126492 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/126492

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2008-08-13 07:30:12 UTC 
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 3 Dmitry Marakasov freebsd_committer freebsd_triage 2008-08-22 11:51:35 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->amdmi3

I'll take it.
Comment 4 Dmitry Marakasov 2008-08-28 18:07:36 UTC 
* amdmi3@FreeBSD.org (amdmi3@FreeBSD.org) wrote:
> Synopsis: audio/musicpd may depends on libsamplerate

Please approve the following patch.
- Fix depends (add options for samplerate, jack; check appropriate
  WITH_/WITHOUT_ flags appropriately)
- Respect NOPORTDOCS and thus fix plist for NOPORTDOCS case
- Better pkg-message handling
- Reorder options in the Makefile in more canonical way

--- musicpd.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/audio/musicpd/Makefile,v
retrieving revision 1.35
diff -u -r1.35 Makefile
--- Makefile	21 Aug 2008 06:16:17 -0000	1.35
+++ Makefile	28 Aug 2008 17:04:07 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	musicpd
 PORTVERSION=	0.13.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio ipv6
 MASTER_SITES=	http://musicpd.org/uploads/files/ \
 		http://redundancy.redundancy.org/mirror/
@@ -23,6 +23,17 @@
 GNU_CONFIGURE=	yes
 USE_RC_SUBR=	musicpd.sh
 PKGMESSAGE=	${WRKDIR}/pkg-message
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+CFLAGS+=	-I${PREFIX}/include
+
+MAN1=		mpd.1
+MAN5=		mpd.conf.5
+
+DOCSDIR=	${PREFIX}/share/doc/mpd
+
+SUB_FILES=	pkg-message
 
 OPTIONS=	FLAC "Support for FLAC Audio" on \
 		VORBIS "Support for OGG Vorbis Audio" on \
@@ -35,7 +46,9 @@
 		IPV6 "Support for IPV6" on \
 		AO "Support for libao" off \
 		PULSE "Support for PulseAudio" off \
-		SHOUT "Support for Icecast and Shoutcast" on
+		JACK "Support for JACK" off \
+		SHOUT "Support for Icecast and Shoutcast" on \
+		SAMPLERATE "Support for ibsamplerate" on
 
 .include <bsd.port.pre.mk>
 
@@ -96,34 +109,33 @@
 LIB_DEPENDS+=	ao.3:${PORTSDIR}/audio/libao
 .endif
 
-.ifdef(WITHOUT_PULSE)
+.ifdef(WITH_PULSE)
+LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
+.else
 CONFIGURE_ARGS+=--disable-pulse
+.endif
+
+.ifdef(WITH_JACK)
+LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
 .else
-LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
+CONFIGURE_ARGS+=--disable-jack
 .endif
 
 .ifdef(WITHOUT_SHOUT)
 CONFIGURE_ARGS+=--disable-shout
 .endif
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-CFLAGS+=	-I${PREFIX}/include
-
-MAN1=		mpd.1
-MAN5=		mpd.conf.5
-
-DOCSDIR=	${PREFIX}/share/doc/mpd
-DOCS=	COMMANDS \
-		mpdconf.example \
-		README \
-		UPGRADING
-
-SED_SCRIPT+=	-e 's,%%PREFIX%%,${PREFIX},g'
+.ifdef(WITHOUT_SAMPLERATE)
+CONFIGURE_ARGS+=--disable-lsr
+.else
+LIB_DEPENDS+=	samplerate.1:${PORTSDIR}/audio/libsamplerate
+.endif
 
-post-build:
-	@${SED} ${SED_SCRIPT} ${MASTERDIR}/pkg-message >${PKGMESSAGE}
+.if defined(NOPORTDOCS)
+post-patch:
+	@${REINPLACE_CMD} -e '/^install-data-am:/ s|install-docDATA||' \
+		${WRKSRC}/Makefile.in ${WRKSRC}/doc/Makefile.in
+.endif
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
Index: pkg-message
===================================================================
RCS file: pkg-message
diff -N pkg-message
--- pkg-message	27 Feb 2007 03:51:05 -0000	1.6
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-************************************************************
-
-The musicpd package has been successfully installed.
-
-In order to run the MPD server, you need to create
-  %%PREFIX%%/etc/mpd.conf out of
-  %%PREFIX%%/share/doc/mpd/mpdconf.example
-and add the following line to /etc/rc.conf:
-  musicpd_enable="YES"
-
-Then start the server with
-  %%PREFIX%%/etc/rc.d/musicpd start
-or reboot.
-
-NOTE: The musicpd server is pretty useless without a
-      client. You might want to install one of the following
-      ports, too: mpc, glurp, gmpc, kmp or phpmp
-
-************************************************************
-
Index: files/pkg-message.in
===================================================================
RCS file: files/pkg-message.in
diff -N files/pkg-message.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/pkg-message.in	28 Aug 2008 17:04:07 -0000
@@ -0,0 +1,20 @@
+************************************************************
+
+The musicpd package has been successfully installed.
+
+In order to run the MPD server, you need to create
+  %%PREFIX%%/etc/mpd.conf out of
+  %%PREFIX%%/share/doc/mpd/mpdconf.example
+and add the following line to /etc/rc.conf:
+  musicpd_enable="YES"
+
+Then start the server with
+  %%PREFIX%%/etc/rc.d/musicpd start
+or reboot.
+
+NOTE: The musicpd server is pretty useless without a
+      client. You might want to install one of the following
+      ports, too: mpc, ncmpc, glurp, gmpc, kmp or phpmp
+
+************************************************************
+
--- musicpd.patch ends here ---

-- 
Dmitry Marakasov   .   55B5 0596 FF1E 8D84 5F56  9510 D35A 80DD F9D2 F77D
amdmi3@amdmi3.ru  ..:  jabber: amdmi3@jabber.ru    http://www.amdmi3.ru
Comment 5 dfilter service freebsd_committer freebsd_triage 2008-09-06 14:16:53 UTC 
amdmi3      2008-09-06 13:16:39 UTC

  FreeBSD ports repository

  Modified files:
    audio/musicpd        Makefile 
  Added files:
    audio/musicpd/files  pkg-message.in 
  Removed files:
    audio/musicpd        pkg-message 
  Log:
  - Fix depends (add options for samplerate, jack; check WITH_/WITHOUT_ flags appropriately)
  - Respect NOPORTDOCS and thus fix plist for NOPORTDOCS case
  - Better pkg-message handling
  - Reorder variables in the Makefile in more canonical way
  
  PR:             126492
  Submitted by:   Henry Hu <henry dot hu dot sh at gmail dot com>
  Patch by:       me
  Approved by:    maintainer timeout
  
  Revision  Changes    Path
  1.36      +33 -21    ports/audio/musicpd/Makefile
  1.1       +20 -0     ports/audio/musicpd/files/pkg-message.in (new)
  1.7       +0 -20     ports/audio/musicpd/pkg-message (dead)
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Comment 6 Dmitry Marakasov freebsd_committer freebsd_triage 2008-09-06 14:16:54 UTC 
State Changed
From-To: feedback->closed

Committed. Thanks!