diff options
author | gerald <gerald@FreeBSD.org> | 2013-11-26 22:02:43 +0800 |
---|---|---|
committer | gerald <gerald@FreeBSD.org> | 2013-11-26 22:02:43 +0800 |
commit | 4899d51396489b06464322728522cb91a68516b8 (patch) | |
tree | 4624ae5c809b1c7ba0656e8ff946442aeb236df0 | |
parent | 2b290372df49d4364c90a6943f266f7827c14f63 (diff) | |
download | freebsd-ports-gnome-4899d51396489b06464322728522cb91a68516b8.tar.gz freebsd-ports-gnome-4899d51396489b06464322728522cb91a68516b8.tar.zst freebsd-ports-gnome-4899d51396489b06464322728522cb91a68516b8.zip |
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@mark.reidel.info> (old maintainer) [2]
gblach (new maintainer) [2]
-rw-r--r-- | MOVED | 1 | ||||
-rw-r--r-- | audio/Makefile | 2 | ||||
-rw-r--r-- | audio/musicpc/Makefile (renamed from audio/mpc/Makefile) | 19 | ||||
-rw-r--r-- | audio/musicpc/distinfo (renamed from audio/mpc/distinfo) | 0 | ||||
-rw-r--r-- | audio/musicpc/pkg-descr (renamed from audio/mpc/pkg-descr) | 0 | ||||
-rw-r--r-- | audio/pm3umpdl/Makefile | 2 |
6 files changed, 13 insertions, 11 deletions
@@ -5264,3 +5264,4 @@ sysutils/rsyslog6-snmp||2013-11-25|Has expired: Use sysutils/rsyslog7 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 diff --git a/audio/Makefile b/audio/Makefile index cf76794da67f..0ed9922890a8 100644 --- a/audio/Makefile +++ b/audio/Makefile @@ -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 diff --git a/audio/mpc/Makefile b/audio/musicpc/Makefile index edd44ee7afd3..d124e0770e9f 100644 --- a/audio/mpc/Makefile +++ b/audio/musicpc/Makefile @@ -1,17 +1,18 @@ # Created by: Mark Reidel <ports@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@mark.reidel.info +MAINTAINER= gblach@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> diff --git a/audio/mpc/distinfo b/audio/musicpc/distinfo index 6e1053be24ca..6e1053be24ca 100644 --- a/audio/mpc/distinfo +++ b/audio/musicpc/distinfo diff --git a/audio/mpc/pkg-descr b/audio/musicpc/pkg-descr index ac2ba1d04a45..ac2ba1d04a45 100644 --- a/audio/mpc/pkg-descr +++ b/audio/musicpc/pkg-descr diff --git a/audio/pm3umpdl/Makefile b/audio/pm3umpdl/Makefile index 68eabc34e545..9e7956616074 100644 --- a/audio/pm3umpdl/Makefile +++ b/audio/pm3umpdl/Makefile @@ -12,7 +12,7 @@ EXTRACT_ONLY= MAINTAINER= vvelox@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 |