diff options
Diffstat (limited to 'math')
-rw-r--r-- | math/gnumeric/Makefile | 5 | ||||
-rw-r--r-- | math/gnumeric/distinfo | 2 | ||||
-rw-r--r-- | math/gnumeric/files/patch-aa | 23 | ||||
-rw-r--r-- | math/gnumeric/files/patch-ba | 8 | ||||
-rw-r--r-- | math/gnumeric/pkg-plist | 32 | ||||
-rw-r--r-- | math/gnumeric2/Makefile | 5 | ||||
-rw-r--r-- | math/gnumeric2/distinfo | 2 | ||||
-rw-r--r-- | math/gnumeric2/files/patch-aa | 23 | ||||
-rw-r--r-- | math/gnumeric2/files/patch-ba | 8 | ||||
-rw-r--r-- | math/gnumeric2/pkg-plist | 32 |
10 files changed, 118 insertions, 22 deletions
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile index 51903614da6..25e05c950b5 100644 --- a/math/gnumeric/Makefile +++ b/math/gnumeric/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnumeric -PORTVERSION= 0.53 +PORTVERSION= 0.54 CATEGORIES= math gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gnumeric @@ -20,16 +20,19 @@ RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore \ LIB_DEPENDS= gnomeprint.9:${PORTSDIR}/print/gnomeprint \ glade.3:${PORTSDIR}/devel/libglade +GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_PERL5= yes USE_GMAKE= yes USE_X_PREFIX= yes USE_LIBTOOL= yes +LIBTOOLFILES= configure libole2/configure CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ --datadir=${PREFIX}/share/gnome \ --with-gnome=${PREFIX} --with-guile CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + GLIB_CONFIG="${GLIB_CONFIG}" \ GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" diff --git a/math/gnumeric/distinfo b/math/gnumeric/distinfo index b521d076564..7fb73a96fd5 100644 --- a/math/gnumeric/distinfo +++ b/math/gnumeric/distinfo @@ -1 +1 @@ -MD5 (gnumeric-0.53.tar.gz) = 775b2b8ad8c4192bf50b3bdc03292e85 +MD5 (gnumeric-0.54.tar.gz) = 3a323d6d301d0e0acb908798e9875a17 diff --git a/math/gnumeric/files/patch-aa b/math/gnumeric/files/patch-aa index 847f32305e7..4611b7d38db 100644 --- a/math/gnumeric/files/patch-aa +++ b/math/gnumeric/files/patch-aa @@ -1,9 +1,9 @@ ---- configure.orig Tue May 9 20:50:13 2000 -+++ configure Tue May 16 09:56:35 2000 -@@ -5951,8 +5951,8 @@ +--- configure.orig Sun May 21 01:24:08 2000 ++++ configure Mon May 22 10:35:06 2000 +@@ -5934,8 +5934,8 @@ echo $ac_n "checking for GTK >= 1.2.7""... $ac_c" 1>&6 - echo "configure:5954: checking for GTK >= 1.2.7" >&5 + echo "configure:5937: checking for GTK >= 1.2.7" >&5 -if gtk-config --version > /dev/null 2>&1; then - vers=`gtk-config --version | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` +if $GTK_CONFIG --version > /dev/null 2>&1; then @@ -11,3 +11,18 @@ if test "$vers" -ge 1002007; then echo "$ac_t""found" 1>&6 else +@@ -6748,10 +6748,10 @@ + *) # Relative path. + ac_sub_cache_file="$ac_dots$cache_file" ;; + esac +- case "$ac_given_INSTALL" in +- [/$]*) INSTALL="$ac_given_INSTALL" ;; +- *) INSTALL="$ac_dots$ac_given_INSTALL" ;; +- esac ++# case "$ac_given_INSTALL" in ++# [/$]*) INSTALL="$ac_given_INSTALL" ;; ++# *) INSTALL="$ac_dots$ac_given_INSTALL" ;; ++# esac + + echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" + # The eval makes quoting arguments work. diff --git a/math/gnumeric/files/patch-ba b/math/gnumeric/files/patch-ba index bceb783e7ea..911608c661a 100644 --- a/math/gnumeric/files/patch-ba +++ b/math/gnumeric/files/patch-ba @@ -1,11 +1,11 @@ ---- Makefile.in.orig Tue May 9 21:57:18 2000 -+++ Makefile.in Tue May 16 12:16:37 2000 +--- Makefile.in.orig Sun May 21 01:25:10 2000 ++++ Makefile.in Mon May 22 10:10:34 2000 @@ -152,12 +152,12 @@ perl_val = @perl_val@ python_val = @python_val@ --SUBDIRS = . intl po macros idl plugins wizards src graph doc icons -+SUBDIRS = . intl po macros idl plugins wizards src graph icons +-SUBDIRS = . intl po macros libole2 idl plugins wizards src graph doc icons ++SUBDIRS = . intl po macros libole2 idl plugins wizards src graph icons change_logs = OOChangeLog OChangeLog ChangeLog diff --git a/math/gnumeric/pkg-plist b/math/gnumeric/pkg-plist index b11bbfed544..7155b7a31e3 100644 --- a/math/gnumeric/pkg-plist +++ b/math/gnumeric/pkg-plist @@ -1,7 +1,18 @@ bin/gnumeric +bin/libole2-config etc/CORBA/servers/gnumeric.gnorba etc/CORBA/servers/graph.gnorba etc/gnumericConf.sh +etc/libole2Conf.sh +include/libole2/libole2.h +include/libole2/ms-ole-summary.h +include/libole2/ms-ole-vba.h +include/libole2/ms-ole.h +lib/libole2.a +lib/libole2.so +lib/libole2.so.0 +@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R +@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B lib/gnumeric/%%VERSION%%/plugins/gnum_csv.so lib/gnumeric/%%VERSION%%/plugins/gnum_dif.so lib/gnumeric/%%VERSION%%/plugins/gnum_guile.so @@ -13,6 +24,8 @@ lib/gnumeric/%%VERSION%%/plugins/gnum_sc.so lib/gnumeric/%%VERSION%%/plugins/gnum_sylk.so lib/gnumeric/%%VERSION%%/plugins/gnum_text.so lib/gnumeric/%%VERSION%%/plugins/gnum_xbase.so +share/aclocal/gnome-libole2.m4 +share/aclocal/libole2.m4 share/gnome/apps/Applications/gnumeric.desktop share/gnome/gnumeric/%%VERSION%%/glade/advanced-filter.glade share/gnome/gnumeric/%%VERSION%%/glade/analysis-tools.glade @@ -49,9 +62,21 @@ share/gnome/gnumeric/%%VERSION%%/python/gnumeric_defs.py share/gnome/gnumeric/%%VERSION%%/python/gnumeric_startup.py share/gnome/idl/Gnumeric.idl share/gnome/idl/Graph.idl +share/gnome/libole2/html/libole2-decl.txt +share/gnome/libole2/html/libole2-sections.txt +share/gnome/libole2/html/libole2.html +share/gnome/libole2/html/libole2/index.html +share/gnome/libole2/html/libole2/libole2-common.html +share/gnome/libole2/html/libole2/libole2-miscellaneous.html +share/gnome/libole2/html/libole2/libole2-msole.html +share/gnome/libole2/html/libole2/libole2-msolestream.html +share/gnome/libole2/html/libole2/libole2-msolesummary.html +share/gnome/libole2/html/libole2/r14.html +share/gnome/libole2/html/libole2/r19.html share/gnome/mc/templates/gnumeric.desktop share/gnome/mime-info/gnumeric.keys share/gnome/mime-info/gnumeric.mime +share/gnome/oaf/gnumeric.oafinfo share/gnome/oaf/graph.oafinfo share/gnome/pixmaps/gnome-application-x-gnumeric.png share/gnome/pixmaps/gnome-application-x-xls.png @@ -199,6 +224,7 @@ share/locale/et/LC_MESSAGES/gnumeric.mo share/locale/fi/LC_MESSAGES/gnumeric.mo share/locale/fr/LC_MESSAGES/gnumeric.mo share/locale/ga/LC_MESSAGES/gnumeric.mo +share/locale/gl/LC_MESSAGES/gnumeric.mo share/locale/hr/LC_MESSAGES/gnumeric.mo share/locale/hu/LC_MESSAGES/gnumeric.mo share/locale/it/LC_MESSAGES/gnumeric.mo @@ -220,8 +246,12 @@ share/locale/zh_TW.Big5/LC_MESSAGES/gnumeric.mo @dirrm share/gnome/gnumeric/%%VERSION%%/glade @dirrm share/gnome/gnumeric/%%VERSION%% @dirrm share/gnome/gnumeric -@dirrm share/gnome/pixmaps/gnumeric +@dirrm share/gnome/libole2/html/libole2 +@dirrm share/gnome/libole2/html +@dirrm share/gnome/libole2 @dirrm share/gnome/oaf +@dirrm share/gnome/pixmaps/gnumeric @dirrm lib/gnumeric/%%VERSION%%/plugins @dirrm lib/gnumeric/%%VERSION%% @dirrm lib/gnumeric +@dirrm include/libole2 diff --git a/math/gnumeric2/Makefile b/math/gnumeric2/Makefile index 51903614da6..25e05c950b5 100644 --- a/math/gnumeric2/Makefile +++ b/math/gnumeric2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnumeric -PORTVERSION= 0.53 +PORTVERSION= 0.54 CATEGORIES= math gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gnumeric @@ -20,16 +20,19 @@ RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore \ LIB_DEPENDS= gnomeprint.9:${PORTSDIR}/print/gnomeprint \ glade.3:${PORTSDIR}/devel/libglade +GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_PERL5= yes USE_GMAKE= yes USE_X_PREFIX= yes USE_LIBTOOL= yes +LIBTOOLFILES= configure libole2/configure CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ --datadir=${PREFIX}/share/gnome \ --with-gnome=${PREFIX} --with-guile CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + GLIB_CONFIG="${GLIB_CONFIG}" \ GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" diff --git a/math/gnumeric2/distinfo b/math/gnumeric2/distinfo index b521d076564..7fb73a96fd5 100644 --- a/math/gnumeric2/distinfo +++ b/math/gnumeric2/distinfo @@ -1 +1 @@ -MD5 (gnumeric-0.53.tar.gz) = 775b2b8ad8c4192bf50b3bdc03292e85 +MD5 (gnumeric-0.54.tar.gz) = 3a323d6d301d0e0acb908798e9875a17 diff --git a/math/gnumeric2/files/patch-aa b/math/gnumeric2/files/patch-aa index 847f32305e7..4611b7d38db 100644 --- a/math/gnumeric2/files/patch-aa +++ b/math/gnumeric2/files/patch-aa @@ -1,9 +1,9 @@ ---- configure.orig Tue May 9 20:50:13 2000 -+++ configure Tue May 16 09:56:35 2000 -@@ -5951,8 +5951,8 @@ +--- configure.orig Sun May 21 01:24:08 2000 ++++ configure Mon May 22 10:35:06 2000 +@@ -5934,8 +5934,8 @@ echo $ac_n "checking for GTK >= 1.2.7""... $ac_c" 1>&6 - echo "configure:5954: checking for GTK >= 1.2.7" >&5 + echo "configure:5937: checking for GTK >= 1.2.7" >&5 -if gtk-config --version > /dev/null 2>&1; then - vers=`gtk-config --version | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` +if $GTK_CONFIG --version > /dev/null 2>&1; then @@ -11,3 +11,18 @@ if test "$vers" -ge 1002007; then echo "$ac_t""found" 1>&6 else +@@ -6748,10 +6748,10 @@ + *) # Relative path. + ac_sub_cache_file="$ac_dots$cache_file" ;; + esac +- case "$ac_given_INSTALL" in +- [/$]*) INSTALL="$ac_given_INSTALL" ;; +- *) INSTALL="$ac_dots$ac_given_INSTALL" ;; +- esac ++# case "$ac_given_INSTALL" in ++# [/$]*) INSTALL="$ac_given_INSTALL" ;; ++# *) INSTALL="$ac_dots$ac_given_INSTALL" ;; ++# esac + + echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" + # The eval makes quoting arguments work. diff --git a/math/gnumeric2/files/patch-ba b/math/gnumeric2/files/patch-ba index bceb783e7ea..911608c661a 100644 --- a/math/gnumeric2/files/patch-ba +++ b/math/gnumeric2/files/patch-ba @@ -1,11 +1,11 @@ ---- Makefile.in.orig Tue May 9 21:57:18 2000 -+++ Makefile.in Tue May 16 12:16:37 2000 +--- Makefile.in.orig Sun May 21 01:25:10 2000 ++++ Makefile.in Mon May 22 10:10:34 2000 @@ -152,12 +152,12 @@ perl_val = @perl_val@ python_val = @python_val@ --SUBDIRS = . intl po macros idl plugins wizards src graph doc icons -+SUBDIRS = . intl po macros idl plugins wizards src graph icons +-SUBDIRS = . intl po macros libole2 idl plugins wizards src graph doc icons ++SUBDIRS = . intl po macros libole2 idl plugins wizards src graph icons change_logs = OOChangeLog OChangeLog ChangeLog diff --git a/math/gnumeric2/pkg-plist b/math/gnumeric2/pkg-plist index b11bbfed544..7155b7a31e3 100644 --- a/math/gnumeric2/pkg-plist +++ b/math/gnumeric2/pkg-plist @@ -1,7 +1,18 @@ bin/gnumeric +bin/libole2-config etc/CORBA/servers/gnumeric.gnorba etc/CORBA/servers/graph.gnorba etc/gnumericConf.sh +etc/libole2Conf.sh +include/libole2/libole2.h +include/libole2/ms-ole-summary.h +include/libole2/ms-ole-vba.h +include/libole2/ms-ole.h +lib/libole2.a +lib/libole2.so +lib/libole2.so.0 +@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R +@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B lib/gnumeric/%%VERSION%%/plugins/gnum_csv.so lib/gnumeric/%%VERSION%%/plugins/gnum_dif.so lib/gnumeric/%%VERSION%%/plugins/gnum_guile.so @@ -13,6 +24,8 @@ lib/gnumeric/%%VERSION%%/plugins/gnum_sc.so lib/gnumeric/%%VERSION%%/plugins/gnum_sylk.so lib/gnumeric/%%VERSION%%/plugins/gnum_text.so lib/gnumeric/%%VERSION%%/plugins/gnum_xbase.so +share/aclocal/gnome-libole2.m4 +share/aclocal/libole2.m4 share/gnome/apps/Applications/gnumeric.desktop share/gnome/gnumeric/%%VERSION%%/glade/advanced-filter.glade share/gnome/gnumeric/%%VERSION%%/glade/analysis-tools.glade @@ -49,9 +62,21 @@ share/gnome/gnumeric/%%VERSION%%/python/gnumeric_defs.py share/gnome/gnumeric/%%VERSION%%/python/gnumeric_startup.py share/gnome/idl/Gnumeric.idl share/gnome/idl/Graph.idl +share/gnome/libole2/html/libole2-decl.txt +share/gnome/libole2/html/libole2-sections.txt +share/gnome/libole2/html/libole2.html +share/gnome/libole2/html/libole2/index.html +share/gnome/libole2/html/libole2/libole2-common.html +share/gnome/libole2/html/libole2/libole2-miscellaneous.html +share/gnome/libole2/html/libole2/libole2-msole.html +share/gnome/libole2/html/libole2/libole2-msolestream.html +share/gnome/libole2/html/libole2/libole2-msolesummary.html +share/gnome/libole2/html/libole2/r14.html +share/gnome/libole2/html/libole2/r19.html share/gnome/mc/templates/gnumeric.desktop share/gnome/mime-info/gnumeric.keys share/gnome/mime-info/gnumeric.mime +share/gnome/oaf/gnumeric.oafinfo share/gnome/oaf/graph.oafinfo share/gnome/pixmaps/gnome-application-x-gnumeric.png share/gnome/pixmaps/gnome-application-x-xls.png @@ -199,6 +224,7 @@ share/locale/et/LC_MESSAGES/gnumeric.mo share/locale/fi/LC_MESSAGES/gnumeric.mo share/locale/fr/LC_MESSAGES/gnumeric.mo share/locale/ga/LC_MESSAGES/gnumeric.mo +share/locale/gl/LC_MESSAGES/gnumeric.mo share/locale/hr/LC_MESSAGES/gnumeric.mo share/locale/hu/LC_MESSAGES/gnumeric.mo share/locale/it/LC_MESSAGES/gnumeric.mo @@ -220,8 +246,12 @@ share/locale/zh_TW.Big5/LC_MESSAGES/gnumeric.mo @dirrm share/gnome/gnumeric/%%VERSION%%/glade @dirrm share/gnome/gnumeric/%%VERSION%% @dirrm share/gnome/gnumeric -@dirrm share/gnome/pixmaps/gnumeric +@dirrm share/gnome/libole2/html/libole2 +@dirrm share/gnome/libole2/html +@dirrm share/gnome/libole2 @dirrm share/gnome/oaf +@dirrm share/gnome/pixmaps/gnumeric @dirrm lib/gnumeric/%%VERSION%%/plugins @dirrm lib/gnumeric/%%VERSION%% @dirrm lib/gnumeric +@dirrm include/libole2 |