Index: head/audio/musicpc/Makefile
===================================================================
--- head/audio/musicpc/Makefile	(revision 406072)
+++ head/audio/musicpc/Makefile	(revision 406073)
@@ -1,48 +1,49 @@
 # Created by: Mark Reidel <ports@mark.reidle.info>
 # $FreeBSD$
 
 PORTNAME=	musicpc
 PORTVERSION=	0.27
 CATEGORIES=	audio ipv6
 MASTER_SITES=	http://www.musicpd.org/download/mpc/0/
 DISTNAME=	mpc-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Command line client for the musicpd
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libmpdclient.so:${PORTSDIR}/audio/libmpdclient
 
-OPTIONS_DEFINE=	EXAMPLES DOCS ICONV
-OPTIONS_DEFAULT=	ICONV
-
 USES=		pkgconfig tar:xz
 GNU_CONFIGURE=	yes
-LDFLAGS+=	-L${LOCALBASE}/lib
-CFLAGS+=	-I${LOCALBASE}/include
 
 PLIST_FILES=	bin/mpc man/man1/mpc.1.gz
 
 PORTDOCS=	AUTHORS README NEWS
 PORTEXAMPLES=	*
 
-ICONV_USES=		iconv
+OPTIONS_DEFINE=	EXAMPLES DOCS ICONV
+OPTIONS_DEFAULT=	ICONV
+
+ICONV_USES=	iconv
 ICONV_LDFLAGS=	${ICONV_LIB}
 ICONV_CONFIGURE_ENABLE=	iconv
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lintl|${ICONV_LIB}|g' ${WRKSRC}/configure
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/mpc ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/doc/mpc.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
+do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/mpc-completion.bash \
 		${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
Index: head/audio/musicpc/pkg-descr
===================================================================
--- head/audio/musicpc/pkg-descr	(revision 406072)
+++ head/audio/musicpc/pkg-descr	(revision 406073)
@@ -1,4 +1,4 @@
 A client for MPD, the Music Player Daemon.
 mpc connects to a MPD running on a machine via a network.
 
-WWW: http://www.musicpd.org
+WWW: http://www.musicpd.org/