diff options
-rw-r--r-- | cad/covered-current/Makefile | 4 | ||||
-rw-r--r-- | cad/covered/Makefile | 4 | ||||
-rw-r--r-- | cad/gnetman/Makefile | 4 | ||||
-rw-r--r-- | databases/idzebra/Makefile | 4 | ||||
-rw-r--r-- | databases/pgtcl/Makefile | 4 | ||||
-rw-r--r-- | databases/pgtclng/Makefile | 4 | ||||
-rw-r--r-- | devel/gcvs/Makefile | 4 | ||||
-rw-r--r-- | editors/vigor/Makefile | 4 | ||||
-rw-r--r-- | graphics/skencil/Makefile | 4 | ||||
-rw-r--r-- | lang/smalltalk/Makefile | 4 | ||||
-rw-r--r-- | lang/tcl-otcl/Makefile | 3 | ||||
-rw-r--r-- | misc/dirdiff/Makefile | 6 | ||||
-rw-r--r-- | misc/dirdiff/distinfo | 5 | ||||
-rw-r--r-- | misc/dirdiff/patches/patch-aa | 4 | ||||
-rw-r--r-- | misc/dirdiff/patches/patch-filecmp.c | 12 | ||||
-rw-r--r-- | misc/hanzim/Makefile | 4 | ||||
-rw-r--r-- | sysutils/xhfs/Makefile | 3 | ||||
-rw-r--r-- | textproc/WordNet/Makefile | 4 | ||||
-rw-r--r-- | textproc/tcl-tDOM/Makefile | 4 | ||||
-rw-r--r-- | time/ical/Makefile | 4 | ||||
-rw-r--r-- | x11/filerunner/Makefile | 4 | ||||
-rw-r--r-- | x11/tk-Tix/Makefile | 4 |
22 files changed, 74 insertions, 23 deletions
diff --git a/cad/covered-current/Makefile b/cad/covered-current/Makefile index 4706e8abd5a..74674fecab5 100644 --- a/cad/covered-current/Makefile +++ b/cad/covered-current/Makefile @@ -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 @@ REPLACE_FILES.WISH+= scripts/summary.tcl 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 --git a/cad/covered/Makefile b/cad/covered/Makefile index 134509db0d9..6205472105c 100644 --- a/cad/covered/Makefile +++ b/cad/covered/Makefile @@ -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 @@ REPLACE_FILES.WISH+= scripts/summary.tcl 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 --git a/cad/gnetman/Makefile b/cad/gnetman/Makefile index 16085e1ede7..426107c601d 100644 --- a/cad/gnetman/Makefile +++ b/cad/gnetman/Makefile @@ -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 @@ post-extract: ${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 --git a/databases/idzebra/Makefile b/databases/idzebra/Makefile index 72520c55f8c..dc602bd1a65 100644 --- a/databases/idzebra/Makefile +++ b/databases/idzebra/Makefile @@ -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 @@ GNU_CONFIGURE= yes 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 --git a/databases/pgtcl/Makefile b/databases/pgtcl/Makefile index b4277e93548..6faa7d3048d 100644 --- a/databases/pgtcl/Makefile +++ b/databases/pgtcl/Makefile @@ -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 @@ GNU_CONFIGURE= yes 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 --git a/databases/pgtclng/Makefile b/databases/pgtclng/Makefile index 6ff9a90c502..df20fb2bf1f 100644 --- a/databases/pgtclng/Makefile +++ b/databases/pgtclng/Makefile @@ -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 @@ GNU_CONFIGURE= yes 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 --git a/devel/gcvs/Makefile b/devel/gcvs/Makefile index a7b4bc248a1..b53bca13293 100644 --- a/devel/gcvs/Makefile +++ b/devel/gcvs/Makefile @@ -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-tclinclude="${BUILDLINK_PREFIX.tcl}/include" 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 --git a/editors/vigor/Makefile b/editors/vigor/Makefile index af35a7a1c4d..f1eb23d76b7 100644 --- a/editors/vigor/Makefile +++ b/editors/vigor/Makefile @@ -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 @@ BDB_ACCEPTED= db1 .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 --git a/graphics/skencil/Makefile b/graphics/skencil/Makefile index f967b4bee7a..4e860b06741 100644 --- a/graphics/skencil/Makefile +++ b/graphics/skencil/Makefile @@ -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= -L${BUILDLINK_PREFIX.tk}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFI 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 --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile index 9258464fc79..4fa72b52c6d 100644 --- a/lang/smalltalk/Makefile +++ b/lang/smalltalk/Makefile @@ -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 @@ REPLACE_FILES.sys-sed= ${REPLACE_SED} .include "../../mk/bsd.prefs.mk" +CPPFLAGS+= -DUSE_INTERP_RESULT + # for backtrace .if ${OPSYS} == "NetBSD" && exists(/usr/include/execinfo.h) LIBS+= -lexecinfo diff --git a/lang/tcl-otcl/Makefile b/lang/tcl-otcl/Makefile index 6911cd3e2f4..16eb0d9e592 100644 --- a/lang/tcl-otcl/Makefile +++ b/lang/tcl-otcl/Makefile @@ -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-tcl-ver=${TCL_VERSION} 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 --git a/misc/dirdiff/Makefile b/misc/dirdiff/Makefile index f8f130e49b9..46a70b5cb54 100644 --- a/misc/dirdiff/Makefile +++ b/misc/dirdiff/Makefile @@ -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 @@ DEPENDS+= tk>=8.3.4:../../x11/tk USE_LIBTOOL= yes +.include "../../mk/bsd.prefs.mk" + +CFLAGS+= -DUSE_INTERP_RESULT + .include "../../lang/tcl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/dirdiff/distinfo b/misc/dirdiff/distinfo index 888413b30d7..04f7928ec66 100644 --- a/misc/dirdiff/distinfo +++ b/misc/dirdiff/distinfo @@ -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 --git a/misc/dirdiff/patches/patch-aa b/misc/dirdiff/patches/patch-aa index 86faee97255..164a7e03e6d 100644 --- a/misc/dirdiff/patches/patch-aa +++ b/misc/dirdiff/patches/patch-aa @@ -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 @@ $NetBSD: patch-aa,v 1.2 2003/07/24 08:42:30 agc Exp $ # 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 --git a/misc/dirdiff/patches/patch-filecmp.c b/misc/dirdiff/patches/patch-filecmp.c new file mode 100644 index 00000000000..c3a61b73ff4 --- /dev/null +++ b/misc/dirdiff/patches/patch-filecmp.c @@ -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 --git a/misc/hanzim/Makefile b/misc/hanzim/Makefile index 0d3947b4e4b..4778575934f 100644 --- a/misc/hanzim/Makefile +++ b/misc/hanzim/Makefile @@ -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 @@ INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 .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 --git a/sysutils/xhfs/Makefile b/sysutils/xhfs/Makefile index 2adcb7019ef..0d391d09c5f 100644 --- a/sysutils/xhfs/Makefile +++ b/sysutils/xhfs/Makefile @@ -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-tcl=${BUILDLINK_PREFIX.tcl}/lib 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 --git a/textproc/WordNet/Makefile b/textproc/WordNet/Makefile index 540fa41d708..985a65e7316 100644 --- a/textproc/WordNet/Makefile +++ b/textproc/WordNet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2014/01/11 14:42:05 adam Exp $ +# $NetBSD: Makefile,v 1.12 2014/01/20 19:20:08 joerg Exp $ # DISTNAME= WordNet-3.0 @@ -27,5 +27,7 @@ SUBST_MESSAGE.docpath= Fixing path for documentation. SUBST_SED.docpath= -e 's,prefix)/doc,prefix)/share/doc/WordNet,' SUBST_STAGE.docpath= pre-configure +CPPFLAGS+= -DUSE_INTERP_RESULT + .include "../../x11/tk/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/tcl-tDOM/Makefile b/textproc/tcl-tDOM/Makefile index 42a9d6a3a7f..5d7ed96e5a2 100644 --- a/textproc/tcl-tDOM/Makefile +++ b/textproc/tcl-tDOM/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2014/01/11 14:42:06 adam Exp $ +# $NetBSD: Makefile,v 1.4 2014/01/20 19:20:08 joerg Exp $ # DISTNAME= tDOM-0.8.3 @@ -16,5 +16,7 @@ LICENSE= mpl-1.1 GNU_CONFIGURE= yes USE_LANGUAGES= c +CPPFLAGS+= -DUSE_INTERP_ERRORLINE + .include "../../lang/tcl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/time/ical/Makefile b/time/ical/Makefile index 1a30af18e9b..009e482d761 100644 --- a/time/ical/Makefile +++ b/time/ical/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2014/01/11 14:42:06 adam Exp $ +# $NetBSD: Makefile,v 1.30 2014/01/20 19:20:09 joerg Exp $ VER= 3.0.2 DISTNAME= ical-${VER} @@ -22,6 +22,8 @@ CONFIGURE_ARGS+= --prefix=${PREFIX:Q} \ --with-tclsh=${BUILDLINK_PREFIX.tcl}/bin/tclsh \ --with-tkconfig=${BUILDLINK_PREFIX.tk}/lib +CPPFLAGS+= -DUSE_INTERP_RESULT + USE_TOOLS+= gmake gsed PLIST_SUBS+= "PKGVERSION=${VER}" diff --git a/x11/filerunner/Makefile b/x11/filerunner/Makefile index 3dadf2496b2..cc65276b551 100644 --- a/x11/filerunner/Makefile +++ b/x11/filerunner/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2014/01/11 14:42:06 adam Exp $ +# $NetBSD: Makefile,v 1.36 2014/01/20 19:20:09 joerg Exp $ DISTNAME= FileRunner-2.5.1 PKGNAME= ${DISTNAME:S/FileRunner/filerunner/} @@ -31,5 +31,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/bitmaps/${map} ${DESTDIR}${PREFIX}/lib/FileRunner/bitmaps .endfor +CPPFLAGS+= -DUSE_INTERP_RESULT + .include "../../x11/tk/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/tk-Tix/Makefile b/x11/tk-Tix/Makefile index 0fac5bbd8ee..843cc71d241 100644 --- a/x11/tk-Tix/Makefile +++ b/x11/tk-Tix/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2014/01/11 14:42:06 adam Exp $ +# $NetBSD: Makefile,v 1.24 2014/01/20 19:20:09 joerg Exp $ # DISTNAME= Tix${TIX_VERSION}-src @@ -34,6 +34,8 @@ INSTALLATION_DIRS+= ${PKGMANDIR}/mann INSTALLATION_DIRS+= lib/Tix${TIX_VERSION}/docs USE_TOOLS+= tar +CPPFLAGS+= -DUSE_INTERP_RESULT + post-install: for f in ${WRKSRC}/man/*.n; do \ ${INSTALL_DATA} -m 444 $$f \ |