diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-10-14 18:33:48 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-10-14 18:33:48 +0800 |
commit | 1b3327761c8bcb98d89b529daeae9600844b4361 (patch) | |
tree | 0be1cd4eb5fec6661da4798906b0d9bd522e794f /textproc/scrollkeeper/files | |
parent | a65aedbb59fd9dfb33a4633611777da99ec4dcd5 (diff) | |
download | marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.tar marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.tar.gz marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.tar.bz2 marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.tar.lz marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.tar.xz marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.tar.zst marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.zip |
Clean out MarcusCom after the big import into ports.
Next stop, GNOME 2.17.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7799 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'textproc/scrollkeeper/files')
-rw-r--r-- | textproc/scrollkeeper/files/patch-Makefile.in | 38 | ||||
-rw-r--r-- | textproc/scrollkeeper/files/patch-configure | 19 | ||||
-rw-r--r-- | textproc/scrollkeeper/files/patch-extract_dtds_Makefile.in | 11 | ||||
-rw-r--r-- | textproc/scrollkeeper/files/patch-libs_database.c | 12 | ||||
-rw-r--r-- | textproc/scrollkeeper/files/patch-libs_i18n.c | 60 | ||||
-rw-r--r-- | textproc/scrollkeeper/files/patch-libs_install.c | 14 | ||||
-rw-r--r-- | textproc/scrollkeeper/files/patch-libs_scrollkeeper.h.in | 11 | ||||
-rw-r--r-- | textproc/scrollkeeper/files/patch-scripts_scrollkeeper-config.in | 11 |
8 files changed, 0 insertions, 176 deletions
diff --git a/textproc/scrollkeeper/files/patch-Makefile.in b/textproc/scrollkeeper/files/patch-Makefile.in deleted file mode 100644 index 26e75d437..000000000 --- a/textproc/scrollkeeper/files/patch-Makefile.in +++ /dev/null @@ -1,38 +0,0 @@ ---- 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-configure b/textproc/scrollkeeper/files/patch-configure deleted file mode 100644 index 054d07f1f..000000000 --- a/textproc/scrollkeeper/files/patch-configure +++ /dev/null @@ -1,19 +0,0 @@ ---- configure.orig Sat Dec 6 03:18:20 2003 -+++ configure Sat Dec 6 17:46:38 2003 -@@ -7864,6 +7864,7 @@ - - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+$ac_aux_dir/ltconfig $LIBTOOL_DEPS - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -8360,7 +8361,7 @@ - echo "$as_me:$LINENO: checking for DocBook XML DTD" >&5 - echo $ECHO_N "checking for DocBook XML DTD... $ECHO_C" >&6 - db_found= -- for vers in 4.2 4.1.2; do -+ for vers in 4.1.2 4.2; do - if xmlcatalog $XML_CATALOG "-//OASIS//DTD DocBook XML V$vers//EN" >/dev/null ; then - db_found=$vers - break diff --git a/textproc/scrollkeeper/files/patch-extract_dtds_Makefile.in b/textproc/scrollkeeper/files/patch-extract_dtds_Makefile.in deleted file mode 100644 index 1fb855079..000000000 --- a/textproc/scrollkeeper/files/patch-extract_dtds_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 4a9c6a771..000000000 --- a/textproc/scrollkeeper/files/patch-libs_database.c +++ /dev/null @@ -1,12 +0,0 @@ ---- 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 deleted file mode 100644 index 3e5f38730..000000000 --- a/textproc/scrollkeeper/files/patch-libs_i18n.c +++ /dev/null @@ -1,60 +0,0 @@ ---- 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 deleted file mode 100644 index e1162f1fd..000000000 --- a/textproc/scrollkeeper/files/patch-libs_install.c +++ /dev/null @@ -1,14 +0,0 @@ ---- 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 deleted file mode 100644 index c8a8d3400..000000000 --- a/textproc/scrollkeeper/files/patch-libs_scrollkeeper.h.in +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 - - /* diff --git a/textproc/scrollkeeper/files/patch-scripts_scrollkeeper-config.in b/textproc/scrollkeeper/files/patch-scripts_scrollkeeper-config.in deleted file mode 100644 index 0185737ce..000000000 --- a/textproc/scrollkeeper/files/patch-scripts_scrollkeeper-config.in +++ /dev/null @@ -1,11 +0,0 @@ ---- scripts/scrollkeeper-config.in.orig Thu Mar 21 00:08:51 2002 -+++ scripts/scrollkeeper-config.in Sat May 25 23:59:53 2002 -@@ -4,7 +4,7 @@ - localstatedir=@localstatedir@ - partial_db_dir=@SCROLLKEEPER_PARTIAL_DB_DIR@ - pkglocalstatedir=${localstatedir}/${partial_db_dir} --pkgdatadir=${prefix}/share/scrollkeeper -+pkgdatadir=${prefix}/share/gnome/scrollkeeper - datadir=@datadir@ - - usage() |