share/gnome -> share

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@8618 df743ca5-7f9a-e211-a948-0013205c9059

6 files changed, 146 insertions, 0 deletions

diff --git a/textproc/scrollkeeper/files/patch-Makefile.in b/textproc/scrollkeeper/files/patch-Makefile.in
new file mode 100644
index 000000000..26e75d437
--- /dev/null
+++ b/textproc/scrollkeeper/files/patch-Makefile.in
@@ -0,0 +1,38 @@
+--- Makefile.in.orig	Sat Dec  6 17:36:32 2003
++++ Makefile.in	Sat Dec  6 17:37:57 2003
+@@ -193,18 +193,6 @@
+ 	scrollkeeper-spec.txt
+ 
+ 
+-scrollkeeperdocdir = $(datadir)/doc/scrollkeeper-$(VERSION)
+-scrollkeeperdoc_DATA = \
+-	AUTHORS			\
+-	ChangeLog		\
+-	COPYING.DOC		\
+-	COPYING			\
+-	NEWS			\
+-	README			\
+-	scrollkeeper-spec.txt	\
+-	TODO
+-
+-
+ scrollkeeper_localstate_dir = $(localstatedir)/@SCROLLKEEPER_PARTIAL_DB_DIR@
+ 
+ ACLOCAL_AMFLAGS = -I m4
+@@ -222,7 +210,7 @@
+ CONFIG_HEADER = config.h
+ CONFIG_CLEAN_FILES = intl/Makefile scrollkeeper.spec
+ DIST_SOURCES =
+-DATA = $(scrollkeeperdoc_DATA)
++DATA =
+ 
+ 
+ RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+@@ -564,7 +552,6 @@
+ all-am: Makefile $(DATA) config.h
+ installdirs: installdirs-recursive
+ installdirs-am:
+-	$(mkinstalldirs) $(DESTDIR)$(scrollkeeperdocdir)
+ 
+ install: install-recursive
+ install-exec: install-exec-recursive
diff --git a/textproc/scrollkeeper/files/patch-extract_dtds_Makefile.in b/textproc/scrollkeeper/files/patch-extract_dtds_Makefile.in
new file mode 100644
index 000000000..1fb855079
--- /dev/null
+++ b/textproc/scrollkeeper/files/patch-extract_dtds_Makefile.in
@@ -0,0 +1,11 @@
+--- extract/dtds/Makefile.in.orig	Sat Dec  6 17:43:49 2003
++++ extract/dtds/Makefile.in	Sat Dec  6 17:43:49 2003
+@@ -408,7 +408,7 @@
+ 
+ # ScrollKeeper OMF Variation DTD V1.0
+ install-data-hook:
+-	-/usr/bin/xmlcatalog --noout --add "public" \
++	-%%LOCALBASE%%/bin/xmlcatalog --noout --add "public" \
+ 		"-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" \
+ 		"$(dtdsdir)/scrollkeeper-omf.dtd" $(CATALOG)
+ 
diff --git a/textproc/scrollkeeper/files/patch-libs_database.c b/textproc/scrollkeeper/files/patch-libs_database.c
new file mode 100644
index 000000000..4a9c6a771
--- /dev/null
+++ b/textproc/scrollkeeper/files/patch-libs_database.c
@@ -0,0 +1,12 @@
+--- libs/database.c.orig	Sat May 25 23:17:10 2002
++++ libs/database.c	Sat May 25 23:18:01 2002
+@@ -73,7 +73,8 @@
+     
+     /* create locale directories and symlinks */
+     
+-    dir = opendir(data_dir);
++    if ((dir = opendir(data_dir)) == NULL)
++	return;
+     
+     while((dir_ent = readdir(dir)) != NULL)
+     {
diff --git a/textproc/scrollkeeper/files/patch-libs_i18n.c b/textproc/scrollkeeper/files/patch-libs_i18n.c
new file mode 100644
index 000000000..3e5f38730
--- /dev/null
+++ b/textproc/scrollkeeper/files/patch-libs_i18n.c
@@ -0,0 +1,60 @@
+--- libs/i18n.c.orig	Sun Nov  9 18:05:36 2003
++++ libs/i18n.c	Tue Feb 14 18:50:23 2006
+@@ -38,6 +38,19 @@ enum {
+  *    All rights reserved.
+  */
+ 
++/* XXX Implement strndup for FreeBSD. */
++static char *
++strndup(const char *str, size_t len) {
++    char *ret;
++
++    if ((str == NULL || len < 0)) return(NULL);
++    ret = (char *)malloc(len + 1);
++    if (ret == NULL) return(NULL);
++    strncpy(ret, str, len);
++    ret[len] = '\0';
++    return(ret);
++}
++
+ /* Support function for compute_locale_variants. */
+ static int explode_locale(const char *locale, char **language,
+ 		char **territory, char **codeset, char **modifier)
+@@ -118,7 +131,7 @@ static char **compute_locale_variants(co
+ 		if ((i & ~mask) == 0) {
+ 			int length = strlen(language) + strlen(territory) 
+ 				+ strlen(codeset) + strlen(modifier);
+-			char *var = (char *) malloc(sizeof(char) * length);
++			char *var = (char *) malloc(sizeof(char) * (length + 1));
+ 			check_ptr(var, "");
+ 
+ 			strcpy(var, language);
+@@ -144,7 +157,8 @@ static char **compute_locale_variants(co
+ 	pos = 0;
+ 	for (i = 0; i <= mask; i++) {
+ 		if (progress[i] != NULL) {
+-			retval[pos] = progress[i];
++			retval[pos] = strdup(progress[i]);
++			free(progress[i]);
+ 			++pos;
+ 		}
+ 	}
+@@ -206,7 +220,7 @@ char **sk_get_language_list()
+ 		count++;
+ 	}
+ 	
+-	tab = (char ***)malloc(sizeof(char **) * count);
++	tab = (char ***)malloc(sizeof(char **) * (count + 1));
+ 	
+ 	str = strdup(lang);
+ 	check_ptr(str, "");
+@@ -246,7 +260,8 @@ char **sk_get_language_list()
+ 	while (tab[j] != NULL) {
+ 		k = 0;
+ 		while (tab[j][k] != NULL) {
+-			retval[pos] = tab[j][k];
++			retval[pos] = strdup(tab[j][k]);
++			free(tab[j][k]);
+ 			++pos;
+ 			++k;
+ 		}
diff --git a/textproc/scrollkeeper/files/patch-libs_install.c b/textproc/scrollkeeper/files/patch-libs_install.c
new file mode 100644
index 000000000..e1162f1fd
--- /dev/null
+++ b/textproc/scrollkeeper/files/patch-libs_install.c
@@ -0,0 +1,14 @@
+--- libs/install.c.orig	Sat Dec  6 17:47:34 2003
++++ libs/install.c	Sat Dec  6 17:47:47 2003
+@@ -517,10 +517,9 @@
+     /* these should all be <sect> nodes */	    
+     for(node = sect_node; node != NULL; node = node->next)
+     {
++	xmlChar *categorycode;
+     	if (xmlStrcmp(node->name, (xmlChar *)"sect"))
+ 	    continue;
+-	
+-	xmlChar *categorycode;
+ 	
+ 	categorycode = xmlGetProp(node, (xmlChar *)"categorycode");
+ 	if (categorycode == NULL)
diff --git a/textproc/scrollkeeper/files/patch-libs_scrollkeeper.h.in b/textproc/scrollkeeper/files/patch-libs_scrollkeeper.h.in
new file mode 100644
index 000000000..c8a8d3400
--- /dev/null
+++ b/textproc/scrollkeeper/files/patch-libs_scrollkeeper.h.in
@@ -0,0 +1,11 @@
+--- libs/scrollkeeper.h.in.orig	Mon Jun  3 14:00:51 2002
++++ libs/scrollkeeper.h.in	Mon Jun  3 14:01:11 2002
+@@ -32,7 +32,7 @@
+ #define SCROLLKEEPERLOCALEDIR "/usr/X11R6/share/locale"
+ #define SCROLLKEEPERLOGFILE "@localstatedir@/log/scrollkeeper.log"
+ #define SCROLLKEEPERLOGFILE_ROT "@localstatedir@/log/scrollkeeper.log.1"
+-#define SCROLLKEEPER_OMF_DTD "@prefix@/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd"
++#define SCROLLKEEPER_OMF_DTD "@prefix@/share/gnome/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd"
+ #define PATHLEN		256
+ 
+ /*