svn commit: r467226 - head/multimedia/audacious

[Dmitry Marakasov]

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 at 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 <bsd.port.options.mk>
-
 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 <bsd.port.mk>

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/