Hi,

textproc/docx2txt is quite outdated (version 1.0).
The current version (1.4) has improvements in particular with respect
to lists, indentation, and special characters.

Tested on i386, and the results look better indeed.
I couldn't find any regressions.

The README file and the configuration example file in part serve
the purpose of a manual, so i think it's worth installing them -
but i don't want to waste time converting them to an actual manual
right now.

I considered adding a @sample /etc/docx2txt.config, but made up my
mind that it's better not to.  Very few users will want to change
that, so let's not clutter /etc.  If somebody really needs it, they
should just create a one-line /etc file themselves.

OK?
  Ingo


Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/docx2txt/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile    11 Mar 2013 11:42:41 -0000      1.2
+++ Makefile    7 Oct 2014 10:57:18 -0000
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.2 2013/03/11 11:42:41 espie Exp $
 
 COMMENT =              command line converter from Microsoft docx to ASCII text
-DISTNAME =             docx2txt-1.0
+DISTNAME =             docx2txt-1.4
 CATEGORIES =           textproc
 HOMEPAGE =             http://docx2txt.sourceforge.net/
 MAINTAINER =           Ingo Schwarze <schwa...@openbsd.org>
@@ -18,5 +18,10 @@
 
 do-install:
        ${INSTALL_SCRIPT} ${WRKSRC}/docx2txt.pl ${PREFIX}/bin/docx2txt
+       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/docx2txt
+       ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/docx2txt/README
+       ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/docx2txt
+       ${INSTALL_DATA} ${WRKSRC}/docx2txt.config \
+               ${PREFIX}/share/examples/docx2txt/docx2txt.config
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/textproc/docx2txt/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo    5 Apr 2011 15:09:50 -0000       1.1.1.1
+++ distinfo    7 Oct 2014 10:57:18 -0000
@@ -1,5 +1,2 @@
-MD5 (docx2txt-1.0.tgz) = ei00BMRFttLSTWK/X8aBFg==
-RMD160 (docx2txt-1.0.tgz) = /ndDsNX9KpxjlPaUricVkebDvf0=
-SHA1 (docx2txt-1.0.tgz) = EJ7GWXaQiXecNSyyionPQAhAeRw=
-SHA256 (docx2txt-1.0.tgz) = 9I9pc2+nMFnZ3eHy9RjJr/qBdFFfEG3bOdakXi+iM9s=
-SIZE (docx2txt-1.0.tgz) = 24795
+SHA256 (docx2txt-1.4.tgz) = spd1KRCkBMFDXnA9Wu20VxIivXWfoxbIatjIu+WMbRs=
+SIZE (docx2txt-1.4.tgz) = 31302
Index: patches/patch-docx2txt_pl
===================================================================
RCS file: /cvs/ports/textproc/docx2txt/patches/patch-docx2txt_pl,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-docx2txt_pl
--- patches/patch-docx2txt_pl   5 Apr 2011 15:09:50 -0000       1.1.1.1
+++ patches/patch-docx2txt_pl   7 Oct 2014 10:57:18 -0000
@@ -1,12 +1,27 @@
 $OpenBSD: patch-docx2txt_pl,v 1.1.1.1 2011/04/05 15:09:50 schwarze Exp $
---- docx2txt.pl.orig   Sun Oct  4 17:31:04 2009
-+++ docx2txt.pl        Tue Apr  5 16:07:08 2011
-@@ -72,7 +72,7 @@
- # first in current directory and then in the same location as this script.
+No need to require an absolute path for unzip.
+--- docx2txt.pl.orig   Tue May 13 18:15:32 2014
++++ docx2txt.pl        Tue Oct  7 12:33:43 2014
+@@ -107,7 +107,7 @@
+ # directory/ user configuration directory/ system configuration directory.
+ #
+ 
+-our $config_unzip = '/usr/bin/unzip'; # Windows path like 
'C:/path/to/unzip.exe'
++our $config_unzip = 'unzip';          # Windows path like 
'C:/path/to/unzip.exe'
+ our $config_unzip_opts = '-p';                # To extract file on standard 
output
+ 
+ our $config_newLine = "\n";           # Alternative is "\r\n".
+@@ -299,13 +299,6 @@ if (%config) {
+ }
+ 
+ #
+-# Check for unzip utility, before proceeding further.
+-#
+-
+-die "Failed to locate unzip command '$config_unzip'!\n" if ! -f $config_unzip;
+-
+-
+-#
+ # Handle cases where this script reads docx file from STDIN.
  #
  
--our $unzip = '/usr/bin/unzip';        # Windows path like 
'C:/path/to/unzip.exe'
-+our $unzip = 'unzip';         # rely on the PATH
- our $newLine = "\n";          # Alternative is "\r\n".
- our $listIndent = "  ";               # Indent nested lists by "\t", " " etc.
- our $lineWidth = 80;          # Line width, used for short line justification.
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/docx2txt/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- pkg/PLIST   5 Apr 2011 15:09:50 -0000       1.1.1.1
+++ pkg/PLIST   7 Oct 2014 10:57:18 -0000
@@ -1,2 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2011/04/05 15:09:50 schwarze Exp $
 bin/docx2txt
+share/doc/docx2txt/
+share/doc/docx2txt/README
+share/examples/docx2txt/
+share/examples/docx2txt/docx2txt.config

Reply via email to