- Add my LOCAL to MASTER_SITES

- Convert to new LIB_DEPENDS format
- Convert to new options framework
- Pet portlint: move LICENSE upward
- Use DATADIR
- Use PORTDOCS macro
- Use bsd.port.mk instead of bsd.port.pre.mk + bsd.port.post.mk
- Simplify regex
- Cosmetic change

3 files changed, 50 insertions, 72 deletions

diff --git a/audio/icecast2/Makefile b/audio/icecast2/Makefile
index 398ef5fbb0e6..3847ff65a967 100644
--- a/audio/icecast2/Makefile
+++ b/audio/icecast2/Makefile
@@ -7,41 +7,44 @@ PORTREVISION=	10
 PORTEPOCH=	1
 CATEGORIES=	audio net ipv6
 MASTER_SITES=	http://downloads.xiph.org/releases/icecast/ \
-		http://svn.xiph.org/releases/icecast/
+		http://svn.xiph.org/releases/icecast/ \
+		LOCAL/sunpoet
 DISTNAME=	icecast-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Streaming mp3/ogg-vorbis audio server
 
-LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
-		shout.5:${PORTSDIR}/audio/libshout2 \
-		speex.1:${PORTSDIR}/audio/speex \
-		theora.0:${PORTSDIR}/multimedia/libtheora \
-		vorbis.4:${PORTSDIR}/audio/libvorbis \
-		xslt.2:${PORTSDIR}/textproc/libxslt
-
 LICENSE=	GPLv2
 
-GNU_CONFIGURE=	yes
-USE_RC_SUBR=	icecast2
-SUB_FILES+=	pkg-message
-CONFIGURE_ENV=	OGG_PREFIX=${LOCALBASE}
+LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
+		libshout.so:${PORTSDIR}/audio/libshout2 \
+		libspeex.so:${PORTSDIR}/audio/speex \
+		libtheora.so:${PORTSDIR}/multimedia/libtheora \
+		libvorbis.so:${PORTSDIR}/audio/libvorbis \
+		libxslt.so:${PORTSDIR}/textproc/libxslt
+
+OPTIONS_DEFINE=	DOCS
+
 CFLAGS+=	-I${LOCALBASE}/include
+CONFIGURE_ENV=	OGG_PREFIX=${LOCALBASE}
+GNU_CONFIGURE=	yes
+USE_RC_SUBR=	${PORTNAME}
 USES=		gmake
+WRKSRC=		${WRKDIR}/icecast-${PORTVERSION}
 
+DATADIR=	${PREFIX}/share/icecast
 DOCSDIR=	${PREFIX}/share/doc/icecast
-WRKSRC=		${WRKDIR}/icecast-${PORTVERSION}
+PORTDOCS=	*
+SUB_FILES=	pkg-message
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(NOPORTDOCS)
 post-patch:
-	${REINPLACE_CMD} \
-		-e 's|SUBDIRS = src conf debian doc web admin win32 examples|SUBDIRS = src conf debian web admin win32 examples # doc|' \
-		-e 's| install-exec-am install-data-am| install-exec-am|' ${WRKSRC}/Makefile.in
+.if !${PORT_OPTIONS:MDOCS}
+	${REINPLACE_CMD} -e '/^SUBDIRS = / s| doc||; s| install-exec-am install-data-am| install-exec-am|' ${WRKSRC}/Makefile.in
 .endif
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/icecast2/files/patch-conf::Makefile.in b/audio/icecast2/files/patch-conf-Makefile.in
index 763310470585..763310470585 100644
--- a/audio/icecast2/files/patch-conf::Makefile.in
+++ b/audio/icecast2/files/patch-conf-Makefile.in
diff --git a/audio/icecast2/pkg-plist b/audio/icecast2/pkg-plist
index 777cd5ff2abd..9535023489b8 100644
--- a/audio/icecast2/pkg-plist
+++ b/audio/icecast2/pkg-plist
@@ -1,55 +1,30 @@
 bin/icecast
 etc/icecast.xml.sample
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/icecast2_admin.html
-%%PORTDOCS%%%%DOCSDIR%%/icecast2_basicsetup.html
-%%PORTDOCS%%%%DOCSDIR%%/icecast2_changes.html
-%%PORTDOCS%%%%DOCSDIR%%/icecast2_config_file.html
-%%PORTDOCS%%%%DOCSDIR%%/icecast2_faq.html
-%%PORTDOCS%%%%DOCSDIR%%/icecast2_glossary.html
-%%PORTDOCS%%%%DOCSDIR%%/icecast2_introduction.html
-%%PORTDOCS%%%%DOCSDIR%%/icecast2_listenerauth.html
-%%PORTDOCS%%%%DOCSDIR%%/icecast2_relay.html
-%%PORTDOCS%%%%DOCSDIR%%/icecast2_stats.html
-%%PORTDOCS%%%%DOCSDIR%%/icecast2_win32.html
-%%PORTDOCS%%%%DOCSDIR%%/icecast2_yp.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/listener_auth1.jpg
-%%PORTDOCS%%%%DOCSDIR%%/listener_auth2.jpg
-%%PORTDOCS%%%%DOCSDIR%%/listener_auth3.jpg
-%%PORTDOCS%%%%DOCSDIR%%/masterslave.png
-%%PORTDOCS%%%%DOCSDIR%%/relay.png
-share/icecast/admin/listclients.xsl
-share/icecast/admin/listmounts.xsl
-share/icecast/admin/manageauth.xsl
-share/icecast/admin/moveclients.xsl
-share/icecast/admin/response.xsl
-share/icecast/admin/stats.xsl
-share/icecast/admin/updatemetadata.xsl
-share/icecast/doc/icecast.xml.dist
-share/icecast/doc/icecast_minimal.xml.dist
-share/icecast/doc/icecast_shoutcast_compat.xml.dist
-share/icecast/doc/icecast_urlauth.xml.dist
-share/icecast/web/auth.xsl
-share/icecast/web/corner_bottomleft.jpg
-share/icecast/web/corner_bottomright.jpg
-share/icecast/web/corner_topleft.jpg
-share/icecast/web/corner_topright.jpg
-share/icecast/web/icecast.png
-share/icecast/web/key.gif
-share/icecast/web/key.png
-share/icecast/web/server_version.xsl
-share/icecast/web/status.xsl
-share/icecast/web/status2.xsl
-share/icecast/web/style.css
-share/icecast/web/tunein.png
-@dirrm share/icecast/web
-@dirrm share/icecast/doc
-@dirrm share/icecast/admin
-@dirrm share/icecast
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%DATADIR%%/admin/listclients.xsl
+%%DATADIR%%/admin/listmounts.xsl
+%%DATADIR%%/admin/manageauth.xsl
+%%DATADIR%%/admin/moveclients.xsl
+%%DATADIR%%/admin/response.xsl
+%%DATADIR%%/admin/stats.xsl
+%%DATADIR%%/admin/updatemetadata.xsl
+%%DATADIR%%/doc/icecast.xml.dist
+%%DATADIR%%/doc/icecast_minimal.xml.dist
+%%DATADIR%%/doc/icecast_shoutcast_compat.xml.dist
+%%DATADIR%%/doc/icecast_urlauth.xml.dist
+%%DATADIR%%/web/auth.xsl
+%%DATADIR%%/web/corner_bottomleft.jpg
+%%DATADIR%%/web/corner_bottomright.jpg
+%%DATADIR%%/web/corner_topleft.jpg
+%%DATADIR%%/web/corner_topright.jpg
+%%DATADIR%%/web/icecast.png
+%%DATADIR%%/web/key.gif
+%%DATADIR%%/web/key.png
+%%DATADIR%%/web/server_version.xsl
+%%DATADIR%%/web/status.xsl
+%%DATADIR%%/web/status2.xsl
+%%DATADIR%%/web/style.css
+%%DATADIR%%/web/tunein.png
+@dirrm %%DATADIR%%/web
+@dirrm %%DATADIR%%/doc
+@dirrm %%DATADIR%%/admin
+@dirrm %%DATADIR%%