Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 4 Oct 2016 15:40:33 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r423272 - head/multimedia/smpeg2
Message-ID:  <201610041540.u94FeXi2027981@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Tue Oct  4 15:40:33 2016
New Revision: 423272
URL: https://svnweb.freebsd.org/changeset/ports/423272

Log:
  multimedia/smpeg2: clarify license and use option helpers

Modified:
  head/multimedia/smpeg2/Makefile   (contents, props changed)

Modified: head/multimedia/smpeg2/Makefile
==============================================================================
--- head/multimedia/smpeg2/Makefile	Tue Oct  4 15:27:37 2016	(r423271)
+++ head/multimedia/smpeg2/Makefile	Tue Oct  4 15:40:33 2016	(r423272)
@@ -11,7 +11,8 @@ MASTER_SITES=	http://www.libsdl.org/proj
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Free MPEG1 video player library with sound support
 
-LICENSE=	GPLv2
+LICENSE=	MIT LGPL20+
+LICENSE_COMB=	multi
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
@@ -26,16 +27,11 @@ OPTIONS_SUB=	yes
 
 CONFIGURE_ARGS=	--enable-mmx
 
-.include <bsd.port.options.mk>
+PLAYMPEG_CONFLICTS_INSTALL=	smpeg
+PLAYMPEG_VARS=	LICENSE+=GPLv2+
 
-.if ${PORT_OPTIONS:MPLAYMPEG}
-CONFLICTS+=	smpeg
-.endif
-
-post-patch:
-.if ! ${PORT_OPTIONS:MPLAYMPEG}
+post-patch-PLAYMPEG-off:
 	@${REINPLACE_CMD} -e '/^bin_PROGRAMS =/s/plaympeg$$(EXEEXT)// ; \
 		/^man_MANS =/s/plaympeg\.1//' ${WRKSRC}/Makefile.in
-.endif
 
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610041540.u94FeXi2027981>