<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/a3963e96b3c28234b5d8800f440e30a8a1d0c612">https://github.com/macports/macports-ports/commit/a3963e96b3c28234b5d8800f440e30a8a1d0c612</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 a3963e96b3c libnewt: Add py*-libnewt and whiptcl subports
</span>a3963e96b3c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a3963e96b3c28234b5d8800f440e30a8a1d0c612
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Thu Apr 25 21:29:15 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> libnewt: Add py*-libnewt and whiptcl subports
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Move tcl bindings to new whiptcl subport.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add new py*-libnewt subports for the "snack" python bindings.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> A bunch of build system patches are needed to make this work, to be
</span><span style='display:block; white-space:pre;color:#404040;'> submitted to the developers in due course.
</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/44044
</span>---
devel/libnewt/Portfile | 76 ++++++++++++++--
devel/libnewt/files/patch-Makefile.in.diff | 139 ++++++++++++++++++++++++++---
2 files changed, 192 insertions(+), 23 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libnewt/Portfile b/devel/libnewt/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d9adbe6fc17..07e621b96ae 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libnewt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libnewt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,6 @@ PortSystem 1.0
</span>
name libnewt
version 0.52.24
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span> checksums rmd160 ae2b10238f3f9499f281076d97614074bc540d53 \
sha256 5ded7e221f85f642521c49b1826c8de19845aa372baf5d630a51774b544fbdbb \
size 176693
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,6 +13,7 @@ maintainers {ryandesign @ryandesign} openmaintainer
</span> license GPL-2
description text-mode widget-based user interface library
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set libnewt_desc ${description}
</span>
long_description Newt is a programming library for color text-mode, \
widget-based user interfaces. Newt can be used to add \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,13 +22,15 @@ long_description Newt is a programming library for color text-mode, \
</span> to text mode user interfaces.
homepage https://pagure.io/newt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://releases.pagure.org/newt/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://releases.pagure.org/newt/
</span>
distname newt-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:gettext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gettext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:gettext-runtime \
</span> port:popt \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:tcl \
</span> port:slang2
patchfiles patch-Makefile.in.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,14 +39,70 @@ patchfiles patch-Makefile.in.diff \
</span> # We are patching configure.ac and Makefile.in.
use_autoreconf yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# It can't find tclConfig.sh unless libdir is expanded
</span> configure.args --without-python \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --libdir=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-tcl
</span>
# configure: WARNING: unrecognized options: --disable-dependency-tracking
# gcc-4.2: -E, -S, -save-temps and -M options are not allowed with multiple -arch flags
universal_variant no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url [lindex ${master_sites} 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex {newt-([0-9.]+)\.tar}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.type regex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.url [lindex ${master_sites} 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.regex {newt-([0-9.]+)\.tar}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Don't build libnewt again; link with the one that's already installed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args LIBNEWTSH=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.args LIBNEWTSH=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.type none
</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;'>+subport whiptcl {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description tcl bindings for ${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description ${subport} provides {*}${description}, a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${libnewt_desc}.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:tcl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --without-tcl --with-tcl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # It can't find tclConfig.sh unless libdir is expanded
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://pagure.io/newt/issue/5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --libdir=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.target whiptcl.so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.target install-tcl
</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;'>+set python_versions [list 3.8 3.9 3.10 3.11 3.12]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach pv ${python_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pv_no_dot [string map {. {}} ${pv}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ subport py${pv_no_dot}-${name} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description python ${pv} bindings (the \"snack\" module) for \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description {*}${description}, a ${libnewt_desc}.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ categories-append python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:python${pv_no_dot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-python --with-python=python${pv}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.target _snack.so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.target install-py
</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;color:#808080;'>diff --git a/devel/libnewt/files/patch-Makefile.in.diff b/devel/libnewt/files/patch-Makefile.in.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 78a1a69580c..0e8d636c70a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libnewt/files/patch-Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libnewt/files/patch-Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,23 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.in.orig 2022-11-29 05:04:29.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.in 2022-12-03 02:55:44.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7,11 +7,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Add support for building macOS dylibs.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Build whiptcl and python modules as bundles, not dylibs.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Remove PIFLAGS and PLFLAGS variables because their contents was already part of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PCFLAGS and PLDFLAGS respectively.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Try to get LDFLAGS from python-config using --embed first, as required by Python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+3.8 and later. Fall back to not using --embed for Python 3.7 and earlier.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Don't silently ignore build/install errors.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Create install-py and install-tcl targets to install just those parts.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Install python modules to the correct platlib and purelib directories.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+TODO: PR URLs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.in.orig 2023-10-25 05:21:25.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.in 2024-04-25 22:01:35.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7,16 +7,22 @@
</span> LDFLAGS = @LDFLAGS@
CPPFLAGS = -D_GNU_SOURCE @CPPFLAGS@
GNU_LD = @GNU_LD@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,19 +31,28 @@
</span> +else
SOEXT = so
+endif
<span style='display:block; white-space:pre;background:#e0ffe0;'>++BUNDLEEXT = so
</span>
PYTHONVERS = @PYTHONVERS@
WHIPTCLLIB = @WHIPTCLLIB@
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26,17 +31,28 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifneq ($(WHIPTCLLIB),)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-WHIPTCLSO = $(WHIPTCLLIB).$(SOEXT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++WHIPTCLSO = $(WHIPTCLLIB).$(BUNDLEEXT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WHIPTCLSO =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26,17 +32,30 @@
</span> NDIALOGOBJS = whiptail.o dialogboxes.o
WHIPTCLOBJS = shared/whiptcl.o shared/dialogboxes.o
LIBNEWT = libnewt.a
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ifeq ($(SOEXT),dylib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ifeq ($(UNAME_S),Darwin)
</span> +SHARED = -dynamiclib
<span style='display:block; white-space:pre;background:#e0ffe0;'>++BUNDLE = -bundle
</span> +LIBNEWTSH = libnewt.$(VERSION).$(SOEXT)
+LIBNEWTSONAME = libnewt.$(SONAME).$(SOEXT)
+else
+SHARED = -shared
<span style='display:block; white-space:pre;background:#e0ffe0;'>++BUNDLE = -shared
</span> LIBNEWTSH = libnewt.$(SOEXT).$(VERSION)
LIBNEWTSONAME = libnewt.$(SOEXT).$(SONAME)
+endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,7 +60,7 @@
</span> scrollbar.o textbox.o scale.o grid.o windows.o buttonbar.o \
checkboxtree.o
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ifeq ($(SOEXT),dylib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ifeq ($(UNAME_S),Darwin)
</span> +SHLIBFLAGS= -install_name $(libdir)/$(LIBNEWTSONAME) -current_version $(VERSION) -compatibility_version $(SONAME)
+else
ifneq ($(GNU_LD),)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,18 +72,68 @@
</span>
SHCFLAGS = -fPIC
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -105,8 +121,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -65,7 +84,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TARGET=depend $(PROGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-all: $(TARGET) _snack.$(SOEXT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++all: $(TARGET) _snack.$(BUNDLEEXT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test: test.o $(LIBNEWT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CC) -g -o test test.o $(LIBNEWT) $(LDFLAGS) $(LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -82,8 +101,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ showkey: showkey.o $(LIBNEWT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CC) -g -o showkey showkey.o $(LIBNEWT) $(LDFLAGS) $(LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-_snack.$(SOEXT): snack.c $(LIBNEWTSH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @[ -n "$(PYTHONVERS)" ] && for ver in $(PYTHONVERS); do \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_snack.$(BUNDLEEXT): snack.c $(LIBNEWTSH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ifneq ($(PYTHONVERS),)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @for ver in $(PYTHONVERS); do \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pyconfig=$$ver-config; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ! $$pyconfig --cflags > /dev/null 2>&1 && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python-config --cflags > /dev/null 2>&1; then \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -92,21 +112,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mkdir -p $$ver; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PCFLAGS=`$$pyconfig --cflags`; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PIFLAGS=`$$pyconfig --includes`; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PLDFLAGS=`$$pyconfig --ldflags`; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PLFLAGS=`$$pyconfig --libs`; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo $(CC) $(SHCFLAGS) $(CFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snack.o snack.c; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(CC) $(SHCFLAGS) $(CFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snack.o snack.c; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo $(CC) --shared $(LDFLAGS) $$PLDFLAGS $$PLFLAGS -o $$ver/_snack.$(SOEXT) $$ver/snack.o -L. -lnewt $(LIBS); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(CC) --shared $(LDFLAGS) $$PLDFLAGS $$PLFLAGS -o $$ver/_snack.$(SOEXT) $$ver/snack.o -L. -lnewt $(LIBS); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- done || :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PLDFLAGS=`$$pyconfig --ldflags --embed || $$pyconfig --ldflags`; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo $(CC) $(SHCFLAGS) $(CFLAGS) $(CPPFLAGS) $$PCFLAGS -c -o $$ver/snack.o snack.c; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CC) $(SHCFLAGS) $(CFLAGS) $(CPPFLAGS) $$PCFLAGS -c -o $$ver/snack.o snack.c; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo $(CC) $(BUNDLE) $(LDFLAGS) $$PLDFLAGS -o $$ver/_snack.$(BUNDLEEXT) $$ver/snack.o -L. -lnewt $(LIBS); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CC) $(BUNDLE) $(LDFLAGS) $$PLDFLAGS -o $$ver/_snack.$(BUNDLEEXT) $$ver/snack.o -L. -lnewt $(LIBS); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ touch $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> whiptail: $(NDIALOGOBJS) $(LIBNEWTSH)
$(CC) -g -o whiptail $(NDIALOGOBJS) -L. $(LDFLAGS) -lnewt $(LIBS) -lpopt
-whiptcl.$(SOEXT): $(WHIPTCLOBJS) $(LIBNEWTSH)
- $(CC) -shared $(SHCFLAGS) $(LDFLAGS) -o whiptcl.$(SOEXT) $(WHIPTCLOBJS) -L. -lnewt $(LIBTCL) -lpopt $(LIBS)
+$(WHIPTCLSO): $(WHIPTCLOBJS) $(LIBNEWTSH)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) $(SHARED) $(SHCFLAGS) $(LDFLAGS) -o $(WHIPTCLSO) $(WHIPTCLOBJS) -L. -lnewt $(LIBTCL) -lpopt $(LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CC) $(BUNDLE) $(SHCFLAGS) $(LDFLAGS) -o $(WHIPTCLSO) $(WHIPTCLOBJS) -L. -lnewt $(LIBTCL) -lpopt $(LIBS)
</span>
$(LIBNEWT): $(LIBOBJS)
ar rv $@ $^
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -126,7 +142,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -118,7 +137,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ clean:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -f $(PROGS) *.o $(LIBNEWT) core $(LIBNEWTSH) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(SHAREDDIR)/*.o *.$(SOEXT)*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(SHAREDDIR)/*.o *.$(SOEXT)* *.$(BUNDLEEXT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depend:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CC) $(CFLAGS) $(CPPFLAGS) -M $(SOURCES) > .depend
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -126,7 +145,7 @@
</span> sharedlib: $(LIBNEWTSH)
$(LIBNEWTSH): $(SHAREDOBJS)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,12 +142,47 @@
</span> ln -fs $(LIBNEWTSONAME) libnewt.$(SOEXT)
ln -fs $(LIBNEWTSH) $(LIBNEWTSONAME)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -151,7 +167,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -143,7 +162,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install -m 644 whiptail.1 $(instroot)/$(man1dir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ make -C po datadir=$(instroot)/$(datadir) install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-install-sh: sharedlib $(WHIPTCLSO) _snack.$(SOEXT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++install-sh: sharedlib install-tcl install-py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [ -d $(instroot)/$(libdir) ] || install -m 755 -d $(instroot)/$(libdir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [ -d $(instroot)/$(includedir) ] || install -m 755 -d $(instroot)/$(includedir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [ -d $(instroot)/$(pkgconfigdir) ] || install -m 755 -d $(instroot)/$(pkgconfigdir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -151,14 +170,28 @@
</span> install -m 755 $(LIBNEWTSH) $(instroot)/$(libdir)
ln -sf $(LIBNEWTSONAME) $(instroot)/$(libdir)/libnewt.$(SOEXT)
ln -sf $(LIBNEWTSH) $(instroot)/$(libdir)/$(LIBNEWTSONAME)
- [ -n "$(WHIPTCLSO)" ] && install -m 755 whiptcl.$(SOEXT) $(instroot)/$(libdir) || :
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [ -n "$(WHIPTCLSO)" ] && install -m 755 $(WHIPTCLSO) $(instroot)/$(libdir) || :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [ -n "$(PYTHONVERS)" ] && for ver in $(PYTHONVERS) ; do \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [ -d $(instroot)/$(libdir)/$$ver/site-packages ] || install -m 755 -d $(instroot)/$(libdir)/$$ver/site-packages ;\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install -m 755 $$ver/_snack.$(SOEXT) $(instroot)/$(libdir)/$$ver/site-packages ;\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [ -n "$(PYTHONVERS)" ] && for ver in $(PYTHONVERS) ; do \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [ -d $(instroot)/$(libdir)/$$ver/site-packages ] || install -m 755 -d $(instroot)/$(libdir)/$$ver/site-packages ;\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install -m 755 $$ver/_snack.$(SOEXT) $(instroot)/$(libdir)/$$ver/site-packages ;\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install -m 644 snack.py $(instroot)/$(libdir)/$$ver/site-packages ;\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- done || :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install -m 644 libnewt.pc $(instroot)/$(pkgconfigdir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++install-tcl: $(WHIPTCLSO)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ifneq ($(WHIPTCLSO),)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [ -d $(instroot)/$(libdir) ] || install -m 755 -d $(instroot)/$(libdir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ install -m 755 $(WHIPTCLSO) $(instroot)/$(libdir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++install-py: _snack.$(BUNDLEEXT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ifneq ($(PYTHONVERS),)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @for ver in $(PYTHONVERS); do \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PLATLIB=`$$ver -c "import sysconfig; print(sysconfig.get_path('platlib'))"`; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PURELIB=`$$ver -c "import sysconfig; print(sysconfig.get_path('purelib'))"`; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [ -d $(instroot)/$$PLATLIB ] || install -m 755 -d $(instroot)/$$PLATLIB ;\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [ -d $(instroot)/$$PURELIB ] || install -m 755 -d $(instroot)/$$PURELIB ;\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo install -m 755 $$ver/_snack.$(BUNDLEEXT) $(instroot)/$$PLATLIB;\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ install -m 755 $$ver/_snack.$(BUNDLEEXT) $(instroot)/$$PLATLIB;\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo install -m 644 snack.py $(instroot)/$$PURELIB;\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ install -m 644 snack.py $(instroot)/$$PURELIB;\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Makefile: configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @echo "You need to rerun ./autogen.sh and ./configure before continuing"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @exit 1
</span></pre><pre style='margin:0'>
</pre>