svn commit: r334933 - in head: . audio audio/mpc audio/musicpc audio/pm3umpdl

[Gerald Pfeifer]

Author: gerald
Date: Tue Nov 26 14:02:43 2013
New Revision: 334933
URL: http://svnweb.freebsd.org/changeset/ports/334933

Log:
  Rename audio/mpc to audio/musicpc to avoid a package name conflict
  with math/mpc. [1]
  
  Adjust to new LIB_DEPENDS standard.
  
  Broker a maintainer handover. [2]
  
  Approved by:	portmgr (bapt) [1]
  		Mark Reidel <ports at mark.reidel.info> (old maintainer) [2]
  		gblach (new maintainer) [2]

Added:
  head/audio/musicpc/
     - copied from r334931, head/audio/mpc/
Deleted:
  head/audio/mpc/
Modified:
  head/MOVED
  head/audio/Makefile
  head/audio/musicpc/Makefile
  head/audio/pm3umpdl/Makefile

Modified: head/MOVED
==============================================================================
--- head/MOVED	Tue Nov 26 13:53:37 2013	(r334932)
+++ head/MOVED	Tue Nov 26 14:02:43 2013	(r334933)
@@ -5264,3 +5264,4 @@ sysutils/rsyslog6-snmp||2013-11-25|Has e
 sysutils/rsyslog6-mysql||2013-11-25|Has expired: Use sysutils/rsyslog7
 sysutils/rsyslog6-dbi||2013-11-25|Has expired: Use sysutils/rsyslog7
 www/trac-gitplugin||2013-11-25|Removed: this plugin has been included in the Trac 1.0 distribution
+audio/mpc|audio/musicpc|2013-11-19|Renamed to avoid conflict with math/mpc

Modified: head/audio/Makefile
==============================================================================
--- head/audio/Makefile	Tue Nov 26 13:53:37 2013	(r334932)
+++ head/audio/Makefile	Tue Nov 26 14:02:43 2013	(r334933)
@@ -496,7 +496,6 @@
     SUBDIR += mp3unicode
     SUBDIR += mp3val
     SUBDIR += mp3wrap
-    SUBDIR += mpc
     SUBDIR += mpdas
     SUBDIR += mpdbrowser
     SUBDIR += mpdcon
@@ -515,6 +514,7 @@
     SUBDIR += musica
     SUBDIR += musicbox-tag-editor
     SUBDIR += musiccontrol
+    SUBDIR += musicpc
     SUBDIR += musicpd
     SUBDIR += mythplugin-mythmusic
     SUBDIR += napster

Modified: head/audio/musicpc/Makefile
==============================================================================
--- head/audio/mpc/Makefile	Tue Nov 26 13:27:45 2013	(r334931)
+++ head/audio/musicpc/Makefile	Tue Nov 26 14:02:43 2013	(r334933)
@@ -1,17 +1,18 @@
 # Created by: Mark Reidel <ports at mark.reidle.info>
 # $FreeBSD$
 
-PORTNAME=	mpc
+PORTNAME=	musicpc
 PORTVERSION=	0.22
 CATEGORIES=	audio ipv6
-MASTER_SITES=	SF/musicpd/${PORTNAME}/${PORTVERSION}/
+MASTER_SITES=	SF/musicpd/mpc/${PORTVERSION}/
+DISTNAME=	mpc-${PORTVERSION}
 
-MAINTAINER=	ports at mark.reidel.info
+MAINTAINER=	gblach at FreeBSD.org
 COMMENT=	Command line client for the musicpd
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	mpdclient:${PORTSDIR}/audio/libmpdclient
+LIB_DEPENDS=	libmpdclient.so:${PORTSDIR}/audio/libmpdclient
 
 OPTIONS_DEFINE=	EXAMPLES DOCS ICONV
 OPTIONS_DEFAULT=	ICONV
@@ -23,12 +24,12 @@ GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	-I${LOCALBASE}/include
 
-MAN1=		${PORTNAME}.1
+MAN1=		mpc.1
 
 PORTDOCS=	AUTHORS README NEWS
 PORTEXAMPLES=	*
 
-PLIST_FILES=	bin/${PORTNAME}
+PLIST_FILES=	bin/mpc
 
 .include <bsd.port.options.mk>
 
@@ -43,7 +44,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|-lintl|${ICONV_LIB}|g' ${WRKSRC}/configure
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/src/mpc ${PREFIX}/bin
 
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
@@ -52,9 +53,9 @@ do-install:
 
 .if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/${PORTNAME}-completion.bash ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/mpc-completion.bash ${EXAMPLESDIR}
 .endif
 
-	${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 ${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/${MAN1} ${MAN1PREFIX}/man/man1
 
 .include <bsd.port.mk>

Modified: head/audio/pm3umpdl/Makefile
==============================================================================
--- head/audio/pm3umpdl/Makefile	Tue Nov 26 13:53:37 2013	(r334932)
+++ head/audio/pm3umpdl/Makefile	Tue Nov 26 14:02:43 2013	(r334933)
@@ -12,7 +12,7 @@ EXTRACT_ONLY=
 MAINTAINER=	vvelox at vvelox.net
 COMMENT=	Loading a M3U file into musicpd
 
-RUN_DEPENDS=	${LOCALBASE}/bin/mpc:${PORTSDIR}/audio/mpc
+RUN_DEPENDS=	${LOCALBASE}/bin/mpc:${PORTSDIR}/audio/musicpc
 
 USES=		perl5
 NO_STAGE=	yes