From c4a54867430e2acc7486bc95f9bb3c7c3cd73394 Mon Sep 17 00:00:00 2001 From: jasper Date: Thu, 30 Aug 2007 07:48:26 +0000 Subject: [PATCH] - update siag to 3.6.1 - better COMMENT - fix LIB_DEPENDS - fix the horrible location of the docs (and noone noticed?!) - remove NO_REGRESS - re-format DESCR (i must say, pretty nice suite this is.) --- productivity/siag/Makefile | 16 +- productivity/siag/distinfo | 10 +- productivity/siag/patches/patch-stocks_http_c | 18 + productivity/siag/patches/patch-xfiler_Fw_c | 8 +- productivity/siag/patches/patch-xfiler_Main_c | 8 +- productivity/siag/pkg/DESCR | 8 +- productivity/siag/pkg/PLIST | 370 +++++++++--------- 7 files changed, 225 insertions(+), 213 deletions(-) create mode 100644 productivity/siag/patches/patch-stocks_http_c diff --git a/productivity/siag/Makefile b/productivity/siag/Makefile index 1b7784e3fa9..a2b0118e185 100644 --- a/productivity/siag/Makefile +++ b/productivity/siag/Makefile @@ -1,15 +1,13 @@ -# $OpenBSD: Makefile,v 1.6 2006/08/03 23:28:11 espie Exp $ +# $OpenBSD: Makefile,v 1.7 2007/08/30 07:48:26 jasper Exp $ -COMMENT= "office suite" +COMMENT= tightly integrated, free office package -VERSION= 3.5.6 +VERSION= 3.6.1 DISTNAME= siag-${VERSION} CATEGORIES= x11 HOMEPAGE= http://siag.nu/ -MASTER_SITES= http://siag.nu/pub/siag/ - # GPL PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes @@ -17,18 +15,18 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes WANTLIB= ICE SM X11 Xext Xmu Xpm Xt c m ncurses termcap +MASTER_SITES= http://siag.nu/pub/siag/ + USE_X11= Yes -LIB_DEPENDS= Mowitz.>=2::x11/mowitz \ +LIB_DEPENDS= Mowitz.>=3::x11/mowitz \ neXtaw.>=13::x11/neXtaw CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc +CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/siag/ CONFIGURE_ENV+= LDFLAGS="-L${WRKBUILD}/common -L${LOCALBASE}/lib" \ CPPFLAGS="-I${LOCALBASE}/include" -NO_REGRESS= Yes - .include diff --git a/productivity/siag/distinfo b/productivity/siag/distinfo index d9a06b2531d..e654a86873d 100644 --- a/productivity/siag/distinfo +++ b/productivity/siag/distinfo @@ -1,5 +1,5 @@ -MD5 (siag-3.5.6.tar.gz) = NTnWmr3NwipQ5P4naVQVfA== -RMD160 (siag-3.5.6.tar.gz) = UfdE/rT4pN82MybCnvoQ6A2udx4= -SHA1 (siag-3.5.6.tar.gz) = 8uDTDOqWBQXqy3902Zna8H06Q3E= -SHA256 (siag-3.5.6.tar.gz) = VtipmZyo8ILQtf1B4A35rsaWXeQxb0lQh7avScy9/ho= -SIZE (siag-3.5.6.tar.gz) = 1674405 +MD5 (siag-3.6.1.tar.gz) = PQDdoiIJMnu5B7p4hQx5fw== +RMD160 (siag-3.6.1.tar.gz) = F3mxOElWq2x4beA9a6uyHkfNDp8= +SHA1 (siag-3.6.1.tar.gz) = XUfg7iVi9BSSpFPu91wGODabwU0= +SHA256 (siag-3.6.1.tar.gz) = cSYzraxZG8SEZrErkBL/UQZiM7NtBYm8RO1UumK83Vo= +SIZE (siag-3.6.1.tar.gz) = 1526023 diff --git a/productivity/siag/patches/patch-stocks_http_c b/productivity/siag/patches/patch-stocks_http_c new file mode 100644 index 00000000000..70cdb0cce48 --- /dev/null +++ b/productivity/siag/patches/patch-stocks_http_c @@ -0,0 +1,18 @@ +$OpenBSD: patch-stocks_http_c,v 1.1 2007/08/30 07:48:26 jasper Exp $ +--- stocks/http.c.orig Wed Aug 29 16:14:41 2007 ++++ stocks/http.c Wed Aug 29 16:17:14 2007 +@@ -20,13 +20,13 @@ + + #define __HTTP_C__ + ++#include + #include + #include + #include + #include + #include + +-#include + #include + #include + #include diff --git a/productivity/siag/patches/patch-xfiler_Fw_c b/productivity/siag/patches/patch-xfiler_Fw_c index c5a75008f67..1e87dd83452 100644 --- a/productivity/siag/patches/patch-xfiler_Fw_c +++ b/productivity/siag/patches/patch-xfiler_Fw_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-xfiler_Fw_c,v 1.1 2003/03/02 21:22:22 pvalchev Exp $ ---- xfiler/Fw.c.orig Sun Mar 2 12:50:28 2003 -+++ xfiler/Fw.c Sun Mar 2 12:50:44 2003 -@@ -858,9 +858,9 @@ static int devAction(int d, char *action +$OpenBSD: patch-xfiler_Fw_c,v 1.2 2007/08/30 07:48:26 jasper Exp $ +--- xfiler/Fw.c.orig Thu Jan 16 00:57:08 2003 ++++ xfiler/Fw.c Wed Aug 29 16:11:54 2007 +@@ -858,9 +858,9 @@ static int devAction(int d, char *action) fprintf(stderr, "%s\n", action); freopen("/dev/null", "r", stdin); if (user.arg0flag) diff --git a/productivity/siag/patches/patch-xfiler_Main_c b/productivity/siag/patches/patch-xfiler_Main_c index 3260ea0c474..2a1bdc6ee0d 100644 --- a/productivity/siag/patches/patch-xfiler_Main_c +++ b/productivity/siag/patches/patch-xfiler_Main_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-xfiler_Main_c,v 1.1 2003/03/02 21:22:22 pvalchev Exp $ ---- xfiler/Main.c.orig Sun Mar 2 12:51:11 2003 -+++ xfiler/Main.c Sun Mar 2 12:51:24 2003 -@@ -316,7 +316,7 @@ int shell_test(UserInfo *ui) +$OpenBSD: patch-xfiler_Main_c,v 1.2 2007/08/30 07:48:26 jasper Exp $ +--- xfiler/Main.c.orig Mon Mar 10 00:20:42 2003 ++++ xfiler/Main.c Wed Aug 29 16:11:54 2007 +@@ -317,7 +317,7 @@ int shell_test(UserInfo *ui) perror("(child) Can't close pipe"); exit(1); } diff --git a/productivity/siag/pkg/DESCR b/productivity/siag/pkg/DESCR index 5af1ed0f188..c30a9ce16e7 100644 --- a/productivity/siag/pkg/DESCR +++ b/productivity/siag/pkg/DESCR @@ -1,5 +1,3 @@ -Siag Office is a tightly integrated, free office package. -It consists of the spreadsheet Siag, the word processor PW, -the animation program Egon, the text editor XedPlus, the -file manager Xfiler and the previewer Gvu. - +Siag Office is a tightly integrated, free office package. It consists of +the spreadsheet Siag, the word processor PW, the animation program Egon, +the text editor XedPlus, the file manager Xfiler and the previewer Gvu. diff --git a/productivity/siag/pkg/PLIST b/productivity/siag/pkg/PLIST index 18dfcde4dec..f8aff06f968 100644 --- a/productivity/siag/pkg/PLIST +++ b/productivity/siag/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.3 2004/09/15 18:32:53 espie Exp $ +@comment $OpenBSD: PLIST,v 1.4 2007/08/30 07:48:26 jasper Exp $ bin/egon bin/gvu bin/mgptotxt @@ -10,14 +10,11 @@ bin/siagrun bin/tsiag bin/xedplus bin/xfiler -doc/ -doc/siag/ -doc/siag/antiword/ -doc/siag/antiword/README lib/siag/ -lib/siag/antiword/ -lib/siag/antiword/8859-1.txt -lib/siag/antiword/antiword +lib/siag/o3read/ +lib/siag/o3read/dbtohtml +lib/siag/o3read/o3tohtml +lib/siag/o3read/utf8tolatin1 lib/siag/plugins/ lib/siag/plugins/clipart lib/siag/plugins/dummy @@ -35,186 +32,187 @@ lib/siag/plugins/text @man man/man1/siod.1 @man man/man1/xedplus.1 @man man/man1/xfiler.1 -share/doc/AUTHORS -share/doc/COPYING -share/doc/FILES -share/doc/NLS -share/doc/README -share/doc/common/ -share/doc/common/COPYING.LIB -share/doc/common/Copyright -share/doc/common/bitmaps/ -share/doc/common/bitmaps/bold.gif -share/doc/common/bitmaps/borders.gif -share/doc/common/bitmaps/copyright.gif -share/doc/common/bitmaps/egon_fg.gif -share/doc/common/bitmaps/fld_open.gif -share/doc/common/bitmaps/grid.gif -share/doc/common/bitmaps/hcenter.gif -share/doc/common/bitmaps/hleft.gif -share/doc/common/bitmaps/hright.gif -share/doc/common/bitmaps/info.gif -share/doc/common/bitmaps/italic.gif -share/doc/common/bitmaps/new.gif -share/doc/common/bitmaps/next.gif -share/doc/common/bitmaps/none.gif -share/doc/common/bitmaps/play.gif -share/doc/common/bitmaps/plotter.gif -share/doc/common/bitmaps/preview.gif -share/doc/common/bitmaps/previous.gif -share/doc/common/bitmaps/printer.gif -share/doc/common/bitmaps/pw_fg.gif -share/doc/common/bitmaps/save.gif -share/doc/common/bitmaps/siag_fg.gif -share/doc/common/bitmaps/sigma.gif -share/doc/common/bitmaps/stop.gif -share/doc/common/bitmaps/uchar.gif -share/doc/common/bitmaps/uline.gif -share/doc/common/bitmaps/vbottom.gif -share/doc/common/bitmaps/vtop.gif -share/doc/common/credits.html -share/doc/common/fonts.html -share/doc/common/form.html -share/doc/common/interpreters.html -share/doc/common/office.html -share/doc/common/plugins.html -share/doc/common/search.html -share/doc/common/siaghelp.html -share/doc/egon/ -share/doc/egon/commands.html -share/doc/egon/concepts.html -share/doc/egon/egon.gif -share/doc/egon/egon.html -share/doc/egon/examples/ -share/doc/egon/examples/bounce.egon -share/doc/egon/examples/ms.egon -share/doc/egon/examples/propeller.egon -share/doc/egon/examples/rondo.egon -share/doc/egon/fileformats.html -share/doc/egon/intro.html -share/doc/egon/invocation.html -share/doc/egon/keys.html -share/doc/egon/mouse.html -share/doc/egon/scheme.html -share/doc/egon/scrollbars.html -share/doc/egon/strings.html -share/doc/egon/toolbar.html -share/doc/gvu/ -share/doc/gvu/README -share/doc/gvu/comments.doc -share/doc/gvu/copyright.html -share/doc/gvu/gs.interface -share/doc/gvu/gvu.html -share/doc/plugins/ -share/doc/plugins/README -share/doc/pw/ -share/doc/pw/commands.html -share/doc/pw/concepts.html -share/doc/pw/examples/ -share/doc/pw/examples/changes.pw -share/doc/pw/examples/chead.doc -share/doc/pw/examples/chead.html -share/doc/pw/examples/chead.pw -share/doc/pw/examples/chead.rtf -share/doc/pw/examples/chead.txt -share/doc/pw/examples/color.pw -share/doc/pw/examples/egon.pw -share/doc/pw/examples/egon.rtf -share/doc/pw/examples/morefonts.pw -share/doc/pw/examples/newpw.pw -share/doc/pw/examples/rtfex.rtf -share/doc/pw/examples/rtftest.rtf -share/doc/pw/examples/rtftest2.rtf -share/doc/pw/examples/rtftest3.rtf -share/doc/pw/examples/standard.bmk -share/doc/pw/examples/styles.html -share/doc/pw/examples/styles.pw -share/doc/pw/examples/styles2.pw -share/doc/pw/examples/svenska.pw -share/doc/pw/examples/svenska.rtf -share/doc/pw/fileformats.html -share/doc/pw/intro.html -share/doc/pw/invocation.html -share/doc/pw/keys.html -share/doc/pw/mouse.html -share/doc/pw/pw.gif -share/doc/pw/pw.html -share/doc/pw/scheme.html -share/doc/pw/scrollbars.html -share/doc/pw/spell.html -share/doc/pw/strings.html -share/doc/pw/toolbar.html share/doc/siag/ +share/doc/siag/AUTHORS +share/doc/siag/COPYING +share/doc/siag/FILES +share/doc/siag/NLS share/doc/siag/README -share/doc/siag/c-expr.html -share/doc/siag/commands.html -share/doc/siag/concepts.html -share/doc/siag/data.scm -share/doc/siag/examples/ -share/doc/siag/examples/allfuncs.wk1 -share/doc/siag/examples/allfunctions.siag -share/doc/siag/examples/cheeses.siag -share/doc/siag/examples/complex.siag -share/doc/siag/examples/database.siag -share/doc/siag/examples/emprestimo.wk1 -share/doc/siag/examples/example.wk1 -share/doc/siag/examples/fibonacci-c.siag -share/doc/siag/examples/fibonacci.siag -share/doc/siag/examples/fonts.siag -share/doc/siag/examples/foo.siag -share/doc/siag/examples/foo.wk1 -share/doc/siag/examples/formtest.siag -share/doc/siag/examples/gmp.siag -share/doc/siag/examples/group.siag -share/doc/siag/examples/heaven-c.siag -share/doc/siag/examples/heaven-guile.siag -share/doc/siag/examples/heaven-tcl.siag -share/doc/siag/examples/heaven.siag -share/doc/siag/examples/hyperhelp.siag -share/doc/siag/examples/image_plugin.siag -share/doc/siag/examples/kalkyl.siag -share/doc/siag/examples/mailaddr.csv -share/doc/siag/examples/morefonts.siag -share/doc/siag/examples/multtabl-c.siag -share/doc/siag/examples/multtabl.siag -share/doc/siag/examples/obras.wk1 -share/doc/siag/examples/passwd.siag -share/doc/siag/examples/plot.siag -share/doc/siag/examples/portfolj.siag -share/doc/siag/examples/prestacao.wk1 -share/doc/siag/examples/property.siag -share/doc/siag/examples/sincos.siag -share/doc/siag/examples/strfib.siag -share/doc/siag/examples/strings.siag -share/doc/siag/examples/surface1.siag -share/doc/siag/examples/surface2.siag -share/doc/siag/examples/tables.wk1 -share/doc/siag/examples/tcltest.siag -share/doc/siag/excel.html -share/doc/siag/fileformats.html -share/doc/siag/form.html -share/doc/siag/gnuplot.html -share/doc/siag/intro.html -share/doc/siag/invocation.html -share/doc/siag/keys.html -share/doc/siag/mouse.html -share/doc/siag/scheme.html -share/doc/siag/scrollbars.html -share/doc/siag/siag-functions.html -share/doc/siag/siag.gif -share/doc/siag/siag.html -share/doc/siag/strings.html -share/doc/siag/toolbar.html -share/doc/siod/ -share/doc/siod/siod.html -share/doc/xcommon/ -share/doc/xcommon/form.scm -share/doc/xedplus/ -share/doc/xedplus/README -share/doc/xedplus/xedplus.html -share/doc/xfiler/ -share/doc/xfiler/README -share/doc/xfiler/xfiler.html +share/doc/siag/common/ +share/doc/siag/common/COPYING.LIB +share/doc/siag/common/Copyright +share/doc/siag/common/bitmaps/ +share/doc/siag/common/bitmaps/bold.gif +share/doc/siag/common/bitmaps/borders.gif +share/doc/siag/common/bitmaps/copyright.gif +share/doc/siag/common/bitmaps/egon_fg.gif +share/doc/siag/common/bitmaps/fld_open.gif +share/doc/siag/common/bitmaps/grid.gif +share/doc/siag/common/bitmaps/hcenter.gif +share/doc/siag/common/bitmaps/hleft.gif +share/doc/siag/common/bitmaps/hright.gif +share/doc/siag/common/bitmaps/info.gif +share/doc/siag/common/bitmaps/italic.gif +share/doc/siag/common/bitmaps/new.gif +share/doc/siag/common/bitmaps/next.gif +share/doc/siag/common/bitmaps/none.gif +share/doc/siag/common/bitmaps/play.gif +share/doc/siag/common/bitmaps/plotter.gif +share/doc/siag/common/bitmaps/preview.gif +share/doc/siag/common/bitmaps/previous.gif +share/doc/siag/common/bitmaps/printer.gif +share/doc/siag/common/bitmaps/pw_fg.gif +share/doc/siag/common/bitmaps/save.gif +share/doc/siag/common/bitmaps/siag_fg.gif +share/doc/siag/common/bitmaps/sigma.gif +share/doc/siag/common/bitmaps/stop.gif +share/doc/siag/common/bitmaps/uchar.gif +share/doc/siag/common/bitmaps/uline.gif +share/doc/siag/common/bitmaps/vbottom.gif +share/doc/siag/common/bitmaps/vtop.gif +share/doc/siag/common/credits.html +share/doc/siag/common/fonts.html +share/doc/siag/common/form.html +share/doc/siag/common/interpreters.html +share/doc/siag/common/office.html +share/doc/siag/common/plugins.html +share/doc/siag/common/search.html +share/doc/siag/common/siaghelp.html +share/doc/siag/egon/ +share/doc/siag/egon/commands.html +share/doc/siag/egon/concepts.html +share/doc/siag/egon/egon.gif +share/doc/siag/egon/egon.html +share/doc/siag/egon/examples/ +share/doc/siag/egon/examples/bounce.egon +share/doc/siag/egon/examples/ms.egon +share/doc/siag/egon/examples/propeller.egon +share/doc/siag/egon/examples/rondo.egon +share/doc/siag/egon/fileformats.html +share/doc/siag/egon/intro.html +share/doc/siag/egon/invocation.html +share/doc/siag/egon/keys.html +share/doc/siag/egon/mouse.html +share/doc/siag/egon/scheme.html +share/doc/siag/egon/scrollbars.html +share/doc/siag/egon/strings.html +share/doc/siag/egon/toolbar.html +share/doc/siag/gvu/ +share/doc/siag/gvu/README +share/doc/siag/gvu/comments.doc +share/doc/siag/gvu/copyright.html +share/doc/siag/gvu/gs.interface +share/doc/siag/gvu/gvu.html +share/doc/siag/plugins/ +share/doc/siag/plugins/README +share/doc/siag/pw/ +share/doc/siag/pw/commands.html +share/doc/siag/pw/concepts.html +share/doc/siag/pw/examples/ +share/doc/siag/pw/examples/changes.pw +share/doc/siag/pw/examples/chead.doc +share/doc/siag/pw/examples/chead.html +share/doc/siag/pw/examples/chead.pw +share/doc/siag/pw/examples/chead.rtf +share/doc/siag/pw/examples/chead.txt +share/doc/siag/pw/examples/color.pw +share/doc/siag/pw/examples/egon.pw +share/doc/siag/pw/examples/egon.rtf +share/doc/siag/pw/examples/morefonts.pw +share/doc/siag/pw/examples/newpw.pw +share/doc/siag/pw/examples/rtfex.rtf +share/doc/siag/pw/examples/rtftest.rtf +share/doc/siag/pw/examples/rtftest2.rtf +share/doc/siag/pw/examples/rtftest3.rtf +share/doc/siag/pw/examples/standard.bmk +share/doc/siag/pw/examples/styles.html +share/doc/siag/pw/examples/styles.pw +share/doc/siag/pw/examples/styles2.pw +share/doc/siag/pw/examples/svenska.pw +share/doc/siag/pw/examples/svenska.rtf +share/doc/siag/pw/fileformats.html +share/doc/siag/pw/intro.html +share/doc/siag/pw/invocation.html +share/doc/siag/pw/keys.html +share/doc/siag/pw/mouse.html +share/doc/siag/pw/pw.gif +share/doc/siag/pw/pw.html +share/doc/siag/pw/scheme.html +share/doc/siag/pw/scrollbars.html +share/doc/siag/pw/spell.html +share/doc/siag/pw/strings.html +share/doc/siag/pw/toolbar.html +share/doc/siag/siag/ +share/doc/siag/siag/README +share/doc/siag/siag/c-expr.html +share/doc/siag/siag/commands.html +share/doc/siag/siag/concepts.html +share/doc/siag/siag/data.scm +share/doc/siag/siag/examples/ +share/doc/siag/siag/examples/allfuncs.wk1 +share/doc/siag/siag/examples/allfunctions.siag +share/doc/siag/siag/examples/cheeses.siag +share/doc/siag/siag/examples/complex.siag +share/doc/siag/siag/examples/database.siag +share/doc/siag/siag/examples/emprestimo.wk1 +share/doc/siag/siag/examples/example.wk1 +share/doc/siag/siag/examples/fibonacci-c.siag +share/doc/siag/siag/examples/fibonacci.siag +share/doc/siag/siag/examples/fonts.siag +share/doc/siag/siag/examples/foo.siag +share/doc/siag/siag/examples/foo.wk1 +share/doc/siag/siag/examples/formtest.siag +share/doc/siag/siag/examples/gmp.siag +share/doc/siag/siag/examples/group.siag +share/doc/siag/siag/examples/heaven-c.siag +share/doc/siag/siag/examples/heaven-guile.siag +share/doc/siag/siag/examples/heaven-tcl.siag +share/doc/siag/siag/examples/heaven.siag +share/doc/siag/siag/examples/hyperhelp.siag +share/doc/siag/siag/examples/image_plugin.siag +share/doc/siag/siag/examples/kalkyl.siag +share/doc/siag/siag/examples/mailaddr.csv +share/doc/siag/siag/examples/morefonts.siag +share/doc/siag/siag/examples/multtabl-c.siag +share/doc/siag/siag/examples/multtabl.siag +share/doc/siag/siag/examples/obras.wk1 +share/doc/siag/siag/examples/passwd.siag +share/doc/siag/siag/examples/plot.siag +share/doc/siag/siag/examples/portfolj.siag +share/doc/siag/siag/examples/prestacao.wk1 +share/doc/siag/siag/examples/property.siag +share/doc/siag/siag/examples/sincos.siag +share/doc/siag/siag/examples/strfib.siag +share/doc/siag/siag/examples/strings.siag +share/doc/siag/siag/examples/surface1.siag +share/doc/siag/siag/examples/surface2.siag +share/doc/siag/siag/examples/tables.wk1 +share/doc/siag/siag/examples/tcltest.siag +share/doc/siag/siag/excel.html +share/doc/siag/siag/fileformats.html +share/doc/siag/siag/form.html +share/doc/siag/siag/gnuplot.html +share/doc/siag/siag/intro.html +share/doc/siag/siag/invocation.html +share/doc/siag/siag/keys.html +share/doc/siag/siag/mouse.html +share/doc/siag/siag/scheme.html +share/doc/siag/siag/scrollbars.html +share/doc/siag/siag/siag-functions.html +share/doc/siag/siag/siag.gif +share/doc/siag/siag/siag.html +share/doc/siag/siag/strings.html +share/doc/siag/siag/toolbar.html +share/doc/siag/siod/ +share/doc/siag/siod/siod.html +share/doc/siag/xcommon/ +share/doc/siag/xcommon/form.scm +share/doc/siag/xedplus/ +share/doc/siag/xedplus/README +share/doc/siag/xedplus/xedplus.html +share/doc/siag/xfiler/ +share/doc/siag/xfiler/README +share/doc/siag/xfiler/xfiler.html share/siag/ share/siag/common/ share/siag/common/any2xpm