From owner-svn-ports-all@freebsd.org  Tue Oct  4 15:40:34 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 B167CAF546E;
 Tue,  4 Oct 2016 15:40:34 +0000 (UTC)
 (envelope-from jbeich@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 834F7E03;
 Tue,  4 Oct 2016 15:40:34 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u94FeXVT027982;
 Tue, 4 Oct 2016 15:40:33 GMT (envelope-from jbeich@FreeBSD.org)
Received: (from jbeich@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u94FeXi2027981;
 Tue, 4 Oct 2016 15:40:33 GMT (envelope-from jbeich@FreeBSD.org)
Message-Id: <201610041540.u94FeXi2027981@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jbeich set sender to
 jbeich@FreeBSD.org using -f
From: Jan Beich <jbeich@FreeBSD.org>
Date: Tue, 4 Oct 2016 15:40:33 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r423272 - head/multimedia/smpeg2
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.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 04 Oct 2016 15:40:34 -0000

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>