From 76acfa2e6479ebbe72a2241ddf04247a28f9e510 Mon Sep 17 00:00:00 2001 From: rh Date: Wed, 3 Apr 2002 20:38:35 +0000 Subject: Fix scrollkeeper directory creation. Bump revision to 0.2nb1. --- textproc/scrollkeeper/Makefile | 19 ++++---- textproc/scrollkeeper/distinfo | 11 +++-- textproc/scrollkeeper/patches/patch-aa | 14 +++--- textproc/scrollkeeper/patches/patch-ab | 24 ++++++---- textproc/scrollkeeper/patches/patch-ac | 81 +++++++++------------------------- textproc/scrollkeeper/patches/patch-ad | 21 +++++++++ textproc/scrollkeeper/patches/patch-ae | 21 +++++++++ textproc/scrollkeeper/patches/patch-af | 13 ++++++ 8 files changed, 117 insertions(+), 87 deletions(-) create mode 100644 textproc/scrollkeeper/patches/patch-ad create mode 100644 textproc/scrollkeeper/patches/patch-ae create mode 100644 textproc/scrollkeeper/patches/patch-af (limited to 'textproc/scrollkeeper') diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile index b505c5f64f3..eb08e7f47e4 100644 --- a/textproc/scrollkeeper/Makefile +++ b/textproc/scrollkeeper/Makefile @@ -1,17 +1,18 @@ -# $NetBSD: Makefile,v 1.4 2002/01/02 04:49:34 fredb Exp $ +# $NetBSD: Makefile,v 1.5 2002/04/03 20:38:35 rh Exp $ # -DISTNAME= scrollkeeper-0.2 -CATEGORIES= textproc -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scrollkeeper/} \ - ${MASTER_SITE_GNOME:=stable/sources/scrollkeeper/} +DISTNAME= scrollkeeper-0.2 +PKGREVISION= 1 +CATEGORIES= textproc +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scrollkeeper/} \ + ${MASTER_SITE_GNOME:=stable/sources/scrollkeeper/} -MAINTAINER= packages@netbsd.org -HOMEPAGE= http://scrollkeeper.sourceforge.net/ -COMMENT= Open Document Cataloging Project +MAINTAINER= packages@netbsd.org +HOMEPAGE= http://scrollkeeper.sourceforge.net/ +COMMENT= Open Document Cataloging Project BUILD_USES_MSGFMT= yes -DEPENDS+= libxml>=1.8.9:../../textproc/libxml +DEPENDS+= libxml>=1.8.9:../../textproc/libxml GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/textproc/scrollkeeper/distinfo b/textproc/scrollkeeper/distinfo index 5a5f86d551d..bc344f8c844 100644 --- a/textproc/scrollkeeper/distinfo +++ b/textproc/scrollkeeper/distinfo @@ -1,7 +1,10 @@ -$NetBSD: distinfo,v 1.4 2001/09/10 00:23:30 mycroft Exp $ +$NetBSD: distinfo,v 1.5 2002/04/03 20:38:35 rh Exp $ SHA1 (scrollkeeper-0.2.tar.gz) = 2f1f7ce884d64d3f7e6222a373372635cdf8508e Size (scrollkeeper-0.2.tar.gz) = 308061 bytes -SHA1 (patch-aa) = 26878255f20e941ac923ae5845c7a983ec33ef68 -SHA1 (patch-ab) = 84a69952e60e0ad661dead97f7190ed58c753a33 -SHA1 (patch-ac) = 9df212b8e00b8683c0f317fd6c69e9d134b725a0 +SHA1 (patch-aa) = 1899045e50dddbeedbf93d9a7defcc3a79aac09e +SHA1 (patch-ab) = 5e293438129fb2573a36cd74731f1cc262f50dd3 +SHA1 (patch-ac) = 32bbe5475c706212990930c0388afedb9827a845 +SHA1 (patch-ad) = 388af631a3e3111ec38736320e688c842da7773f +SHA1 (patch-ae) = 75c8dbf68b2de211b355e9fad18094239c8e3c4e +SHA1 (patch-af) = 40f6d50184389557efd755b1708df729c25f0707 diff --git a/textproc/scrollkeeper/patches/patch-aa b/textproc/scrollkeeper/patches/patch-aa index 1955891777b..8cbb51a8d94 100644 --- a/textproc/scrollkeeper/patches/patch-aa +++ b/textproc/scrollkeeper/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/04/06 10:53:26 rh Exp $ +$NetBSD: patch-aa,v 1.2 2002/04/03 20:38:35 rh Exp $ ---- toc/src/Makefile.in.orig Fri Apr 6 10:14:53 2001 -+++ toc/src/Makefile.in +--- cl/src/Makefile.in.orig Wed Mar 28 22:22:56 2001 ++++ cl/src/Makefile.in @@ -105,7 +105,7 @@ - INCLUDES = -I$(top_srcdir)/libs $(XML_CFLAGS) + INCLUDES = -I$(top_srcdir)/libs $(XML_CFLAGS) --LDADD = $(XML_LIBS) $(top_builddir)/libs/libscrollkeeper.la -+LDADD = $(XML_LIBS) -L$(top_builddir)/libs/.libs -Wl,-R`cd $(top_builddir) ; pwd`/libs/.libs -lscrollkeeper +-LDADD = $(XML_LIBS) $(top_builddir)/libs/libscrollkeeper.la ++LDADD = $(XML_LIBS) -L$(top_builddir)/libs/.libs -Wl,-R`cd $(top_builddir) ; pwd`/libs/.libs -lscrollkeeper - bin_PROGRAMS = scrollkeeper_toc + bin_PROGRAMS = scrollkeeper-preinstall scrollkeeper-update scrollkeeper-install scrollkeeper-uninstall scrollkeeper-get-cl diff --git a/textproc/scrollkeeper/patches/patch-ab b/textproc/scrollkeeper/patches/patch-ab index 89ab7db6b84..8c78ae3949d 100644 --- a/textproc/scrollkeeper/patches/patch-ab +++ b/textproc/scrollkeeper/patches/patch-ab @@ -1,13 +1,21 @@ -$NetBSD: patch-ab,v 1.1.1.1 2001/04/06 10:53:26 rh Exp $ +$NetBSD: patch-ab,v 1.2 2002/04/03 20:38:35 rh Exp $ ---- cl/src/Makefile.in.orig Fri Apr 6 10:18:45 2001 -+++ cl/src/Makefile.in -@@ -105,7 +105,7 @@ - INCLUDES = -I$(top_srcdir)/libs $(XML_CFLAGS) +--- cl/src/get-cl.c.orig Thu Mar 15 21:10:33 2001 ++++ cl/src/get-cl.c +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -29,7 +30,7 @@ + #define SCROLLKEEPERLOCALEDIR "/usr/share/locale" --LDADD = $(XML_LIBS) $(top_builddir)/libs/libscrollkeeper.la -+LDADD = $(XML_LIBS) -L$(top_builddir)/libs/.libs -Wl,-R`cd $(top_builddir) ; pwd`/libs/.libs -lscrollkeeper +-#define PATHLEN 256 ++#define PATHLEN MAXPATHLEN + static char **av; - bin_PROGRAMS = scrollkeeper-preinstall scrollkeeper-update scrollkeeper-install scrollkeeper-uninstall scrollkeeper-get-cl diff --git a/textproc/scrollkeeper/patches/patch-ac b/textproc/scrollkeeper/patches/patch-ac index 11cfb1f8538..95961c70b92 100644 --- a/textproc/scrollkeeper/patches/patch-ac +++ b/textproc/scrollkeeper/patches/patch-ac @@ -1,26 +1,7 @@ -$NetBSD: patch-ac,v 1.2 2001/09/10 00:23:32 mycroft Exp $ +$NetBSD: patch-ac,v 1.3 2002/04/03 20:38:35 rh Exp $ ---- cl/src/get-cl.c.orig Thu Mar 15 11:10:33 2001 -+++ cl/src/get-cl.c Mon Sep 10 00:16:56 2001 -@@ -19,6 +19,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -29,7 +30,7 @@ - - #define SCROLLKEEPERLOCALEDIR "/usr/share/locale" - --#define PATHLEN 256 -+#define PATHLEN MAXPATHLEN - - static char **av; - ---- cl/src/install.c.orig Thu Mar 15 11:10:33 2001 -+++ cl/src/install.c Mon Sep 10 00:17:09 2001 +--- cl/src/install.c.orig Thu Mar 15 21:10:33 2001 ++++ cl/src/install.c @@ -24,6 +24,7 @@ #include #include @@ -38,41 +19,23 @@ $NetBSD: patch-ac,v 1.2 2001/09/10 00:23:32 mycroft Exp $ static int verbose = 0; ---- cl/src/uninstall.c.orig Thu Mar 15 11:10:33 2001 -+++ cl/src/uninstall.c Mon Sep 10 00:17:21 2001 -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -31,7 +32,7 @@ - - #define _(String) gettext (String) - --#define PATHLEN 256 -+#define PATHLEN MAXPATHLEN - - struct IdTab { - int id; ---- cl/src/update.c.orig Thu Mar 15 11:10:33 2001 -+++ cl/src/update.c Mon Sep 10 00:17:33 2001 -@@ -19,6 +19,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -32,7 +33,7 @@ - - #define SCROLLKEEPERLOCALEDIR "/usr/share/locale" - --#define PATHLEN 256 -+#define PATHLEN MAXPATHLEN - - char **av; +@@ -512,7 +513,7 @@ + { + char source_file[PATHLEN], target_file[PATHLEN]; + +- sprintf(command, "mkdir %s/%s", scrollkeeper_dir, dir_ent->d_name); ++ sprintf(command, "mkdir -p %s/%s", scrollkeeper_dir, dir_ent->d_name); + system(command); + sprintf(source_file, "%s/scrollkeeper_cl.xml", source_path); + sprintf(target_file, "%s/%s/scrollkeeper_cl.xml", +@@ -610,7 +611,9 @@ + stat(toc_dir, &buf); + if (!S_ISDIR(buf.st_mode)) + { +- sprintf(command, "mkdir %s", toc_dir); ++ sprintf(command, "rm -f %s", toc_dir); ++ system(command); ++ sprintf(command, "mkdir -p %s", toc_dir); + system(command); + } diff --git a/textproc/scrollkeeper/patches/patch-ad b/textproc/scrollkeeper/patches/patch-ad new file mode 100644 index 00000000000..68b67213c26 --- /dev/null +++ b/textproc/scrollkeeper/patches/patch-ad @@ -0,0 +1,21 @@ +$NetBSD: patch-ad,v 1.1 2002/04/03 20:38:35 rh Exp $ + +--- cl/src/uninstall.c.orig Thu Mar 15 21:10:33 2001 ++++ cl/src/uninstall.c +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -31,7 +32,7 @@ + + #define _(String) gettext (String) + +-#define PATHLEN 256 ++#define PATHLEN MAXPATHLEN + + struct IdTab { + int id; diff --git a/textproc/scrollkeeper/patches/patch-ae b/textproc/scrollkeeper/patches/patch-ae new file mode 100644 index 00000000000..764288f10ff --- /dev/null +++ b/textproc/scrollkeeper/patches/patch-ae @@ -0,0 +1,21 @@ +$NetBSD: patch-ae,v 1.1 2002/04/03 20:38:35 rh Exp $ + +--- cl/src/update.c.orig Thu Mar 15 21:10:33 2001 ++++ cl/src/update.c +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -32,7 +33,7 @@ + + #define SCROLLKEEPERLOCALEDIR "/usr/share/locale" + +-#define PATHLEN 256 ++#define PATHLEN MAXPATHLEN + + char **av; + diff --git a/textproc/scrollkeeper/patches/patch-af b/textproc/scrollkeeper/patches/patch-af new file mode 100644 index 00000000000..ad083eea324 --- /dev/null +++ b/textproc/scrollkeeper/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.1 2002/04/03 20:38:36 rh Exp $ + +--- toc/src/Makefile.in.orig Wed Mar 28 22:22:57 2001 ++++ toc/src/Makefile.in +@@ -105,7 +105,7 @@ + INCLUDES = -I$(top_srcdir)/libs $(XML_CFLAGS) + + +-LDADD = $(XML_LIBS) $(top_builddir)/libs/libscrollkeeper.la ++LDADD = $(XML_LIBS) -L$(top_builddir)/libs/.libs -Wl,-R`cd $(top_builddir) ; pwd`/libs/.libs -lscrollkeeper + + + bin_PROGRAMS = scrollkeeper_toc -- cgit v1.2.3