From owner-svn-ports-head@FreeBSD.ORG Sat Sep 28 16:59:57 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id AC41B823; Sat, 28 Sep 2013 16:59:57 +0000 (UTC) (envelope-from naddy@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 89F1F267D; Sat, 28 Sep 2013 16:59:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8SGxv2m014440; Sat, 28 Sep 2013 16:59:57 GMT (envelope-from naddy@svn.freebsd.org) Received: (from naddy@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8SGxutI014427; Sat, 28 Sep 2013 16:59:56 GMT (envelope-from naddy@svn.freebsd.org) Message-Id: <201309281659.r8SGxutI014427@svn.freebsd.org> From: Christian Weisgerber Date: Sat, 28 Sep 2013 16:59:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r328596 - in head/audio: xmms-bonk xmms-flac xmms-shn xmms-wavpack xmms-xf86audio X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Sep 2013 16:59:57 -0000 Author: naddy Date: Sat Sep 28 16:59:55 2013 New Revision: 328596 URL: http://svnweb.freebsd.org/changeset/ports/328596 Log: Support staging, general clean-up. Deleted: head/audio/xmms-bonk/pkg-plist head/audio/xmms-flac/pkg-plist head/audio/xmms-wavpack/pkg-plist Modified: head/audio/xmms-bonk/Makefile (contents, props changed) head/audio/xmms-flac/Makefile head/audio/xmms-shn/Makefile head/audio/xmms-shn/pkg-plist (contents, props changed) head/audio/xmms-wavpack/Makefile (contents, props changed) head/audio/xmms-xf86audio/Makefile Modified: head/audio/xmms-bonk/Makefile ============================================================================== --- head/audio/xmms-bonk/Makefile Sat Sep 28 16:54:24 2013 (r328595) +++ head/audio/xmms-bonk/Makefile Sat Sep 28 16:59:55 2013 (r328596) @@ -10,12 +10,14 @@ DISTNAME= bonk-xmms-${PORTVERSION} MAINTAINER= naddy@FreeBSD.org COMMENT= XMMS input plugin to play bonk files -LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms -NO_STAGE= yes +LIB_DEPENDS= libxmms.so:${PORTSDIR}/multimedia/xmms ALL_TARGET= +PLIST_FILES= lib/xmms/Input/libbonk.so + do-install: - ${INSTALL_DATA} ${WRKSRC}/libbonk.so ${PREFIX}/lib/xmms/Input + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/xmms/Input + ${INSTALL_DATA} ${WRKSRC}/libbonk.so ${STAGEDIR}${PREFIX}/lib/xmms/Input .include Modified: head/audio/xmms-flac/Makefile ============================================================================== --- head/audio/xmms-flac/Makefile Sat Sep 28 16:54:24 2013 (r328595) +++ head/audio/xmms-flac/Makefile Sat Sep 28 16:59:55 2013 (r328596) @@ -9,13 +9,12 @@ DISTNAME= flac-${PORTVERSION} MAINTAINER= naddy@FreeBSD.org COMMENT= XMMS input plugin for playing FLAC files -LIB_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms \ - FLAC:${PORTSDIR}/audio/flac \ - pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ - ogg:${PORTSDIR}/audio/libogg +LIB_DEPENDS= libxmms.so:${PORTSDIR}/multimedia/xmms \ + libFLAC.so:${PORTSDIR}/audio/flac \ + libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \ + libogg.so:${PORTSDIR}/audio/libogg USES= gettext iconv -NO_STAGE= yes USE_AUTOTOOLS= libtool USE_GNOME= gtk12 USE_XORG= x11 xau xcb xdmcp xext xi @@ -28,8 +27,6 @@ LDFLAGS+= -L${LOCALBASE}/lib MAKE_ARGS= LIBTOOL="${LIBTOOL} --tag=disable-static" MAKEFILE= ${FILESDIR}/Makefile -# XXX -post-install: - ${RM} ${PREFIX}/lib/xmms/Input/libxmms-flac.la +PLIST_FILES= lib/xmms/Input/libxmms-flac.so .include Modified: head/audio/xmms-shn/Makefile ============================================================================== --- head/audio/xmms-shn/Makefile Sat Sep 28 16:54:24 2013 (r328595) +++ head/audio/xmms-shn/Makefile Sat Sep 28 16:59:55 2013 (r328596) @@ -14,15 +14,12 @@ BUILD_DEPENDS= xmms-config:${PORTSDIR}/m RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms USE_GNOME= gtk12 -NO_STAGE= yes GNU_CONFIGURE= yes -.include +OPTIONS_DEFINE= DOCS post-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} -.endif + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .include Modified: head/audio/xmms-shn/pkg-plist ============================================================================== --- head/audio/xmms-shn/pkg-plist Sat Sep 28 16:54:24 2013 (r328595) +++ head/audio/xmms-shn/pkg-plist Sat Sep 28 16:59:55 2013 (r328596) @@ -1,5 +1,4 @@ @comment $FreeBSD$ -lib/xmms/Input/libshn.la lib/xmms/Input/libshn.so %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%@dirrm %%DOCSDIR%% Modified: head/audio/xmms-wavpack/Makefile ============================================================================== --- head/audio/xmms-wavpack/Makefile Sat Sep 28 16:54:24 2013 (r328595) +++ head/audio/xmms-wavpack/Makefile Sat Sep 28 16:59:55 2013 (r328596) @@ -9,17 +9,15 @@ MASTER_SITES= http://www.wavpack.com/ MAINTAINER= naddy@FreeBSD.org COMMENT= XMMS input plugin to play WavPack files -LIB_DEPENDS= wavpack.2:${PORTSDIR}/audio/wavpack \ - xmms.4:${PORTSDIR}/multimedia/xmms +LIB_DEPENDS= libwavpack.so:${PORTSDIR}/audio/wavpack \ + libxmms.so:${PORTSDIR}/multimedia/xmms USES= pkgconfig -NO_STAGE= yes USE_BZIP2= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -post-install: - ${RM} ${PREFIX}/lib/xmms/Input/libwavpack.la +PLIST_FILES= lib/xmms/Input/libwavpack.so .include Modified: head/audio/xmms-xf86audio/Makefile ============================================================================== --- head/audio/xmms-xf86audio/Makefile Sat Sep 28 16:54:24 2013 (r328595) +++ head/audio/xmms-xf86audio/Makefile Sat Sep 28 16:59:55 2013 (r328596) @@ -8,19 +8,17 @@ MASTER_SITES= http://www.devin.com/xmms- MAINTAINER= naddy@FreeBSD.org COMMENT= XF86Audio multimedia-key support for XMMS -LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms +LIB_DEPENDS= libxmms.so:${PORTSDIR}/multimedia/xmms MAKE_ARGS= CC="${CC}" OPT="${CFLAGS}" DEBUG="" -NO_STAGE= yes -.include +OPTIONS_DEFINE= DOCS do-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/xmms/General ${INSTALL_DATA} ${WRKSRC}/libxf86audio.so \ - `xmms-config --general-plugin-dir` -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} -.endif + ${STAGEDIR}${PREFIX}/lib/xmms/General + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .include