From owner-svn-ports-all@FreeBSD.ORG Thu Mar 6 12:42:57 2014 Return-Path: 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 ESMTPS id 6CFE7713; Thu, 6 Mar 2014 12:42:57 +0000 (UTC) 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 59C3ED02; Thu, 6 Mar 2014 12:42:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s26CgvIV088242; Thu, 6 Mar 2014 12:42:57 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s26CgvGS088240; Thu, 6 Mar 2014 12:42:57 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201403061242.s26CgvGS088240@svn.freebsd.org> From: Rene Ladan Date: Thu, 6 Mar 2014 12:42:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r347190 - head/audio/scrobbler 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.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Mar 2014 12:42:57 -0000 Author: rene Date: Thu Mar 6 12:42:56 2014 New Revision: 347190 URL: http://svnweb.freebsd.org/changeset/ports/347190 QAT: https://qat.redports.org/buildarchive/r347190/ Log: - Remove dependency on expired beep-media-player - Stage support, fix conditional package list - Use option framework instead of WITH knobs - Update and portlint pkg-descr - Bump PORTREVISION Approved by: portmgr (bapt) Modified: head/audio/scrobbler/Makefile head/audio/scrobbler/pkg-descr Modified: head/audio/scrobbler/Makefile ============================================================================== --- head/audio/scrobbler/Makefile Thu Mar 6 12:33:04 2014 (r347189) +++ head/audio/scrobbler/Makefile Thu Mar 6 12:42:56 2014 (r347190) @@ -3,7 +3,7 @@ PORTNAME?= scrobbler PORTVERSION= 0.3.8.1 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= audio MASTER_SITES= http://static.audioscrobbler.com/plugins/ \ http://www.pipian.com/stuffforchat/ @@ -14,66 +14,42 @@ COMMENT?= XMMS/BMP plugin for Audioscrob LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl -CONFLICTS= bmp-scrobbler-[0-9]* \ - xmms-scrobbler-[0-9]* +CONFLICTS= xmms-scrobbler-[0-9]* USES= gmake pkgconfig USE_CSTD= gnu89 -NO_STAGE= yes USE_BZIP2= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -SLAVEDIRS= audio/xmms-scrobbler audio/bmp-scrobbler +SLAVEDIRS= audio/xmms-scrobbler -.if !defined(WITH_XMMS) && !defined(WITH_BMP) -WITH_XMMS= yes -WITH_BMP= yes -.endif - -.if defined(WITH_XMMS) -LIB_DEPENDS+= libxmms.so:${PORTSDIR}/multimedia/xmms -PLIST_FILES+= lib/xmms/General/libxmms_scrobbler.la \ - lib/xmms/General/libxmms_scrobbler.so -.else -CONFIGURE_ARGS+= --disable-xmms-plugin -.endif +OPTIONS_DEFINE= APE XMMS DEBUG ENCODINGS_PATCH +OPTIONS_DEFAULT=XMMS +XMMS_DESC= Enable XMMS support +ENCODINGS_PATCH_DESC= Enable ID3 tags recoding support + +XMMS_LIB_DEPENDS= libxmms.so:${PORTSDIR}/multimedia/xmms +XMMS_PLIST_FILES= lib/xmms/General/libxmms_scrobbler.la \ + lib/xmms/General/libxmms_scrobbler.so +XMMS_PLIST_DIRS= lib/xmms/General lib/xmms +XMMS_CONFIGURE_ENABLE= xmms-plugin -.if defined(WITH_BMP) -LIB_DEPENDS+= libbeep.so:${PORTSDIR}/multimedia/beep-media-player -PLIST_FILES+= lib/bmp/General/libbmp_scrobbler.la \ - lib/bmp/General/libbmp_scrobbler.so -.else CONFIGURE_ARGS+= --disable-bmp-plugin -.endif -.if defined(WITH_DEBUG) -CONFIGURE_ARGS+= --enable-debug -.endif +DEBUG_CONFIGURE_ARGS= debug -.if defined(WITH_APE) -CONFIGURE_ARGS+= --enable-prefer-ape -.endif +APE_CONFIGURE_ENABLE= prefer-ape -.if defined(WITH_ENCODINGS_PATCH) -USES+= iconv -.endif +ENCODINGS_PATCH_USES= iconv + +.include post-patch:: @${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure -.if defined(WITH_ENCODINGS_PATCH) +.if ${PORT_OPTIONS:MENCODINGS_PATCH} @${PATCH} ${PATCH_ARGS} -p1 < ${FILESDIR}/extra-encodings-patch .endif -pre-everything:: - @${ECHO_MSG} "You may specify the following on the command line:" - @${ECHO_MSG} " " - @${ECHO_MSG} "WITH_XMMS=yes to enable xmms support" - @${ECHO_MSG} "WITH_BMP=yes to enable beep-media-player support" - @${ECHO_MSG} "WITH_DEBUG=yes to turn on debug mode" - @${ECHO_MSG} "WITH_APE=yes to enable ape" - @${ECHO_MSG} "WITH_ENCODINGS_PATCH=yes to enable ID3 tags recoding support" - @${ECHO_MSG} " " - .include Modified: head/audio/scrobbler/pkg-descr ============================================================================== --- head/audio/scrobbler/pkg-descr Thu Mar 6 12:33:04 2014 (r347189) +++ head/audio/scrobbler/pkg-descr Thu Mar 6 12:42:56 2014 (r347190) @@ -1,5 +1,5 @@ -This is an BMP/XMMS Plugin which sends the Playlist data to +This is an XMMS Plugin which sends the Playlist data to audioscrobbler.com Author: pipian@pipian.com -WWW: http://www.audioscrobbler.com +WWW: http://www.audioscrobbler.com