[pkgsrc/trunk]: pkgsrc Fix build with TCL 8.6

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Fix build with TCL 8.6
From: joerg <joerg%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 15:17:53 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/6e467209e9b7
branches:  trunk
changeset: 629403:6e467209e9b7
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Jan 20 19:20:07 2014 +0000

description:
Fix build with TCL 8.6

diffstat:

 cad/covered-current/Makefile         |   4 +++-
 cad/covered/Makefile                 |   4 +++-
 cad/gnetman/Makefile                 |   4 +++-
 databases/idzebra/Makefile           |   4 +++-
 databases/pgtcl/Makefile             |   4 +++-
 databases/pgtclng/Makefile           |   4 +++-
 devel/gcvs/Makefile                  |   4 +++-
 editors/vigor/Makefile               |   4 +++-
 graphics/skencil/Makefile            |   4 +++-
 lang/smalltalk/Makefile              |   4 +++-
 lang/tcl-otcl/Makefile               |   3 ++-
 misc/dirdiff/Makefile                |   6 +++++-
 misc/dirdiff/distinfo                |   5 +++--
 misc/dirdiff/patches/patch-aa        |   4 ++--
 misc/dirdiff/patches/patch-filecmp.c |  12 ++++++++++++
 misc/hanzim/Makefile                 |   4 +++-
 sysutils/xhfs/Makefile               |   3 ++-
 textproc/WordNet/Makefile            |   4 +++-
 textproc/tcl-tDOM/Makefile           |   4 +++-
 time/ical/Makefile                   |   4 +++-
 x11/filerunner/Makefile              |   4 +++-
 x11/tk-Tix/Makefile                  |   4 +++-
 22 files changed, 74 insertions(+), 23 deletions(-)

diffs (truncated from 385 to 300 lines):

diff -r 967dcaa35794 -r 6e467209e9b7 cad/covered-current/Makefile
--- a/cad/covered-current/Makefile      Mon Jan 20 18:21:29 2014 +0000
+++ b/cad/covered-current/Makefile      Mon Jan 20 19:20:07 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2014/01/11 14:42:01 adam Exp $
+# $NetBSD: Makefile,v 1.24 2014/01/20 19:20:08 joerg Exp $
 #
 
 DISTNAME=      covered-${SNAPDATE}
@@ -36,6 +36,8 @@
 CONFIGURE_ENV+=        r_cv_path_TCL_CONFIG=${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh
 CONFIGURE_ENV+=        r_cv_path_TK_CONFIG=${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh
 
+CPPFLAGS+=     -DUSE_INTERP_RESULT
+
 .include "../../devel/gperf/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/tcl/buildlink3.mk"
diff -r 967dcaa35794 -r 6e467209e9b7 cad/covered/Makefile
--- a/cad/covered/Makefile      Mon Jan 20 18:21:29 2014 +0000
+++ b/cad/covered/Makefile      Mon Jan 20 19:20:07 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2014/01/11 14:42:01 adam Exp $
+# $NetBSD: Makefile,v 1.21 2014/01/20 19:20:07 joerg Exp $
 #
 
 DISTNAME=      covered-0.4.7
@@ -34,6 +34,8 @@
 CONFIGURE_ENV+=        r_cv_path_TCL_CONFIG=${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh
 CONFIGURE_ENV+=        r_cv_path_TK_CONFIG=${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh
 
+CPPFLAGS+=     -DUSE_INTERP_RESULT
+
 .include "../../devel/gperf/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/tcl/buildlink3.mk"
diff -r 967dcaa35794 -r 6e467209e9b7 cad/gnetman/Makefile
--- a/cad/gnetman/Makefile      Mon Jan 20 18:21:29 2014 +0000
+++ b/cad/gnetman/Makefile      Mon Jan 20 19:20:07 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2014/01/11 14:42:01 adam Exp $
+# $NetBSD: Makefile,v 1.15 2014/01/20 19:20:08 joerg Exp $
 #
 
 DISTNAME=              gnetman-11Feb05
@@ -19,6 +19,8 @@
        ${RM} ${WRKSRC}/src/include/tcl.h
        ${RM} ${WRKSRC}/src/include/tk.h
 
+CPPFLAGS+=     -DUSE_INTERP_RESULT -DUSE_INTERP_ERRORLINE
+
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 967dcaa35794 -r 6e467209e9b7 databases/idzebra/Makefile
--- a/databases/idzebra/Makefile        Mon Jan 20 18:21:29 2014 +0000
+++ b/databases/idzebra/Makefile        Mon Jan 20 19:20:07 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2014/01/11 14:42:00 adam Exp $
+# $NetBSD: Makefile,v 1.13 2014/01/20 19:20:08 joerg Exp $
 #
 
 DISTNAME=      idzebra-2.0.47
@@ -15,6 +15,8 @@
 USE_LIBTOOL=   yes
 TEST_TARGET=   check
 
+CPPFLAGS+=     -DUSE_INTERP_RESULT -DUSE_INTERP_ERRORLINE
+
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff -r 967dcaa35794 -r 6e467209e9b7 databases/pgtcl/Makefile
--- a/databases/pgtcl/Makefile  Mon Jan 20 18:21:29 2014 +0000
+++ b/databases/pgtcl/Makefile  Mon Jan 20 19:20:07 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2014/01/11 14:42:02 adam Exp $
+# $NetBSD: Makefile,v 1.13 2014/01/20 19:20:08 joerg Exp $
 #
 
 DISTNAME=      pgtcl1.5
@@ -17,6 +17,8 @@
 
 CONFIGURE_ARGS+=       SHLIB_LD_FLAGS=${COMPILER_RPATH_FLAG}${PREFIX}/lib
 
+CPPFLAGS+=     -DUSE_INTERP_ERRORLINE
+
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../mk/pgsql.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 967dcaa35794 -r 6e467209e9b7 databases/pgtclng/Makefile
--- a/databases/pgtclng/Makefile        Mon Jan 20 18:21:29 2014 +0000
+++ b/databases/pgtclng/Makefile        Mon Jan 20 19:20:07 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2014/01/11 14:42:02 adam Exp $
+# $NetBSD: Makefile,v 1.14 2014/01/20 19:20:08 joerg Exp $
 #
 
 VER=           1.5.3
@@ -20,6 +20,8 @@
 CONFIGURE_ARGS+=       --with-postgres-include=${PREFIX:Q}/include
 CONFIGURE_ARGS+=       --with-postgres-lib=${PREFIX:Q}/lib
 
+CPPFLAGS+=     -DUSE_INTERP_ERRORLINE
+
 PGTCLLIBNAME           = libpgtcl${VER:C/\.//g}.so
 
 post-install:
diff -r 967dcaa35794 -r 6e467209e9b7 devel/gcvs/Makefile
--- a/devel/gcvs/Makefile       Mon Jan 20 18:21:29 2014 +0000
+++ b/devel/gcvs/Makefile       Mon Jan 20 19:20:07 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2014/01/11 14:42:02 adam Exp $
+# $NetBSD: Makefile,v 1.37 2014/01/20 19:20:08 joerg Exp $
 
 DISTNAME=              gcvs-1.0
 PKGREVISION=           9
@@ -22,6 +22,8 @@
 CONFIGURE_ARGS+=       --with-tcllib="${BUILDLINK_PREFIX.tcl}/lib"
 CONFIGURE_ARGS+=       perl_path=${PERL5}
 
+CPPFLAGS+=     -DUSE_INTERP_RESULT
+
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
 
diff -r 967dcaa35794 -r 6e467209e9b7 editors/vigor/Makefile
--- a/editors/vigor/Makefile    Mon Jan 20 18:21:29 2014 +0000
+++ b/editors/vigor/Makefile    Mon Jan 20 19:20:07 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2014/01/11 14:42:03 adam Exp $
+# $NetBSD: Makefile,v 1.43 2014/01/20 19:20:08 joerg Exp $
 #
 
 DISTNAME=      vigor-0.016
@@ -46,6 +46,8 @@
 .include "../../mk/bdb.buildlink3.mk"
 .endif
 
+CPPFLAGS+=     -DUSE_INTERP_RESULT
+
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
diff -r 967dcaa35794 -r 6e467209e9b7 graphics/skencil/Makefile
--- a/graphics/skencil/Makefile Mon Jan 20 18:21:29 2014 +0000
+++ b/graphics/skencil/Makefile Mon Jan 20 19:20:07 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2014/01/11 14:42:04 adam Exp $
+# $NetBSD: Makefile,v 1.30 2014/01/20 19:20:08 joerg Exp $
 
 DISTNAME=      skencil-0.6.17
 PKGREVISION=   12
@@ -19,6 +19,8 @@
 SK_TKFLAGS+=   ${COMPILER_RPATH_FLAG}${X11BASE}/lib
 SK_CONF_ARGS+= --tk-flags=${SK_TKFLAGS:Q}
 
+CPPFLAGS+=     -DUSE_INTERP_RESULT
+
 do-configure:
        cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
            ${PYTHONBIN} setup.py configure ${SK_CONF_ARGS}
diff -r 967dcaa35794 -r 6e467209e9b7 lang/smalltalk/Makefile
--- a/lang/smalltalk/Makefile   Mon Jan 20 18:21:29 2014 +0000
+++ b/lang/smalltalk/Makefile   Mon Jan 20 19:20:07 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2014/01/11 14:42:04 adam Exp $
+# $NetBSD: Makefile,v 1.82 2014/01/20 19:20:08 joerg Exp $
 
 DISTNAME=      smalltalk-3.2.4
 PKGREVISION=   18
@@ -44,6 +44,8 @@
 
 .include "../../mk/bsd.prefs.mk"
 
+CPPFLAGS+=     -DUSE_INTERP_RESULT
+
 # for backtrace
 .if ${OPSYS} == "NetBSD" && exists(/usr/include/execinfo.h)
 LIBS+= -lexecinfo
diff -r 967dcaa35794 -r 6e467209e9b7 lang/tcl-otcl/Makefile
--- a/lang/tcl-otcl/Makefile    Mon Jan 20 18:21:29 2014 +0000
+++ b/lang/tcl-otcl/Makefile    Mon Jan 20 19:20:07 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2014/01/11 14:42:01 adam Exp $
+# $NetBSD: Makefile,v 1.29 2014/01/20 19:20:08 joerg Exp $
 
 DISTNAME=      otcl-src-1.14
 PKGNAME=       tcl-${DISTNAME:S/-src//}
@@ -26,6 +26,7 @@
 CONFIGURE_ARGS+=       --with-tk-ver=${TK_VERSION}
 
 CPPFLAGS+=     -I${BUILDLINK_PREFIX.tcl}/include/tcl/generic
+CFLAGS+=       -DUSE_INTERP_RESULT -DUSE_INTERP_ERRORLINE
 
 DOCS=          autoload.html capi.html class.html object.html \
                tutorial.html otcl-paper.ps.gz
diff -r 967dcaa35794 -r 6e467209e9b7 misc/dirdiff/Makefile
--- a/misc/dirdiff/Makefile     Mon Jan 20 18:21:29 2014 +0000
+++ b/misc/dirdiff/Makefile     Mon Jan 20 19:20:07 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2014/01/11 14:42:04 adam Exp $
+# $NetBSD: Makefile,v 1.18 2014/01/20 19:20:08 joerg Exp $
 #
 
 DISTNAME=      dirdiff-2.1
@@ -16,5 +16,9 @@
 
 USE_LIBTOOL=   yes
 
+.include "../../mk/bsd.prefs.mk"
+
+CFLAGS+=       -DUSE_INTERP_RESULT
+
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 967dcaa35794 -r 6e467209e9b7 misc/dirdiff/distinfo
--- a/misc/dirdiff/distinfo     Mon Jan 20 18:21:29 2014 +0000
+++ b/misc/dirdiff/distinfo     Mon Jan 20 19:20:07 2014 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.4 2006/10/08 11:43:06 obache Exp $
+$NetBSD: distinfo,v 1.5 2014/01/20 19:20:08 joerg Exp $
 
 SHA1 (dirdiff-2.1.tar.gz) = baa355b2eae4886de57a47cb69d8214c7545c0e8
 RMD160 (dirdiff-2.1.tar.gz) = 280ead77db4371eee2d6cc6d5df3ee362585fbb0
 Size (dirdiff-2.1.tar.gz) = 43105 bytes
-SHA1 (patch-aa) = 3d82bc63fe30b8c4eed2a84571d56f769d93a56a
+SHA1 (patch-aa) = 03b27f19ec415638ae02813e2a02ec139be27719
+SHA1 (patch-filecmp.c) = dd56255289746eacc4804d11f2fb1880c9272411
diff -r 967dcaa35794 -r 6e467209e9b7 misc/dirdiff/patches/patch-aa
--- a/misc/dirdiff/patches/patch-aa     Mon Jan 20 18:21:29 2014 +0000
+++ b/misc/dirdiff/patches/patch-aa     Mon Jan 20 19:20:07 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2003/07/24 08:42:30 agc Exp $
+$NetBSD: patch-aa,v 1.3 2014/01/20 19:20:08 joerg Exp $
 
 --- Makefile   2003/07/24 07:02:17     1.1
 +++ Makefile   2003/07/24 07:03:14
@@ -14,7 +14,7 @@
  
  # You may need to change the -I arguments depending on your system
 -CFLAGS=-O3 -I/usr/include/tcl8.3/ -I/usr/include/tcl
-+CFLAGS=-O3 -I${PREFIX}/include
++CFLAGS+=-I${PREFIX}/include
  
 -all:  libfilecmp.so.0.0
 +LIBS= libfilecmp.a
diff -r 967dcaa35794 -r 6e467209e9b7 misc/dirdiff/patches/patch-filecmp.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/dirdiff/patches/patch-filecmp.c      Mon Jan 20 19:20:07 2014 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-filecmp.c,v 1.1 2014/01/20 19:20:08 joerg Exp $
+
+--- filecmp.c.orig     2014-01-20 17:20:35.000000000 +0000
++++ filecmp.c
+@@ -10,6 +10,7 @@
+ #include <string.h>
+ #include <ctype.h>
+ #include <tcl.h>
++#include <unistd.h>
+ #include <sys/fcntl.h>
+ 
+ #define BSIZE         32768
diff -r 967dcaa35794 -r 6e467209e9b7 misc/hanzim/Makefile
--- a/misc/hanzim/Makefile      Mon Jan 20 18:21:29 2014 +0000
+++ b/misc/hanzim/Makefile      Mon Jan 20 19:20:07 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2014/01/11 14:42:04 adam Exp $
+# $NetBSD: Makefile,v 1.16 2014/01/20 19:20:08 joerg Exp $
 #
 
 DISTNAME=      hanzim-1.3
@@ -27,6 +27,8 @@
 .include "../../x11/tk/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 
+CFLAGS+=       -DUSE_INTERP_RESULT
+
 pre-install:
        @if ${TEST} -z "$$DISPLAY"; then                                \
                ${ERROR_MSG} "${PKGNAME} runs a binary during installation"; \
diff -r 967dcaa35794 -r 6e467209e9b7 sysutils/xhfs/Makefile
--- a/sysutils/xhfs/Makefile    Mon Jan 20 18:21:29 2014 +0000
+++ b/sysutils/xhfs/Makefile    Mon Jan 20 19:20:07 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2014/01/11 14:42:05 adam Exp $
+# $NetBSD: Makefile,v 1.23 2014/01/20 19:20:08 joerg Exp $
 #
 
 DISTNAME=      hfsutils-3.2.6
@@ -16,6 +16,7 @@
 CONFIGURE_ARGS+=       --with-tk=${BUILDLINK_PREFIX.tk}/lib
 CONFIGURE_ARGS+=       --disable-cli
 CPPFLAGS+=     -I${BUILDLINK_PREFIX.libhfs}/include/libhfs
+CPPFLAGS+=     -DUSE_INTERP_RESULT
 
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 
diff -r 967dcaa35794 -r 6e467209e9b7 textproc/WordNet/Makefile
--- a/textproc/WordNet/Makefile Mon Jan 20 18:21:29 2014 +0000
Prev by Date: [pkgsrc/trunk]: pkgsrc/devel/ruby-SDL Utilize GEM_NAME in PLIST.
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Updated textproc/py-X to 0.13
Previous by Thread: [pkgsrc/trunk]: pkgsrc/devel/ruby-SDL Utilize GEM_NAME in PLIST.
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated textproc/py-X to 0.13
Indexes:
Home | Main Index | Thread Index | Old Index