svn commit: r414039 - in head/textproc/xlhtml: . files

[Dmitry Marakasov]

Author: amdmi3
Date: Tue Apr 26 09:03:21 2016
New Revision: 414039
URL: https://svnweb.freebsd.org/changeset/ports/414039

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

Modified:
  head/textproc/xlhtml/Makefile
  head/textproc/xlhtml/files/patch-ppthtml_nspptview
  head/textproc/xlhtml/files/patch-xlhtml__xlhtml.c
  head/textproc/xlhtml/files/patch-xlhtml_nsopen
  head/textproc/xlhtml/files/patch-xlhtml_nsxlview

Modified: head/textproc/xlhtml/Makefile
==============================================================================
--- head/textproc/xlhtml/Makefile	Tue Apr 26 08:29:42 2016	(r414038)
+++ head/textproc/xlhtml/Makefile	Tue Apr 26 09:03:21 2016	(r414039)
@@ -11,14 +11,15 @@ MASTER_SITES=	SF/chicago/${PORTNAME}/bac
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Convert Excel and PowerPoint files to HTML and text
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 GNU_CONFIGURE=	yes
 USES=		gmake tar:tgz
 
 OPTIONS_DEFINE=	DOCS
 
-post-install:
+post-install-DOCS-on:
 .for dir in xlhtml ppthtml
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/${dir}
 	cd ${WRKSRC}/${dir} && \

Modified: head/textproc/xlhtml/files/patch-ppthtml_nspptview
==============================================================================
--- head/textproc/xlhtml/files/patch-ppthtml_nspptview	Tue Apr 26 08:29:42 2016	(r414038)
+++ head/textproc/xlhtml/files/patch-ppthtml_nspptview	Tue Apr 26 09:03:21 2016	(r414039)
@@ -1,5 +1,5 @@
---- ppthtml/nspptview.orig	Sun Jun 22 08:47:02 2003
-+++ ppthtml/nspptview	Sun Jun 22 08:49:18 2003
+--- ppthtml/nspptview.orig	2002-03-20 15:32:43 UTC
++++ ppthtml/nspptview
 @@ -1,7 +1,7 @@
  #!/bin/csh
  
@@ -9,7 +9,7 @@
      exit 1
  endif
  
-@@ -12,9 +12,8 @@
+@@ -12,9 +12,8 @@ set source = $argv[1]
  #set tmp = /tmp/$com:t.$$
  #set html = $tmp.html
  

Modified: head/textproc/xlhtml/files/patch-xlhtml__xlhtml.c
==============================================================================
--- head/textproc/xlhtml/files/patch-xlhtml__xlhtml.c	Tue Apr 26 08:29:42 2016	(r414038)
+++ head/textproc/xlhtml/files/patch-xlhtml__xlhtml.c	Tue Apr 26 09:03:21 2016	(r414039)
@@ -1,7 +1,7 @@
---- xlhtml/xlhtml.c	2002/02/27 18:10:01	1.1
-+++ xlhtml/xlhtml.c	2002/02/27 18:12:58
-@@ -746,8 +746,13 @@
- 					ws_array[i]->ws_title.str, ws_array[i]->biggest_row, ws_array[i]->biggest_col);
+--- xlhtml/xlhtml.c.orig	2002-04-11 03:25:17 UTC
++++ xlhtml/xlhtml.c
+@@ -616,8 +616,13 @@ void scan_file(COLEDIRENT *cde, void *_i
+ 					ws_array[i]->biggest_row, ws_array[i]->biggest_col);
  			}
  		}
 -		else if (Xtract)

Modified: head/textproc/xlhtml/files/patch-xlhtml_nsopen
==============================================================================
--- head/textproc/xlhtml/files/patch-xlhtml_nsopen	Tue Apr 26 08:29:42 2016	(r414038)
+++ head/textproc/xlhtml/files/patch-xlhtml_nsopen	Tue Apr 26 09:03:21 2016	(r414039)
@@ -1,6 +1,6 @@
---- xlhtml/nsopen.orig	Sun Jun 22 01:17:52 2003
-+++ xlhtml/nsopen	Sun Jun 22 01:18:51 2003
-@@ -12,9 +12,9 @@
+--- xlhtml/nsopen.orig	2002-03-20 15:32:50 UTC
++++ xlhtml/nsopen
+@@ -12,9 +12,9 @@ if (!(-r $file)) then
  endif
  
  #Try to open file in an existing netscape window

Modified: head/textproc/xlhtml/files/patch-xlhtml_nsxlview
==============================================================================
--- head/textproc/xlhtml/files/patch-xlhtml_nsxlview	Tue Apr 26 08:29:42 2016	(r414038)
+++ head/textproc/xlhtml/files/patch-xlhtml_nsxlview	Tue Apr 26 09:03:21 2016	(r414039)
@@ -1,6 +1,6 @@
---- xlhtml/nsxlview.orig	Sun Jun 22 08:36:31 2003
-+++ xlhtml/nsxlview	Sun Jun 22 08:44:57 2003
-@@ -12,10 +12,8 @@
+--- xlhtml/nsxlview.orig	2002-03-20 15:32:50 UTC
++++ xlhtml/nsxlview
+@@ -12,10 +12,8 @@ set source = $argv[1]
  #set tmp = /tmp/$com:t.$$
  #set html = $tmp.html