<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/bb804d1484109edc491e80ead06929b847bed767">https://github.com/macports/macports-base/commit/bb804d1484109edc491e80ead06929b847bed767</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit bb804d1484109edc491e80ead06929b847bed767
</span>Author: Rainer Müller <raimue@macports.org>
AuthorDate: Mon Apr 2 17:49:16 2018 +0200
<span style='display:block; white-space:pre;color:#404040;'> compat: New directory for compatibility functions
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Move all implementations that are meant for older systems to their own
</span><span style='display:block; white-space:pre;color:#404040;'> directory in order to be able to reuse the objects without copying *.c
</span><span style='display:block; white-space:pre;color:#404040;'> files around.
</span>---
Mk/macports.tea.mk | 9 +++++++--
configure | 3 ++-
configure.ac | 1 +
src/Makefile.in | 2 +-
src/compat/Makefile.in | 23 +++++++++++++++++++++++
src/{pextlib1.0 => compat}/getdelim.c | 4 ++++
src/{pextlib1.0 => compat}/getdelim.h | 0
src/{pextlib1.0 => compat}/getline.c | 4 ++++
src/{pextlib1.0 => compat}/getline.h | 0
src/{pextlib1.0 => compat}/strlcat.c | 6 +++---
src/{pextlib1.0 => compat}/strlcat.h | 9 +++++++--
src/darwintracelib1.0/Makefile.in | 5 ++++-
src/pextlib1.0/Makefile.in | 9 ++++++---
13 files changed, 62 insertions(+), 13 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/Mk/macports.tea.mk b/Mk/macports.tea.mk
</span><span style='display:block; white-space:pre;color:#808080;'>index f898ce9..2e1f69f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/Mk/macports.tea.mk
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/Mk/macports.tea.mk
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,9 @@
</span> .c.o:
${CC} -c -DUSE_TCL_STUBS -DTCL_NO_DEPRECATED ${CFLAGS} ${CPPFLAGS} ${SHLIB_CFLAGS} $< -o $@
<span style='display:block; white-space:pre;background:#ffe0e0;'>-all:: ${SHLIB_NAME} pkgIndex.tcl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PKGINDEX ?= pkgIndex.tcl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+all:: ${SHLIB_NAME} ${PKGINDEX}
</span>
$(SHLIB_NAME): ${OBJS}
${SHLIB_LD} ${OBJS} -o ${SHLIB_NAME} ${TCL_STUB_LIB_SPEC} ${SHLIB_LDFLAGS} ${LIBS}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,7 +22,10 @@ clean::
</span>
distclean:: clean
<span style='display:block; white-space:pre;background:#ffe0e0;'>-install:: all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+INSTALLTARGET ?= install-real
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+install:: $(INSTALLTARGET)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+$(INSTALLTARGET):: all
</span> $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${INSTALLDIR}"
$(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 ${SHLIB_NAME} "${INSTALLDIR}"
$(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 pkgIndex.tcl "${INSTALLDIR}"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/configure b/configure
</span><span style='display:block; white-space:pre;color:#808080;'>index 923c29d..d31997c 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/configure
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/configure
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9294,7 +9294,7 @@ $as_echo "yes" >&6; }
</span>
# Output
<span style='display:block; white-space:pre;background:#ffe0e0;'>-ac_config_files="$ac_config_files Doxyfile Makefile Mk/macports.autoconf.mk doc/Makefile doc/base.mtree doc/macosx.mtree doc/macports.conf doc/prefix.mtree doc/pubkeys.conf portmgr/dmg/postflight setupenv.bash src/Makefile src/cregistry/Makefile src/darwintracelib1.0/Makefile src/machista1.0/Makefile src/macports1.0/Makefile src/macports1.0/macports_autoconf.tcl src/macports1.0/macports_test_autoconf.tcl src/mpcommon1.0/Makefile src/package1.0/Makefile src/package1.0/package_test_autocon [...]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ac_config_files="$ac_config_files Doxyfile Makefile Mk/macports.autoconf.mk doc/Makefile doc/base.mtree doc/macosx.mtree doc/macports.conf doc/prefix.mtree doc/pubkeys.conf portmgr/dmg/postflight setupenv.bash src/Makefile src/cregistry/Makefile src/compat/Makefile src/darwintracelib1.0/Makefile src/machista1.0/Makefile src/macports1.0/Makefile src/macports1.0/macports_autoconf.tcl src/macports1.0/macports_test_autoconf.tcl src/mpcommon1.0/Makefile src/package1.0/Makefile src/package1.0/ [...]
</span>
ac_config_files="$ac_config_files vendor/tclsh"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10013,6 +10013,7 @@ do
</span> "setupenv.bash") CONFIG_FILES="$CONFIG_FILES setupenv.bash" ;;
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"src/cregistry/Makefile") CONFIG_FILES="$CONFIG_FILES src/cregistry/Makefile" ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ "src/compat/Makefile") CONFIG_FILES="$CONFIG_FILES src/compat/Makefile" ;;
</span> "src/darwintracelib1.0/Makefile") CONFIG_FILES="$CONFIG_FILES src/darwintracelib1.0/Makefile" ;;
"src/machista1.0/Makefile") CONFIG_FILES="$CONFIG_FILES src/machista1.0/Makefile" ;;
"src/macports1.0/Makefile") CONFIG_FILES="$CONFIG_FILES src/macports1.0/Makefile" ;;
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/configure.ac b/configure.ac
</span><span style='display:block; white-space:pre;color:#808080;'>index 6f590b2..ec3d73c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/configure.ac
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/configure.ac
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -413,6 +413,7 @@ AC_CONFIG_FILES([
</span> setupenv.bash
src/Makefile
src/cregistry/Makefile
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/compat/Makefile
</span> src/darwintracelib1.0/Makefile
src/machista1.0/Makefile
src/macports1.0/Makefile
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/Makefile.in b/src/Makefile.in
</span><span style='display:block; white-space:pre;color:#808080;'>index acb66b2..07fe261 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@ TCLPKG= cregistry \
</span> pextlib1.0 \
machista1.0 \
mpcommon1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-SUBDIR= ${TCLPKG} port programs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+SUBDIR= compat ${TCLPKG} port programs
</span>
ifeq (@TRACEMODE_SUPPORT@,1)
TCLPKG+= darwintracelib1.0
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/compat/Makefile.in b/src/compat/Makefile.in
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..b7ad206
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/compat/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+srcdir = @srcdir@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+VPATH = @srcdir@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+include ../../Mk/macports.autoconf.mk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ifneq ($(HAVE_GETDELIM),yes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+OBJS+= strlcat.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ifneq ($(HAVE_GETLINE),yes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+OBJS+= getline.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ifneq ($(HAVE_STRLCAT),yes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+OBJS+= strlcat.o
</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;'>+# disable pkgIndex.tcl and install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PKGINDEX=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+INSTALLTARGET=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+include $(srcdir)/../../Mk/macports.tea.mk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distclean::
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -f Makefile
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/pextlib1.0/getdelim.c b/src/compat/getdelim.c
</span>similarity index 98%
rename from src/pextlib1.0/getdelim.c
rename to src/compat/getdelim.c
<span style='display:block; white-space:pre;color:#808080;'>index 816a0e7..7bac840 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/pextlib1.0/getdelim.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/compat/getdelim.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,6 +33,10 @@
</span> #include <stdio.h>
#include <stdlib.h>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#if HAVE_CONFIG_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#include <config.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #if !HAVE_GETDELIM
#include "getdelim.h"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/pextlib1.0/getdelim.h b/src/compat/getdelim.h
</span>similarity index 100%
rename from src/pextlib1.0/getdelim.h
rename to src/compat/getdelim.h
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/pextlib1.0/getline.c b/src/compat/getline.c
</span>similarity index 97%
rename from src/pextlib1.0/getline.c
rename to src/compat/getline.c
<span style='display:block; white-space:pre;color:#808080;'>index 1253371..c6215e8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/pextlib1.0/getline.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/compat/getline.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,6 +32,10 @@
</span>
#include <stdio.h>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#if HAVE_CONFIG_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#include <config.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #if !HAVE_GETLINE
#if !HAVE_GETDELIM
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/pextlib1.0/getline.h b/src/compat/getline.h
</span>similarity index 100%
rename from src/pextlib1.0/getline.h
rename to src/compat/getline.h
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/pextlib1.0/strlcat.c b/src/compat/strlcat.c
</span>similarity index 100%
rename from src/pextlib1.0/strlcat.c
rename to src/compat/strlcat.c
<span style='display:block; white-space:pre;color:#808080;'>index 6829beb..54b2e39 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/pextlib1.0/strlcat.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/compat/strlcat.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,15 +13,15 @@
</span> ** of space remaining.
*/
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#include <stddef.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #if HAVE_CONFIG_H
#include <config.h>
#endif
#ifndef HAVE_STRLCAT
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#include <stddef.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include <string.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> size_t strlcat(char *dst, const char *src, size_t size)
{
size_t used, length, copy;
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/pextlib1.0/strlcat.h b/src/compat/strlcat.h
</span>similarity index 50%
rename from src/pextlib1.0/strlcat.h
rename to src/compat/strlcat.h
<span style='display:block; white-space:pre;color:#808080;'>index 3f8d7d2..c207ebe 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/pextlib1.0/strlcat.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/compat/strlcat.h
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#ifdef HAVE_STRLCAT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#ifndef _STRLCAT_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define _STRLCAT_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #include <string.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if !HAVE_STRLCAT
</span> size_t strlcat(char *dst, const char *src, size_t size);
#endif
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* _STRLCAT_H */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/darwintracelib1.0/Makefile.in b/src/darwintracelib1.0/Makefile.in
</span><span style='display:block; white-space:pre;color:#808080;'>index 62be504..f1ee776 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/darwintracelib1.0/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/darwintracelib1.0/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,9 +24,12 @@ SRCS = \
</span> OBJS = $(SRCS:%.c=%.o)
ifneq ($(HAVE_STRLCAT),yes)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-OBJS+= ../pextlib1.0/strlcat.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+COMPAT_OBJS+= $(srcdir)/../compat/strlcat.o
</span> endif
<span style='display:block; white-space:pre;background:#e0ffe0;'>+CPPFLAGS+= -I../compat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+LIBS+= $(COMPAT_OBJS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> SHLIB_NAME = darwintrace$(SHLIB_SUFFIX)
INSTALLDIR = $(DESTDIR)$(TCL_PACKAGE_PATH)/darwintrace1.0
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/pextlib1.0/Makefile.in b/src/pextlib1.0/Makefile.in
</span><span style='display:block; white-space:pre;color:#808080;'>index f11f3fc..df48d95 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/pextlib1.0/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/pextlib1.0/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,15 +32,18 @@ OBJS+=sip_copy_proc.o
</span> endif
ifneq ($(HAVE_GETDELIM),yes)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-OBJS+= strlcat.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+COMPAT_OBJS+= ../compat/strlcat.o
</span> endif
ifneq ($(HAVE_GETLINE),yes)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-OBJS+= getline.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+COMPAT_OBJS+= ../compat/getline.o
</span> endif
ifneq ($(HAVE_STRLCAT),yes)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-OBJS+= strlcat.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+COMPAT_OBJS+= ../compat/strlcat.o
</span> endif
<span style='display:block; white-space:pre;background:#e0ffe0;'>+CPPFLAGS+= -I../compat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+LIBS+= $(COMPAT_OBJS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> SHLIB_NAME= Pextlib${SHLIB_SUFFIX}
INSTALLDIR= ${DESTDIR}${TCL_PACKAGE_PATH}/pextlib1.0
</pre><pre style='margin:0'>
</pre>