cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 1.4.0 so it works again.

Browse Source
This commit is contained in:
marcm 2004-12-10 20:39:22 +00:00
parent 1096c04b5c
commit 69423cb08d
9 changed files with 758 additions and 644 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
math/gnumeric/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.8 2004/08/10 09:14:48 xsa Exp $
# $OpenBSD: Makefile,v 1.9 2004/12/10 20:39:22 marcm Exp $
COMMENT= "spreadsheet application for GNOME"
VERSION= 1.2.13
VERSION= 1.4.0
DISTNAME= gnumeric-${VERSION}
CATEGORIES= math x11/gnome
@ -16,7 +16,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnumeric/1.2/}
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnumeric/1.4/}
MODULES= devel/gettext
@ -26,15 +26,17 @@ BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig \
RUN_DEPENDS= :scrollkeeper-*:textproc/scrollkeeper
LIB_DEPENDS= gnomeui-2::x11/gnome/libgnomeui \
gnomeprintui-2-2::x11/gnome/libgnomeprintui \
gsf-1.9.2,gsf-gnome-1.9.2::devel/libgsf,-gnome
gsf-1.11,gsf-gnome-1.11::devel/libgsf,-gnome
USE_X11= Yes
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --with-bonobo
CONFIGURE_ARGS+= --with-gnome
CONFIGURE_ARGS+= --without-gda
CONFIGURE_ARGS+= --without-gb
CONFIGURE_ARGS+= --without-guile
CONFIGURE_ARGS+= --without-psiconv
CONFIGURE_ARGS+= --without-paradox
CONFIGURE_ARGS+= --without-long-double
CONFIGURE_ARGS+= --without-python
CONFIGURE_ARGS+= --with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/gnumeric
@ -42,7 +44,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
SUBST_VARS= VERSION
post-patch:
@ln -s /usr/bin/true ${WRKDIR}/bin/scrollkeeper-update

6
math/gnumeric/distinfo
View File

@ -1,3 +1,3 @@
MD5 (gnumeric-1.2.13.tar.gz) = df9a06755f31628cb0114a9d9d471cdc
RMD160 (gnumeric-1.2.13.tar.gz) = b4ac93b694a05324f7d289675f863b9ab2804ce2
SHA1 (gnumeric-1.2.13.tar.gz) = 9ce939cc7c90dca25e23a5d077672641d6b0bd1c
MD5 (gnumeric-1.4.0.tar.gz) = 5f8c191fb5294b0e23278c5804b6954f
RMD160 (gnumeric-1.4.0.tar.gz) = 6a974ac0104628aed1037d94da67d615ba238c97
SHA1 (gnumeric-1.4.0.tar.gz) = 3d650583b7322721e01f676a290737fc58f6831b

10
math/gnumeric/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.3 2004/04/12 01:30:26 marcm Exp $
--- configure.orig 2004-04-07 22:24:49.000000000 -0700
+++ configure 2004-04-11 09:39:00.000000000 -0700
@@ -8517,7 +8517,7 @@ nto-qnx*)
$OpenBSD: patch-configure,v 1.4 2004/12/10 20:39:22 marcm Exp $
--- configure.orig Sun Nov 28 20:02:09 2004
+++ configure Tue Dec 7 20:43:37 2004
@@ -9520,7 +9520,7 @@ nto-qnx*)
openbsd*)
version_type=sunos
need_lib_prefix=no
@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.3 2004/04/12 01:30:26 marcm Exp $
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
@@ -22470,7 +22470,7 @@ if test $ac_cv_func_bind_textdomain_code
@@ -24613,7 +24613,7 @@ if test $ac_cv_func_bind_textdomain_code
DATADIRNAME=share
else
CATOBJEXT=.mo

10
math/gnumeric/patches/patch-ltmain_sh
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-ltmain_sh,v 1.4 2004/07/25 00:17:39 marcm Exp $
--- ltmain.sh.orig Mon Apr 12 10:33:23 2004
+++ ltmain.sh Fri Jul 23 07:57:26 2004
$OpenBSD: patch-ltmain_sh,v 1.5 2004/12/10 20:39:22 marcm Exp $
--- ltmain.sh.orig Sun Nov 28 20:02:01 2004
+++ ltmain.sh Tue Dec 7 20:43:37 2004
@@ -1857,9 +1857,12 @@ EOF
if test "$linkmode,$pass" = "prog,link"; then
compile_deplibs="$deplib $compile_deplibs"
@ -16,7 +16,7 @@ $OpenBSD: patch-ltmain_sh,v 1.4 2004/07/25 00:17:39 marcm Exp $
continue
;;
-l*)
@@ -2274,10 +2277,6 @@ EOF
@@ -2270,10 +2273,6 @@ EOF
link_static=no # Whether the deplib will be linked statically
if test -n "$library_names" &&
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
@ -27,7 +27,7 @@ $OpenBSD: patch-ltmain_sh,v 1.4 2004/07/25 00:17:39 marcm Exp $
# This is a shared library
# Warn about portability, can't link against -module's on
@@ -5827,40 +5826,6 @@ relink_command=\"$relink_command\""
@@ -5828,40 +5827,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = : && exit $EXIT_SUCCESS

12
math/gnumeric/patches/patch-src_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_Makefile_in,v 1.2 2004/01/28 16:10:33 marcm Exp $
--- src/Makefile.in.orig 2004-01-18 13:49:00.000000000 -0800
+++ src/Makefile.in 2004-01-24 20:14:33.000000000 -0800
@@ -248,7 +248,7 @@ EXTRA_DIST = GNOME_Gnumeric.xml GNOME_Gn
# $(INTLLIBS)
# Bonobo requires things to be in a subdir of this form
-uidir = $(gnumeric_datadir)/gnome-2.0/ui
+uidir = $(datadir)/gnome-2.0/ui
ui_DATA = GNOME_Gnumeric.xml GNOME_Gnumeric_Component.xml
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../gnumeric-config.h

21
math/gnumeric/patches/patch-src_tools_solver_lp_solve_commonlib_c Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-src_tools_solver_lp_solve_commonlib_c,v 1.1 2004/12/10 20:39:22 marcm Exp $
--- src/tools/solver/lp_solve/commonlib.c.orig Tue Dec 7 21:26:14 2004
+++ src/tools/solver/lp_solve/commonlib.c Tue Dec 7 21:50:44 2004
@@ -1,7 +1,7 @@
#include <sys/types.h>
-#ifdef INTEGERTIME
+#if defined (INTEGERTIME) || defined (__OpenBSD__)
# include <time.h>
#else
# include <sys/timeb.h>
@@ -279,7 +279,7 @@ double timeNow()
{
#ifdef INTEGERTIME
return((double)time(NULL));
-#elif defined CLOCKTIME
+#elif defined (CLOCKTIME) || defined (__OpenBSD__)
return((double)clock()/CLOCKS_PER_SEC /* CLK_TCK */);
#else
struct timeb buf;

21
math/gnumeric/patches/patch-templates_autoformat_Makefile_in Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-templates_autoformat_Makefile_in,v 1.1 2004/12/10 20:39:22 marcm Exp $
--- templates/autoformat/Makefile.in.orig Tue Dec 7 22:21:23 2004
+++ templates/autoformat/Makefile.in Tue Dec 7 22:21:45 2004
@@ -470,13 +470,15 @@ install-data-local:
< $(srcdir)/$$cat.category.in \
> $$dir/.category ; \
for f in $(srcdir)/autoformat.$$cat.*.xml.in ; do \
- echo " $${f/.*autoformat.$$cat./}" ; \
+ f1=`echo $${f} | sed -e 's/.*autoformat.$$cat.//'`; \
+ f2=`echo $${f} | sed -e 's/.xml.in/.xml/'`; \
+ echo " $${f1}" ; \
sed \
-e 's/ _author *=/ author=/' \
-e 's/ _name *=/ name=/' \
-e 's/ _description *=/ description=/' \
< $$f \
- > $$dir/`basename $${f/.xml.in/.xml}` ; \
+ > $$dir/`basename $${f2}` ; \
done \
done

72
math/gnumeric/pkg/PFRAG.shared
View File

@ -1,35 +1,37 @@
@comment $OpenBSD: PFRAG.shared,v 1.1 2004/07/25 00:17:40 marcm Exp $
lib/gnumeric/${VERSION}-bonobo/plugins/applix/applix.so
lib/gnumeric/${VERSION}-bonobo/plugins/corba/corba.so
lib/gnumeric/${VERSION}-bonobo/plugins/derivatives/derivatives.so
lib/gnumeric/${VERSION}-bonobo/plugins/dif/dif.so
lib/gnumeric/${VERSION}-bonobo/plugins/excel/excel.so
lib/gnumeric/${VERSION}-bonobo/plugins/fn-complex/plugin.so
lib/gnumeric/${VERSION}-bonobo/plugins/fn-database/plugin.so
lib/gnumeric/${VERSION}-bonobo/plugins/fn-date/plugin.so
lib/gnumeric/${VERSION}-bonobo/plugins/fn-eng/plugin.so
lib/gnumeric/${VERSION}-bonobo/plugins/fn-financial/plugin.so
lib/gnumeric/${VERSION}-bonobo/plugins/fn-info/plugin.so
lib/gnumeric/${VERSION}-bonobo/plugins/fn-logical/plugin.so
lib/gnumeric/${VERSION}-bonobo/plugins/fn-lookup/plugin.so
lib/gnumeric/${VERSION}-bonobo/plugins/fn-math/plugin.so
lib/gnumeric/${VERSION}-bonobo/plugins/fn-random/plugin.so
lib/gnumeric/${VERSION}-bonobo/plugins/fn-stat/plugin.so
lib/gnumeric/${VERSION}-bonobo/plugins/fn-string/plugin.so
lib/gnumeric/${VERSION}-bonobo/plugins/html/html.so
lib/gnumeric/${VERSION}-bonobo/plugins/lotus/lotus.so
lib/gnumeric/${VERSION}-bonobo/plugins/mps/mps.so
lib/gnumeric/${VERSION}-bonobo/plugins/numtheory/numtheory.so
lib/gnumeric/${VERSION}-bonobo/plugins/oleo/oleo.so
lib/gnumeric/${VERSION}-bonobo/plugins/openoffice/openoffice.so
lib/gnumeric/${VERSION}-bonobo/plugins/plan_perfect/plan_perfect.so
lib/gnumeric/${VERSION}-bonobo/plugins/plot_barcol/barcol.so
lib/gnumeric/${VERSION}-bonobo/plugins/plot_pie/pie.so
lib/gnumeric/${VERSION}-bonobo/plugins/plot_xy/xy.so
lib/gnumeric/${VERSION}-bonobo/plugins/qpro/qpro.so
lib/gnumeric/${VERSION}-bonobo/plugins/sample_datasource/sample_datasource.so
lib/gnumeric/${VERSION}-bonobo/plugins/sc/sc.so
lib/gnumeric/${VERSION}-bonobo/plugins/sylk/sylk.so
lib/gnumeric/${VERSION}-bonobo/plugins/uihello/plugin.so
lib/gnumeric/${VERSION}-bonobo/plugins/xbase/xbase.so
lib/gnumeric/${VERSION}-bonobo/plugins/xml_sax/xml_sax.so
@comment $OpenBSD: PFRAG.shared,v 1.2 2004/12/10 20:39:22 marcm Exp $
lib/gnumeric/${VERSION}/plugins/applix/applix.so
lib/gnumeric/${VERSION}/plugins/corba/corba.so
lib/gnumeric/${VERSION}/plugins/derivatives/derivatives.so
lib/gnumeric/${VERSION}/plugins/dif/dif.so
lib/gnumeric/${VERSION}/plugins/excel/excel.so
lib/gnumeric/${VERSION}/plugins/fn-complex/plugin.so
lib/gnumeric/${VERSION}/plugins/fn-database/plugin.so
lib/gnumeric/${VERSION}/plugins/fn-date/plugin.so
lib/gnumeric/${VERSION}/plugins/fn-eng/plugin.so
lib/gnumeric/${VERSION}/plugins/fn-erlang/erlang.so
lib/gnumeric/${VERSION}/plugins/fn-financial/plugin.so
lib/gnumeric/${VERSION}/plugins/fn-info/plugin.so
lib/gnumeric/${VERSION}/plugins/fn-logical/plugin.so
lib/gnumeric/${VERSION}/plugins/fn-lookup/plugin.so
lib/gnumeric/${VERSION}/plugins/fn-math/plugin.so
lib/gnumeric/${VERSION}/plugins/fn-random/plugin.so
lib/gnumeric/${VERSION}/plugins/fn-stat/plugin.so
lib/gnumeric/${VERSION}/plugins/fn-string/plugin.so
lib/gnumeric/${VERSION}/plugins/html/html.so
lib/gnumeric/${VERSION}/plugins/lotus/lotus.so
lib/gnumeric/${VERSION}/plugins/mps/mps.so
lib/gnumeric/${VERSION}/plugins/numtheory/numtheory.so
lib/gnumeric/${VERSION}/plugins/oleo/oleo.so
lib/gnumeric/${VERSION}/plugins/openoffice/openoffice.so
lib/gnumeric/${VERSION}/plugins/plan_perfect/plan_perfect.so
lib/gnumeric/${VERSION}/plugins/plot_barcol/barcol.so
lib/gnumeric/${VERSION}/plugins/plot_pie/pie.so
lib/gnumeric/${VERSION}/plugins/plot_radar/radar.so
lib/gnumeric/${VERSION}/plugins/plot_xy/xy.so
lib/gnumeric/${VERSION}/plugins/qpro/qpro.so
lib/gnumeric/${VERSION}/plugins/sample_datasource/sample_datasource.so
lib/gnumeric/${VERSION}/plugins/sc/sc.so
lib/gnumeric/${VERSION}/plugins/sylk/sylk.so
lib/gnumeric/${VERSION}/plugins/uihello/plugin.so
lib/gnumeric/${VERSION}/plugins/xbase/xbase.so
lib/gnumeric/${VERSION}/plugins/xml_sax/xml_sax.so

1237
math/gnumeric/pkg/PLIST
View File

File diff suppressed because it is too large Load Diff