diff options
-rw-r--r-- | math/gnumeric/Makefile | 4 | ||||
-rw-r--r-- | math/gnumeric/distinfo | 2 | ||||
-rw-r--r-- | math/gnumeric/files/patch-aa | 60 | ||||
-rw-r--r-- | math/gnumeric/pkg-plist | 8 | ||||
-rw-r--r-- | math/gnumeric2/Makefile | 4 | ||||
-rw-r--r-- | math/gnumeric2/distinfo | 2 | ||||
-rw-r--r-- | math/gnumeric2/files/patch-aa | 60 | ||||
-rw-r--r-- | math/gnumeric2/pkg-plist | 8 |
8 files changed, 100 insertions, 48 deletions
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile index 9a29eae756c5..a219ccedacd4 100644 --- a/math/gnumeric/Makefile +++ b/math/gnumeric/Makefile @@ -1,12 +1,12 @@ # New ports collection makefile for: gnumeric -# Version required: 0.47 +# Version required: 0.48 # Date created: 08 October 1998 # Whom: Yukihiro Nakai <Nakai@technologist.com> # # $FreeBSD$ # -DISTNAME= gnumeric-0.47 +DISTNAME= gnumeric-0.48 CATEGORIES= math gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gnumeric diff --git a/math/gnumeric/distinfo b/math/gnumeric/distinfo index 6f1c1370b543..594ec8f04f56 100644 --- a/math/gnumeric/distinfo +++ b/math/gnumeric/distinfo @@ -1 +1 @@ -MD5 (gnumeric-0.47.tar.gz) = 335c791580e12d59cd5061ebb9430158 +MD5 (gnumeric-0.48.tar.gz) = 7cf41733b6f7e3238a07229e22075617 diff --git a/math/gnumeric/files/patch-aa b/math/gnumeric/files/patch-aa index 484360792b8d..f6f19c4e21f8 100644 --- a/math/gnumeric/files/patch-aa +++ b/math/gnumeric/files/patch-aa @@ -1,5 +1,16 @@ ---- configure.orig Thu Dec 30 18:02:16 1999 -+++ configure Fri Dec 31 12:29:33 1999 +--- configure.orig Sat Jan 22 11:31:42 2000 ++++ configure Tue Jan 25 12:19:20 2000 +@@ -2294,8 +2294,8 @@ + CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ + LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \ + DLLTOOL="$DLLTOOL" AS="$AS" \ +-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ +-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ ++${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \ ++$libtool_flags --no-verify --disable-ltlibs /usr/local/share/libtool/ltmain.sh $host \ + || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } + + # Redirect the config.log output again, so that the ltconfig log is not @@ -2790,7 +2790,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then @@ -48,28 +59,39 @@ fi if test "$XGETTEXT" != ":"; then -@@ -6110,7 +6111,7 @@ - echo "configure:6111: checking for GnomePrint libraries" >&5 +@@ -6122,7 +6123,7 @@ + echo $ac_n "checking for GnomePrint libraries >= 0.10""... $ac_c" 1>&6 + echo "configure:6124: checking for GnomePrint libraries >= 0.10" >&5 if gnome-config --libs print > /dev/null 2>&1; then - echo "$ac_t""found" 1>&6 -- . `gnome-config --libdir`/printConf.sh -+ . `$GNOME_CONFIG --sysconfdir`/printConf.sh - echo $ac_n "checking for GnomePrint >= 0.8""... $ac_c" 1>&6 - echo "configure:6116: checking for GnomePrint >= 0.8" >&5 - case x$MODULE_VERSION in -@@ -6125,8 +6126,8 @@ +- vers=`(. \`gnome-config --libdir\`/printConf.sh && echo $MODULE_VERSION | sed -e "s/gnome-print-//" ) | \ ++ vers=`(. \`$GNOME_CONFIG --sysconfdir\`/printConf.sh && echo $MODULE_VERSION | sed -e "s/gnome-print-//" ) | \ + awk 'BEGIN { FS = "."; } { print $1 * 1000 + $2;}'` + if test "$vers" -ge 10; then + echo "$ac_t""found" 1>&6 +@@ -6135,8 +6136,8 @@ echo $ac_n "checking for Glade libraries >= 0.11""... $ac_c" 1>&6 - echo "configure:6128: checking for Glade libraries >= 0.11" >&5 + echo "configure:6138: checking for Glade libraries >= 0.11" >&5 -if gnome-config --libs libglade > /dev/null 2>&1; then -- vers=`gnome-config --modversion libglade` +- vers=`gnome-config --modversion libglade | awk 'BEGIN { FS = "."; } { print $1 * 1000 + $2;}'` +if libglade-config --libs > /dev/null 2>&1; then -+ vers=`libglade-config --version | sed -e 's/ /-/'` - case $vers - in - libglade-0.1[123456789]) echo "$ac_t""found" 1>&6 ;; -@@ -6136,8 +6137,8 @@ - { echo "configure: error: Did not find libGlade installed" 1>&2; exit 1; } ++ vers=`libglade-config --version | sed -e 's/libglade //' | awk 'BEGIN { FS = "."; } { print $1 * 1000 + $2;}'` + if test "$vers" -ge 11; then + echo "$ac_t""found" 1>&6 + else +@@ -6148,8 +6149,8 @@ + + echo $ac_n "checking for GTK >= 1.2.2""... $ac_c" 1>&6 + echo "configure:6151: checking for GTK >= 1.2.2" >&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 ++ vers=`$GTK_CONFIG --version | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` + if test "$vers" -ge 1002002; then + echo "$ac_t""found" 1>&6 + else +@@ -6159,8 +6160,8 @@ + { echo "configure: error: Did not find GTK+ installed" 1>&2; exit 1; } fi -EXTRA_GNOME_LIBS=`gnome-config --libs gnomeui print libglade $bonobo $gb` diff --git a/math/gnumeric/pkg-plist b/math/gnumeric/pkg-plist index 613cacd67ccb..64012b6fc5b5 100644 --- a/math/gnumeric/pkg-plist +++ b/math/gnumeric/pkg-plist @@ -1,6 +1,10 @@ bin/gnumeric etc/CORBA/servers/gnumeric.gnorba share/gnome/apps/Applications/gnumeric.desktop +share/gnome/gnumeric/glade/autocorrect-exceptions.glade +share/gnome/gnumeric/glade/autocorrect.glade +share/gnome/gnumeric/glade/autosave-prompt.glade +share/gnome/gnumeric/glade/autosave.glade share/gnome/gnumeric/glade/cell-format.glade share/gnome/gnumeric/glade/cell-sort.glade share/gnome/gnumeric/glade/col-width.glade @@ -14,6 +18,7 @@ share/gnome/gnumeric/glade/names.glade share/gnome/gnumeric/glade/print.glade share/gnome/gnumeric/glade/row-height.glade share/gnome/gnumeric/glade/sheet-rename.glade +share/gnome/gnumeric/glade/stf.glade share/gnome/gnumeric/glade/summary.glade share/gnome/gnumeric/guile/functions.scm share/gnome/gnumeric/guile/gnumeric_startup.scm @@ -23,9 +28,8 @@ share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_guile.so share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_html.so share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_lotus.so share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_oleo.so -share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_python.so share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_sc.so -share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_stat.so +share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_stf.so share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_sylk.so share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_text.so share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_xbase.so diff --git a/math/gnumeric2/Makefile b/math/gnumeric2/Makefile index 9a29eae756c5..a219ccedacd4 100644 --- a/math/gnumeric2/Makefile +++ b/math/gnumeric2/Makefile @@ -1,12 +1,12 @@ # New ports collection makefile for: gnumeric -# Version required: 0.47 +# Version required: 0.48 # Date created: 08 October 1998 # Whom: Yukihiro Nakai <Nakai@technologist.com> # # $FreeBSD$ # -DISTNAME= gnumeric-0.47 +DISTNAME= gnumeric-0.48 CATEGORIES= math gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gnumeric diff --git a/math/gnumeric2/distinfo b/math/gnumeric2/distinfo index 6f1c1370b543..594ec8f04f56 100644 --- a/math/gnumeric2/distinfo +++ b/math/gnumeric2/distinfo @@ -1 +1 @@ -MD5 (gnumeric-0.47.tar.gz) = 335c791580e12d59cd5061ebb9430158 +MD5 (gnumeric-0.48.tar.gz) = 7cf41733b6f7e3238a07229e22075617 diff --git a/math/gnumeric2/files/patch-aa b/math/gnumeric2/files/patch-aa index 484360792b8d..f6f19c4e21f8 100644 --- a/math/gnumeric2/files/patch-aa +++ b/math/gnumeric2/files/patch-aa @@ -1,5 +1,16 @@ ---- configure.orig Thu Dec 30 18:02:16 1999 -+++ configure Fri Dec 31 12:29:33 1999 +--- configure.orig Sat Jan 22 11:31:42 2000 ++++ configure Tue Jan 25 12:19:20 2000 +@@ -2294,8 +2294,8 @@ + CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ + LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \ + DLLTOOL="$DLLTOOL" AS="$AS" \ +-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ +-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ ++${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \ ++$libtool_flags --no-verify --disable-ltlibs /usr/local/share/libtool/ltmain.sh $host \ + || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } + + # Redirect the config.log output again, so that the ltconfig log is not @@ -2790,7 +2790,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then @@ -48,28 +59,39 @@ fi if test "$XGETTEXT" != ":"; then -@@ -6110,7 +6111,7 @@ - echo "configure:6111: checking for GnomePrint libraries" >&5 +@@ -6122,7 +6123,7 @@ + echo $ac_n "checking for GnomePrint libraries >= 0.10""... $ac_c" 1>&6 + echo "configure:6124: checking for GnomePrint libraries >= 0.10" >&5 if gnome-config --libs print > /dev/null 2>&1; then - echo "$ac_t""found" 1>&6 -- . `gnome-config --libdir`/printConf.sh -+ . `$GNOME_CONFIG --sysconfdir`/printConf.sh - echo $ac_n "checking for GnomePrint >= 0.8""... $ac_c" 1>&6 - echo "configure:6116: checking for GnomePrint >= 0.8" >&5 - case x$MODULE_VERSION in -@@ -6125,8 +6126,8 @@ +- vers=`(. \`gnome-config --libdir\`/printConf.sh && echo $MODULE_VERSION | sed -e "s/gnome-print-//" ) | \ ++ vers=`(. \`$GNOME_CONFIG --sysconfdir\`/printConf.sh && echo $MODULE_VERSION | sed -e "s/gnome-print-//" ) | \ + awk 'BEGIN { FS = "."; } { print $1 * 1000 + $2;}'` + if test "$vers" -ge 10; then + echo "$ac_t""found" 1>&6 +@@ -6135,8 +6136,8 @@ echo $ac_n "checking for Glade libraries >= 0.11""... $ac_c" 1>&6 - echo "configure:6128: checking for Glade libraries >= 0.11" >&5 + echo "configure:6138: checking for Glade libraries >= 0.11" >&5 -if gnome-config --libs libglade > /dev/null 2>&1; then -- vers=`gnome-config --modversion libglade` +- vers=`gnome-config --modversion libglade | awk 'BEGIN { FS = "."; } { print $1 * 1000 + $2;}'` +if libglade-config --libs > /dev/null 2>&1; then -+ vers=`libglade-config --version | sed -e 's/ /-/'` - case $vers - in - libglade-0.1[123456789]) echo "$ac_t""found" 1>&6 ;; -@@ -6136,8 +6137,8 @@ - { echo "configure: error: Did not find libGlade installed" 1>&2; exit 1; } ++ vers=`libglade-config --version | sed -e 's/libglade //' | awk 'BEGIN { FS = "."; } { print $1 * 1000 + $2;}'` + if test "$vers" -ge 11; then + echo "$ac_t""found" 1>&6 + else +@@ -6148,8 +6149,8 @@ + + echo $ac_n "checking for GTK >= 1.2.2""... $ac_c" 1>&6 + echo "configure:6151: checking for GTK >= 1.2.2" >&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 ++ vers=`$GTK_CONFIG --version | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` + if test "$vers" -ge 1002002; then + echo "$ac_t""found" 1>&6 + else +@@ -6159,8 +6160,8 @@ + { echo "configure: error: Did not find GTK+ installed" 1>&2; exit 1; } fi -EXTRA_GNOME_LIBS=`gnome-config --libs gnomeui print libglade $bonobo $gb` diff --git a/math/gnumeric2/pkg-plist b/math/gnumeric2/pkg-plist index 613cacd67ccb..64012b6fc5b5 100644 --- a/math/gnumeric2/pkg-plist +++ b/math/gnumeric2/pkg-plist @@ -1,6 +1,10 @@ bin/gnumeric etc/CORBA/servers/gnumeric.gnorba share/gnome/apps/Applications/gnumeric.desktop +share/gnome/gnumeric/glade/autocorrect-exceptions.glade +share/gnome/gnumeric/glade/autocorrect.glade +share/gnome/gnumeric/glade/autosave-prompt.glade +share/gnome/gnumeric/glade/autosave.glade share/gnome/gnumeric/glade/cell-format.glade share/gnome/gnumeric/glade/cell-sort.glade share/gnome/gnumeric/glade/col-width.glade @@ -14,6 +18,7 @@ share/gnome/gnumeric/glade/names.glade share/gnome/gnumeric/glade/print.glade share/gnome/gnumeric/glade/row-height.glade share/gnome/gnumeric/glade/sheet-rename.glade +share/gnome/gnumeric/glade/stf.glade share/gnome/gnumeric/glade/summary.glade share/gnome/gnumeric/guile/functions.scm share/gnome/gnumeric/guile/gnumeric_startup.scm @@ -23,9 +28,8 @@ share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_guile.so share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_html.so share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_lotus.so share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_oleo.so -share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_python.so share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_sc.so -share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_stat.so +share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_stf.so share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_sylk.so share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_text.so share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_xbase.so |