head	1.2;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.2
	OPENPKG_E1_MP:1.2
	OPENPKG_E1_MP_2_STABLE:1.2
	OPENPKG_E1_FP:1.2
	OPENPKG_2_STABLE_MP:1.2
	OPENPKG_2_STABLE_20061018:1.2
	OPENPKG_2_STABLE_20060622:1.2
	OPENPKG_2_STABLE:1.2.0.2
	OPENPKG_2_STABLE_BP:1.2
	OPENPKG_2_5_RELEASE:1.1
	OPENPKG_2_5_SOLID:1.1.0.6
	OPENPKG_2_5_SOLID_BP:1.1
	OPENPKG_2_4_RELEASE:1.1
	OPENPKG_2_4_SOLID:1.1.0.4
	OPENPKG_2_4_SOLID_BP:1.1
	OPENPKG_CW_FP:1.1
	OPENPKG_2_3_RELEASE:1.1
	OPENPKG_2_3_SOLID:1.1.0.2
	OPENPKG_2_3_SOLID_BP:1.1;
locks; strict;
comment	@# @;


1.2
date	2005.11.03.07.11.20;	author rse;	state Exp;
branches;
next	1.1;
commitid	aLM1b3jfme5VCh8r;

1.1
date	2005.02.17.19.07.43;	author rse;	state Exp;
branches;
next	;


desc
@@


1.2
log
@upgrading package: antiword 0.36.1 -> 0.37
@
text
@Index: antiword.h
--- antiword.h.orig	2005-07-06 19:46:22 +0200
+++ antiword.h	2005-11-03 08:08:20 +0100
@@@@ -197,7 +197,7 @@@@
 #define FONTNAMES_FILE		"fontname.txt"
 #elif defined(__amigaos)
 #define GLOBAL_ANTIWORD_DIR	"SYS:.antiword"
-#define ANTIWORD_DIR		".antiword"
+#define ANTIWORD_DIR		"antiword"
 #define FONTNAMES_FILE		"fontnames"
 #elif defined(N_PLAT_NLM)
 #define GLOBAL_ANTIWORD_DIR	"SYS:/antiword"
@@@@ -225,7 +225,7 @@@@
 #define FONTNAMES_FILE		"fontnames"
 #else	/* All others */
 #define GLOBAL_ANTIWORD_DIR	"/usr/share/antiword"
-#define ANTIWORD_DIR		".antiword"
+#define ANTIWORD_DIR		"antiword"
 #define FONTNAMES_FILE		"fontnames"
 #endif /* __dos */
 /* The names of grouped mapping files */
Index: chartrans.c
--- chartrans.c.orig	2005-01-11 20:44:46 +0100
+++ chartrans.c	2005-11-03 08:08:20 +0100
@@@@ -6,10 +6,15 @@@@
  * Translate Word characters to local representation
  */
 
+#if defined(__FreeBSD__)
+#include <osreldate.h>
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#if defined(__STDC_ISO_10646__)
+#if defined(__STDC_ISO_10646__) || defined(__FreeBSD__) || defined(__NetBSD__)
+#include <wchar.h>
 #include <wctype.h>
 #endif /* __STDC_ISO_10646__ */
 #include "antiword.h"
@@@@ -707,7 +712,8 @@@@
 		 */
 		return ulChar & ~0x20;
 	}
-#if defined(__STDC_ISO_10646__)
+#if defined(__STDC_ISO_10646__) || (defined(__FreeBSD__) && __FreeBSD_version >= 500000) || defined(__NetBSD__)
+#include <wchar.h>
 	/*
 	 * If this is ISO C99 and all locales have wchar_t = ISO 10646
 	 * (e.g., glibc 2.2 or newer), then use standard function
Index: fonts_u.c
--- fonts_u.c.orig	2005-06-14 19:23:29 +0200
+++ fonts_u.c	2005-11-03 08:08:20 +0100
@@@@ -56,7 +56,6 @@@@
 	}
 
 	/* Try the local version of the fontnames file */
-	szHome = szGetHomeDirectory();
 	if (strlen(szHome) +
 	    sizeof(FILE_SEPARATOR ANTIWORD_DIR FILE_SEPARATOR FONTNAMES_FILE) >=
 	    sizeof(szLocalFile)) {
Index: main_u.c
--- main_u.c.orig	2005-01-15 21:08:51 +0100
+++ main_u.c	2005-11-03 08:09:11 +0100
@@@@ -36,7 +36,10 @@@@
 #    include <locale.h>
 #  endif
 #else
+#if defined(__STDC_ISO_10646__) || defined(__FreeBSD__) || defined(__NetBSD__)
+#include <wchar.h>
 #include <locale.h>
+#endif
 #endif /* __CYGWIN__ || __CYGMING__ */
 #if defined(N_PLAT_NLM)
 #if !defined(_VA_LIST)
@@@@ -252,7 +255,8 @@@@
 
 #if !defined(__dos)
 	if (is_locale_utf8()) {
-#if defined(__STDC_ISO_10646__)
+#if defined(__STDC_ISO_10646__) || defined(__FreeBSD__) || defined(__NetBSD__)
+#include <wchar.h>
 		/*
 		 * If the user wants UTF-8 and the envirionment variables
 		 * support UTF-8, than set the locale accordingly
@@@@ -268,11 +272,13 @@@@
 		}
 #endif /* __STDC_ISO_10646__ */
 	} else {
+#ifdef LC_CTYPE
 		if (setlocale(LC_CTYPE, "") == NULL) {
 			werr(0, "Can't set the locale! Will use defaults");
 			(void)setlocale(LC_CTYPE, "C");
 		}
 		DBG_MSG("The locale has been set");
+#endif
 	}
 #endif /* !__dos */
 
Index: options.c
--- options.c.orig	2005-05-27 20:21:18 +0200
+++ options.c	2005-11-03 08:08:20 +0100
@@@@ -218,7 +218,6 @@@@
 	}
 
 	/* Try the local version of the mapping file */
-	szHome = szGetHomeDirectory();
 	if (strlen(szHome) + tFilenameLen <
 	    sizeof(szMappingFile) -
 	    sizeof(ANTIWORD_DIR) -
@


1.1
log
@sed(1) usages which include a newline are not portable and multiple and conditional 'shtool subst' are not very maintainable anyway, so replace the substitutions with a patch and this way get the package building under Solaris again
@
text
@d2 3
a4 3
--- antiword.h.orig	2004-09-30 20:55:56.000000000 +0200
+++ antiword.h	2005-02-17 20:04:40.364083736 +0100
@@@@ -194,7 +194,7 @@@@
d13 1
a13 1
@@@@ -218,7 +218,7 @@@@
d23 2
a24 2
--- chartrans.c.orig	2004-09-13 13:17:37.000000000 +0200
+++ chartrans.c	2005-02-17 20:04:40.364604120 +0100
d42 1
a42 1
@@@@ -700,7 +705,8 @@@@
d53 2
a54 2
--- fonts_u.c.orig	2004-09-07 17:16:42.000000000 +0200
+++ fonts_u.c	2005-02-17 20:04:40.364855447 +0100
d64 6
a69 7
--- main_u.c.orig	2004-10-14 18:49:18.000000000 +0200
+++ main_u.c	2005-02-17 20:05:46.016037658 +0100
@@@@ -29,7 +29,8 @@@@
 #include <fcntl.h>
 #include <io.h>
 #endif /* __dos */
-#if defined(__STDC_ISO_10646__)
d73 2
a74 1
 #endif /* __STDC_ISO_10646__ */
d76 2
a77 1
@@@@ -245,7 +246,8 @@@@
d87 1
a87 1
@@@@ -261,11 +263,13 @@@@
d102 3
a104 3
--- options.c.orig	2004-10-08 20:54:36.000000000 +0200
+++ options.c	2005-02-17 20:04:40.365514131 +0100
@@@@ -216,7 +216,6 @@@@
@