From owner-svn-ports-head@freebsd.org  Mon Nov 14 09:00:18 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
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 A0780C4001C;
 Mon, 14 Nov 2016 09:00:18 +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 57172FA4;
 Mon, 14 Nov 2016 09:00:18 +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 uAE90Hk6086218;
 Mon, 14 Nov 2016 09:00:17 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAE90HmC086216;
 Mon, 14 Nov 2016 09:00:17 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201611140900.uAE90HmC086216@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Mon, 14 Nov 2016 09:00:17 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r426094 - in head/multimedia/szap-s2: . files
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.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 14 Nov 2016 09:00:18 -0000

Author: amdmi3
Date: Mon Nov 14 09:00:17 2016
New Revision: 426094
URL: https://svnweb.freebsd.org/changeset/ports/426094

Log:
  - Add LICENSE
  - Simplify patching
  - Cosmetic fixes
  - Switch to options helpers

Modified:
  head/multimedia/szap-s2/Makefile
  head/multimedia/szap-s2/files/patch-teletext

Modified: head/multimedia/szap-s2/Makefile
==============================================================================
--- head/multimedia/szap-s2/Makefile	Mon Nov 14 08:52:52 2016	(r426093)
+++ head/multimedia/szap-s2/Makefile	Mon Nov 14 09:00:17 2016	(r426094)
@@ -9,21 +9,27 @@ MASTER_SITES=	LOCAL/nox
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple zapping tool for the Linux DVB S2 API
 
+LICENSE=	GPLv2+
+
 BUILD_DEPENDS=  ${LOCALBASE}/include/linux/dvb/frontend.h:multimedia/v4l_compat
 
 USES=		gmake tar:bzip2
-PATCH_STRIP=	-p1
 USE_CSTD=	gnu89
-MAKE_ARGS=	INCLUDE=-I"${LOCALBASE}/include"
-MAKE_ARGS+=	CC="${CC}"
-MAKE_ARGS+=	CXX="${CXX}"
+MAKE_ARGS=	INCLUDE=-I"${LOCALBASE}/include" \
+		CC="${CC}" \
+		CXX="${CXX}"
 WRKSRC=		${WRKDIR}/szap-s2-e34f73b254db
+
 PORTDOCS=	README
 PLIST_FILES=	bin/szap-s2
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
-	(cd ${WRKSRC} && ${INSTALL_PROGRAM} szap-s2 ${STAGEDIR}/${PREFIX}/bin)
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
+	${INSTALL_PROGRAM} ${WRKSRC}/szap-s2 ${STAGEDIR}/${PREFIX}/bin
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/multimedia/szap-s2/files/patch-teletext
==============================================================================
--- head/multimedia/szap-s2/files/patch-teletext	Mon Nov 14 08:52:52 2016	(r426093)
+++ head/multimedia/szap-s2/files/patch-teletext	Mon Nov 14 09:00:17 2016	(r426094)
@@ -1,5 +1,5 @@
---- a/szap-s2.c
-+++ b/szap-s2.c
+--- szap-s2.c.orig	2010-01-29 22:54:19 UTC
++++ szap-s2.c
 @@ -206,6 +206,7 @@ static char *usage_str =
      "     -i        : run interactively, allowing you to type in channel names\n"
      "     -p        : add pat and pmt to TS recording (implies -r)\n"