From owner-svn-ports-head@freebsd.org Sun Dec 20 15:28:53 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9FA03A4D18C; Sun, 20 Dec 2015 15:28:53 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5532C18DF; Sun, 20 Dec 2015 15:28:53 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBKFSp4R073853; Sun, 20 Dec 2015 15:28:51 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBKFSpg1073852; Sun, 20 Dec 2015 15:28:51 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201512201528.tBKFSpg1073852@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Sun, 20 Dec 2015 15:28:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r404058 - head/audio/mp3stat 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.20 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: Sun, 20 Dec 2015 15:28:53 -0000 Author: amdmi3 Date: Sun Dec 20 15:28:51 2015 New Revision: 404058 URL: https://svnweb.freebsd.org/changeset/ports/404058 Log: - Add LICENSE_FILE - Switch to USES=localbase - Simplify installation - Switch to options helpers Modified: head/audio/mp3stat/Makefile Modified: head/audio/mp3stat/Makefile ============================================================================== --- head/audio/mp3stat/Makefile Sun Dec 20 15:28:49 2015 (r404057) +++ head/audio/mp3stat/Makefile Sun Dec 20 15:28:51 2015 (r404058) @@ -15,18 +15,15 @@ COMMENT= Read information about mp3s and BROKEN= unfetchable LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING -OPTIONS_DEFINE= VORBIS DOCS -OPTIONS_DEFAULT= VORBIS - -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} - -USES= dos2unix gmake pkgconfig +USES= dos2unix gmake localbase pkgconfig DOS2UNIX_FILES= ui/console/cli.cpp USE_GNOME= gtk20 -CXXFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -Wl,--rpath,${LOCALBASE}/lib +LDFLAGS+= -Wl,--rpath,${LOCALBASE}/lib + +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} PORTDOCS= README PLIST_FILES= bin/mp3stat \ @@ -34,6 +31,9 @@ PLIST_FILES= bin/mp3stat \ lib/mp3stat/ui_gtk2.so \ lib/mp3stat/ui_console.so +OPTIONS_DEFINE= VORBIS DOCS +OPTIONS_DEFAULT= VORBIS + VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis VORBIS_PLIST_FILES= lib/mp3stat/input_vorb.so VORBIS_MAKE_ARGS_OFF= VORBIS="" @@ -48,18 +48,18 @@ post-patch: s|^CXX|#CXX|g' do-install: - (cd ${WRKSRC} && ${INSTALL_PROGRAM} mp3stat ${STAGEDIR}${PREFIX}/bin) + ${INSTALL_PROGRAM} ${WRKSRC}/mp3stat ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${PREFIX}/lib/mp3stat - (cd ${WRKSRC}/ui/gtk && ${INSTALL_LIB} ui_gtk2.so \ - ${STAGEDIR}${PREFIX}/lib/mp3stat) - (cd ${WRKSRC}/ui/console && ${INSTALL_LIB} ui_console.so \ - ${STAGEDIR}${PREFIX}/lib/mp3stat) - (cd ${WRKSRC}/input/mp3 && ${INSTALL_LIB} input_mp3.so \ - ${STAGEDIR}${PREFIX}/lib/mp3stat) + ${INSTALL_LIB} ${WRKSRC}/ui/gtk/ui_gtk2.so ${STAGEDIR}${PREFIX}/lib/mp3stat + ${INSTALL_LIB} ${WRKSRC}/ui/console/ui_console.so ${STAGEDIR}${PREFIX}/lib/mp3stat + ${INSTALL_LIB} ${WRKSRC}/input/mp3/input_mp3.so ${STAGEDIR}${PREFIX}/lib/mp3stat + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${WRKSRC} && ${INSTALL_DATA} README ${STAGEDIR}${DOCSDIR}) + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} + do-install-VORBIS-on: - (cd ${WRKSRC}/input/vorbis && ${INSTALL_LIB} input_vorb.so \ - ${STAGEDIR}${PREFIX}/lib/mp3stat) + ${INSTALL_LIB} ${WRKSRC}/input/vorbis/input_vorb.so \ + ${STAGEDIR}${PREFIX}/lib/mp3stat .include