[86589] trunk/dports/textproc/unrtf

[ryandesign at macports.org]

Revision: 86589
          http://trac.macports.org/changeset/86589
Author:   ryandesign at macports.org
Date:     2011-10-28 21:46:04 -0700 (Fri, 28 Oct 2011)
Log Message:
-----------
unrtf: update to 0.21.2, fix hardcoded references to /usr/local (#31819)

Modified Paths:
--------------
    trunk/dports/textproc/unrtf/Portfile
    trunk/dports/textproc/unrtf/files/patch-configure.diff

Added Paths:
-----------
    trunk/dports/textproc/unrtf/files/patch-prefix.diff

Modified: trunk/dports/textproc/unrtf/Portfile
===================================================================
--- trunk/dports/textproc/unrtf/Portfile	2011-10-29 02:37:25 UTC (rev 86588)
+++ trunk/dports/textproc/unrtf/Portfile	2011-10-29 04:46:04 UTC (rev 86589)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                unrtf
-version             0.21.1
+version             0.21.2
 categories          textproc
 platforms           darwin
 maintainers         nomaintainer
@@ -18,9 +18,18 @@
 homepage            http://www.gnu.org/software/unrtf/unrtf.html
 master_sites        gnu
 
-checksums           sha1    a414c315f3aa58dffebc19cf277f6c1bbc1fc3e8 \
-                    rmd160  0364bf4f4a7c48e08514ee36609bb0bf0c90df2e
+checksums           rmd160  180d16ac43bac5ef28a4afb65a564a34cb8bef9d \
+                    sha256  acb1b093dd2c7485fc43b128ccaf665d6188f568752cec96d54b693374caddb0
 
 depends_lib         port:libiconv
 
-patchfiles          patch-configure.diff
+patchfiles          patch-configure.diff \
+                    patch-prefix.diff
+
+post-patch {
+    reinplace "s|@PREFIX@|${prefix}|g" \
+                    ${worksrcpath}/doc/unrtf.1 \
+                    ${worksrcpath}/src/main.h \
+                    ${worksrcpath}/src/my_iconv.h \
+                    ${worksrcpath}/src/path.h
+}

Modified: trunk/dports/textproc/unrtf/files/patch-configure.diff
===================================================================
--- trunk/dports/textproc/unrtf/files/patch-configure.diff	2011-10-29 02:37:25 UTC (rev 86588)
+++ trunk/dports/textproc/unrtf/files/patch-configure.diff	2011-10-29 04:46:04 UTC (rev 86589)
@@ -1,9 +1,9 @@
---- configure.orig	2010-11-26 18:02:24.000000000 +0100
-+++ configure	2010-11-26 18:03:18.000000000 +0100
-@@ -4838,6 +4838,8 @@
- case $host in
-     *-*-cygwin*)	LIBS="-liconv"
+--- configure.orig	2010-08-15 09:08:09.000000000 -0500
++++ configure	2011-10-28 19:41:37.000000000 -0500
+@@ -4840,6 +4840,8 @@
  ;;
+     *aix*)		LIBS="-liconv"
+ ;;
 +    *-*-darwin*)	LIBS="-liconv"
 +;;
  esac

Added: trunk/dports/textproc/unrtf/files/patch-prefix.diff
===================================================================
--- trunk/dports/textproc/unrtf/files/patch-prefix.diff	                        (rev 0)
+++ trunk/dports/textproc/unrtf/files/patch-prefix.diff	2011-10-29 04:46:04 UTC (rev 86589)
@@ -0,0 +1,57 @@
+--- doc/unrtf.1.orig	2010-07-03 21:30:58.000000000 -0500
++++ doc/unrtf.1	2011-10-28 22:06:20.000000000 -0500
+@@ -87,20 +87,20 @@
+ configuration files are a simple format.  To change the behaviour of
+ unrtf, a local copy of a system configuration file can be be made and
+ edited.  The most complete configuration file and hence the best starting
+-point is /usr/local/lib/unrtf/html.conf.
++point is @PREFIX@/lib/unrtf/html.conf.
+ .TP
+ \-P config_search_path
+ specifies the directories in which the configuration file for the specified
+ format will be sought.  The path can be provided as a single directory
+ or a list of colon separated directories. 
+-The default is /usr/local/lib/unrtf/ where distributed output
++The default is @PREFIX@/lib/unrtf/ where distributed output
+ configuration files are installed.
+ .SH FILES
+ .TP
+-/usr/local/lib/unrtf/*.conf
++ at PREFIX@/lib/unrtf/*.conf
+ - run time output configuration files.
+ .TP
+-/usr/local/lib/unrtf/SYMBOL.charmap
++ at PREFIX@/lib/unrtf/SYMBOL.charmap
+ - UTF encoding of the SYMBOL font
+ used in many RTF files.  Unfortunately the iconv package does not include
+ font encodings.  The format is identical to iconv code page files.
+--- src/main.h.orig	2010-07-03 21:30:58.000000000 -0500
++++ src/main.h	2011-10-28 22:06:11.000000000 -0500
+@@ -47,7 +47,7 @@
+ #include "output.h"
+ #endif
+ 
+-#define CONFIG_DIR "/usr/local/lib/unrtf/"
++#define CONFIG_DIR "@PREFIX@/lib/unrtf/"
+ #define DEFAULT_OUTPUT "html"
+ 
+ extern OutputPersonality *op;
+--- src/my_iconv.h.orig	2010-07-03 21:30:58.000000000 -0500
++++ src/my_iconv.h	2011-10-28 22:06:08.000000000 -0500
+@@ -10,7 +10,7 @@
+ #define HAVE_ICONV_H
+ #endif
+ 
+-#define CHARMAP_DIR "/usr/local/lib/unrtf/charmaps/"
++#define CHARMAP_DIR "@PREFIX@/lib/unrtf/charmaps/"
+ #define char_table_size 256
+ 
+ typedef struct
+--- src/path.h.orig	2010-07-03 21:30:58.000000000 -0500
++++ src/path.h	2011-10-28 22:06:05.000000000 -0500
+@@ -1,4 +1,4 @@
+-#define DEFAULT_UNRTF_SEARCH_PATH	"/usr/local/lib/unrtf/"
++#define DEFAULT_UNRTF_SEARCH_PATH	"@PREFIX@/lib/unrtf/"
+ 
+ char	*search_path;
+ int	n_path_dirs;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111028/ece483ce/attachment.html>