[135662] trunk/dports/science/viking

[devans at macports.org]

Revision: 135662
          https://trac.macports.org/changeset/135662
Author:   devans at macports.org
Date:     2015-04-29 00:20:00 -0700 (Wed, 29 Apr 2015)
Log Message:
-----------
viking: update to version 1.6, dependencies, reconfigure using upstream autogen.sh for intltool 0.51 compatibility.

Modified Paths:
--------------
    trunk/dports/science/viking/Portfile

Added Paths:
-----------
    trunk/dports/science/viking/files/
    trunk/dports/science/viking/files/autogen.sh
    trunk/dports/science/viking/files/patch-configure.ac.diff

Modified: trunk/dports/science/viking/Portfile
===================================================================
--- trunk/dports/science/viking/Portfile	2015-04-29 06:36:14 UTC (rev 135661)
+++ trunk/dports/science/viking/Portfile	2015-04-29 07:20:00 UTC (rev 135662)
@@ -4,8 +4,7 @@
 PortSystem          1.0
 
 name                viking
-version             1.5.1
-revision            3
+version             1.6
 categories          science
 license             GPL-2
 maintainers         nomaintainer
@@ -16,22 +15,34 @@
 master_sites        sourceforge:project/viking
 use_bzip2           yes
 
-checksums           rmd160  27f3d828fdddeb423386da2eb598e9b39b8e1b35 \
-                    sha256  6c560c8665112732e575110e9a316638cf278f03b5ecd92ff8845419cb3d53ec
+checksums           rmd160  b348bf666753adae0344023d7d32e5ae78dc7554 \
+                    sha256  21f1bd372c571b8d021e4509a69ec6448efefec623355a9db26cd81898b5920a
 
 depends_build       bin:gnutar:gnutar \
                     port:gnome-doc-utils \
+                    port:gtk-doc \
                     port:intltool \
                     port:pkgconfig
 
-depends_lib         \
-                    port:curl \
+depends_lib         port:curl \
                     port:gpsd \
                     port:gtk2 \
-                    port:libexif \
+                    port:gexiv2 \
                     port:libmagic
 
 depends_run         port:expect \
                     port:gpsbabel
 
+patchfiles          patch-configure.ac.diff
+
+# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
+
+post-patch {
+    xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
+}
+
+configure.cmd       ./autogen.sh
+
+configure.args      --disable-mapnik
+
 livecheck.regex     ${name}-(\[0-9.\]+)${extract.suffix}

Added: trunk/dports/science/viking/files/autogen.sh
===================================================================
--- trunk/dports/science/viking/files/autogen.sh	                        (rev 0)
+++ trunk/dports/science/viking/files/autogen.sh	2015-04-29 07:20:00 UTC (rev 135662)
@@ -0,0 +1,46 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+test -n "$srcdir" || srcdir=`dirname "$0"`
+test -n "$srcdir" || srcdir=.
+
+olddir=`pwd`
+cd "$srcdir"
+
+INTLTOOLIZE=`which intltoolize`
+if test -z $INTLTOOLIZE; then
+        echo "*** No intltoolize found, please install the intltool package ***"
+        exit 1
+fi
+
+GTK_DOC=`which gtkdocize`
+if test -z $GTK_DOC; then
+        echo "*** No gtkdocize found, please install the gtk-doc-tools package ***"
+        exit 1
+fi
+
+GNOME_DOC=`which gnome-doc-prepare`
+if test -z $GNOME_DOC; then
+        echo "*** No gnome-doc-prepare found, please install the gnome-doc-utils package ***"
+        exit 1
+fi
+
+AUTORECONF=`which autoreconf`
+if test -z $AUTORECONF; then
+        echo "*** No autoreconf found, please install it ***"
+        exit 1
+fi
+
+if test -z `which autopoint`; then
+        echo "*** No autopoint found, please install it ***"
+        exit 1
+fi
+
+gnome-doc-prepare --automake --copy --force || exit $?
+gtkdocize --copy || exit $?
+autopoint --force || exit $?
+AUTOPOINT='intltoolize --automake --copy --force' autoreconf --force --install --verbose || exit $?
+
+cd "$olddir"
+test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"
+

Added: trunk/dports/science/viking/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/science/viking/files/patch-configure.ac.diff	                        (rev 0)
+++ trunk/dports/science/viking/files/patch-configure.ac.diff	2015-04-29 07:20:00 UTC (rev 135662)
@@ -0,0 +1,19 @@
+--- configure.ac.orig	2015-04-29 00:09:24.000000000 -0700
++++ configure.ac	2015-04-29 00:09:59.000000000 -0700
+@@ -438,11 +438,11 @@
+ 		win32/installer/Makefile
+ 		win32/installer/pixmaps/Makefile
+ 		win32/installer/translations/Makefile])
+-AM_COND_IF([VIKING_DOC],
+-	[AC_CONFIG_FILES([
+-		doc/Makefile
+-		doc/reference/Makefile
+-		doc/examples/Makefile])])
++#AM_COND_IF([VIKING_DOC],
++#	[AC_CONFIG_FILES([
++#		doc/Makefile
++#		doc/reference/Makefile
++#		doc/examples/Makefile])])
+ 
+ AC_OUTPUT([
+ 	   viking.spec
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150429/a9c72ec1/attachment.html>