<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[134933] trunk/dports/graphics/gimp2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/134933">134933</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2015-04-10 21:17:15 -0700 (Fri, 10 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>gimp2: reconfigure using autogen.sh for intltool 0.51 compatibility.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsgimp2Portfile">trunk/dports/graphics/gimp2/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsgimp2filesautogensh">trunk/dports/graphics/gimp2/files/autogen.sh</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgraphicsgimp2Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/gimp2/Portfile (134932 => 134933)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp2/Portfile 2015-04-11 04:13:11 UTC (rev 134932)
+++ trunk/dports/graphics/gimp2/Portfile 2015-04-11 04:17:15 UTC (rev 134933)
</span><span class="lines">@@ -33,7 +33,10 @@
</span><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><del>- port:gtk-doc
</del><ins>+ port:gtk-doc \
+ port:autoconf \
+ port:automake \
+ port:libtool
</ins><span class="cx">
</span><span class="cx"> depends_lib port:desktop-file-utils \
</span><span class="cx"> port:iso-codes \
</span><span class="lines">@@ -69,11 +72,15 @@
</span><span class="cx">
</span><span class="cx"> depends_run path:share/gimp/2.0/help:gimp-help-en
</span><span class="cx">
</span><del>-patchfiles patch-etc-gimprc.diff
-
</del><span class="cx"> # gcc-4.2 5493 and 5666.3_13: gimpcpuaccel.c:180: error: can't find a register in class 'BREG' while reloading 'asm'
</span><span class="cx"> compiler.blacklist-append gcc-3.3 gcc-4.0 gcc-4.2 apple-gcc-4.2
</span><span class="cx">
</span><ins>+patchfiles patch-etc-gimprc.diff
+
+post-patch {
+ xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
+}
+
</ins><span class="cx"> pre-configure {
</span><span class="cx"> if {[file exists ${prefix}/lib/gtk-2.0/include/gdkconfig.h]} {
</span><span class="cx"> set gtk_not_quartz [catch {exec grep -q GDK_WINDOWING_QUARTZ ${prefix}/lib/gtk-2.0/include/gdkconfig.h}]
</span><span class="lines">@@ -86,15 +93,12 @@
</span><span class="cx"> } else {
</span><span class="cx"> error "Cannot find gdkconfig.h"
</span><span class="cx"> }
</span><ins>+}
</ins><span class="cx">
</span><del>-# update m4macros/intltool.m4 and autoreconf
</del><ins>+# reconfigure using autogen.sh for intltool 0.51 compatibility
</ins><span class="cx">
</span><del>- copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4macros
-}
</del><ins>+configure.cmd ./autogen.sh
</ins><span class="cx">
</span><del>-use_autoreconf yes
-autoreconf.args -fvi
-
</del><span class="cx"> configure.args --build=${configure.build_arch}-apple-${os.platform}${os.version} \
</span><span class="cx"> --enable-mp \
</span><span class="cx"> --with-pdbgen \
</span></span></pre></div>
<a id="trunkdportsgraphicsgimp2filesautogensh"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/gimp2/files/autogen.sh (0 => 134933)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp2/files/autogen.sh (rev 0)
+++ trunk/dports/graphics/gimp2/files/autogen.sh 2015-04-11 04:17:15 UTC (rev 134933)
</span><span class="lines">@@ -0,0 +1,329 @@
</span><ins>+#!/bin/sh
+
+# This script does all the magic calls to automake/autoconf and
+# friends that are needed to configure a git clone. As described in
+# the file HACKING you need a couple of extra tools to run this script
+# successfully.
+#
+# If you are compiling from a released tarball you don't need these
+# tools and you shouldn't use this script. Just call ./configure
+# directly.
+
+ACLOCAL=${ACLOCAL-aclocal-1.11}
+AUTOCONF=${AUTOCONF-autoconf}
+AUTOHEADER=${AUTOHEADER-autoheader}
+AUTOMAKE=${AUTOMAKE-automake-1.11}
+LIBTOOLIZE=${LIBTOOLIZE-libtoolize}
+
+AUTOCONF_REQUIRED_VERSION=2.54
+AUTOMAKE_REQUIRED_VERSION=1.10.0
+INTLTOOL_REQUIRED_VERSION=0.40.1
+LIBTOOL_REQUIRED_VERSION=1.5
+LIBTOOL_WIN32_REQUIRED_VERSION=2.2
+
+
+PROJECT="GNU Image Manipulation Program"
+TEST_TYPE=-d
+FILE=plug-ins
+
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+ORIGDIR=`pwd`
+cd $srcdir
+
+
+check_version ()
+{
+ VERSION_A=$1
+ VERSION_B=$2
+
+ save_ifs="$IFS"
+ IFS=.
+ set dummy $VERSION_A 0 0 0
+ MAJOR_A=$2
+ MINOR_A=$3
+ MICRO_A=$4
+ set dummy $VERSION_B 0 0 0
+ MAJOR_B=$2
+ MINOR_B=$3
+ MICRO_B=$4
+ IFS="$save_ifs"
+
+ if expr "$MAJOR_A" = "$MAJOR_B" > /dev/null; then
+ if expr "$MINOR_A" \> "$MINOR_B" > /dev/null; then
+ echo "yes (version $VERSION_A)"
+ elif expr "$MINOR_A" = "$MINOR_B" > /dev/null; then
+ if expr "$MICRO_A" \>= "$MICRO_B" > /dev/null; then
+ echo "yes (version $VERSION_A)"
+ else
+ echo "Too old (version $VERSION_A)"
+ DIE=1
+ fi
+ else
+ echo "Too old (version $VERSION_A)"
+ DIE=1
+ fi
+ elif expr "$MAJOR_A" \> "$MAJOR_B" > /dev/null; then
+ echo "Major version might be too new ($VERSION_A)"
+ else
+ echo "Too old (version $VERSION_A)"
+ DIE=1
+ fi
+}
+
+echo
+echo "I am testing that you have the tools required to build the"
+echo "$PROJECT from git. This test is not foolproof,"
+echo "so if anything goes wrong, see the file HACKING for more information..."
+echo
+
+DIE=0
+
+OS=`uname -s`
+case $OS in
+ *YGWIN* | *INGW*)
+ echo "Looks like Win32, you will need libtool $LIBTOOL_WIN32_REQUIRED_VERSION or newer."
+ echo
+ LIBTOOL_REQUIRED_VERSION=$LIBTOOL_WIN32_REQUIRED_VERSION
+ ;
+esac
+
+echo -n "checking for libtool >= $LIBTOOL_REQUIRED_VERSION ... "
+if ($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1; then
+ LIBTOOLIZE=$LIBTOOLIZE
+elif (glibtoolize --version) < /dev/null > /dev/null 2>&1; then
+ LIBTOOLIZE=glibtoolize
+else
+ echo
+ echo " You must have libtool installed to compile $PROJECT."
+ echo " Install the appropriate package for your distribution,"
+ echo " or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
+ echo
+ DIE=1
+fi
+
+if test x$LIBTOOLIZE != x; then
+ VER=`$LIBTOOLIZE --version \
+ | grep libtool | sed "s/.* \([0-9.]*\)[-a-z0-9]*$/\1/"`
+ check_version $VER $LIBTOOL_REQUIRED_VERSION
+fi
+
+# check if gtk-doc is explicitely disabled
+for ag_option in $AUTOGEN_CONFIGURE_ARGS $@
+do
+ case $ag_option in
+ -disable-gtk-doc | --disable-gtk-doc)
+ enable_gtk_doc=no
+ ;;
+ esac
+done
+
+if test x$enable_gtk_doc = xno; then
+ echo "skipping test for gtkdocize"
+else
+ echo -n "checking for gtkdocize ... "
+ if (gtkdocize --version) < /dev/null > /dev/null 2>&1; then
+ echo "yes"
+ else
+ echo
+ echo " You must have gtk-doc installed to compile $PROJECT."
+ echo " Install the appropriate package for your distribution,"
+ echo " or get the source tarball at"
+ echo " http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/"
+ echo " You can also use the option --disable-gtk-doc to skip"
+ echo " this test but then you will not be able to generate a"
+ echo " configure script that can build the API documentation."
+ DIE=1
+ fi
+fi
+
+echo -n "checking for autoconf >= $AUTOCONF_REQUIRED_VERSION ... "
+if ($AUTOCONF --version) < /dev/null > /dev/null 2>&1; then
+ VER=`$AUTOCONF --version | head -n 1 \
+ | grep -iw autoconf | sed "s/.* \([0-9.]*\)[-a-z0-9]*$/\1/"`
+ check_version $VER $AUTOCONF_REQUIRED_VERSION
+else
+ echo
+ echo " You must have autoconf installed to compile $PROJECT."
+ echo " Download the appropriate package for your distribution,"
+ echo " or get the source tarball at ftp://ftp.gnu.org/pub/gnu/autoconf/"
+ echo
+ DIE=1;
+fi
+
+
+echo -n "checking for automake >= $AUTOMAKE_REQUIRED_VERSION ... "
+if ($AUTOMAKE --version) < /dev/null > /dev/null 2>&1; then
+ AUTOMAKE=$AUTOMAKE
+ ACLOCAL=$ACLOCAL
+elif (automake-1.15 --version) < /dev/null > /dev/null 2>&1; then
+ AUTOMAKE=automake-1.15
+ ACLOCAL=aclocal-1.15
+elif (automake-1.14 --version) < /dev/null > /dev/null 2>&1; then
+ AUTOMAKE=automake-1.14
+ ACLOCAL=aclocal-1.14
+elif (automake-1.13 --version) < /dev/null > /dev/null 2>&1; then
+ AUTOMAKE=automake-1.13
+ ACLOCAL=aclocal-1.13
+elif (automake-1.12 --version) < /dev/null > /dev/null 2>&1; then
+ AUTOMAKE=automake-1.12
+ ACLOCAL=aclocal-1.12
+elif (automake-1.11 --version) < /dev/null > /dev/null 2>&1; then
+ AUTOMAKE=automake-1.11
+ ACLOCAL=aclocal-1.11
+elif (automake-1.10 --version) < /dev/null > /dev/null 2>&1; then
+ AUTOMAKE=automake-1.10
+ ACLOCAL=aclocal-1.10
+else
+ echo
+ echo " You must have automake $AUTOMAKE_REQUIRED_VERSION or newer installed to compile $PROJECT."
+ echo " Download the appropriate package for your distribution,"
+ echo " or get the source tarball at ftp://ftp.gnu.org/pub/gnu/automake/"
+ echo
+ DIE=1
+fi
+
+if test x$AUTOMAKE != x; then
+ VER=`$AUTOMAKE --version \
+ | grep automake | sed "s/.* \([0-9.]*\)[-a-z0-9]*$/\1/"`
+ check_version $VER $AUTOMAKE_REQUIRED_VERSION
+fi
+
+
+echo -n "checking for intltool >= $INTLTOOL_REQUIRED_VERSION ... "
+if (intltoolize --version) < /dev/null > /dev/null 2>&1; then
+ VER=`intltoolize --version \
+ | grep intltoolize | sed "s/.* \([0-9.]*\)/\1/"`
+ check_version $VER $INTLTOOL_REQUIRED_VERSION
+else
+ echo
+ echo " You must have intltool installed to compile $PROJECT."
+ echo " Get the latest version from"
+ echo " ftp://ftp.gnome.org/pub/GNOME/sources/intltool/"
+ echo
+ DIE=1
+fi
+
+
+echo -n "checking for xsltproc ... "
+if (xsltproc --version) < /dev/null > /dev/null 2>&1; then
+ echo "yes"
+else
+ echo
+ echo " You must have xsltproc installed to compile $PROJECT."
+ echo " Get the latest version from"
+ echo " ftp://ftp.gnome.org/pub/GNOME/sources/libxslt/"
+ echo
+ DIE=1
+fi
+
+if test "$DIE" -eq 1; then
+ echo
+ echo "Please install/upgrade the missing tools and call me again."
+ echo
+ exit 1
+fi
+
+
+test $TEST_TYPE $FILE || {
+ echo
+ echo "You must run this script in the top-level $PROJECT directory."
+ echo
+ exit 1
+}
+
+
+echo
+echo "I am going to run ./configure with the following arguments:"
+echo
+echo " $AUTOGEN_CONFIGURE_ARGS $@"
+echo
+
+if test -z "$*"; then
+ echo "If you wish to pass additional arguments, please specify them "
+ echo "on the $0 command line or set the AUTOGEN_CONFIGURE_ARGS "
+ echo "environment variable."
+ echo
+fi
+
+
+if test -z "$ACLOCAL_FLAGS"; then
+
+ acdir=`$ACLOCAL --print-ac-dir`
+ m4list="glib-2.0.m4 glib-gettext.m4 gtk-2.0.m4 intltool.m4 pkg.m4"
+
+ for file in $m4list
+ do
+ if [ ! -f "$acdir/$file" ]; then
+ echo
+ echo "WARNING: aclocal's directory is $acdir, but..."
+ echo " no file $acdir/$file"
+ echo " You may see fatal macro warnings below."
+ echo " If these files are installed in /some/dir, set the "
+ echo " ACLOCAL_FLAGS environment variable to \"-I /some/dir\""
+ echo " or install $acdir/$file."
+ echo
+ fi
+ done
+fi
+
+rm -rf autom4te.cache
+
+$ACLOCAL $ACLOCAL_FLAGS
+RC=$?
+if test $RC -ne 0; then
+ echo "$ACLOCAL gave errors. Please fix the error conditions and try again."
+ exit $RC
+fi
+
+$LIBTOOLIZE --force || exit $?
+
+if test x$enable_gtk_doc = xno; then
+ if test -f gtk-doc.make; then :; else
+ echo "EXTRA_DIST = missing-gtk-doc" > gtk-doc.make
+ fi
+ echo "WARNING: You have disabled gtk-doc."
+ echo " As a result, you will not be able to generate the API"
+ echo " documentation and 'make dist' will not work."
+ echo
+else
+ gtkdocize || exit $?
+fi
+
+# optionally feature autoheader
+($AUTOHEADER --version) < /dev/null > /dev/null 2>&1 && $AUTOHEADER || exit 1
+
+$AUTOMAKE --add-missing || exit $?
+$AUTOCONF || exit $?
+
+echo "Running intltoolize ..."
+intltoolize --automake --copy --force || exit $?
+
+sed -e "s|GETTEXT_PACKAGE = @GETTEXT_PACKAGE@|GETTEXT_PACKAGE = @GETTEXT_PACKAGE@-libgimp|" \
+ -e "s|subdir = po|subdir = po-libgimp|" < po/Makefile.in.in > po-libgimp/Makefile.in.in
+
+sed -e "s|GETTEXT_PACKAGE = @GETTEXT_PACKAGE@|GETTEXT_PACKAGE = @GETTEXT_PACKAGE@-std-plug-ins|" \
+ -e "s|subdir = po|subdir = po-plug-ins|" < po/Makefile.in.in > po-plug-ins/Makefile.in.in
+
+sed -e "s|GETTEXT_PACKAGE = @GETTEXT_PACKAGE@|GETTEXT_PACKAGE = @GETTEXT_PACKAGE@-python|" \
+ -e "s|subdir = po|subdir = po-python|" < po/Makefile.in.in > po-python/Makefile.in.in
+
+sed -e "s|GETTEXT_PACKAGE = @GETTEXT_PACKAGE@|GETTEXT_PACKAGE = @GETTEXT_PACKAGE@-script-fu|" \
+ -e "s|subdir = po|subdir = po-script-fu|" < po/Makefile.in.in > po-script-fu/Makefile.in.in
+
+sed -e "s|GETTEXT_PACKAGE = @GETTEXT_PACKAGE@|GETTEXT_PACKAGE = @GETTEXT_PACKAGE@-tips|" \
+ -e "s|subdir = po|subdir = po-tips|" < po/Makefile.in.in > po-tips/Makefile.in.in
+
+cd $ORIGDIR
+
+$srcdir/configure $AUTOGEN_CONFIGURE_ARGS "$@"
+RC=$?
+if test $RC -ne 0; then
+ echo
+ echo "Configure failed or did not finish!"
+ exit $RC
+fi
+
+echo
+echo "Now type 'make' to compile the $PROJECT."
</ins></span></pre>
</div>
</div>
</body>
</html>