From owner-svn-ports-head@freebsd.org Tue Mar 19 10:44:43 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C240B154C58F; Tue, 19 Mar 2019 10:44:42 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 678DC778E0; Tue, 19 Mar 2019 10:44:42 +0000 (UTC) (envelope-from hrs@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3C2D6822A; Tue, 19 Mar 2019 10:44:42 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2JAigMd042187; Tue, 19 Mar 2019 10:44:42 GMT (envelope-from hrs@FreeBSD.org) Received: (from hrs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2JAid8o042175; Tue, 19 Mar 2019 10:44:39 GMT (envelope-from hrs@FreeBSD.org) Message-Id: <201903191044.x2JAid8o042175@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hrs set sender to hrs@FreeBSD.org using -f From: Hiroki Sato Date: Tue, 19 Mar 2019 10:44:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r496255 - in head: . cad cad/klayout cad/klayout/files X-SVN-Group: ports-head X-SVN-Commit-Author: hrs X-SVN-Commit-Paths: in head: . cad cad/klayout cad/klayout/files X-SVN-Commit-Revision: 496255 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 678DC778E0 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.93 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.93)[-0.933,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Mar 2019 10:44:43 -0000 Author: hrs Date: Tue Mar 19 10:44:39 2019 New Revision: 496255 URL: https://svnweb.freebsd.org/changeset/ports/496255 Log: Resurrect cad/klayout and update to 0.25.8. Added: head/cad/klayout/ - copied from r495966, head/cad/klayout/ head/cad/klayout/files/patch-src-klayout.pri (contents, props changed) head/cad/klayout/files/patch-src-lay-lay-laySignalHandler.cc (contents, props changed) head/cad/klayout/files/patch-src-laybasic-laybasic-layBrowserDialog.h (contents, props changed) head/cad/klayout/files/patch-src-laybasic-laybasic-laybasic.pro (contents, props changed) head/cad/klayout/files/patch-src-tl-tl-tlStream.cc (contents, props changed) head/cad/klayout/pkg-plist (contents, props changed) Deleted: head/cad/klayout/files/patch-config-Makefile.conf head/cad/klayout/files/patch-src-layApplication.cc head/cad/klayout/files/patch-src-tlStream.cc Modified: head/MOVED head/cad/Makefile head/cad/klayout/Makefile head/cad/klayout/distinfo head/cad/klayout/files/patch-build.sh Modified: head/MOVED ============================================================================== --- head/MOVED Tue Mar 19 09:04:16 2019 (r496254) +++ head/MOVED Tue Mar 19 10:44:39 2019 (r496255) @@ -11709,7 +11709,6 @@ audio/qmpdclient||2019-03-16|Has expired: Qt4 has been audio/skype-call-recorder||2019-03-16|Has expired: Qt4 has been EOL since december 2015 audio/virtual_oss_ctl||2019-03-16|Has expired: Qt4 has been EOL since december 2015 biology/clustalx||2019-03-16|Has expired: Qt4 has been EOL since december 2015 -cad/klayout||2019-03-16|Has expired: Qt4 has been EOL since december 2015 cad/layouteditor||2019-03-16|Has expired: Qt4 has been EOL since december 2015 cad/leocad||2019-03-16|Has expired: Qt4 has been EOL since december 2015 cad/meshlab||2019-03-16|Has expired: Qt4 has been EOL since december 2015 Modified: head/cad/Makefile ============================================================================== --- head/cad/Makefile Tue Mar 19 09:04:16 2019 (r496254) +++ head/cad/Makefile Tue Mar 19 10:44:39 2019 (r496255) @@ -54,6 +54,7 @@ SUBDIR += kicad-library-symbols-devel SUBDIR += kicad-library-templates SUBDIR += kicad-library-templates-devel + SUBDIR += klayout SUBDIR += ldraw SUBDIR += lepton-eda SUBDIR += libopencad Modified: head/cad/klayout/Makefile ============================================================================== --- head/cad/klayout/Makefile Sat Mar 16 21:52:35 2019 (r495966) +++ head/cad/klayout/Makefile Tue Mar 19 10:44:39 2019 (r496255) @@ -1,55 +1,52 @@ # $FreeBSD$ PORTNAME= klayout -PORTVERSION= 0.24.9 -PORTREVISION= 4 +PORTVERSION= 0.25.8 +DISTVERSIONPREFIX= v CATEGORIES= cad -MASTER_SITES= http://www.klayout.org/downloads/source/ MAINTAINER= hrs@FreeBSD.org COMMENT= Qt-based GDS2 Viewer LICENSE= GPLv2 -DEPRECATED= Qt4 has been EOL since december 2015 -EXPIRATION_DATE= 2019-03-15 - -USES= compiler:c++0x gmake python qt:4 +USES= compiler:c++0x gmake gl python qt:5 +USE_GITHUB= yes +GH_ACCOUNT= KLayout +USE_GL= gl USE_RUBY= yes -USE_QT= corelib designer gui network moc_build sql uic_build \ - rcc_build qt3support xml +USE_QT= core buildtools designer gui multimedia network printsupport \ + qmake sql svg testlib widgets xml xmlpatterns USE_LDCONFIG= yes -PLIST_FILES= bin/klayout \ - bin/strm2cif \ - bin/strm2dxf \ - bin/strm2gds \ - bin/strm2oas \ - bin/strm2txt \ - bin/strmclip \ - bin/strmcmp \ - bin/strmxor \ - lib/libklayout.so -PLATFORMKEYWORD=freebsd-32-gcc-release +CXXFLAGS+= -fPIC -I${LOCALBASE}/include/qt5 +LDFLAGS+= ${LIBS} -L${LOCALBASE}/lib/qt5 -lpthread +QT5MODULES= Core Designer Gui Multimedia MultimediaWidgets \ + Network PrintSupport Sql Svg Test Widgets Xml XmlPatterns +.for M in ${QT5MODULES} +CXXFLAGS+= -I${LOCALBASE}/include/qt5/Qt${M} +LIBS+= -lQt5${M} +.endfor +MAKE_ENV= INSTALL_ROOT=${STAGEDIR} +BUILD_WRKSRC= ${WRKSRC}/build-release +INSTALL_WRKSRC= ${WRKSRC}/build-release + BROKEN_sparc64= Does not compile on sparc64: gcc bug -do-build: +do-configure: cd ${WRKSRC} && \ - ${SETENV} CC=${CC} CXX=${CXX} CFLAGS="${CFLAGS}" \ - CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \ - _MAKE_JOBS="${_MAKE_JOBS}" LOCALBASE="${LOCALBASE}" \ - ${SH} build.sh -platform ${PLATFORMKEYWORD} \ - -qtbin ${QT_BINDIR} \ - -qtinc ${QT_INCDIR} \ - -qtlib ${QT_LIBDIR} \ - -python ${PYTHON_CMD} + ${SETENV} ${MAKE_ENV} ${SH} build.sh \ + -with-qtbinding \ + -qt5 \ + -rpath ${LOCALBASE}/lib \ + -prefix ${PREFIX} \ + -python ${PYTHON_CMD} \ + -ruby ${RUBY} \ + -dry-run -do-install: - cd ${WRKSRC}/bin.${PLATFORMKEYWORD} && \ - ${INSTALL_PROGRAM} ${PLIST_FILES:Mbin/*:S,^bin/,,} \ - ${STAGEDIR}${PREFIX}/bin - cd ${WRKSRC}/build.${PLATFORMKEYWORD}/main && \ - ${INSTALL_LIB} ${PLIST_FILES:Mlib/*:S,^lib/,,} \ - ${STAGEDIR}${PREFIX}/lib +post-install: + cd ${STAGEDIR}${PREFIX} && \ + ${MV} libklayout* ${STAGEDIR}${PREFIX}/lib && \ + ${MV} klayout strm* ${STAGEDIR}${PREFIX}/bin .include Modified: head/cad/klayout/distinfo ============================================================================== --- head/cad/klayout/distinfo Sat Mar 16 21:52:35 2019 (r495966) +++ head/cad/klayout/distinfo Tue Mar 19 10:44:39 2019 (r496255) @@ -1,3 +1,3 @@ -TIMESTAMP = 1483243344 -SHA256 (klayout-0.24.9.tar.gz) = 475420a7858aa9d9a0f7312c0da827f1f350340a30abcaf1589a41d35946dccd -SIZE (klayout-0.24.9.tar.gz) = 11262298 +TIMESTAMP = 1552658839 +SHA256 (KLayout-klayout-v0.25.8_GH0.tar.gz) = 63372bda3ed825552e01f505a3c979431f0485300183c38ebceb864451c24cbe +SIZE (KLayout-klayout-v0.25.8_GH0.tar.gz) = 21009736 Modified: head/cad/klayout/files/patch-build.sh ============================================================================== --- head/cad/klayout/files/patch-build.sh Sat Mar 16 21:52:35 2019 (r495966) +++ head/cad/klayout/files/patch-build.sh Tue Mar 19 10:44:39 2019 (r496255) @@ -1,71 +1,126 @@ ---- build.sh.orig 2016-06-19 16:35:28 UTC +--- build.sh.orig 2019-02-23 17:34:47 UTC +++ build.sh -@@ -3,7 +3,7 @@ - EXEC_NAME=klayout - IS_MAC="no" - EXEC_HOLDER="" --OTHER_BIN="" -+OTHER_BIN="strm2gds strm2oas strm2txt strm2cif strm2dxf strmcmp strmclip strmxor" +@@ -482,7 +482,7 @@ echo " Build directory: $BUILD" + mkdir -p $BUILD - CURR_DIR=`pwd` - PLATFORM="linux-32-gcc-release" -@@ -39,6 +39,9 @@ Darwin*) - PLATFORM="mac-yosemite-gcc-release" - EXEC_HOLDER="klayout.app/Contents/MacOS" - ;; -+FreeBSD) -+ PLATFORM="freebsd-32-gcc-release" -+ ;; - *) - # Assume Linux for the remaining variants - case `arch` in -@@ -374,7 +377,7 @@ if [ $HAVE_64BIT_COORD != 0 ]; then - echo " 64 bit coordinates enabled" + # source the version script +-. $(dirname $(which $0))/version.sh ++. version.sh + + # qmake needs absolute paths, so we get them now: + # OSX does not have `readlink -f` command. Use equivalent Perl script. +@@ -495,11 +495,7 @@ else fi --gcc_path=`type gcc 2>/dev/null` -+gcc_path=`type $CC 2>/dev/null` - if [ "$gcc_path" = "" ]; then - echo "*** ERROR: unable to locate gcc in path" - exit 1 -@@ -463,11 +466,7 @@ else - cd $CURR_DIR + if [ "$IS_MAC" = "no" ]; then +- if ( gmake -v >/dev/null 2>/dev/null ); then + MAKE_PRG=gmake +- else +- MAKE_PRG=make +- fi + else + MAKE_PRG=make fi +@@ -521,9 +517,9 @@ cd $BUILD --if ( gmake -v >/dev/null 2>/dev/null ); then -- MAKE_PRG=gmake --else -- MAKE_PRG=make --fi -+MAKE_PRG="gmake ${_MAKE_JOBS}" + # chose the right qmake + if [ $HAVE_QT5 = 0 ]; then +- export QT_SELECT=4 ++ export QT_SELECT=qt4 + else +- export QT_SELECT=5 ++ export QT_SELECT=qt5 + fi - mkdir -p $BUILD - echo "WIN_CYGWIN=$WIN_CYGWIN" >$BUILD/Makefile -@@ -515,6 +514,9 @@ echo "PYTHONINCLUDE=$PYTHONINCLUDE" >>$B - echo "HAVE_PYTHON=$HAVE_PYTHON" >>$BUILD/Makefile.env - echo "HAVE_QTBINDINGS=$HAVE_QTBINDINGS" >>$BUILD/Makefile.env - echo "HAVE_64BIT_COORD=$HAVE_64BIT_COORD" >>$BUILD/Makefile.env -+echo "CFLAGS=$CFLAGS" >>$BUILD/Makefile.env -+echo "CXXFLAGS=$CXXFLAGS" >>$BUILD/Makefile.env -+echo "LDLAGS=$LDFLAGS" >>$BUILD/Makefile.env + $QMAKE -v +@@ -531,54 +527,55 @@ $QMAKE -v + # Force a minimum rebuild because of version info + touch $CURR_DIR/src/version/version.h - echo "Building plugins: $PLUGINS" - echo "" -@@ -549,12 +551,12 @@ if [ $WIN_CYGWIN = 0 ]; then - fi - echo "" - echo "Final binary is ready in $EXEC_FULL_PATH." -- echo "To run it, you may need to add the following to your LD_LIBRARY_PATH:" -- echo "$QTLIB" -+# echo "To run it, you may need to add the following to your LD_LIBRARY_PATH:" -+# echo "$QTLIB" +-qmake_options=( ++## XXX ++## CONFIG=\"$CONFIG\" ++qmake_options=" + -recursive +- CONFIG+="$CONFIG" +- RUBYLIBFILE="$RUBYLIBFILE" +- RUBYINCLUDE="$RUBYINCLUDE" +- RUBYINCLUDE2="$RUBYINCLUDE2" +- RUBYVERSIONCODE="$RUBYVERSIONCODE" +- HAVE_RUBY="$HAVE_RUBY" +- PYTHONLIBFILE="$PYTHONLIBFILE" +- PYTHONINCLUDE="$PYTHONINCLUDE" +- HAVE_PYTHON="$HAVE_PYTHON" +- HAVE_QTBINDINGS="$HAVE_QTBINDINGS" +- HAVE_64BIT_COORD="$HAVE_64BIT_COORD" +- HAVE_QT5="$HAVE_QT5" +- HAVE_CURL="$HAVE_CURL" +- PREFIX="$BIN" +- RPATH="$RPATH" +- KLAYOUT_VERSION="$KLAYOUT_VERSION" +- KLAYOUT_VERSION_DATE="$KLAYOUT_VERSION_DATE" +- KLAYOUT_VERSION_REV="$KLAYOUT_VERSION_REV" +-) ++ RUBYLIBFILE=\"$RUBYLIBFILE\" ++ RUBYINCLUDE=\"$RUBYINCLUDE\" ++ RUBYINCLUDE2=\"$RUBYINCLUDE2\" ++ RUBYVERSIONCODE=\"$RUBYVERSIONCODE\" ++ HAVE_RUBY=\"$HAVE_RUBY\" ++ PYTHONLIBFILE=\"$PYTHONLIBFILE\" ++ PYTHONINCLUDE=\"$PYTHONINCLUDE\" ++ HAVE_PYTHON=\"$HAVE_PYTHON\" ++ HAVE_QTBINDINGS=\"$HAVE_QTBINDINGS\" ++ HAVE_64BIT_COORD=\"$HAVE_64BIT_COORD\" ++ HAVE_QT5=\"$HAVE_QT5\" ++ HAVE_CURL=\"$HAVE_CURL\" ++ PREFIX=\"$BIN\" ++ RPATH=\"$RPATH\" ++ KLAYOUT_VERSION=\"$KLAYOUT_VERSION\" ++ KLAYOUT_VERSION_DATE=\"$KLAYOUT_VERSION_DATE\" ++ KLAYOUT_VERSION_REV=\"$KLAYOUT_VERSION_REV\" ++" -- LD_LIBRARY_PATH=$QTLIB:$LD_LIBRARY_PATH -- $EXEC_FULL_PATH -v -- $EXEC_FULL_PATH -h -+# LD_LIBRARY_PATH=$QTLIB:$LD_LIBRARY_PATH -+# $EXEC_FULL_PATH -v -+# $EXEC_FULL_PATH -h + if [ $BUILD_EXPERT = 1 ]; then +- qmake_options+=( +- QMAKE_AR="$AR cqs" +- QMAKE_LINK_C="$CC" +- QMAKE_LINK_C_SHLIB="$CC" +- QMAKE_LINK="$CXX" +- QMAKE_LINK_SHLIB="$CXX" +- QMAKE_OBJCOPY="$OBJCOPY" ++ qmake_options="$qmake_options ++ QMAKE_AR=\"$AR cqs\" ++ QMAKE_LINK_C=\"$CC\" ++ QMAKE_LINK_C_SHLIB=\"$CC\" ++ QMAKE_LINK=\"$CXX\" ++ QMAKE_LINK_SHLIB=\"$CXX\" ++ QMAKE_OBJCOPY=\"$OBJCOPY\" + QMAKE_RANLIB= + QMAKE_STRIP= +- QMAKE_CC="$CC" +- QMAKE_CXX="$CXX" +- QMAKE_CFLAGS="$CFLAGS" ++ QMAKE_CC=\"$CC\" ++ QMAKE_CXX=\"$CXX\" ++ QMAKE_CFLAGS=\"$CFLAGS\" + QMAKE_CFLAGS_RELEASE= + QMAKE_CFLAGS_DEBUG= +- QMAKE_CXXFLAGS="$CXXFLAGS" ++ QMAKE_CXXFLAGS=\"$CXXFLAGS\" + QMAKE_CXXFLAGS_RELEASE= + QMAKE_CXXFLAGS_DEBUG= +- QMAKE_LFLAGS="$LDFLAGS" ++ QMAKE_LFLAGS=\"$LDFLAGS\" + QMAKE_LFLAGS_RELEASE= + QMAKE_LFLAGS_DEBUG= +- ) ++ " fi - exit 0 +-echo $QMAKE "$CURR_DIR/src/klayout.pro" "${qmake_options[@]}" +-$QMAKE "$CURR_DIR/src/klayout.pro" "${qmake_options[@]}" ++echo $QMAKE "$CURR_DIR/src/klayout.pro" ${qmake_options} QMAKE_CFLAGS="$CFLAGS" ++$QMAKE "$CURR_DIR/src/klayout.pro" ${qmake_options} QMAKE_CXXFLAGS="$CXXFLAGS" QMAKE_CFLAGS="$CFLAGS" QMAKE_LFLAGS="$LDFLAGS" + + cd $CURR_DIR + echo "" Added: head/cad/klayout/files/patch-src-klayout.pri ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/klayout/files/patch-src-klayout.pri Tue Mar 19 10:44:39 2019 (r496255) @@ -0,0 +1,21 @@ +--- src/klayout.pri.orig 2019-02-23 17:34:47 UTC ++++ src/klayout.pri +@@ -68,7 +68,8 @@ QMAKE_CXXFLAGS_WARN_ON += \ + -Wno-deprecated-declarations \ + -Wno-reserved-user-defined-literal \ + +-QT += network xml sql ++QT += network xml sql widgets ++INCLUDEPATH += . + + equals(HAVE_QT5, "1") { + QT += designer printsupport +@@ -84,7 +85,7 @@ equals(HAVE_QT5, "1") { + win32 { + QMAKE_LFLAGS += -Wl,--exclude-all-symbols + } else { +- QMAKE_CXXFLAGS += -fvisibility=hidden ++# QMAKE_CXXFLAGS += -fvisibility=hidden + } + + VERSION_STRING = $$KLAYOUT_VERSION Added: head/cad/klayout/files/patch-src-lay-lay-laySignalHandler.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/klayout/files/patch-src-lay-lay-laySignalHandler.cc Tue Mar 19 10:44:39 2019 (r496255) @@ -0,0 +1,11 @@ +--- src/lay/lay/laySignalHandler.cc.orig 2019-02-23 17:34:47 UTC ++++ src/lay/lay/laySignalHandler.cc +@@ -450,7 +450,7 @@ void install_signal_handlers () + act.sa_sigaction = signal_handler; + sigemptyset (&act.sa_mask); + act.sa_flags = SA_SIGINFO; +-#if !defined(__APPLE__) ++#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__DrafonFly__) + act.sa_restorer = 0; + #endif + Added: head/cad/klayout/files/patch-src-laybasic-laybasic-layBrowserDialog.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/klayout/files/patch-src-laybasic-laybasic-layBrowserDialog.h Tue Mar 19 10:44:39 2019 (r496255) @@ -0,0 +1,10 @@ +--- src/laybasic/laybasic/layBrowserDialog.h.orig 2019-02-23 17:34:47 UTC ++++ src/laybasic/laybasic/layBrowserDialog.h +@@ -26,6 +26,7 @@ + + #include "tlTypeTraits.h" + ++#include "laybasicCommon.h" + #include "ui_BrowserDialog.h" + + #include "gsi.h" Added: head/cad/klayout/files/patch-src-laybasic-laybasic-laybasic.pro ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/klayout/files/patch-src-laybasic-laybasic-laybasic.pro Tue Mar 19 10:44:39 2019 (r496255) @@ -0,0 +1,20 @@ +--- src/laybasic/laybasic/laybasic.pro.orig 2019-02-23 17:34:47 UTC ++++ src/laybasic/laybasic/laybasic.pro +@@ -6,6 +6,8 @@ include($$PWD/../../lib.pri) + + DEFINES += MAKE_LAYBASIC_LIBRARY + ++QT += widgets gui ++ + FORMS = \ + AlignCellOptionsDialog.ui \ + BookmarkManagementForm.ui \ +@@ -273,7 +275,7 @@ HEADERS = \ + laybasicConfig.h \ + layBackgroundAwareTreeStyle.h + +-INCLUDEPATH += $$TL_INC $$GSI_INC $$DB_INC $$RDB_INC ++INCLUDEPATH += . $$TL_INC $$GSI_INC $$DB_INC $$RDB_INC + DEPENDPATH += $$TL_INC $$GSI_INC $$DB_INC $$RDB_INC + LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_db -lklayout_rdb + Added: head/cad/klayout/files/patch-src-tl-tl-tlStream.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/klayout/files/patch-src-tl-tl-tlStream.cc Tue Mar 19 10:44:39 2019 (r496255) @@ -0,0 +1,20 @@ +--- src/tl/tl/tlStream.cc.orig 2019-02-23 17:34:47 UTC ++++ src/tl/tl/tlStream.cc +@@ -30,6 +30,8 @@ + #include + #ifdef _WIN32 + # include ++#else ++# include + #endif + + #include "tlStream.h" +@@ -1089,7 +1091,7 @@ OutputFile::~OutputFile () + #if defined(_WIN32) + _close (m_fd); + #else +- close (m_fd); ++ ::close (m_fd); + #endif + m_fd = -1; + } Added: head/cad/klayout/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/klayout/pkg-plist Tue Mar 19 10:44:39 2019 (r496255) @@ -0,0 +1,79 @@ +bin/klayout +bin/strm2cif +bin/strm2dxf +bin/strm2gds +bin/strm2gdstxt +bin/strm2oas +bin/strm2txt +bin/strmclip +bin/strmcmp +bin/strmrun +bin/strmxor +lib/libklayout_ant.so +lib/libklayout_ant.so.0 +lib/libklayout_ant.so.0.25 +lib/libklayout_ant.so.0.25.8 +lib/libklayout_bd.so +lib/libklayout_bd.so.0 +lib/libklayout_bd.so.0.25 +lib/libklayout_bd.so.0.25.8 +lib/libklayout_db.so +lib/libklayout_db.so.0 +lib/libklayout_db.so.0.25 +lib/libklayout_db.so.0.25.8 +lib/libklayout_drc.so +lib/libklayout_drc.so.0 +lib/libklayout_drc.so.0.25 +lib/libklayout_drc.so.0.25.8 +lib/libklayout_edt.so +lib/libklayout_edt.so.0 +lib/libklayout_edt.so.0.25 +lib/libklayout_edt.so.0.25.8 +lib/libklayout_ext.so +lib/libklayout_ext.so.0 +lib/libklayout_ext.so.0.25 +lib/libklayout_ext.so.0.25.8 +lib/libklayout_gsi.so +lib/libklayout_gsi.so.0 +lib/libklayout_gsi.so.0.25 +lib/libklayout_gsi.so.0.25.8 +lib/libklayout_gsiqt.so +lib/libklayout_gsiqt.so.0 +lib/libklayout_gsiqt.so.0.25 +lib/libklayout_gsiqt.so.0.25.8 +lib/libklayout_img.so +lib/libklayout_img.so.0 +lib/libklayout_img.so.0.25 +lib/libklayout_img.so.0.25.8 +lib/libklayout_lay.so +lib/libklayout_lay.so.0 +lib/libklayout_lay.so.0.25 +lib/libklayout_lay.so.0.25.8 +lib/libklayout_laybasic.so +lib/libklayout_laybasic.so.0 +lib/libklayout_laybasic.so.0.25 +lib/libklayout_laybasic.so.0.25.8 +lib/libklayout_lib.so +lib/libklayout_lib.so.0 +lib/libklayout_lib.so.0.25 +lib/libklayout_lib.so.0.25.8 +lib/libklayout_lym.so +lib/libklayout_lym.so.0 +lib/libklayout_lym.so.0.25 +lib/libklayout_lym.so.0.25.8 +lib/libklayout_pya.so +lib/libklayout_pya.so.0 +lib/libklayout_pya.so.0.25 +lib/libklayout_pya.so.0.25.8 +lib/libklayout_rba.so +lib/libklayout_rba.so.0 +lib/libklayout_rba.so.0.25 +lib/libklayout_rba.so.0.25.8 +lib/libklayout_rdb.so +lib/libklayout_rdb.so.0 +lib/libklayout_rdb.so.0.25 +lib/libklayout_rdb.so.0.25.8 +lib/libklayout_tl.so +lib/libklayout_tl.so.0 +lib/libklayout_tl.so.0.25 +lib/libklayout_tl.so.0.25.8