From owner-svn-ports-all@FreeBSD.ORG  Thu Oct 31 23:33:14 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 9E65AC7A;
 Thu, 31 Oct 2013 23:33:14 +0000 (UTC)
 (envelope-from jhale@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 71D122BE2;
 Thu, 31 Oct 2013 23:33:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9VNXEwj010971;
 Thu, 31 Oct 2013 23:33:14 GMT (envelope-from jhale@svn.freebsd.org)
Received: (from jhale@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9VNXE3a010969;
 Thu, 31 Oct 2013 23:33:14 GMT (envelope-from jhale@svn.freebsd.org)
Message-Id: <201310312333.r9VNXE3a010969@svn.freebsd.org>
From: "Jason E. Hale" <jhale@FreeBSD.org>
Date: Thu, 31 Oct 2013 23:33:14 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r332299 - head/audio/xmmsctrl
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 31 Oct 2013 23:33:14 -0000

Author: jhale
Date: Thu Oct 31 23:33:13 2013
New Revision: 332299
URL: http://svnweb.freebsd.org/changeset/ports/332299

Log:
  - Fix build with clang
  - Support staging
  - Make installation of examples optional

Modified:
  head/audio/xmmsctrl/Makefile
  head/audio/xmmsctrl/pkg-plist   (contents, props changed)

Modified: head/audio/xmmsctrl/Makefile
==============================================================================
--- head/audio/xmmsctrl/Makefile	Thu Oct 31 23:33:06 2013	(r332298)
+++ head/audio/xmmsctrl/Makefile	Thu Oct 31 23:33:13 2013	(r332299)
@@ -18,24 +18,22 @@ BUILD_DEPENDS=	xmms:${PORTSDIR}/multimed
 RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
 
 USES=		gmake
-NO_STAGE=	yes
+USE_CSTD=	gnu89
 MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
 PORTDOCS=	Changelog README
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/xmmsctrl ${PREFIX}/bin
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-.endif
-	${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/xmmsctrl ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/samples && \
 		${INSTALL_DATA} emacs-transcriber twmrc_bindings \
-			${EXAMPLESDIR} && \
-		${INSTALL_SCRIPT} *.sh ${EXAMPLESDIR}
+			${STAGEDIR}${EXAMPLESDIR} && \
+		${INSTALL_SCRIPT} *.sh ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>

Modified: head/audio/xmmsctrl/pkg-plist
==============================================================================
--- head/audio/xmmsctrl/pkg-plist	Thu Oct 31 23:33:06 2013	(r332298)
+++ head/audio/xmmsctrl/pkg-plist	Thu Oct 31 23:33:13 2013	(r332299)
@@ -1,13 +1,13 @@
 bin/xmmsctrl
-%%EXAMPLESDIR%%/emacs-transcriber
-%%EXAMPLESDIR%%/pause_stop_play.sh
-%%EXAMPLESDIR%%/play_pause.sh
-%%EXAMPLESDIR%%/play_unpause_next.sh
-%%EXAMPLESDIR%%/playlist2html.sh
-%%EXAMPLESDIR%%/twmrc_bindings
-%%EXAMPLESDIR%%/win_playlist.sh
-%%EXAMPLESDIR%%/window_shown.sh
-%%EXAMPLESDIR%%/xmmsnext.sh
-%%EXAMPLESDIR%%/xmmsprev.sh
-%%EXAMPLESDIR%%/xmmsswitch.sh
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/emacs-transcriber
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pause_stop_play.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/play_pause.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/play_unpause_next.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/playlist2html.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/twmrc_bindings
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/win_playlist.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/window_shown.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xmmsnext.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xmmsprev.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xmmsswitch.sh
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%