<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c3bbf3e9552ede073a0e6704298e36947a89e3e0">https://github.com/macports/macports-ports/commit/c3bbf3e9552ede073a0e6704298e36947a89e3e0</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new c3bbf3e9552 bluefish: Update to 2.2.15
</span>c3bbf3e9552 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c3bbf3e9552ede073a0e6704298e36947a89e3e0
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Mon Aug 5 23:31:05 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> bluefish: Update to 2.2.15
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also switch to enchant2 and python312.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/70492
</span>---
editors/bluefish/Portfile | 47 +++---
editors/bluefish/files/autogen.sh | 185 ---------------------
editors/bluefish/files/enchant2.patch | 34 ++++
...gure.ac.diff => gtk-mac-integration-gtk3.patch} | 6 +-
editors/bluefish/files/patch-bfwin-gtkmacmenu.diff | 14 --
5 files changed, 58 insertions(+), 228 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/bluefish/Portfile b/editors/bluefish/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 25a2e9e8004..de65782c61b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/bluefish/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/bluefish/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,11 @@ PortSystem 1.0
</span> PortGroup active_variants 1.1
name bluefish
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.2.10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.2.15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 af490a9b5aed385a60b418ec737f27333fffca65 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6143e51c6b5579d596f3a9a85e0f0d8580c9f58f828575b119880e0ca1d941bc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4762151
</span>
categories editors www
license GPL-3+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,29 +18,31 @@ description A powerful editor for web designers
</span> long_description Bluefish is a powerful editor for experienced web designers and \
programmers. Bluefish supports many programming and markup languages \
but it focuses on editing dynamic and interactive websites.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://bluefish.openoffice.nl/
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://bluefish.openoffice.nl
</span> master_sites http://www.bennewitz.com/bluefish/stable/source/ \
http://bluefish.mrball.net/stable/source/ \
sourceforge:project/bluefish/bluefish/${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 98f9e1442882dd8342895ef43f636ff6b5dce623 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 afeca12b693bb58e30c2199e6a21cc06da02d88e0ac9d08b7a231a9c8e7c3eb2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4159964
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> use_bzip2 yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Also, we are patching configure.ac.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+autoreconf.cmd ./autogen.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+autoreconf.env LIBTOOLIZE=${prefix}/bin/glibtoolize
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append \
port:autoconf \
port:automake \
port:gettext \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:intltool \
</span> port:libtool \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/pkg-config:pkgconfig
</span>
depends_lib-append \
port:desktop-file-utils \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:enchant \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:enchant2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gettext-runtime \
</span> port:gucharmap \
path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
port:libxml2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,18 +51,8 @@ depends_lib-append \
</span> depends_run-append \
port:adwaita-icon-theme
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Remove reference to obsolete header 'gtk-mac-menu.h', eliminated with gtkmacintegration 3.x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-bfwin-gtkmacmenu.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cmd ./autogen.sh && ./configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append gtk-mac-integration-gtk3.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ enchant2.patch
</span>
configure.args-append \
--disable-python \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,13 +60,13 @@ configure.args-append \
</span> --disable-update-databases \
--with-gtk2=no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python27 description {Enable zen-coding plugin using Python 2.7} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:python27
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python ${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python312 description {Enable zen-coding plugin using Python 3.12} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:python312
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.python ${prefix}/bin/python3.12
</span> configure.args-delete --disable-python
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +python312
</span>
variant quartz {}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/bluefish/files/autogen.sh b/editors/bluefish/files/autogen.sh
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e213ad4a112..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/bluefish/files/autogen.sh
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,185 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#!/bin/bash
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# $Id: autogen.sh,v 1.11 2008-05-06 14:44:52 dleidert Exp $
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set -e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## all initial declarations, overwrite them using e.g. 'ACLOCAL=aclocal-1.8 AUTOMAKE=automake-1.8 ./autogen.sh'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-ACLOCAL=${ACLOCAL:-aclocal}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-AUTOCONF=${AUTOCONF:-autoconf}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-AUTOHEADER=${AUTOHEADER:-autoheader}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-AUTOMAKE=${AUTOMAKE:-automake}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-GETTEXTIZE=${GETTEXTIZE:-gettextize}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-INTLTOOLIZE=${INTLTOOLIZE:-intltoolize}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-LIBTOOLIZE=${LIBTOOLIZE:-glibtoolize}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## check, if all binaries exist and fail with error 1 if not
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if [ -z `which $ACLOCAL` ] ; then echo "Error. ACLOCAL=$ACLOCAL not found." >&2 && exit 1 ; fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if [ -z `which $AUTOCONF` ] ; then echo "Error. AUTOCONF=$AUTOCONF not found." >&2 && exit 1 ; fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if [ -z `which $AUTOHEADER` ] ; then echo "Error. AUTOHEADER=$AUTOHEADER not found." >&2 && exit 1 ; fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if [ -z `which $AUTOMAKE` ] ; then echo "Error. AUTOMAKE=$AUTOMAKE not found." >&2 && exit 1 ; fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if [ -z `which $GETTEXTIZE` ] ; then echo "Error. GETTEXTIZE=$GETTEXTIZE not found." >&2 && exit 1 ; fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if [ -z `which $INTLTOOLIZE` ] ; then echo "Error. INTLTOOLIZE=$INTLTOOLIZE not found." >&2 && exit 1 ; fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if [ -z `which $LIBTOOLIZE` ] ; then echo "Error. LIBTOOLIZE=$LIBTOOLIZE not found." >&2 && exit 1 ; fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## find where automake is installed and get the version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-AUTOMAKE_PATH=${AUTOMAKE_PATH:-`which $AUTOMAKE | sed 's|\/bin\/automake.*||'`}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-AUTOMAKE_VERSION=`$AUTOMAKE --version | grep automake | awk '{print $4}' | awk -F. '{print $1"."$2}'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## find gettext version. Use GETTEXTIZE since it is already initialized
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-GETTEXT_VERSION=`$GETTEXTIZE --version | grep gettextize | awk '{print $4}' | awk -F. '{print $1"."$2}'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## automake files we need to have inside our source
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if [[ $AUTOMAKE_VERSION = "1.7" || $GETTEXT_VERSION < "0.15" ]] ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AUTOMAKE_FILES="missing mkinstalldirs install-sh"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AUTOMAKE_FILES="missing install-sh"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## the directories which will contain the $GETTEXT_FILES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-GETTEXT_PO_DIRS="
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-src/plugin_about/po
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-src/plugin_charmap/po
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-src/plugin_entities/po
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-src/plugin_htmlbar/po
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-src/plugin_infbrowser/po
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-src/plugin_snippets/po
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-src/plugin_xmltools/po
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-src/plugin_zencoding/po
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## the gettext files we need to copy to $GETTEXT_PO_DIRS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-GETTEXT_FILES="
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Makefile.in.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-boldquot.sed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-en@boldquot.header
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-en@quot.header
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-insert-header.sin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-quot.sed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-remove-potcdate.sin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Rules-quot
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## the prefix where we expect share/gettext/po/$GETTEXT_FILES files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-GETTEXT_LOCATION_LIST="
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-`which $GETTEXTIZE | sed 's|\/bin\/gettextize|\/share\/gettext\/po|'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-`echo $PATH | tr ':' '\n' | sed 's|bin|share|;s|$|\/gettext\/po|g'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/usr/share/gettext/po
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/usr/local/share/gettext/po
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## use $GETTEXT_LOCATION to add a custom gettext location prefix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-GETTEXT_LOCATION=${GETTEXT_LOCATION:-$GETTEXT_LOCATION_LIST}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## check if $GETTEXT_LOCATION contains the files we need and set $GETTEXT_DIR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-for dir in $GETTEXT_LOCATION ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ -f $dir/Makefile.in.in ] ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GETTEXT_DIR=$dir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## if $GETTEXT_DIR is still undefined, fail with error 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if [ -z $GETTEXT_DIR ] ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Error. GETTEXT_LOCATION=$GETTEXT_LOCATION_LIST does not exist." >&2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## our help output - if autogen.sh was called with -h|--help or unkbown option
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-autogen_help() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "autogen.sh usage:"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " Produces all files necessary to build the bluefish project files."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " The files are linked by default, if you run ./autogen.sh without an option."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " -v Be more verbose about every step (debugging)."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " -f FILE Output everything to FILE (debugging). Useful for debug output."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " -c Copy files instead to link them."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " -h Print this message."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " You can overwrite the automatically determined location of aclocal (>= 1.8),"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " automake (>= 1.8), autoheader, autoconf, libtoolize, intltoolize and"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " gettextize using:"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " ACLOCAL=/foo/bin/aclocal-1.9 AUTOMAKE=automake-1.9 ./autogen.sh"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## copy $GETTEXT_FILES from $GETTEXT_DIR into $GETTEXT_PO_DIRS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## this will probably become obsolete with gettext 0.16.2, which adds the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## necessary functionality to gettextize - we should prefer this way then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-prepare_gettext() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for dir in $GETTEXT_PO_DIRS ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ -d $dir ] ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for file in $GETTEXT_FILES ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ -n "$VERBOSE" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "DEBUG: $COPYACTION -f $GETTEXT_DIR/$file `pwd`/$dir" >&2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $COPYACTION -f $GETTEXT_DIR/$file `pwd`/$dir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "ERROR: $dir does not exist!"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## check if $AUTOMAKE_FILES were copied to our source
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## link/copy them if not - necessary for e.g. gettext, which seems to always need mkinstalldirs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-autogen_if_missing() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for file in $AUTOMAKE_FILES ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ ! -e "$file" ] ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ -n "$VERBOSE" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "DEBUG: $COPYACTION -f $AUTOMAKE_PATH/share/automake-$AUTOMAKE_VERSION/$file ." >&2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $COPYACTION -f $AUTOMAKE_PATH/share/automake-$AUTOMAKE_VERSION/$file .
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## link/copy the necessary files to our source to prepare for a build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-autogen() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $LIBTOOLIZE $DEBUG -f $COPYOPTION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $INTLTOOLIZE $DEBUG -f $COPYOPTION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- prepare_gettext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $ACLOCAL $ACLOCAL_OPT --force $VERBOSE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $AUTOHEADER -f $DEBUG $VERBOSE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $AUTOMAKE --gnu -a $VERBOSE $COPYOPTION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- autogen_if_missing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $AUTOCONF $DEBUG $VERBOSE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## the main function
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-COPYACTION="ln -s"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-while getopts "chvf:" options; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case "$options" in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- h)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- autogen_help
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- c)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COPYACTION="cp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COPYOPTION="-c"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OUTPUTFILE=$OPTARG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- v)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEBUG="--debug"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VERBOSE="--verbose"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set -x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if [ -n "$OUTPUTFILE" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exec &>$OUTPUTFILE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-autogen
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## ready to rumble
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "Run ./configure with the appropriate options, then make and enjoy."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-exit 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/bluefish/files/enchant2.patch b/editors/bluefish/files/enchant2.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..be44f6a4952
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/bluefish/files/enchant2.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Don't look for enchant1; we want to use enchant2.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig 2024-03-17 15:29:06.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2024-08-05 23:25:26.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -442,30 +442,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libxml-2.0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "x$enable_spell_check" != "xno"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_CHECKING([for optional libenchant development files])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PKG_CHECK_EXISTS(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [enchant],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BF_dependencies="$BF_dependencies enchant"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_DEFINE([HAVE_LIBENCHANT], [1], [Define to 1 if you have the 'enchant' library (-lenchant).])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PKG_CHECK_EXISTS(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [enchant >= 1.4],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [AC_DEFINE([HAVE_LIBENCHANT_1_4], [1], [Define to 1 if you have the 'enchant' library (-lenchant) >= 1.4.])]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_RESULT([yes])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_CHECK_HEADERS(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [enchant.h enchant/enchant.h],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_CHECK_LIB(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [enchant],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [enchant_dict_check],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [AC_MSG_RESULT([yes])],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [AC_MSG_RESULT([no])]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_CHECKING([for optional libenchant-2 development files])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_CHECK_EXISTS(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [enchant-2],
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/bluefish/files/patch-configure.ac.diff b/editors/bluefish/files/gtk-mac-integration-gtk3.patch
</span>similarity index 67%
rename from editors/bluefish/files/patch-configure.ac.diff
rename to editors/bluefish/files/gtk-mac-integration-gtk3.patch
<span style='display:block; white-space:pre;color:#808080;'>index fce24dd18a2..3f7c39db3df 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/bluefish/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/bluefish/files/gtk-mac-integration-gtk3.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig 2016-02-04 09:16:45.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2016-02-04 09:17:02.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -491,7 +491,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig 2024-03-17 15:29:06.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2024-08-05 21:47:28.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -492,7 +492,7 @@
</span> _gdk_tgt=`$PKG_CONFIG --variable=target gdk-2.0`
fi
if test "x$_gdk_tgt" = "xquartz"; then
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/bluefish/files/patch-bfwin-gtkmacmenu.diff b/editors/bluefish/files/patch-bfwin-gtkmacmenu.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 33fdf54a743..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/bluefish/files/patch-bfwin-gtkmacmenu.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/bfwin.c.orig 2022-06-04 09:22:58.544544348 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/bfwin.c 2022-06-04 09:23:06.408261730 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,11 +21,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*#define DEBUG*/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef MAC_INTEGRATION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <gtkosxapplication.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <gtk-mac-menu.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <string.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "config.h"
</span></pre><pre style='margin:0'>
</pre>