[151752] trunk/dports/gnome/gnumeric

devans at macports.org devans at macports.org
Sun Aug 21 11:40:31 PDT 2016


Revision: 151752
          https://trac.macports.org/changeset/151752
Author:   devans at macports.org
Date:     2016-08-21 11:40:30 -0700 (Sun, 21 Aug 2016)
Log Message:
-----------
gnumeric: update to version 1.12.32, autogen.sh, no longer requires gnome-common.

Modified Paths:
--------------
    trunk/dports/gnome/gnumeric/Portfile
    trunk/dports/gnome/gnumeric/files/autogen.sh

Removed Paths:
-------------
    trunk/dports/gnome/gnumeric/files/patch-configure.ac.diff

Property Changed:
----------------
    trunk/dports/gnome/gnumeric/


Property changes on: trunk/dports/gnome/gnumeric
___________________________________________________________________
Modified: svn:mergeinfo
   - /users/devans/GNOME-3/stable/dports/gnome/gnumeric:126043-149794
   + /users/devans/GNOME-3/stable/dports/gnome/gnumeric:126043-151749

Modified: trunk/dports/gnome/gnumeric/Portfile
===================================================================
--- trunk/dports/gnome/gnumeric/Portfile	2016-08-21 18:39:16 UTC (rev 151751)
+++ trunk/dports/gnome/gnumeric/Portfile	2016-08-21 18:40:30 UTC (rev 151752)
@@ -6,7 +6,7 @@
 PortGroup           gobject_introspection 1.0
 
 name                gnumeric
-version             1.12.31
+version             1.12.32
 set branch          [join [lrange [split ${version} .] 0 1] .]
 
 license             GPL-2+
@@ -26,8 +26,8 @@
 master_sites        gnome:sources/${name}/${branch}/
 use_xz              yes
 
-checksums           rmd160  a6cdd8f40baea32edd0839fa93e9521e26f3ce4c \
-                    sha256  c8ace78e75c280dced3f15b27c44c7a98e8d21cd8361c6b2599cce191f6d6ae7
+checksums           rmd160  2d9b3b0daf535ef598716f362b86f2631453c0aa \
+                    sha256  a07bc83e2adaeb94bfa2c737c9a19d90381a19cb203dd7c4d5f7d6cfdbee6de8
 
 # set pbranch to desired perl version
 # currently 5.22 (#48365)
@@ -36,7 +36,6 @@
 depends_build       port:pkgconfig \
                     port:intltool \
                     port:gnome-doc-utils \
-                    port:gnome-common \
                     port:autoconf \
                     port:automake \
                     port:libtool \
@@ -57,8 +56,6 @@
 
 gobject_introspection yes
 
-patchfiles          patch-configure.ac.diff
-
 # reconfigure using upstream autogen.sh for intltool 0.51 compatibility
 
 post-patch {

Modified: trunk/dports/gnome/gnumeric/files/autogen.sh
===================================================================
--- trunk/dports/gnome/gnumeric/files/autogen.sh	2016-08-21 18:39:16 UTC (rev 151751)
+++ trunk/dports/gnome/gnumeric/files/autogen.sh	2016-08-21 18:40:30 UTC (rev 151752)
@@ -3,22 +3,11 @@
 
 PKG_NAME="Gnumeric"
 
-REQUIRED_AUTOMAKE_VERSION=1.9.0
-REQUIRED_LIBTOOL_VERSION=1.4.3
+test -n "$srcdir" || srcdir=$(dirname "$0")
+test -n "$srcdir" || srcdir=.
 
-# We use the XGETTEXT_KEYWORDS variable, thus we require:
-REQUIRED_INTLTOOL_VERSION=0.29
+olddir=$(pwd)
 
-# We require Automake 1.7.2, which requires Autoconf 2.54.
-# (It needs _AC_AM_CONFIG_HEADER_HOOK, for example.)
-REQUIRED_AUTOCONF_VERSION=2.54
-
-USE_GNOME2_MACROS=1
-USE_COMMON_DOC_BUILD=yes
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
 (test -f $srcdir/configure.ac \
   && test -d $srcdir/src \
   && test -f $srcdir/src/gnumeric.h) || {
@@ -27,37 +16,22 @@
     exit 1
 }
 
-ifs_save="$IFS"; IFS=":"
-for dir in $PATH ; do
-  IFS="$ifs_save"
-  test -z "$dir" && dir=.
-  if test -f "$dir/gnome-autogen.sh" ; then
-    gnome_autogen="$dir/gnome-autogen.sh"
-    gnome_datadir=`echo $dir | sed -e 's,/bin$,/share,'`
-    break
-  fi
-done
+cd $srcdir
+aclocal --install || exit 1
+glib-gettextize --force --copy || exit 1
+gtkdocize --copy || exit 1
+intltoolize --force --copy --automake || exit 1
+autoreconf --verbose --force --install || exit 1
+cd $olddir
 
-if test -z "$gnome_autogen" ; then
-  echo "You need to install the gnome-common module and make"
-  echo "sure the gnome-autogen.sh script is in your \$PATH."
-  exit 1
-fi
 
-GNOME_DATADIR="$gnome_datadir"
-
-# Dont't run configure yet, ...
-GNM_NOCONFIGURE=$NOCONFIGURE
-NOCONFIGURE=1
-. $gnome_autogen
-
 # We have our own copy of Makefile.in.in generated October 2008.
 # One of the reasons why we need a local copy is that
 # we generate po-functions/Makefile.in.in from it, which is committed to
 # SVN, so this file cannot depend on the versions of the tools which the
 # developers have installed.
 #
-printbold "Creating po/Makefile.in.in and po-functions/Makefile.in.in."
+echo "Creating po/Makefile.in.in and po-functions/Makefile.in.in."
 #rm -f $srcdir/po/Makefile.in.in $srcdir/po-functions/Makefile.in.in
 rm -f $srcdir/po-functions/Makefile.in.in
 #cp $srcdir/po/Makefile.in.in.own $srcdir/po/Makefile.in.in
@@ -68,7 +42,7 @@
     -e '/^EXTRA_DISTFILES/s/ LINGUAS//' \
 $srcdir/po/Makefile.in.in >$srcdir/po-functions/Makefile.in.in
 
-printbold "Creating po-functions/POTFILES.{in,skip}."
+echo "Creating po-functions/POTFILES.{in,skip}."
 rm -f $srcdir/po-functions/POTFILES.in $srcdir/po-functions/POTFILES.skip
 # This regex matches names of XML files:
 xml_file_name='^((schemas|templates)/.+|[^/]+)\.in$|\.(glade|xml)(\.in)?$'
@@ -80,9 +54,13 @@
   egrep "$xml_file_name" $srcdir/po/POTFILES.in
 ) >$srcdir/po-functions/POTFILES.skip
 
-# ... and then proceed.
-if test "x$GNM_NOCONFIGURE" = x; then
-    printbold Running $srcdir/configure $conf_flags "$@" ...
-    $srcdir/configure $conf_flags "$@" \
-        && echo Now type \`make\' to compile $PKG_NAME || exit 1
+
+if [ "$NOCONFIGURE" = "" ]; then
+        $srcdir/configure "$@" || exit 1
+
+        if [ "$1" = "--help" ]; then exit 0 else
+                echo "Now type 'make' to compile $PKG_NAME" || exit 1
+        fi
+else
+        echo "Skipping configure process."
 fi

Deleted: trunk/dports/gnome/gnumeric/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/gnome/gnumeric/files/patch-configure.ac.diff	2016-08-21 18:39:16 UTC (rev 151751)
+++ trunk/dports/gnome/gnumeric/files/patch-configure.ac.diff	2016-08-21 18:40:30 UTC (rev 151752)
@@ -1,19 +0,0 @@
---- configure.ac.orig	2014-12-30 18:35:24.000000000 -0800
-+++ configure.ac	2015-01-26 11:16:37.000000000 -0800
-@@ -266,11 +266,11 @@
- AC_CHECK_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource$ac_exeext, gdk-pixbuf-csource$ac_exeext)
- 
- ## this should come after `AC_PROG_CC'
--ifdef([GNOME_COMPILE_WARNINGS],
--	[GNOME_COMPILE_WARNINGS] CFLAGS="$CFLAGS $WARN_CFLAGS",
--	[]
--)
--set_more_warnings=yes
-+dnl ifdef([GNOME_COMPILE_WARNINGS],
-+dnl	[GNOME_COMPILE_WARNINGS] CFLAGS="$CFLAGS $WARN_CFLAGS",
-+dnl	[]
-+dnl)
-+set_more_warnings=no
- if test "$GCC" = yes -a "x$set_more_warnings" != xno; then
- 	dnl Clang needs this option, or else it will appear to support any
- 	dnl warning option, only to spew warnings about them later.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160821/b77a02e1/attachment.html>


More information about the macports-changes mailing list