diff options
| author | joerg <joerg> | 2005-12-30 17:24:16 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2005-12-30 17:24:16 +0000 |
| commit | 6d96615a1d3a37f0422b923f65f3bade6b8eb891 (patch) | |
| tree | 63fcd321796bd56d6137460f691bbf2ae9889afb /converters | |
| parent | c65c4c4323831a73890c28310d68612ca6bb9ef2 (diff) | |
| download | pkgsrc-6d96615a1d3a37f0422b923f65f3bade6b8eb891.tar.gz | |
ffs is a pre-existing symbol e.g. on DragonFly, use a different name.
Diffstat (limited to 'converters')
| -rw-r--r-- | converters/psiconv/distinfo | 4 | ||||
| -rw-r--r-- | converters/psiconv/patches/patch-ab | 22 | ||||
| -rw-r--r-- | converters/psiconv/patches/patch-ac | 22 |
3 files changed, 47 insertions, 1 deletions
diff --git a/converters/psiconv/distinfo b/converters/psiconv/distinfo index 4c897d567c6..86f7fd9c49b 100644 --- a/converters/psiconv/distinfo +++ b/converters/psiconv/distinfo @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.10 2005/04/20 13:10:06 adam Exp $ +$NetBSD: distinfo,v 1.11 2005/12/30 17:24:16 joerg Exp $ SHA1 (psiconv-0.9.7.tar.gz) = 226f95280ac40ca6642d4283b0d75492f1b8cb70 RMD160 (psiconv-0.9.7.tar.gz) = aed8ad1308f1f51a5dec02d0b98288f314c6d623 Size (psiconv-0.9.7.tar.gz) = 497802 bytes SHA1 (patch-aa) = be7330996b18ce78cf8983e4f18bd6313289c864 +SHA1 (patch-ab) = ec70d619ee26c859b2215547899241c65e96e3ec +SHA1 (patch-ac) = bc9e16854b8a05b19fafcd57bef83e7e73b33ed4 diff --git a/converters/psiconv/patches/patch-ab b/converters/psiconv/patches/patch-ab new file mode 100644 index 00000000000..373431e9c1a --- /dev/null +++ b/converters/psiconv/patches/patch-ab @@ -0,0 +1,22 @@ +$NetBSD: patch-ab,v 1.4 2005/12/30 17:24:25 joerg Exp $ + +--- program/psiconv/gen_xhtml.c.orig 2005-12-30 16:37:52.000000000 +0000 ++++ program/psiconv/gen_xhtml.c +@@ -719,7 +719,7 @@ int gen_xhtml(const psiconv_config confi + } + + +-static struct fileformat_s ffs[] = ++static struct fileformat_s my_ffs[] = + { + { + "XHTML", +@@ -739,6 +739,6 @@ static struct fileformat_s ffs[] = + void init_xhtml(void) + { + int i; +- for (i = 0; ffs[i].name; i++) +- psiconv_list_add(fileformat_list,ffs+i); ++ for (i = 0; my_ffs[i].name; i++) ++ psiconv_list_add(fileformat_list,my_ffs+i); + } diff --git a/converters/psiconv/patches/patch-ac b/converters/psiconv/patches/patch-ac new file mode 100644 index 00000000000..4700c2dbf28 --- /dev/null +++ b/converters/psiconv/patches/patch-ac @@ -0,0 +1,22 @@ +$NetBSD: patch-ac,v 1.4 2005/12/30 17:24:25 joerg Exp $ + +--- program/psiconv/gen_html4.c.orig 2005-12-30 17:00:29.000000000 +0000 ++++ program/psiconv/gen_html4.c +@@ -317,7 +317,7 @@ int gen_html4(const psiconv_config confi + } + + +-static struct fileformat_s ffs[] = ++static struct fileformat_s my_ffs[] = + { + { + "HTML4", +@@ -337,6 +337,6 @@ static struct fileformat_s ffs[] = + void init_html4(void) + { + int i; +- for (i = 0; ffs[i].name; i++) +- psiconv_list_add(fileformat_list,ffs+i); ++ for (i = 0; my_ffs[i].name; i++) ++ psiconv_list_add(fileformat_list,my_ffs+i); + } |