From owner-svn-ports-all@freebsd.org Thu Apr 21 11:33:21 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 59EA4B16CE8; Thu, 21 Apr 2016 11:33:21 +0000 (UTC) (envelope-from gahr@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 13EEE1195; Thu, 21 Apr 2016 11:33:21 +0000 (UTC) (envelope-from gahr@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3LBXKNW051623; Thu, 21 Apr 2016 11:33:20 GMT (envelope-from gahr@FreeBSD.org) Received: (from gahr@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3LBXH1a051587; Thu, 21 Apr 2016 11:33:17 GMT (envelope-from gahr@FreeBSD.org) Message-Id: <201604211133.u3LBXH1a051587@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gahr set sender to gahr@FreeBSD.org using -f From: Pietro Cerutti Date: Thu, 21 Apr 2016 11:33:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413727 - in head: Mk/Uses cad/irsim cad/magic cad/netgen cad/netgen/files cad/xcircuit lang/expect lang/itcl lang/itcl4 lang/itcl4/files lang/nx www/mod_rivet www/tclhttpd www/tdom www... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Apr 2016 11:33:21 -0000 Author: gahr Date: Thu Apr 21 11:33:16 2016 New Revision: 413727 URL: https://svnweb.freebsd.org/changeset/ports/413727 Log: Support Tk in USES=tk:tea. Convert more ports + minor fixes and modernization. Added: head/cad/netgen/files/patch-libsrc_csg_Makefile.am (contents, props changed) head/cad/netgen/files/patch-libsrc_csg_Makefile.in (contents, props changed) head/cad/netgen/files/patch-libsrc_geom2d_Makefile.am (contents, props changed) head/cad/netgen/files/patch-libsrc_geom2d_Makefile.in (contents, props changed) head/cad/netgen/files/patch-libsrc_stlgeom_Makefile.am (contents, props changed) head/cad/netgen/files/patch-libsrc_stlgeom_Makefile.in (contents, props changed) head/cad/netgen/files/patch-libsrc_visualization_Makefile.am (contents, props changed) head/cad/netgen/files/patch-libsrc_visualization_Makefile.in (contents, props changed) head/www/tdom/files/patch-expat_xmlparse.c - copied, changed from r413726, head/www/tdom/files/patch-expat-xmlparse.h Deleted: head/www/tdom/files/patch-expat-xmlparse.h Modified: head/Mk/Uses/tcl.mk head/cad/irsim/Makefile head/cad/magic/Makefile head/cad/netgen/Makefile head/cad/netgen/files/patch-configure head/cad/netgen/files/patch-ng_Makefile.am head/cad/netgen/files/patch-ng_Makefile.in head/cad/xcircuit/Makefile head/lang/expect/Makefile head/lang/itcl/Makefile head/lang/itcl4/Makefile head/lang/itcl4/files/patch-Makefile.in head/lang/itcl4/pkg-descr head/lang/nx/Makefile head/www/mod_rivet/Makefile head/www/mod_rivet/distinfo head/www/mod_rivet/pkg-plist head/www/tclhttpd/Makefile head/www/tdom/Makefile head/www/tdom/files/patch-Makefile.in head/www/tdom/files/patch-configure head/www/tdom/files/patch-generic-dom.h head/www/tdom/files/patch-generic-tcldom.c head/www/tdom/files/patch-generic-tclexpat.c head/www/websh/Makefile Modified: head/Mk/Uses/tcl.mk ============================================================================== --- head/Mk/Uses/tcl.mk Thu Apr 21 11:18:13 2016 (r413726) +++ head/Mk/Uses/tcl.mk Thu Apr 21 11:33:16 2016 (r413727) @@ -212,7 +212,7 @@ CONFIGURE_ARGS+=--exec-prefix=${PREFIX} --with-tcl=${TCL_LIBDIR} \ --with-tclinclude=${TCL_INCLUDEDIR} . if ${_TCLTK_PORT} == "tk" -CONFIGURE_ARGS+=--with-tk=${TK_LIBDIR} +CONFIGURE_ARGS+=--with-tk=${TK_LIBDIR} --with-tkinclude=${TK_INCLUDEDIR} . endif .endif Modified: head/cad/irsim/Makefile ============================================================================== --- head/cad/irsim/Makefile Thu Apr 21 11:18:13 2016 (r413726) +++ head/cad/irsim/Makefile Thu Apr 21 11:33:16 2016 (r413727) @@ -5,7 +5,6 @@ PORTNAME= irsim PORTVERSION= 9.7.93 CATEGORIES= cad MASTER_SITES= http://opencircuitdesign.com/irsim/archive/ -EXTRACT_SUFX= .tgz MAINTAINER= danilo@FreeBSD.org COMMENT= Event-driven logic-level simulator for MOS circuis @@ -20,14 +19,12 @@ TCL_DESC= Tcl interpreter OPTIONS_SUB= yes SCHEME_CONFIGURE_ON= --with-interpreter=scheme -TCL_CONFIGURE_ON= --with-interpreter=tcl --with-tcl=${TCL_LIBDIR} \ - --with-tk=${TK_LIBDIR} --with-tclincls=${TCL_INCLUDEDIR} \ - --with-tkincls=${TK_INCLUDEDIR} --with-tcllibs=${LOCALBASE}/lib \ - --with-tklibs=${LOCALBASE}/lib +TCL_CONFIGURE_ON= --with-interpreter=tcl +TCL_USES= tk:tea CONFIGURE_WRKSRC= ${WRKSRC}/scripts -USES= gmake +USES= gmake tar:tgz USE_XORG= x11 GNU_CONFIGURE= yes @@ -37,7 +34,6 @@ LDFLAGS+= -L${LOCALBASE}/lib .include .if ${PORT_OPTIONS:MTCL} -USES+= tk PLIST_SUB+= NOTCL="@comment " .else WISH= ${FALSE} Modified: head/cad/magic/Makefile ============================================================================== --- head/cad/magic/Makefile Thu Apr 21 11:18:13 2016 (r413726) +++ head/cad/magic/Makefile Thu Apr 21 11:33:16 2016 (r413727) @@ -16,13 +16,10 @@ LICENSE_FILE= ${FILESDIR}/license.txt LIB_DEPENDS= libBLT25.so:x11-toolkits/blt -USES= gmake tk:build tar:tgz +USES= gmake tk:tea tar:tgz USE_XORG= ice xext xi xmu USE_GL= gl -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-tcl=${TCL_LIBDIR} \ - --with-tk=${TK_LIBDIR} \ - --with-opengl +CONFIGURE_ARGS= --with-opengl CONFIGURE_WRKSRC= ${WRKSRC}/scripts ALL_TARGET= tcllibrary Modified: head/cad/netgen/Makefile ============================================================================== --- head/cad/netgen/Makefile Thu Apr 21 11:18:13 2016 (r413726) +++ head/cad/netgen/Makefile Thu Apr 21 11:33:16 2016 (r413727) @@ -15,14 +15,13 @@ LIB_DEPENDS= libTix8.4.3.so:x11-toolkits OCC_BROKEN= Does not compile because of issues with cad/opencascade USE_LDCONFIG= yes -USES= gmake jpeg libtool tk +USES= gmake jpeg libtool tk:tea USE_GL= yes USE_XORG= xmu xi -GNU_CONFIGURE= yes MAKE_JOBS_UNSAFE= yes LDFLAGS+= -L${LOCALBASE}/lib -CPPFLAGS+= -I${LOCALBASE}/include -I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} -I${LOCALBASE}/lib/Togl-1.7 -CONFIGURE_ARGS+= --with-tcl=${TCL_LIBDIR} --with-tk=${TK_LIBDIR} --enable-jpeglib +CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/lib/Togl-1.7 +CONFIGURE_ARGS= --enable-jpeglib FETCH_BEFORE_ARGS+= -o ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} Modified: head/cad/netgen/files/patch-configure ============================================================================== --- head/cad/netgen/files/patch-configure Thu Apr 21 11:18:13 2016 (r413726) +++ head/cad/netgen/files/patch-configure Thu Apr 21 11:33:16 2016 (r413727) @@ -1,14 +1,167 @@ ---- configure-orig 2014-07-24 20:42:11.000000000 -0500 -+++ configure 2014-07-24 20:43:21.000000000 -0500 -@@ -15361,9 +15361,9 @@ +--- configure.orig 2014-10-06 11:04:36 UTC ++++ configure +@@ -9219,7 +9219,7 @@ $as_echo_n "checking whether the $compil + hardcode_minus_L=no + hardcode_shlibpath_var=unsupported + inherit_rpath=no +- link_all_deplibs=unknown ++ link_all_deplibs=no + module_cmds= + module_expsym_cmds= + old_archive_from_new_cmds= +@@ -9488,7 +9488,7 @@ _LT_EOF + wlarc= + else + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script $wl$lib-ver -o $lib' + fi + ;; + +@@ -9507,7 +9507,7 @@ _LT_EOF + _LT_EOF + elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script $wl$lib-ver -o $lib' + else + ld_shlibs=no + fi +@@ -9536,7 +9536,7 @@ _LT_EOF + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script $wl$lib-ver -o $lib' + else + ld_shlibs=no + fi +@@ -9554,7 +9554,7 @@ _LT_EOF + *) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script $wl$lib-ver -o $lib' + else + ld_shlibs=no + fi +@@ -10142,7 +10142,7 @@ $as_echo "$lt_cv_irix_exported_symbol" > + hardcode_direct_absolute=yes + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' ++ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-version-script,$lib-ver' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + export_dynamic_flag_spec='${wl}-E' + else +@@ -10920,7 +10920,7 @@ freebsd* | dragonfly*) + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' soname_spec='$libname$release$shared_ext$major' + need_version=no + need_lib_prefix=no + ;; +@@ -12015,7 +12015,7 @@ striplib= + old_striplib= + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 + $as_echo_n "checking whether stripping libraries is possible... " >&6; } +-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then ++if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +@@ -12263,7 +12263,7 @@ hardcode_automatic_CXX=no + inherit_rpath_CXX=no + module_cmds_CXX= + module_expsym_cmds_CXX= +-link_all_deplibs_CXX=unknown ++link_all_deplibs_CXX=no + old_archive_cmds_CXX=$old_archive_cmds + reload_flag_CXX=$reload_flag + reload_cmds_CXX=$reload_cmds +@@ -12481,7 +12481,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld + # archiving commands below assume that GNU ld is being used. + if test "$with_gnu_ld" = yes; then + archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script $wl$lib-ver -o $lib' + + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' +@@ -13100,7 +13100,7 @@ fi + case `$CC -V 2>&1` in + *"Version 7."*) + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script $wl$lib-ver -o $lib' + ;; + *) # Version 8.0 or newer + tmp_idyn= +@@ -13108,7 +13108,7 @@ fi + ia64*) tmp_idyn=' -i_dynamic';; + esac + archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script $wl$lib-ver -o $lib' + ;; + esac + archive_cmds_need_lc_CXX=no +@@ -13140,7 +13140,7 @@ fi + ;; + *) # Version 6 and above use weak symbols + archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' +- archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ++ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-version-script ${wl}$lib-ver -o $lib' + ;; + esac + +@@ -13151,7 +13151,7 @@ fi + cxx*) + # Compaq C++ + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' ++ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-version-script $wl$lib-ver' + + runpath_var=LD_RUN_PATH + hardcode_libdir_flag_spec_CXX='-rpath $libdir' +@@ -13185,7 +13185,7 @@ fi + # Sun C++ 5.9 + no_undefined_flag_CXX=' -zdefs' + archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' ++ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-version-script ${wl}$lib-ver' + hardcode_libdir_flag_spec_CXX='-R$libdir' + whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + compiler_needs_object_CXX=yes +@@ -13258,7 +13258,7 @@ fi + archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' ++ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-version-script,$lib-ver -o $lib' + export_dynamic_flag_spec_CXX='${wl}-E' + whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + fi +@@ -14766,7 +14766,7 @@ freebsd* | dragonfly*) + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' soname_spec='$libname$release$shared_ext$major' + need_version=no + need_lib_prefix=no + ;; +@@ -15534,9 +15534,9 @@ fi ffmpegon=false # Check whether --enable-ffmpeg was given. if test "${enable_ffmpeg+set}" = set; then : - enableval=$enable_ffmpeg; FFMPEG_INCLUDES="-DFFMPEG -D__STDC_CONSTANT_MACROS" -+ enableval=$enable_ffmpeg; FFMPEG_INCLUDES="-I%%LOCALBASE%%/include/ffmpeg0 -DFFMPEG -D__STDC_CONSTANT_MACROS" ++ enableval=$enable_ffmpeg; FFMPEG_INCLUDES="-I/usr/local/include/ffmpeg0 -DFFMPEG -D__STDC_CONSTANT_MACROS" - FFMPEG_LIBS="-lavutil -lavformat -lavcodec -lavutil -lswscale -lz -lbz2" -+ FFMPEG_LIBS="-L%%LOCALBASE%%/lib/ffmpeg0 -lavutil0 -lavformat0 -lavcodec0 -lavutil0 -lswscale -lz -lbz2" ++ FFMPEG_LIBS="-L/usr/local/lib/ffmpeg0 -lavutil0 -lavformat0 -lavcodec0 -lavutil0 -lswscale -lz -lbz2" if test "$enableval" = yes; then ffmpegon=true; else ffmpegon=false; fi Added: head/cad/netgen/files/patch-libsrc_csg_Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/netgen/files/patch-libsrc_csg_Makefile.am Thu Apr 21 11:33:16 2016 (r413727) @@ -0,0 +1,11 @@ +--- libsrc/csg/Makefile.am.orig 2014-08-29 09:54:06 UTC ++++ libsrc/csg/Makefile.am +@@ -5,7 +5,7 @@ polyhedra.hpp specpoin.hpp csg.hpp expli + revolution.hpp spline3d.hpp vscsg.hpp + + +-AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(TCL_INCLUDES) ++AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(TCL_INCLUDES) $(TK_INCLUDES) + METASOURCES = AUTO + + lib_LTLIBRARIES = libcsg.la Added: head/cad/netgen/files/patch-libsrc_csg_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/netgen/files/patch-libsrc_csg_Makefile.in Thu Apr 21 11:33:16 2016 (r413727) @@ -0,0 +1,11 @@ +--- libsrc/csg/Makefile.in.orig 2014-10-06 11:04:37 UTC ++++ libsrc/csg/Makefile.in +@@ -285,7 +285,7 @@ meshsurf.hpp solid.hpp triapprox.hpp csg + polyhedra.hpp specpoin.hpp csg.hpp explicitcurve2d.hpp identify.hpp \ + revolution.hpp spline3d.hpp vscsg.hpp + +-AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(TCL_INCLUDES) ++AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(TCL_INCLUDES) $(TK_INCLUDES) + METASOURCES = AUTO + lib_LTLIBRARIES = libcsg.la $(am__append_1) + libcsg_la_SOURCES = algprim.cpp brick.cpp \ Added: head/cad/netgen/files/patch-libsrc_geom2d_Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/netgen/files/patch-libsrc_geom2d_Makefile.am Thu Apr 21 11:33:16 2016 (r413727) @@ -0,0 +1,10 @@ +--- libsrc/geom2d/Makefile.am.orig 2014-08-29 09:54:06 UTC ++++ libsrc/geom2d/Makefile.am +@@ -1,6 +1,6 @@ + noinst_HEADERS = geom2dmesh.hpp geometry2d.hpp vsgeom2d.hpp + +-AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(TCL_INCLUDES) ++AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(TCL_INCLUDES) $(TK_INCLUDES) + + METASOURCES = AUTO + Added: head/cad/netgen/files/patch-libsrc_geom2d_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/netgen/files/patch-libsrc_geom2d_Makefile.in Thu Apr 21 11:33:16 2016 (r413727) @@ -0,0 +1,11 @@ +--- libsrc/geom2d/Makefile.in.orig 2014-10-06 11:04:37 UTC ++++ libsrc/geom2d/Makefile.in +@@ -275,7 +275,7 @@ top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + noinst_HEADERS = geom2dmesh.hpp geometry2d.hpp vsgeom2d.hpp +-AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(TCL_INCLUDES) ++AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(TCL_INCLUDES) $(TK_INCLUDES) + METASOURCES = AUTO + lib_LTLIBRARIES = libgeom2d.la $(am__append_1) + libgeom2d_la_SOURCES = genmesh2d.cpp geom2dmesh.cpp geometry2d.cpp Added: head/cad/netgen/files/patch-libsrc_stlgeom_Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/netgen/files/patch-libsrc_stlgeom_Makefile.am Thu Apr 21 11:33:16 2016 (r413727) @@ -0,0 +1,11 @@ +--- libsrc/stlgeom/Makefile.am.orig 2016-04-21 10:58:05 UTC ++++ libsrc/stlgeom/Makefile.am +@@ -1,7 +1,7 @@ + noinst_HEADERS = meshstlsurface.hpp stlgeom.hpp stlline.hpp \ + stltool.hpp stltopology.hpp vsstl.hpp + +-AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(TCL_INCLUDES) ++AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(TCL_INCLUDES) $(TK_INCLUDES) + METASOURCES = AUTO + + lib_LTLIBRARIES = libstl.la Added: head/cad/netgen/files/patch-libsrc_stlgeom_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/netgen/files/patch-libsrc_stlgeom_Makefile.in Thu Apr 21 11:33:16 2016 (r413727) @@ -0,0 +1,11 @@ +--- libsrc/stlgeom/Makefile.in.orig 2016-04-21 10:58:59 UTC ++++ libsrc/stlgeom/Makefile.in +@@ -278,7 +278,7 @@ top_srcdir = @top_srcdir@ + noinst_HEADERS = meshstlsurface.hpp stlgeom.hpp stlline.hpp \ + stltool.hpp stltopology.hpp vsstl.hpp + +-AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(TCL_INCLUDES) ++AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(TCL_INCLUDES) $(TK_INCLUDES) + METASOURCES = AUTO + lib_LTLIBRARIES = libstl.la $(am__append_1) + libstl_la_SOURCES = meshstlsurface.cpp stlgeom.cpp stlgeomchart.cpp \ Added: head/cad/netgen/files/patch-libsrc_visualization_Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/netgen/files/patch-libsrc_visualization_Makefile.am Thu Apr 21 11:33:16 2016 (r413727) @@ -0,0 +1,11 @@ +--- libsrc/visualization/Makefile.am.orig 2016-04-21 10:59:46 UTC ++++ libsrc/visualization/Makefile.am +@@ -3,7 +3,7 @@ visual.hpp vssolution.hpp + + include_HEADERS = soldata.hpp + +-AM_CPPFLAGS = $(MPI_INCLUDES) -I$(top_srcdir)/libsrc/include -DOPENGL -D$(TOGL_WINDOWINGSYSTEM) $(OCCFLAGS) $(TCL_INCLUDES) ++AM_CPPFLAGS = $(MPI_INCLUDES) -I$(top_srcdir)/libsrc/include -DOPENGL -D$(TOGL_WINDOWINGSYSTEM) $(OCCFLAGS) $(TCL_INCLUDES) $(TK_INCLUDES) + METASOURCES = AUTO + + if NGGUI Added: head/cad/netgen/files/patch-libsrc_visualization_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/netgen/files/patch-libsrc_visualization_Makefile.in Thu Apr 21 11:33:16 2016 (r413727) @@ -0,0 +1,11 @@ +--- libsrc/visualization/Makefile.in.orig 2016-04-21 11:00:04 UTC ++++ libsrc/visualization/Makefile.in +@@ -275,7 +275,7 @@ noinst_HEADERS = meshdoc.hpp mvdraw.hpp + visual.hpp vssolution.hpp + + include_HEADERS = soldata.hpp +-AM_CPPFLAGS = $(MPI_INCLUDES) -I$(top_srcdir)/libsrc/include -DOPENGL -D$(TOGL_WINDOWINGSYSTEM) $(OCCFLAGS) $(TCL_INCLUDES) ++AM_CPPFLAGS = $(MPI_INCLUDES) -I$(top_srcdir)/libsrc/include -DOPENGL -D$(TOGL_WINDOWINGSYSTEM) $(OCCFLAGS) $(TCL_INCLUDES) $(TK_INCLUDES) + METASOURCES = AUTO + @NGGUI_TRUE@noinst_LTLIBRARIES = libvisual.la + libvisual_la_SOURCES = meshdoc.cpp mvdraw.cpp \ Modified: head/cad/netgen/files/patch-ng_Makefile.am ============================================================================== --- head/cad/netgen/files/patch-ng_Makefile.am Thu Apr 21 11:18:13 2016 (r413726) +++ head/cad/netgen/files/patch-ng_Makefile.am Thu Apr 21 11:33:16 2016 (r413727) @@ -1,5 +1,13 @@ --- ng/Makefile.am.orig 2014-08-29 09:54:01 UTC +++ ng/Makefile.am +@@ -1,6 +1,6 @@ + include_HEADERS = + +-AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface -DOPENGL -D$(TOGL_WINDOWINGSYSTEM) $(TCL_INCLUDES) $(MPI_INCLUDES) $(FFMPEG_INCLUDES) $(JPEGLIB_INCLUDES) ++AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface -DOPENGL -D$(TOGL_WINDOWINGSYSTEM) $(TCL_INCLUDES) $(MPI_INCLUDES) $(FFMPEG_INCLUDES) $(JPEGLIB_INCLUDES) $(TK_INCLUDES) + + + if NGGUI @@ -22,7 +22,7 @@ netgen_LDADD = $(top_builddir)/libsrc/vi $(top_builddir)/libsrc/csg/libcsg.la \ $(top_builddir)/libsrc/interface/libinterface.la \ Modified: head/cad/netgen/files/patch-ng_Makefile.in ============================================================================== --- head/cad/netgen/files/patch-ng_Makefile.in Thu Apr 21 11:18:13 2016 (r413726) +++ head/cad/netgen/files/patch-ng_Makefile.in Thu Apr 21 11:33:16 2016 (r413727) @@ -1,5 +1,14 @@ --- ng/Makefile.in.orig 2014-10-06 11:04:37 UTC +++ ng/Makefile.in +@@ -303,7 +303,7 @@ include_HEADERS = + AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include \ + -I$(top_srcdir)/libsrc/interface -DOPENGL \ + -D$(TOGL_WINDOWINGSYSTEM) $(TCL_INCLUDES) $(MPI_INCLUDES) \ +- $(FFMPEG_INCLUDES) $(JPEGLIB_INCLUDES) $(am__append_1) ++ $(FFMPEG_INCLUDES) $(JPEGLIB_INCLUDES) $(TK_INCLUDES) $(am__append_1) + netgen_SOURCES = demoview.cpp ngappinit.cpp onetcl.cpp parallelfunc.cpp ngpkg.cpp demoview.hpp parallelfunc.hpp togl_1_7.h + @NGMKL_TRUE@MKL_LIBS = -L$(MKLROOT)/lib/intel64 -lmkl_intel_lp64 -lmkl_gnu_thread -lmkl_core -lmkl_def + # -lpardiso500-GNU472-X86-64 -lgfortran @@ -312,7 +312,7 @@ netgen_LDADD = $(top_builddir)/libsrc/vi $(top_builddir)/libsrc/csg/libcsg.la \ $(top_builddir)/libsrc/interface/libinterface.la \ Modified: head/cad/xcircuit/Makefile ============================================================================== --- head/cad/xcircuit/Makefile Thu Apr 21 11:18:13 2016 (r413726) +++ head/cad/xcircuit/Makefile Thu Apr 21 11:33:16 2016 (r413727) @@ -17,15 +17,12 @@ LICENSE= GPLv2 OPTIONS_DEFINE= EXAMPLES USE_XORG= xpm xscrnsaver xt -USES= tk ghostscript:x11,run gmake tar:tgz -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-tcl=${TCL_LIBDIR} \ - --with-tk=${TK_LIBDIR} +USES= tk:tea ghostscript:x11,run gmake tar:tgz MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOHEADER="${TRUE}" \ AUTOMAKE="${TRUE}" DESKTOP_ENTRIES="Xcircuit" "${COMMENT}" "${DATADIR}/pixmaps/${PORTNAME}.gif" \ - "${PORTNAME}" "" "false" + "${PORTNAME}" "" false # Restrict to stable (even) versions, indicated by the second component. PORTSCOUT= limitw:1,even Modified: head/lang/expect/Makefile ============================================================================== --- head/lang/expect/Makefile Thu Apr 21 11:18:13 2016 (r413726) +++ head/lang/expect/Makefile Thu Apr 21 11:33:16 2016 (r413727) @@ -14,25 +14,16 @@ LIBEXPECT_VER= ${PORTVERSION:S/.//g} WRKSRC= ${WRKDIR}/${DISTNAME} -USES= tcl autoreconf +USES= tcl:tea autoreconf USE_LDCONFIG= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-shared \ - --exec-prefix=${PREFIX} \ - --datadir=${DATADIR} \ - --with-tclconfig=${TCL_LIBDIR} \ - --with-tclinclude=${TCL_INCLUDEDIR} -CONFIGURE_ENV= ac_cv_sys_long_file_names=yes +CONFIGURE_ARGS= --datadir=${DATADIR} PLIST_SUB+= EXPECT_VER=${PORTVERSION} \ LIBEXPECT_VER=${LIBEXPECT_VER} +TEST_TARGET= test post-install: ${LN} -sf expect${PORTVERSION}/libexpect${LIBEXPECT_VER}.so \ ${STAGEDIR}${PREFIX}/lib/libexpect.so.1 - ${LN} -sf libexpect.so.1 \ - ${STAGEDIR}${PREFIX}/lib/libexpect.so - -do-test: - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} test + ${LN} -sf libexpect.so.1 ${STAGEDIR}${PREFIX}/lib/libexpect.so .include Modified: head/lang/itcl/Makefile ============================================================================== --- head/lang/itcl/Makefile Thu Apr 21 11:18:13 2016 (r413726) +++ head/lang/itcl/Makefile Thu Apr 21 11:33:16 2016 (r413727) @@ -11,19 +11,13 @@ DISTNAME= itcl${PORTVERSION} MAINTAINER= erik@bz.bzflag.bz COMMENT= Object-oriented extension to Tcl [incr Tcl] -USES+= tcl +USES+= tcl:84+,tea USE_LDCONFIG= ${PREFIX}/lib/itcl${PORTVERSION:R} WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION} +TEST_TARGET= test -GNU_CONFIGURE= yes -CFLAGS+= -I${TCL_INCLUDEDIR}/generic -CONFIGURE_ARGS= --with-tcl=${TCL_LIBDIR} \ - --with-tclinclude=${TCL_INCLUDEDIR} \ - --prefix=${PREFIX} \ - --exec-prefix=${PREFIX} -CONFIGURE_ENV+= ac_cv_c_tclh=${TCL_INCLUDEDIR}/unix PLIST_SUB+= PORTVERSION=${PORTVERSION} \ VERSION=${PORTVERSION:R} \ MAJOR=${PORTVERSION:R:R} \ @@ -36,10 +30,6 @@ post-patch: ${REINPLACE_CMD} -E '/^includedir/s|/include|/include/itcl${PORTVERSION:R}|' \ ${WRKSRC}/${CONFIGURE_SCRIPT} -post-build test: - (cd ${WRKSRC} && ${SETENV} ITCL_LIBRARY=${WRKSRC}/library \ - ${TCLSH} tests/all.tcl -load "load ./libitcl.so.1") - post-install: ${LN} -s libitcl.so.1 \ ${STAGEDIR}${PREFIX}/lib/${PORTNAME}${PORTVERSION:R}/libitcl${PORTVERSION:R:S/.//}.so Modified: head/lang/itcl4/Makefile ============================================================================== --- head/lang/itcl4/Makefile Thu Apr 21 11:18:13 2016 (r413726) +++ head/lang/itcl4/Makefile Thu Apr 21 11:33:16 2016 (r413727) @@ -11,14 +11,9 @@ DISTNAME= itcl${PORTVERSION} MAINTAINER= tcltk@FreeBSD.org COMMENT= Object-oriented extension to Tcl [incr Tcl] -USES+= tcl:86 -GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-tcl=${TCL_LIBDIR} \ - --with-tclinclude=${TCL_INCLUDEDIR} \ - --includedir=${PREFIX}/include/itcl${PORTVERSION:R} +USES+= tcl:86,tea +CONFIGURE_ARGS+=--includedir=${PREFIX}/include/itcl${PORTVERSION:R} PLIST_SUB+= PKGVER=${PORTVERSION} - -do-test: - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} test +TEST_TARGET= test .include Modified: head/lang/itcl4/files/patch-Makefile.in ============================================================================== --- head/lang/itcl4/files/patch-Makefile.in Thu Apr 21 11:18:13 2016 (r413726) +++ head/lang/itcl4/files/patch-Makefile.in Thu Apr 21 11:33:16 2016 (r413727) @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2014-08-02 18:11:59.564717000 +0200 -+++ Makefile.in 2014-08-29 16:09:56.000000000 +0200 -@@ -93,7 +93,7 @@ +--- Makefile.in.orig 2013-11-21 20:49:06 UTC ++++ Makefile.in +@@ -93,7 +93,7 @@ INSTALL_DATA_DIR = ${INSTALL} -d -m 755 INSTALL_PROGRAM = ${INSTALL} -m 755 INSTALL_DATA = ${INSTALL} -m 644 INSTALL_SCRIPT = ${INSTALL_PROGRAM} @@ -9,7 +9,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ -@@ -222,11 +222,12 @@ +@@ -222,11 +222,12 @@ install-doc: doc @$(INSTALL_DATA_DIR) $(DESTDIR)$(mandir)/mann @echo "Installing documentation in $(DESTDIR)$(mandir)" @cd $(srcdir)/doc; for i in *.n; do \ Modified: head/lang/itcl4/pkg-descr ============================================================================== --- head/lang/itcl4/pkg-descr Thu Apr 21 11:18:13 2016 (r413726) +++ head/lang/itcl4/pkg-descr Thu Apr 21 11:33:16 2016 (r413727) @@ -2,4 +2,4 @@ C++, and [incr Tcl] provides a similar object model, including multiple inheritence and public and private classes and variables. -http://core.tcl.tk/itcl +WWW: http://core.tcl.tk/itcl Modified: head/lang/nx/Makefile ============================================================================== --- head/lang/nx/Makefile Thu Apr 21 11:18:13 2016 (r413726) +++ head/lang/nx/Makefile Thu Apr 21 11:33:16 2016 (r413727) @@ -16,12 +16,8 @@ OPTIONS_DEFINE= DOCS CONFLICTS= xotcl-1.* -USES+= gmake tcl:85+ +USES+= gmake tcl:85+,tea USE_LDCONFIG= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--exec-prefix=${PREFIX} \ - --with-tcl=${TCL_LIBDIR} \ - --with-tclinclude=${TCL_INCLUDEDIR} TEST_TARGET= test PLIST_SUB+= PKGNAME=${DISTNAME} PORTDOCS= * Modified: head/www/mod_rivet/Makefile ============================================================================== --- head/www/mod_rivet/Makefile Thu Apr 21 11:18:13 2016 (r413726) +++ head/www/mod_rivet/Makefile Thu Apr 21 11:33:16 2016 (r413727) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mod_rivet -PORTVERSION= 2.2.3 +PORTVERSION= 2.3.1 CATEGORIES= www tcl MASTER_SITES= APACHE/tcl/rivet DISTNAME= rivet-${PORTVERSION} @@ -15,18 +15,15 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libitcl.so:lang/itcl -GNU_CONFIGURE= yes USE_APACHE= 22+ USE_LDCONFIG= ${PREFIX}/lib/rivet -USES+= gmake libtool tcl:85+ +USES+= gmake libtool tcl:85+,tea INSTALL_TARGET= install-strip SUB_FILES= pkg-message -CONFIGURE_ARGS+=--with-apache-version=2 \ - --prefix=${PREFIX} --with-apxs=${APXS} \ - --with-tcl=${TCL_LIBDIR} --with-tclsh=${TCLSH} \ +CONFIGURE_ARGS= --with-apxs=${APXS} \ --with-rivet-target-dir=${PREFIX}/lib/rivet post-patch: Modified: head/www/mod_rivet/distinfo ============================================================================== --- head/www/mod_rivet/distinfo Thu Apr 21 11:18:13 2016 (r413726) +++ head/www/mod_rivet/distinfo Thu Apr 21 11:33:16 2016 (r413727) @@ -1,2 +1,2 @@ -SHA256 (rivet-2.2.3.tar.gz) = d5f6cae2a09999e59f3f7eef73d55f50ab29ee4277c92c5e6e50e4b165fc7d16 -SIZE (rivet-2.2.3.tar.gz) = 1171217 +SHA256 (rivet-2.3.1.tar.gz) = d6b4dd70204fb8707cca1e0067e75bad689e7182d989d45f4aa17a870c2cbc40 +SIZE (rivet-2.3.1.tar.gz) = 1203555 Modified: head/www/mod_rivet/pkg-plist ============================================================================== --- head/www/mod_rivet/pkg-plist Thu Apr 21 11:18:13 2016 (r413726) +++ head/www/mod_rivet/pkg-plist Thu Apr 21 11:33:16 2016 (r413727) @@ -2,6 +2,7 @@ lib/rivet/init.tcl lib/rivet/librivetlib.so lib/rivet/librivetparser.so lib/rivet/packages/README +lib/rivet/packages/asciiglyphs/asciiglyphs.tcl lib/rivet/packages/calendar/calendar.tcl lib/rivet/packages/commserver/commserver.tcl lib/rivet/packages/commserver/server.tcl @@ -37,6 +38,7 @@ lib/rivet/packages/tclrivet/tclrivet.tcl lib/rivet/packages/tclrivet/tclrivetparser.tcl lib/rivet/pkgIndex.tcl lib/rivet/rivet-tcl/README +lib/rivet/rivet-tcl/catch.tcl lib/rivet/rivet-tcl/cookie.tcl lib/rivet/rivet-tcl/debug.tcl lib/rivet/rivet-tcl/html.tcl @@ -55,6 +57,7 @@ lib/rivet/rivet-tcl/read_file.tcl lib/rivet/rivet-tcl/redirect.tcl lib/rivet/rivet-tcl/rivet_command_document.tcl lib/rivet/rivet-tcl/tclIndex +lib/rivet/rivet-tcl/try.tcl lib/rivet/rivet-tcl/wrap.tcl lib/rivet/rivet-tcl/xml.tcl %%APACHEMODDIR%%/mod_rivet.so Modified: head/www/tclhttpd/Makefile ============================================================================== --- head/www/tclhttpd/Makefile Thu Apr 21 11:18:13 2016 (r413726) +++ head/www/tclhttpd/Makefile Thu Apr 21 11:33:16 2016 (r413727) @@ -14,12 +14,8 @@ COMMENT= Http-server implemented in TCL RUN_DEPENDS= dtplite:devel/tcllib USE_RC_SUBR= tclhttpd -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-tcl="${TCL_LIBDIR}" \ - --with-tclinclude="${TCL_INCLUDEDIR}" \ - --exec-prefix=${PREFIX} -USES= tcl +USES= tcl:tea .include Modified: head/www/tdom/Makefile ============================================================================== --- head/www/tdom/Makefile Thu Apr 21 11:18:13 2016 (r413726) +++ head/www/tdom/Makefile Thu Apr 21 11:33:16 2016 (r413727) @@ -9,20 +9,17 @@ MASTER_SITES= GHC http://mirrors.rit.edu MAINTAINER= mi@aldan.algebra.com COMMENT= High performance XML data processing with Tcl (ARGS for OpenACS) -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/unix +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} TDOMBASE= ${PREFIX}/lib/tdom${PORTVERSION} OPTIONS_DEFINE= DOCS -USES= gmake tar:tgz tcl +USES= gmake tar:tgz tcl:tea USE_GITHUB= yes GH_PROJECT= tdom -HAS_CONFIGURE= yes -CONFIGURE_SCRIPT= ../configure - pre-configure: - ${RM} -f ${WRKSRC}/../generic/domalloc.? + ${RM} -f ${WRKSRC}/generic/domalloc.? PLIST_SUB+= PORTVERSION=${PORTVERSION} @@ -34,10 +31,7 @@ HTMLDOCS= category-index.html dom.html d post-build test: ${SETENV} LANG=C ${MAKE} -C ${WRKSRC} test -CONFIGURE_ARGS+=--enable-threads --disable-tdomalloc \ - --with-tcl=${TCL_LIBDIR} \ - --with-tclinclude=${TCL_INCLUDEDIR} \ - --prefix=${PREFIX} --exec-prefix=${PREFIX} +CONFIGURE_ARGS+=--enable-threads --disable-tdomalloc post-install: ${CHMOD} 755 ${STAGEDIR}${TDOMBASE} @@ -46,10 +40,10 @@ post-install: post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR}/html .for FILE in ${DOCS} - ${INSTALL_DATA} ${WRKSRC}/../${FILE} ${STAGEDIR}${DOCSDIR}/${FILE} + ${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR}/${FILE} .endfor .for FILE in ${HTMLDOCS} - ${INSTALL_DATA} ${WRKSRC}/../doc/${FILE} ${STAGEDIR}${DOCSDIR}/html/${FILE} + ${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${STAGEDIR}${DOCSDIR}/html/${FILE} .endfor .include Modified: head/www/tdom/files/patch-Makefile.in ============================================================================== --- head/www/tdom/files/patch-Makefile.in Thu Apr 21 11:18:13 2016 (r413726) +++ head/www/tdom/files/patch-Makefile.in Thu Apr 21 11:33:16 2016 (r413727) @@ -1,9 +1,11 @@ ---- ../Makefile.in 2007-03-02 18:43:53.000000000 -0500 -+++ ../Makefile.in 2008-02-14 15:21:19.000000000 -0500 -@@ -110,5 +110,5 @@ +--- Makefile.in.orig 2007-03-02 23:43:53 UTC ++++ Makefile.in +@@ -109,7 +109,7 @@ CFLAGS_WARNING = @CFLAGS_WARNING@ + CLEANFILES = @CLEANFILES@ EXEEXT = @EXEEXT@ LDFLAGS_DEFAULT = @LDFLAGS_DEFAULT@ -MAKE_LIB = @MAKE_LIB@ +MAKE_LIB = @MAKE_LIB@ ${LDFLAGS_DEFAULT} MAKE_SHARED_LIB = @MAKE_SHARED_LIB@ MAKE_STATIC_LIB = @MAKE_STATIC_LIB@ + MAKE_STUB_LIB = @MAKE_STUB_LIB@ Modified: head/www/tdom/files/patch-configure ============================================================================== --- head/www/tdom/files/patch-configure Thu Apr 21 11:18:13 2016 (r413726) +++ head/www/tdom/files/patch-configure Thu Apr 21 11:33:16 2016 (r413727) @@ -1,30 +1,37 @@ ---- ../configure 2007-08-05 14:47:49.000000000 -0400 -+++ ../configure 2008-02-14 14:16:33.000000000 -0500 -@@ -6169,5 +6169,5 @@ +--- configure.orig 2007-08-15 21:40:11 UTC ++++ configure +@@ -6168,14 +6168,14 @@ extern "C" + #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char $ac_func (); +void * $ac_func (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named -@@ -6176,5 +6176,5 @@ + something starting with __ and the normal name is an alias. */ + #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -char (*f) () = $ac_func; +void * (*f) () = $ac_func; #endif #ifdef __cplusplus -@@ -7263,5 +7262,5 @@ + } +@@ -7261,7 +7261,7 @@ fi + CFLAGS_OPTIMIZE=-O if test "$GCC" = "yes" ; then CFLAGS_OPTIMIZE=-O2 - CFLAGS_WARNING="-Wall -Wno-implicit-int" + CFLAGS_WARNING="-Wall -Wno-implicit-int -Wno-uninitialized" else CFLAGS_WARNING="" -@@ -8404,5 +8401,5 @@ + fi +@@ -8402,7 +8402,7 @@ echo "${ECHO_T}$tcl_cv_ld_elf" >&6 + # The -pthread needs to go in the CFLAGS, not LIBS LIBS=`echo $LIBS | sed s/-pthread//` CFLAGS="$CFLAGS -pthread" - LDFLAGS="$LDFLAGS -pthread" + LDFLAGS="$LDFLAGS" fi case $system in + FreeBSD-3.*) Copied and modified: head/www/tdom/files/patch-expat_xmlparse.c (from r413726, head/www/tdom/files/patch-expat-xmlparse.h) ============================================================================== --- head/www/tdom/files/patch-expat-xmlparse.h Thu Apr 21 11:18:13 2016 (r413726, copy source) +++ head/www/tdom/files/patch-expat_xmlparse.c Thu Apr 21 11:33:16 2016 (r413727) @@ -1,16 +1,20 @@ ---- ../expat/xmlparse.c 2007-07-30 20:16:28.000000000 -0400 -+++ ../expat/xmlparse.c 2008-02-14 14:20:27.000000000 -0500 -@@ -1476,5 +1476,5 @@ +--- expat/xmlparse.c.orig 2007-07-31 00:16:28 UTC ++++ expat/xmlparse.c +@@ -1475,7 +1475,7 @@ XML_Parse(XML_Parser parser, const char + else if (bufferPtr == bufferEnd) { const char *end; int nLeftOver; - enum XML_Error result; + enum XML_Error result = XML_STATUS_ERROR; parseEndByteIndex += len; positionPtr = s; -@@ -1500,4 +1500,6 @@ + ps_finalBuffer = (XML_Bool)isFinal; +@@ -1499,6 +1499,8 @@ XML_Parse(XML_Parser parser, const char + ps_parsing = XML_FINISHED; return result; } + case XML_FINISHED: + /* nothing */; } } + Modified: head/www/tdom/files/patch-generic-dom.h ============================================================================== --- head/www/tdom/files/patch-generic-dom.h Thu Apr 21 11:18:13 2016 (r413726) +++ head/www/tdom/files/patch-generic-dom.h Thu Apr 21 11:33:16 2016 (r413727) @@ -1,8 +1,10 @@ ---- ../generic/dom.h 2007-08-08 11:52:38.000000000 -0400 -+++ ../generic/dom.h 2008-02-14 14:27:46.000000000 -0500 -@@ -41,5 +41,4 @@ +--- generic/dom.h.orig 2007-08-18 12:51:46 UTC ++++ generic/dom.h +@@ -40,7 +40,6 @@ + #include #include #include -#include /* + * tDOM provides it's own memory allocator which is optimized for Modified: head/www/tdom/files/patch-generic-tcldom.c ============================================================================== --- head/www/tdom/files/patch-generic-tcldom.c Thu Apr 21 11:18:13 2016 (r413726) +++ head/www/tdom/files/patch-generic-tcldom.c Thu Apr 21 11:33:16 2016 (r413727) @@ -1,6 +1,6 @@ ---- ../generic/tcldom.c.orig 2007-12-26 00:19:02.000000000 +0100 -+++ ../generic/tcldom.c 2013-05-22 09:01:30.000000000 +0200 -@@ -5915,6 +5915,9 @@ +--- generic/tcldom.c.orig 2007-12-25 23:19:02 UTC ++++ generic/tcldom.c +@@ -5915,6 +5915,9 @@ int tcldom_DomObjCmd ( | tcldom_EvalLocked | \---------------------------------------------------------------------------*/ @@ -10,7 +10,7 @@ static int tcldom_EvalLocked ( -@@ -5934,7 +5937,7 @@ +@@ -5934,7 +5937,7 @@ int tcldom_EvalLocked ( if (ret == TCL_ERROR) { char msg[64 + TCL_INTEGER_SPACE]; sprintf(msg, "\n (\"%s %s\" body line %d)", Tcl_GetString(objv[0]), Modified: head/www/tdom/files/patch-generic-tclexpat.c ============================================================================== --- head/www/tdom/files/patch-generic-tclexpat.c Thu Apr 21 11:18:13 2016 (r413726) +++ head/www/tdom/files/patch-generic-tclexpat.c Thu Apr 21 11:33:16 2016 (r413727) @@ -1,9 +1,11 @@ ---- ../generic/tclexpat.c 2007-08-07 13:54:16.000000000 -0400 -+++ ../generic/tclexpat.c 2008-02-14 14:35:48.000000000 -0500 -@@ -43,4 +43,6 @@ +--- generic/tclexpat.c.orig 2008-03-04 20:34:28 UTC ++++ generic/tclexpat.c +@@ -42,6 +42,8 @@ + #ifdef _MSC_VER #include +#else +#include /* read() and close() live there */ #endif + #ifdef _POSIX_SOURCE Modified: head/www/websh/Makefile ============================================================================== --- head/www/websh/Makefile Thu Apr 21 11:18:13 2016 (r413726) +++ head/www/websh/Makefile Thu Apr 21 11:33:16 2016 (r413727) @@ -15,11 +15,8 @@ MAKE_JOBS_UNSAFE= yes TCL_DVER= ${TCL_VER:S/.//} -USES= gmake tcl:84,85,86 -USE_AUTOTOOLS= autoconf +USES= autoreconf gmake tcl:tea WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src/unix -CONFIGURE_ARGS+=--with-tclinclude=${TCL_INCLUDEDIR} \ - --with-tcl=${TCL_LIBDIR} USE_LDCONFIG= yes SUB_FILES= httpd.conf pkgIndex.tcl pkg-message SUB_LIST+= TCL_DVER=${TCL_DVER} WS_VER=${PORTVERSION}