- Clarify LICENSE

- Add LICENSE_FILE
- Switch to options helpers
- Regenerate patches with `make makepatch`

5 files changed, 16 insertions, 15 deletions

diff --git a/textproc/xlhtml/Makefile b/textproc/xlhtml/Makefile
index 76ef788df4f1..dae2ac9ab527 100644
--- a/textproc/xlhtml/Makefile
+++ b/textproc/xlhtml/Makefile
@@ -11,14 +11,15 @@ MASTER_SITES=	SF/chicago/${PORTNAME}/backend
 MAINTAINER=	ports@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} && \
diff --git a/textproc/xlhtml/files/patch-ppthtml_nspptview b/textproc/xlhtml/files/patch-ppthtml_nspptview
index 08cf0894e2c8..004615bb08b9 100644
--- a/textproc/xlhtml/files/patch-ppthtml_nspptview
+++ b/textproc/xlhtml/files/patch-ppthtml_nspptview
@@ -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
  
diff --git a/textproc/xlhtml/files/patch-xlhtml__xlhtml.c b/textproc/xlhtml/files/patch-xlhtml__xlhtml.c
index 9c0afeae2a7f..5dc81eb2c609 100644
--- a/textproc/xlhtml/files/patch-xlhtml__xlhtml.c
+++ b/textproc/xlhtml/files/patch-xlhtml__xlhtml.c
@@ -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)
diff --git a/textproc/xlhtml/files/patch-xlhtml_nsopen b/textproc/xlhtml/files/patch-xlhtml_nsopen
index 197e1e4bd74a..8effa6de45b6 100644
--- a/textproc/xlhtml/files/patch-xlhtml_nsopen
+++ b/textproc/xlhtml/files/patch-xlhtml_nsopen
@@ -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
diff --git a/textproc/xlhtml/files/patch-xlhtml_nsxlview b/textproc/xlhtml/files/patch-xlhtml_nsxlview
index 1b174aacc5ad..99dea407a5e4 100644
--- a/textproc/xlhtml/files/patch-xlhtml_nsxlview
+++ b/textproc/xlhtml/files/patch-xlhtml_nsxlview
@@ -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