From owner-svn-ports-head@freebsd.org  Sun Feb 21 10:35:32 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 82C80AB0960;
 Sun, 21 Feb 2016 10:35:32 +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 3D29810B8;
 Sun, 21 Feb 2016 10:35:32 +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 u1LAZVxK093121;
 Sun, 21 Feb 2016 10:35:31 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1LAZVLK093119;
 Sun, 21 Feb 2016 10:35:31 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201602211035.u1LAZVLK093119@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: Sun, 21 Feb 2016 10:35:31 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r409279 - in head/textproc/html2text: . 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.20
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: Sun, 21 Feb 2016 10:35:32 -0000

Author: amdmi3
Date: Sun Feb 21 10:35:30 2016
New Revision: 409279
URL: https://svnweb.freebsd.org/changeset/ports/409279

Log:
  - Clarify LICENSE
  - Add LICENSE_FILE
  - Switch to options helpers
  - Regenerate patches with `make makepatch`

Modified:
  head/textproc/html2text/Makefile
  head/textproc/html2text/files/patch-configure

Modified: head/textproc/html2text/Makefile
==============================================================================
--- head/textproc/html2text/Makefile	Sun Feb 21 10:23:06 2016	(r409278)
+++ head/textproc/html2text/Makefile	Sun Feb 21 10:35:30 2016	(r409279)
@@ -10,7 +10,8 @@ MASTER_SITES=	SUNSITE/apps/www/converter
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Converts HTML documents into plain text
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 HAS_CONFIGURE=	yes
 
@@ -21,6 +22,8 @@ CONFLICTS=	py27-html2text-[0-9]*
 
 PORTSCOUT=	skipb:0 skipv:1.3.2
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -e '/echo=/s/ -e//' ${WRKSRC}/configure
 .for fle in Makefile.in libstd/Makefile.in
@@ -35,9 +38,11 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/html2text ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/html2text.1.gz ${STAGEDIR}${MANPREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/html2textrc.5.gz ${STAGEDIR}${MANPREFIX}/man/man5
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for fle in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${fle} ${STAGEDIR}${DOCSDIR}
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for f in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>

Modified: head/textproc/html2text/files/patch-configure
==============================================================================
--- head/textproc/html2text/files/patch-configure	Sun Feb 21 10:23:06 2016	(r409278)
+++ head/textproc/html2text/files/patch-configure	Sun Feb 21 10:35:30 2016	(r409279)
@@ -1,6 +1,6 @@
---- ./configure.orig	2012-11-11 09:42:22.000000000 -0500
-+++ ./configure	2012-11-11 09:46:01.000000000 -0500
-@@ -38,8 +38,7 @@
+--- configure.orig	2004-01-12 15:47:18 UTC
++++ configure
+@@ -38,8 +38,7 @@ int main(int, char **) {
    return 0;
  }
  EOF
@@ -10,7 +10,7 @@
    if $i -c $tmp_file.C 2>/dev/null; then
      CXX="$i";
      break;
-@@ -205,12 +205,19 @@
+@@ -205,12 +204,19 @@ cat <<EOF >$tmp_file.C;
  #include <new>
  #include <vector>
  using namespace std;