<!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>[135493] trunk/dports/editors/bluefish</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/135493">135493</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2015-04-24 14:03:22 -0700 (Fri, 24 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>bluefish: update to version 2.2.7, reconfigure using upstream autogen.sh for intltool 0.51 compatibility.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportseditorsbluefishPortfile">trunk/dports/editors/bluefish/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/editors/bluefish/files/</li>
<li><a href="#trunkdportseditorsbluefishfilesautogensh">trunk/dports/editors/bluefish/files/autogen.sh</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportseditorsbluefishPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/editors/bluefish/Portfile (135492 => 135493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/editors/bluefish/Portfile 2015-04-24 20:14:14 UTC (rev 135492)
+++ trunk/dports/editors/bluefish/Portfile 2015-04-24 21:03:22 UTC (rev 135493)
</span><span class="lines">@@ -4,8 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name bluefish
</span><del>-version 2.2.4
-revision 1
</del><ins>+version 2.2.7
</ins><span class="cx"> license GPL-3+
</span><span class="cx"> categories editors www
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -22,13 +21,17 @@
</span><span class="cx"> master_sites sourceforge:project/bluefish/bluefish/${version} \
</span><span class="cx"> http://www.bennewitz.com/bluefish/stable/source/
</span><span class="cx">
</span><del>-checksums rmd160 56e8a1478ea6939cef0229fcfd40c44a52c49e83 \
- sha256 771621d848af6342fbab50a52bc7d6fddb29c4616f31ab939c508175c146b3a3
</del><ins>+checksums rmd160 7a9fee51a5cc594beb74f70dc059c657d150474f \
+ sha256 23534b73b929754e15b86d12904ca3ffc1b069da5dcd4f34a67e842fe9e858df
</ins><span class="cx">
</span><span class="cx"> use_bzip2 yes
</span><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><del>- port:intltool
</del><ins>+ port:intltool \
+ port:gettext \
+ 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:shared-mime-info \
</span><span class="lines">@@ -37,38 +40,13 @@
</span><span class="cx"> port:enchant \
</span><span class="cx"> port:gucharmap
</span><span class="cx">
</span><del>-# autoreconf to use MacPorts patched intltool.m4
-# update gettext files in po dirs to avoid gettext version mismatch errors during build
-# bluefish tarball version 2.2.4 includes files from gettext 0.17
-# we have gettext 0.18
</del><ins>+# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
</ins><span class="cx">
</span><span class="cx"> post-patch {
</span><del>- set po_dirs "src/plugin_about/po \
- src/plugin_charmap/po \
- src/plugin_entities/po \
- src/plugin_htmlbar/po \
- src/plugin_infbrowser/po \
- src/plugin_snippets/po \
- src/plugin_zencoding/po"
-
- set gettext_files "Makefile.in.in \
- boldquot.sed \
- en@boldquot.header \
- en@quot.header \
- insert-header.sin \
- quot.sed \
- remove-potcdate.sin \
- Rules-quot"
-
- foreach po_dir ${po_dirs} {
- foreach gettext_file ${gettext_files} {
- copy -force ${prefix}/share/gettext/po/${gettext_file} ${worksrcpath}/${po_dir}
- }
- }
</del><ins>+ xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-use_autoreconf yes
-autoreconf.args -fvi
</del><ins>+configure.cmd ./autogen.sh && ./configure
</ins><span class="cx">
</span><span class="cx"> configure.args --with-gtk2=no \
</span><span class="cx"> --disable-update-databases \
</span></span></pre></div>
<a id="trunkdportseditorsbluefishfilesautogensh"></a>
<div class="addfile"><h4>Added: trunk/dports/editors/bluefish/files/autogen.sh (0 => 135493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/editors/bluefish/files/autogen.sh (rev 0)
+++ trunk/dports/editors/bluefish/files/autogen.sh 2015-04-24 21:03:22 UTC (rev 135493)
</span><span class="lines">@@ -0,0 +1,185 @@
</span><ins>+#!/bin/bash
+#
+# $Id: autogen.sh,v 1.11 2008-05-06 14:44:52 dleidert Exp $
+
+set -e
+
+## all initial declarations, overwrite them using e.g. 'ACLOCAL=aclocal-1.8 AUTOMAKE=automake-1.8 ./autogen.sh'
+ACLOCAL=${ACLOCAL:-aclocal}
+AUTOCONF=${AUTOCONF:-autoconf}
+AUTOHEADER=${AUTOHEADER:-autoheader}
+AUTOMAKE=${AUTOMAKE:-automake}
+GETTEXTIZE=${GETTEXTIZE:-gettextize}
+INTLTOOLIZE=${INTLTOOLIZE:-intltoolize}
+LIBTOOLIZE=${LIBTOOLIZE:-glibtoolize}
+
+## check, if all binaries exist and fail with error 1 if not
+if [ -z `which $ACLOCAL` ] ; then echo "Error. ACLOCAL=$ACLOCAL not found." >&2 && exit 1 ; fi
+if [ -z `which $AUTOCONF` ] ; then echo "Error. AUTOCONF=$AUTOCONF not found." >&2 && exit 1 ; fi
+if [ -z `which $AUTOHEADER` ] ; then echo "Error. AUTOHEADER=$AUTOHEADER not found." >&2 && exit 1 ; fi
+if [ -z `which $AUTOMAKE` ] ; then echo "Error. AUTOMAKE=$AUTOMAKE not found." >&2 && exit 1 ; fi
+if [ -z `which $GETTEXTIZE` ] ; then echo "Error. GETTEXTIZE=$GETTEXTIZE not found." >&2 && exit 1 ; fi
+if [ -z `which $INTLTOOLIZE` ] ; then echo "Error. INTLTOOLIZE=$INTLTOOLIZE not found." >&2 && exit 1 ; fi
+if [ -z `which $LIBTOOLIZE` ] ; then echo "Error. LIBTOOLIZE=$LIBTOOLIZE not found." >&2 && exit 1 ; fi
+
+## find where automake is installed and get the version
+AUTOMAKE_PATH=${AUTOMAKE_PATH:-`which $AUTOMAKE | sed 's|\/bin\/automake.*||'`}
+AUTOMAKE_VERSION=`$AUTOMAKE --version | grep automake | awk '{print $4}' | awk -F. '{print $1"."$2}'`
+
+## find gettext version. Use GETTEXTIZE since it is already initialized
+GETTEXT_VERSION=`$GETTEXTIZE --version | grep gettextize | awk '{print $4}' | awk -F. '{print $1"."$2}'`
+
+## automake files we need to have inside our source
+if [[ $AUTOMAKE_VERSION = "1.7" || $GETTEXT_VERSION < "0.15" ]] ; then
+ AUTOMAKE_FILES="missing mkinstalldirs install-sh"
+else
+ AUTOMAKE_FILES="missing install-sh"
+fi
+
+## the directories which will contain the $GETTEXT_FILES
+GETTEXT_PO_DIRS="
+src/plugin_about/po
+src/plugin_charmap/po
+src/plugin_entities/po
+src/plugin_htmlbar/po
+src/plugin_infbrowser/po
+src/plugin_snippets/po
+src/plugin_xmltools/po
+src/plugin_zencoding/po
+"
+
+## the gettext files we need to copy to $GETTEXT_PO_DIRS
+GETTEXT_FILES="
+Makefile.in.in
+boldquot.sed
+en@boldquot.header
+en@quot.header
+insert-header.sin
+quot.sed
+remove-potcdate.sin
+Rules-quot
+"
+
+## the prefix where we expect share/gettext/po/$GETTEXT_FILES files
+GETTEXT_LOCATION_LIST="
+`which $GETTEXTIZE | sed 's|\/bin\/gettextize|\/share\/gettext\/po|'`
+`echo $PATH | tr ':' '\n' | sed 's|bin|share|;s|$|\/gettext\/po|g'`
+/usr/share/gettext/po
+/usr/local/share/gettext/po
+"
+
+## use $GETTEXT_LOCATION to add a custom gettext location prefix
+GETTEXT_LOCATION=${GETTEXT_LOCATION:-$GETTEXT_LOCATION_LIST}
+
+## check if $GETTEXT_LOCATION contains the files we need and set $GETTEXT_DIR
+for dir in $GETTEXT_LOCATION ; do
+ if [ -f $dir/Makefile.in.in ] ; then
+ GETTEXT_DIR=$dir
+ break
+ fi
+done
+
+## if $GETTEXT_DIR is still undefined, fail with error 1
+if [ -z $GETTEXT_DIR ] ; then
+ echo "Error. GETTEXT_LOCATION=$GETTEXT_LOCATION_LIST does not exist." >&2
+ exit 1
+fi
+
+## our help output - if autogen.sh was called with -h|--help or unkbown option
+autogen_help() {
+ echo
+ echo "autogen.sh usage:"
+ echo
+ echo " Produces all files necessary to build the bluefish project files."
+ echo " The files are linked by default, if you run ./autogen.sh without an option."
+ echo
+ echo " -v Be more verbose about every step (debugging)."
+ echo " -f FILE Output everything to FILE (debugging). Useful for debug output."
+ echo " -c Copy files instead to link them."
+ echo " -h Print this message."
+ echo
+ echo " You can overwrite the automatically determined location of aclocal (>= 1.8),"
+ echo " automake (>= 1.8), autoheader, autoconf, libtoolize, intltoolize and"
+ echo " gettextize using:"
+ echo
+ echo " ACLOCAL=/foo/bin/aclocal-1.9 AUTOMAKE=automake-1.9 ./autogen.sh"
+ echo
+}
+
+## copy $GETTEXT_FILES from $GETTEXT_DIR into $GETTEXT_PO_DIRS
+## this will probably become obsolete with gettext 0.16.2, which adds the
+## necessary functionality to gettextize - we should prefer this way then
+prepare_gettext() {
+ for dir in $GETTEXT_PO_DIRS ; do
+ if [ -d $dir ] ; then
+ for file in $GETTEXT_FILES ; do
+ if [ -n "$VERBOSE" ]; then
+ echo "DEBUG: $COPYACTION -f $GETTEXT_DIR/$file `pwd`/$dir" >&2
+ fi
+ $COPYACTION -f $GETTEXT_DIR/$file `pwd`/$dir
+ done
+ else
+ echo "ERROR: $dir does not exist!"
+ break
+ fi
+ done
+}
+
+## check if $AUTOMAKE_FILES were copied to our source
+## link/copy them if not - necessary for e.g. gettext, which seems to always need mkinstalldirs
+autogen_if_missing() {
+ for file in $AUTOMAKE_FILES ; do
+ if [ ! -e "$file" ] ; then
+ if [ -n "$VERBOSE" ]; then
+ echo "DEBUG: $COPYACTION -f $AUTOMAKE_PATH/share/automake-$AUTOMAKE_VERSION/$file ." >&2
+ fi
+ $COPYACTION -f $AUTOMAKE_PATH/share/automake-$AUTOMAKE_VERSION/$file .
+ fi
+ done
+}
+
+## link/copy the necessary files to our source to prepare for a build
+autogen() {
+ $LIBTOOLIZE $DEBUG -f $COPYOPTION
+ $INTLTOOLIZE $DEBUG -f $COPYOPTION
+ prepare_gettext
+ $ACLOCAL $ACLOCAL_OPT --force $VERBOSE
+ $AUTOHEADER -f $DEBUG $VERBOSE
+ $AUTOMAKE --gnu -a $VERBOSE $COPYOPTION
+ autogen_if_missing
+ $AUTOCONF $DEBUG $VERBOSE
+}
+
+## the main function
+COPYACTION="ln -s"
+while getopts "chvf:" options; do
+ case "$options" in
+ h)
+ autogen_help
+ exit 0
+ ;
+ c)
+ COPYACTION="cp"
+ COPYOPTION="-c"
+ ;
+ f)
+ OUTPUTFILE=$OPTARG
+ ;
+ v)
+ DEBUG="--debug"
+ VERBOSE="--verbose"
+ set -x
+ ;
+ esac
+done
+
+if [ -n "$OUTPUTFILE" ]; then
+ exec &>$OUTPUTFILE
+fi
+autogen
+
+## ready to rumble
+echo "Run ./configure with the appropriate options, then make and enjoy."
+
+exit 0
+
</ins></span></pre>
</div>
</div>
</body>
</html>