From owner-svn-ports-head@freebsd.org Fri Apr 13 09:33:39 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BCE92F9EC86; Fri, 13 Apr 2018 09:33:38 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6FB8C69631; Fri, 13 Apr 2018 09:33:38 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6A9D018044; Fri, 13 Apr 2018 09:33:38 +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 w3D9XcTX025224; Fri, 13 Apr 2018 09:33:38 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3D9XcHE025222; Fri, 13 Apr 2018 09:33:38 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201804130933.w3D9XcHE025222@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Fri, 13 Apr 2018 09:33:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r467226 - head/multimedia/audacious X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: head/multimedia/audacious X-SVN-Commit-Revision: 467226 X-SVN-Commit-Repository: ports 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.25 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: Fri, 13 Apr 2018 09:33:39 -0000 Author: amdmi3 Date: Fri Apr 13 09:33:38 2018 New Revision: 467226 URL: https://svnweb.freebsd.org/changeset/ports/467226 Log: - Fix LICENSE - Whitespace fixes - Switch to options helpers - Update WWW Modified: head/multimedia/audacious/Makefile head/multimedia/audacious/pkg-descr Modified: head/multimedia/audacious/Makefile ============================================================================== --- head/multimedia/audacious/Makefile Fri Apr 13 09:30:38 2018 (r467225) +++ head/multimedia/audacious/Makefile Fri Apr 13 09:33:38 2018 (r467226) @@ -9,17 +9,19 @@ MASTER_SITES= http://distfiles.audacious-media-player. MAINTAINER= ports@FreeBSD.org COMMENT= Lightweight and versatile audio player -LICENSE= GPLv3 +LICENSE= BSD2CLAUSE BSD3CLAUSE +LICENSE_COMB= multi +LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libfreetype.so:print/freetype2 \ - libfontconfig.so:x11-fonts/fontconfig + libfontconfig.so:x11-fonts/fontconfig CONFLICTS_INSTALL= audacious-gtk3-3.* SUB_FILES= pkg-message USES= compiler:c++11-lib desktop-file-utils gettext-tools gmake \ - localbase pkgconfig tar:bzip2 + localbase pkgconfig tar:bzip2 GNU_CONFIGURE= yes USE_XORG= x11 sm USE_GNOME= gtk20 glib20 cairo @@ -27,8 +29,8 @@ USE_LDCONFIG= yes INSTALLS_ICONS= yes CONFIGURE_ARGS= --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \ - --enable-gtk \ - --without-buildstamp + --enable-gtk \ + --without-buildstamp OPTIONS_DEFINE= ICONV NLS EXECINFO OPTIONS_DEFAULT=ICONV EXECINFO @@ -39,20 +41,18 @@ NLS_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-Makefil OPTIONS_SUB= yes EXECINFO_DESC= Build with libexecinfo support -.include - post-patch: -.if ${PORT_OPTIONS:MEXECINFO} + @${REINPLACE_CMD} -e 's| $${MFLAGS}||g' \ + ${WRKSRC}/buildsys.mk.in + +post-patch-EXECINFO-on: @${REINPLACE_CMD} 's|-lm |-lm -lexecinfo |' \ ${WRKSRC}/src/audacious/Makefile @${REINPLACE_CMD} 's|-laudcore|-laudcore -lexecinfo|' \ ${WRKSRC}/audacious.pc.in -.endif - ${REINPLACE_CMD} -e 's| $${MFLAGS}||g' \ - ${WRKSRC}/buildsys.mk.in post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/aud* - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib* + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/aud* + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib* .include Modified: head/multimedia/audacious/pkg-descr ============================================================================== --- head/multimedia/audacious/pkg-descr Fri Apr 13 09:30:38 2018 (r467225) +++ head/multimedia/audacious/pkg-descr Fri Apr 13 09:33:38 2018 (r467226) @@ -2,4 +2,4 @@ Audacious is an open source audio player. A descendant your music how you want it, without stealing away your computer's resources from other tasks. -WWW: http://audacious-media-player.org/ +WWW: https://audacious-media-player.org/