From 40df5f5b8c6a43dcb2f27b69ba241535e3213398 Mon Sep 17 00:00:00 2001 From: reed Date: Wed, 9 Jan 2008 19:16:13 +0000 Subject: Update to 3.6.1. Removed four patches -- three are integrated and antiword is removed. No longer conflict with antiword. Add patch (from OpenBSD) in attempt to fix egon. Improve DESCR. Add http download to MASTER_SITES. Don't depend on gv or gnuplot. gnuplot is optional. And I don't know why it depended on gv. This package provides its own postscript viewer. ChangeLog has: 061110 Buildability fixes for Egon. Unbundled Antiword. Corrected formatting errors in dictionary.it. Bundled o3read. 030916 Siag, PW: Ctrl-T adds sheet, Ctrl-W removes sheet. 030820 Got newest source from CVS. xsiag/window.c had to be reformatted using indent. 030309 Replaced applicationShellWidgetClass with mwApplicationShellWidgetClass. Instant drag and drop support, just like that. This means that Mowitz >= 0.3.0 is now required. Siag, PW, Egon: remove drop.[ch] and use drop functionality in Mowitz instead. Added cb_drag and cb_drop callbacks. 030304 Replaced XtAppInitialize with XtOpenApplication everywhere. 030303 Changed .cvs to .csv in common/siag.dfmext. --- misc/siag/DESCR | 8 ++++++-- misc/siag/Makefile | 21 ++++++++------------- misc/siag/PLIST | 9 +++++---- misc/siag/distinfo | 13 +++++-------- misc/siag/patches/patch-ab | 37 ------------------------------------- misc/siag/patches/patch-af | 12 ------------ misc/siag/patches/patch-ag | 13 ------------- misc/siag/patches/patch-av | 17 ----------------- misc/siag/patches/patch-aw | 15 +++++++++++++++ 9 files changed, 39 insertions(+), 106 deletions(-) delete mode 100644 misc/siag/patches/patch-ab delete mode 100644 misc/siag/patches/patch-af delete mode 100644 misc/siag/patches/patch-ag delete mode 100644 misc/siag/patches/patch-av create mode 100644 misc/siag/patches/patch-aw (limited to 'misc/siag') diff --git a/misc/siag/DESCR b/misc/siag/DESCR index eb7a1ebfc19..3a5cd3cb63d 100644 --- a/misc/siag/DESCR +++ b/misc/siag/DESCR @@ -1,5 +1,9 @@ +Siag Office is a tightly integrated, free office package. + egon: Egon Animator, presentation generator, similar to MS PowerPoint -siag: Scheme In A Grid, spreadsheet, similar to MS Excel -tsiag: Curses-Based version of siag +gvu: Postscript previewer pw: Pathetic Writer, text processor, similar to MS Word (well... :-) +siag: Scheme In A Grid, spreadsheet, similar to MS Excel +tsiag: Curses-based version of siag xedplus: Lightweight text editor which can easily be configured away +xfiler: File manager diff --git a/misc/siag/Makefile b/misc/siag/Makefile index 9818cb6c74c..ce7036370f1 100644 --- a/misc/siag/Makefile +++ b/misc/siag/Makefile @@ -1,22 +1,17 @@ -# $NetBSD: Makefile,v 1.51 2007/06/12 02:55:16 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.52 2008/01/09 19:16:15 reed Exp $ # -# Note: I have tried to update this package to 3.6.0, but there were -# some undefined identifiers "DndDrop" and "DndRawData" in the -# xsiag/window.c file. -DISTNAME= siag-3.5.7 -PKGREVISION= 8 -CATEGORIES= misc textproc math -MASTER_SITES= ftp://siag.nu/pub/siag/ +DISTNAME= siag-3.6.1 +CATEGORIES= misc editors math textproc +MASTER_SITES= ftp://siag.nu/pub/siag/ \ + http://siag.nu/pub/siag/ MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://siag.nu/ +HOMEPAGE= http://siag.nu/ COMMENT= Poor man's office suite with spreadsheet, word processor, etc -DEPENDS+= gv>=3.5.8nb1:../../print/gv -DEPENDS+= gnuplot>=3.7:../../graphics/gnuplot - -CONFLICTS+= antiword-[0-9]* +#DEPENDS+= gv>=3.5.8nb1:../../print/gv +#DEPENDS+= gnuplot>=3.7:../../graphics/gnuplot GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-x diff --git a/misc/siag/PLIST b/misc/siag/PLIST index aee3317437b..463a30449f3 100644 --- a/misc/siag/PLIST +++ b/misc/siag/PLIST @@ -1,5 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2003/03/05 14:30:59 wiz Exp $ -bin/antiword +@comment $NetBSD: PLIST,v 1.4 2008/01/09 19:16:15 reed Exp $ bin/egon bin/gvu bin/mgptotxt @@ -11,7 +10,9 @@ bin/siagrun bin/tsiag bin/xedplus bin/xfiler -lib/siag/antiword/8859-1.txt +lib/siag/o3read/dbtohtml +lib/siag/o3read/o3tohtml +lib/siag/o3read/utf8tolatin1 lib/siag/plugins/clipart lib/siag/plugins/dummy lib/siag/plugins/form @@ -491,5 +492,5 @@ share/siag/xfiler/makeicons @dirrm share/doc/siag/common @dirrm share/doc/siag @dirrm lib/siag/plugins -@dirrm lib/siag/antiword +@dirrm lib/siag/o3read @dirrm lib/siag diff --git a/misc/siag/distinfo b/misc/siag/distinfo index 6557b7cf33d..7b6ec7c8c30 100644 --- a/misc/siag/distinfo +++ b/misc/siag/distinfo @@ -1,16 +1,13 @@ -$NetBSD: distinfo,v 1.12 2007/08/08 21:37:26 joerg Exp $ +$NetBSD: distinfo,v 1.13 2008/01/09 19:16:15 reed Exp $ -SHA1 (siag-3.5.7.tar.gz) = 007030eb29fc1a4d3a0d78f9d93893cf40b6b84b -RMD160 (siag-3.5.7.tar.gz) = 41f20210e4b5b4704ecd0f539cbcf1d409bb9a1a -Size (siag-3.5.7.tar.gz) = 1653929 bytes +SHA1 (siag-3.6.1.tar.gz) = 5d47e0ee2562f41492a453eef75c0638369bc14d +RMD160 (siag-3.6.1.tar.gz) = 1779b1384956ab6c786de03d6babb21e47cd0e9f +Size (siag-3.6.1.tar.gz) = 1526023 bytes SHA1 (patch-aa) = d50549158fd83afb0a8cc9cb6ba607161ea45ff9 -SHA1 (patch-ab) = 564a906957521afae681662d0e19fc06996682ac SHA1 (patch-ac) = e037d16bada6730dfc02890c317d7365a314eb99 SHA1 (patch-ad) = ffcf23d86942253eea4965af4241f62f73e490f4 SHA1 (patch-ae) = 25d31c562a492395b10d680df9e8eabe6aa85603 -SHA1 (patch-af) = 6df3759696b2d30314d007a58a4604f97accd769 -SHA1 (patch-ag) = b8aa8ab9d51ab0254307f294234cbf2242e29d44 SHA1 (patch-ah) = c89d424c45616e001c75bd8c4e7f58d8246de55c SHA1 (patch-ai) = 19d042cbd90fc6eb1c1fccf6fe59b92d9254e973 SHA1 (patch-aj) = 5191d8032037e97e083a3494a24f4acf2cf62196 -SHA1 (patch-av) = 2e2598ca694ed93ff6bd34c9bb4625f915d412ad +SHA1 (patch-aw) = 61bf0f1feb5c6b54b46004eac3d8ce6a403fd894 diff --git a/misc/siag/patches/patch-ab b/misc/siag/patches/patch-ab deleted file mode 100644 index 935ce2453cd..00000000000 --- a/misc/siag/patches/patch-ab +++ /dev/null @@ -1,37 +0,0 @@ -$NetBSD: patch-ab,v 1.5 2004/05/03 15:58:55 wiz Exp $ - ---- xsiag/window.c.orig 2003-02-28 20:06:27.000000000 +0100 -+++ xsiag/window.c -@@ -2822,8 +2822,8 @@ static void save_plugin(char *p) { - if (savematrix(p, w_list->buf, NULL)) { - printf("501 Can't save %s\n", p); - } else { -- w_list->buf->change = FALSE; printf("250 Saved -- %s\n", p); -+ w_list->buf->change = FALSE; printf("250 Saved " -+ "%s\n", p); - } - } - } -@@ -2834,8 +2834,8 @@ static void load_plugin(char *p) { - if (loadmatrix(p, w_list->buf, NULL)) { - printf("501 Can't load %s\n", p); - } else { -- w_list->buf->change = FALSE; printf("250 Loaded -- %s\n", p); -+ w_list->buf->change = FALSE; printf("250 Loaded " -+ "%s\n", p); - } - } - } -@@ -2865,8 +2865,8 @@ static void quit_plugin(char *p) { - - static void prnt_plugin(char *p) { - Widget w = w_list->ui->grid; Display *dpy = XtDisplay(w); Pixmap -- pm = MwTablePixmap(w); XFreePixmap(dpy, pm); printf("502 Can't -- print yet\n"); -+ pm = MwTablePixmap(w); XFreePixmap(dpy, pm); printf("502 Can't " -+ "print yet\n"); - } - - static struct { diff --git a/misc/siag/patches/patch-af b/misc/siag/patches/patch-af deleted file mode 100644 index 9a0bff484f6..00000000000 --- a/misc/siag/patches/patch-af +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-af,v 1.3 2007/05/16 18:40:13 gdt Exp $ - ---- xegon/window.c.orig 2003-01-15 18:56:56.000000000 -0500 -+++ xegon/window.c -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - - #include - #include diff --git a/misc/siag/patches/patch-ag b/misc/siag/patches/patch-ag deleted file mode 100644 index 8999a391591..00000000000 --- a/misc/siag/patches/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ag,v 1.3 2007/05/16 18:40:13 gdt Exp $ - ---- xegon/xegon.h.orig 2003-01-15 18:56:54.000000000 -0500 -+++ xegon/xegon.h -@@ -23,7 +23,7 @@ typedef struct { - Boolean play; - } AppData; - --extern AppData app_data; -+/*extern AppData app_data;*/ - - /* Each list has a frame, a title, a viewport and a list */ - typedef struct egon_ui { diff --git a/misc/siag/patches/patch-av b/misc/siag/patches/patch-av deleted file mode 100644 index 9ab67cf82f4..00000000000 --- a/misc/siag/patches/patch-av +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-av,v 1.2 2003/03/05 14:31:00 wiz Exp $ - ---- antiword/Makefile.in.orig Fri Feb 28 19:38:05 2003 -+++ antiword/Makefile.in -@@ -103,10 +103,10 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE - am__include = @am__include@ - am__quote = @am__quote@ - --bindir = $(libdir)/siag/antiword -+bindir = @bindir@ - build_alias = @build_alias@ - datadir = @datadir@ --docdir = $(prefix)/doc/siag/antiword -+docdir = @docdir@ - exec_prefix = @exec_prefix@ - host_alias = @host_alias@ - includedir = @includedir@ diff --git a/misc/siag/patches/patch-aw b/misc/siag/patches/patch-aw new file mode 100644 index 00000000000..d5180e862cf --- /dev/null +++ b/misc/siag/patches/patch-aw @@ -0,0 +1,15 @@ +$NetBSD: patch-aw,v 1.1 2008/01/09 19:16:14 reed Exp $ + +from OpenBSD ports + +--- egon/fileio_ppt.c.orig Wed Apr 16 16:07:53 2003 ++++ egon/fileio_ppt.c Wed Apr 16 16:08:36 2003 +@@ -479,7 +479,7 @@ static int load(char *fn, buffer *b) + row = 1; + sty = MW_STY_DEFAULT; + +- strncpy(filename, fn, 1000); ++ strncpy(filename, fn, sizeof filename); + cfs = cole_mount(filename, &colerrno); + if (cfs == NULL) { + cole_perror("Egon", colerrno); -- cgit v1.2.3