From 2481795456379c34dea609d5abe65da1323bf749 Mon Sep 17 00:00:00 2001
From: Christian Wiese <christian.wiese@securepoint.de>
Date: Tue, 12 Feb 2013 12:19:09 +0100
Subject: [PATCH] unrtf: Updated (0.21.1 -> 0.21.3)

---
 textproc/unrtf/unrtf-0001-sysconfdir.patch | 84 ++++------------------
 textproc/unrtf/unrtf.desc                  |  6 +-
 2 files changed, 18 insertions(+), 72 deletions(-)

diff --git a/textproc/unrtf/unrtf-0001-sysconfdir.patch b/textproc/unrtf/unrtf-0001-sysconfdir.patch
index 97bc05a69..7d83040bc 100644
--- a/textproc/unrtf/unrtf-0001-sysconfdir.patch
+++ b/textproc/unrtf/unrtf-0001-sysconfdir.patch
@@ -14,78 +14,24 @@
 # version.
 # --- SDE-COPYRIGHT-NOTE-END ---
 
-Do not hardcode CONFIG_DIR and DEFAULT_UNRTF_SEARCH_PATH but instead
-use sysconfdir/unrtf for the configuration files.
+Install config files into $sysconfdir/unrtf and $pkgdatadir
 
---- a/outputs/Makefile.am	2013-02-06 12:27:40.302382572 +0100
-+++ b/outputs/Makefile.am	2013-02-06 12:27:52.269353575 +0100
-@@ -1,2 +1,2 @@
--outputsdir = ${libdir}/${PACKAGE}
+--- ./outputs/Makefile.am.orig	2013-02-12 12:08:56.625472796 +0100
++++ ./outputs/Makefile.am	2013-02-12 12:09:35.850129223 +0100
+@@ -1,4 +1,4 @@
+-outputsdir = ${pkgdatadir}
 +outputsdir = ${sysconfdir}/${PACKAGE}
- dist_outputs_DATA = html.conf latex.conf rtf.conf text.conf vt.conf
---- a/outputs/Makefile.in	2013-02-06 12:08:17.617866161 +0100
-+++ b/outputs/Makefile.in	2013-02-06 12:27:35.262829752 +0100
-@@ -165,7 +165,7 @@
+ dist_outputs_DATA = \
+ 	html.conf \
+ 	latex.conf \
+--- ./outputs/Makefile.in.orig	2013-02-12 12:08:53.541726283 +0100
++++ ./outputs/Makefile.in	2013-02-12 12:10:29.129500764 +0100
+@@ -193,7 +193,7 @@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
--outputsdir = ${libdir}/${PACKAGE}
+-outputsdir = ${pkgdatadir}
 +outputsdir = ${sysconfdir}/${PACKAGE}
- dist_outputs_DATA = html.conf latex.conf rtf.conf text.conf vt.conf
- all: all-am
- 
---- a/src/Makefile.am	2013-02-06 12:32:39.616770354 +0100
-+++ b/src/Makefile.am	2013-02-06 12:36:07.266938713 +0100
-@@ -19,3 +19,6 @@
- 		util.c util.h         \
- 		word.c word.h
- 
-+AM_CFLAGS = -DCONFIG_DIR=\"@sysconfdir@/@PACKAGE@/\" \
-+	     -DDEFAULT_UNRTF_SEARCH_PATH=\"@sysconfdir@/@PACKAGE@/\"
-+
---- a/src/Makefile.in	2013-02-06 12:39:44.104431014 +0100
-+++ b/src/Makefile.in	2013-02-06 12:46:09.967278842 +0100
-@@ -180,6 +180,9 @@
- 		util.c util.h         \
- 		word.c word.h
- 
-+AM_CFLAGS = -DCONFIG_DIR=\"@sysconfdir@/@PACKAGE@/\" \
-+	    -DDEFAULT_UNRTF_SEARCH_PATH=\"@sysconfdir@/@PACKAGE@/\"
-+
- all: all-am
- 
- .SUFFIXES:
---- a/charmaps/Makefile.am	2013-02-06 13:07:51.659959572 +0100
-+++ b/charmaps/Makefile.am	2013-02-06 13:14:54.535714791 +0100
-@@ -1,2 +1,2 @@
--outputsdir = ${libdir}/${PACKAGE}
-+outputsdir = ${sysconfdir}/${PACKAGE}
- dist_outputs_DATA = SYMBOL.charmap
---- a/charmaps/Makefile.in	2013-02-06 13:07:54.651705572 +0100
-+++ b/charmaps/Makefile.in	2013-02-06 13:12:53.094230824 +0100
-@@ -165,7 +165,7 @@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--outputsdir = ${libdir}/${PACKAGE}
-+outputsdir = ${sysconfdir}/${PACKAGE}
- dist_outputs_DATA = SYMBOL.charmap
- all: all-am
- 
---- a/src/main.h	2013-02-06 11:45:31.282823320 +0100
-+++ b/src/main.h	2013-02-06 12:55:58.137108127 +0100
-@@ -47,7 +47,6 @@
- #include "output.h"
- #endif
- 
--#define CONFIG_DIR "/usr/local/lib/unrtf/"
- #define DEFAULT_OUTPUT "html"
- 
- extern OutputPersonality *op;
---- a/src/path.h	2013-02-06 12:05:52.550324089 +0100
-+++ b/src/path.h	2013-02-06 12:56:22.043078354 +0100
-@@ -1,4 +1,3 @@
--#define DEFAULT_UNRTF_SEARCH_PATH	"/usr/local/lib/unrtf/"
- 
- char	*search_path;
- int	n_path_dirs;
+ dist_outputs_DATA = \
+ 	html.conf \
+ 	latex.conf \
diff --git a/textproc/unrtf/unrtf.desc b/textproc/unrtf/unrtf.desc
index c8f135524..90a54670a 100644
--- a/textproc/unrtf/unrtf.desc
+++ b/textproc/unrtf/unrtf.desc
@@ -2,7 +2,7 @@
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY]
 [COPY] Filename: package/.../unrtf/unrtf.desc
-[COPY] Copyright (C) 2010 The OpenSDE Project
+[COPY] Copyright (C) 2010 - 2013 The OpenSDE Project
 [COPY]
 [COPY] More information can be found in the files COPYING and README.
 [COPY]
@@ -26,7 +26,7 @@
 
 [L] GPL
 [S] Stable
-[V] 0.21.1
+[V] 0.21.3
 [P] X -----5---9 800.000
 
-[D] 2567305087 unrtf-0.21.1.tar.gz http://ftp.gnu.org/gnu/unrtf/
+[D] 440738535 unrtf-0.21.3.tar.gz http://ftp.gnu.org/gnu/unrtf/