Update to 0.25.3

* Use Qt 5 instead of Qt 4

Changelog:
0.25.3          (2018-05-03):

* Enhancement: Compile option to use libcurl instead of QtNetwork
       This workaround enables builds on the native CentOS6
       configuration with the package manager functional.
* Enhancement: Pass label (text) layers through DRC script
       The "labels" method now allows copying labels from a layer
       to the output.
* Enhancement: New "split" method for polygons
       This method will fragment the polygons into two or more
       smaller parts for reducing their vertex count.
* Enhancement: New "dtrans" method for RecursiveShapeIterator
       This method delivers the transformation in micron unit space
* Enhancement: New "insert" methods for Shapes
       Shapes can now insert from another Shapes container and
       from a RecursiveShapeIterator. Possible applications are
       fast flattening and fast region selection.
* Enhancement: New method to generate RDB items from shapes
       RdbItem#add_value from a shape, RdbDatabase#create_items
       from a shapes container or recursive shape iterator and
       RdbDatabase#create_item from a shape.
* Enhancement: DXF and CIF "keep layer names"
       If this option is set in the reader options, layer names
       are not translated into GDS layer/datatype pairs.
       Specifically a layer called "L5" for example is not
       translated to 5/0 and to "L5D0" on output correspondingly.
       The buddy script option is "--keep-layer-names".
* Enhancement: DXF contour joining accuracy
       On the DXF reader's options, a contour joining accuracy
       can be specified. Small gaps smaller than this accuracy
       will be closed when forming joined contours from edges.
       The buddy script option is --dxf-contour-accuracy=value.
* Bugfix: DXF display issue
       In some cases, DXF cell instances did not trigger bounding
       box update and the cells only got visible after save and
       load.
* Bugfix: XOR progress is more realistic
       The progress is updated after the layer has been computed,
       not before.
* Bugfix: https://github.com/klayoutmatthias/klayout/issues/117
       DTrans#itype was broken.
* Bugfix: https://github.com/klayoutmatthias/klayout/issues/116
       Fixed a polygon decomposition bug when writing GDS files
       with big polygons with many holes. As a side effect, the
       polygons with many holes computed by a NOT operation for
       example are less complex and spikes in the cutlines are
       avoided.
* Bugfix: https://github.com/klayoutmatthias/klayout/issues/115
       Reader options were not persisted.
* Bugfix: https://github.com/klayoutmatthias/klayout/issues/114
       Custom line styles not loaded from tech's layer properties
       file.
* Enhancement: https://github.com/klayoutmatthias/klayout/issues/113
       The XOR tool has an option now to heal result shapes which
       cross tile boundaries. The result shape count of tiled
       and non-tiled mode should basically be the same then.
* Bugfix: https://github.com/klayoutmatthias/klayout/issues/112
       Salt package repository relative paths have not been working.
* Bugfix: https://github.com/klayoutmatthias/klayout/issues/109
       Issues with Python 3 and shape properties - property
* Bugfix: https://github.com/klayoutmatthias/klayout/issues/108
       Bugfix on Box#enlarge and Box#moved for empty boxes.
       keys generated with Python 3 could not be written to GDS2.
* Bugfix: https://github.com/klayoutmatthias/klayout/issues/107
       Undo not working with shapes.
* Enhancement: https://github.com/klayoutmatthias/klayout/issues/106
       Search & replace help page enhancements.

0.25.2          (2018-03-20):
* Bugfix: https://github.com/klayoutmatthias/klayout/issues/90
      DRC: "extended" was not working as expected with "joined = true"
* Bugfix: https://github.com/klayoutmatthias/klayout/issues/89
      Display issue on MacOS fixed
* Enhancement: https://github.com/klayoutmatthias/klayout/issues/85
      IDE debugger: files can be excluded from showing exceptions when
      they are thrown. To exclude a file press the new "Ignore" button
      when the debugger tells you an exception has been generated.
      To re-able exception reporting, clear the list of the files
      in the IDE settings ("Debugging" tab)
      The macro IDE settings can now be edited in the File/Setup
      dialog.
* Bugfix: https://github.com/klayoutmatthias/klayout/issues/94
      Retina displays are support to some extend on MacOS.
      An open topic is the quality of the icons.
* Enhancement: build system for MacOS

0.25.1          (2018-02-23):
* Enhancements: build compatibility with MacOS and Qt 5.9.
      Qt 4.6 supported now as well with one restriction:
      the package installation feature is not working.
* Bugfixs: Package manager
       - Remove button wasn't enabled if multiple packages were selected
       - A potential crash ob removing packages was fixed
* Enhancement: 64 bit coordinate support enabled on Windows builds
* Further bugfixes: See links
       - https://github.com/klayoutmatthias/klayout/issues/21 (Autorun(-early) doesn't seem to run when lym files are inside a package)
       - https://github.com/klayoutmatthias/klayout/issues/24 (Text insert dialog bug - Ok button isn't working)
       - https://github.com/klayoutmatthias/klayout/issues/26 (Exceptions are reported every time they propagate up in the call chain in the ruby debugger)
       - https://github.com/klayoutmatthias/klayout/issues/28 (CIF format detection failed)
       - https://github.com/klayoutmatthias/klayout/issues/30 (Writer options dialog non-functional on a fresh configuration)
       - https://github.com/klayoutmatthias/klayout/issues/32 (Rounding issue with instance properties)
       - https://github.com/klayoutmatthias/klayout/issues/33 (Plugin factory not working when using with Python)
       - https://github.com/klayoutmatthias/klayout/issues/36 (Hardening against destruction of object inside event handler)
       - https://github.com/klayoutmatthias/klayout/issues/39 (Action cannot be reassigned)
       - https://github.com/klayoutmatthias/klayout/issues/40 (Crash in Python binding)
       - https://github.com/klayoutmatthias/klayout/issues/41 (Polygon#touches? issue)
       - https://github.com/klayoutmatthias/klayout/issues/42 (Headless mode support with Qt5/-zz)
       - https://github.com/klayoutmatthias/klayout/issues/43 (Crash when using Qt specific command line options)
       - https://github.com/klayoutmatthias/klayout/issues/44 (Transformation constructor with x,y not working)
       - https://github.com/klayoutmatthias/klayout/issues/45 (Partial selection does not capture instance)
       - https://github.com/klayoutmatthias/klayout/issues/48 (Cancel does not reset current tool)
       - https://github.com/klayoutmatthias/klayout/issues/51 (Segmentation fault on return to main window and other opportunities)
       - https://github.com/klayoutmatthias/klayout/issues/53 (Unreadable 'about' text)
       - https://github.com/klayoutmatthias/klayout/issues/62 (QXmlSimpleReader#parse cannot be called)
       - https://github.com/klayoutmatthias/klayout/issues/63 (Wrong output on DRC non_interacting with empty second input)
       - https://github.com/klayoutmatthias/klayout/issues/64 (Crash on exit)
       - https://github.com/klayoutmatthias/klayout/issues/68 (OASIS reader issue with degenerated shapes)
       - https://github.com/klayoutmatthias/klayout/issues/69 (DRC: 'inside' does not merge shapes of second input)
       - https://github.com/klayoutmatthias/klayout/issues/71 (Target cell argument is required)
       - https://github.com/klayoutmatthias/klayout/issues/72 (Edges/Region NOT issue)
       - https://github.com/klayoutmatthias/klayout/issues/73 (Allow 'change layers' on PCells which support a single layer parameter)
       - https://github.com/klayoutmatthias/klayout/issues/74 (Small-corner boolean issue)
       - https://github.com/klayoutmatthias/klayout/issues/75 (Python PCell issue when parameters are called 'layer')
       - https://github.com/klayoutmatthias/klayout/issues/79 (Replace function enabled also for read-only macros)
* Further enhancements: see links
       - https://github.com/klayoutmatthias/klayout/issues/29 (Permissive mode for OASIS writer on odd-width paths)
       - https://github.com/klayoutmatthias/klayout/issues/59 (Async download of package index and details)
       - https://github.com/klayoutmatthias/klayout/issues/66 (Authentication dialog indicates retry)
       - https://github.com/klayoutmatthias/klayout/issues/77 (Layout#copy_tree now works in non-editable mode too)

0.25            (2017-11-04):
* Enhancement: Menu customization
      Menu items can be disabled or enabled now. The former
      "Key Bindings" configuration page has been turned into
      "Menu Customization". Check boxes allow enabling or
      disabling of menu items. Disabled menu items are not
      shown.
      A search filter allows quick selection of menu items
      by title or path.
* Enhancement: The cell tree no longer is collapsed on edits
      or when the sorting order changes.
* Enhancement: Using a special menu path, macros can be
      configured to appear in submenus now.
* Enhancement: KLAYOUT_HOME environment variable to
      control the location of the application folder.
      The application folder is the place where KLayout
      keeps the configuration, macros, packages and
      other things.
* Enhancements: Major overhaul of the build environment
      - Qt5 supported now
      - Employs qmake as build system
      - Reorganisation of the sources
      - Continuous integration enabled (unit tests
        integrated in .pro files, JUnit output etc.)
      - Compatible with the clang compiler
* Enhancements: Buddy tools: KLayout now comes with a set of
      additional executables that provide some functionality
      subset in a lean way. These binaries are named "strm..."
      and are installed along with KLayout.
      - strm2cif: converts any format to CIF
      - strm2dxf: converts any format to DXF
      - strm2gds: converts any format to GDS2
      - strm2gdstxt: converts any format to GDS2/text
      - strm2oas: converts any format to OASIS
      - strm2txt: converts any format to plain text (internally)
      - strmclip: creates a clip from a file
      - strmcmp: compares two files (logically)
      - strmxor: compares two files (geometrically)
      For more information, use the "-h" or "--help" option.
* Enhancements: HTTPS support for loading files from URL's directly
* Enhancements: Numerous enhancements and optimizations in the RBA/pya
      area and in the debugger.
* Enhancements: KLayout notifies the user when a file was changed and
      asks whether to reload.
* Enhancements: "File cell or layer": type into the cell or layer list to jump to the
      cell name typed.
* Enhancements: Advanced search features in the filter entry box
      for the cell selection form: Case sensitive/insensitive,
      glob pattern, clear button.
* Enhancements: Tree expansion icons have a better contrast now on Windows
      with dark background.
* Enhancements: Forward and backward navigation buttons in the main window.
      These buttons jump to the previous or next display state:
      zoom window, hierarchy depth, etc..
* Enhancements: A Package manager is provided. Packages are add-ons for
      KLayout and can include macros, script libraries, fonts
      for the TEXT PCell, technologies, DRC scripts etc.
      Packages can be published on GitHub or any server
      supporting WebDAV. After registering a package, users
      can install or update packages with a few clicks.
      For more information see https://github.com/klayoutmatthias/klayout/wiki
      or "About Packages" in the "Various Topics" area of the main
      documentation. The package manager is found in the "Tools"
      menu under "Manage Packages".
* Enhancements: LEF/DEF reader:
       - Compatibility fixes with version 5.8
       - Regions and Groups are supported now
       - LEF/DEF is a standare format now and
         can be used with "File/Open" for example.
* Enhancement: DXR reader supports variable path widths now
* Enhancement: XOR provides graphical progress
* Enhancements: Libraries can be associated with a technology. Only libraries
      associated with the selected technology are shown in the selection
      dialog.
* Enhancements: Overlapping instances are easier to select now (instance
      selection cycling).
* Enhancements: Many more methods in RBA/pya. For example:
       - Ability to directly insert "D" types (such as DBox
         into layouts and cells.
       - RBA::RecursiveShapeIterator now supports complex (non-rectangular)
         search regions
       - A more consistent type framework (consistent complex transformation
         types, vectors)
       - More intuitive interface in certain objects (i.e. CellView,
         LayerPropertiesNode, Annotation etc.). Changing an attribute
         usually has an immediate effect on the respective property now
         ("live objects")
       - Hash functions for certain objects - Box, Edge, Trans, Polygon,
         and other objects can be used as dictionary keys now.
       - New import methods for Region, EdgePairs and Edges
       - New features for LayerMapping and CellMapping
       - Multiple selected cells in LayoutView
       - RBA::TextGenerator to supply the Basic.TEXT PCell's
         functionality as static feature
       - Receivers can be added to signals and removed from
         signals now.
       - Individual instance iterator for CellInstArray
       - ...
* Enhancements: Enhanced layout statistics form with detailed shape
      statistics.
* Enhancements: Line styles (dashed, dotted etc.) available now.
      Works best with manhattan layouts.
* Enhancements: "Marked box mode": boxes are drawn with a cross.
* Enhancements: Arbitrary pattern size for custom fill pattern (no
      limited to multiples of 8). Max size is 32x32.
      Enhanced annotations:
       - Ellipses
       - Position markers
       - Text alignment
       - "Auto measure" rulers (place a ruler measuring the
         distances between adjacent objects with a single
         click)
* Enhancements: DRC enhancements:
       - Text support
       - "smoothed" function
       - "layers" function delivers all layers read
       - Polygon with edge interactions
       - middle and extent_refs methods for center point and other
         references
       - "corners" function
       - "collect...", "select" and "each" methods
* Enhancements: GDS2 paths can now use the MultiXY extension too.
* Enhancements: X2 Support for Gerber import.
* Enhancements: A function to reset the window state after the
      window has been misconfigured (i.e. detaching or closing
      the dockable windows). This feature is found in
      View/Restore Window.

10 files changed, 141 insertions, 116 deletions

diff --git a/cad/klayout/Makefile b/cad/klayout/Makefile
index 537c65877ba..badc8ca99a7 100644
--- a/cad/klayout/Makefile
+++ b/cad/klayout/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2018/07/04 13:40:10 jperkin Exp $
+# $NetBSD: Makefile,v 1.12 2018/07/24 13:00:10 ryoon Exp $
 
-DISTNAME=	klayout-0.24.10
-PKGREVISION=	1
+DISTNAME=	klayout-0.25.3
 CATEGORIES=	cad
 MASTER_SITES=	http://www.klayout.org/downloads/source/
 
@@ -11,52 +10,51 @@ COMMENT=	Simple GDS and OASIS file viewer and Editor
 LICENSE=	gnu-gpl-v2
 
 USE_LANGUAGES=	c c++
-USE_TOOLS+=	gmake
+USE_TOOLS+=	gmake bash
 
 CFLAGS+=	-I${PREFIX}/include/python${PYVERSUFFIX}
 NO_CONFIGURE=	yes
 
-SUBST_CLASSES+= 	rpath
+SUBST_CLASSES+=		rpath
 SUBST_MESSAGE.rpath=	Add COMPILER_RPATH_FLAG and PREFIX to NetBSD specific config file
 SUBST_FILES.rpath+=	config/Makefile.conf.netbsd-32-gcc-release
-SUBST_STAGE.rpath=	pre-configure
-SUBST_VARS.rpath=	COMPILER_RPATH_FLAG PREFIX
-SUBST_SED.rpath=	-e 's|@@LDFLAGS@@|${LDFLAGS}|'
+SUBST_STAGE.rpath=	post-patch
+SUBST_VARS.rpath=	COMPILER_RPATH_FLAG PREFIX LDFLAGS
+
+BUILDLINK_TRANSFORM.NetBSD+=	rm:-ldl
 
 AUTO_MKDIRS=		yes
 INSTALL_BINDIR=		${DESTDIR}${PREFIX}/bin
 INSTALL_LIBDIR=		${DESTDIR}${PREFIX}/lib
-REL_DIR=		build.netbsd-32-gcc-release
-
-OTHER_BIN= \
-	strm2cif \
-	strm2dxf \
-	strm2gds \
-	strm2gdstxt \
-	strm2oas \
-	strm2txt \
-	strmclip \
-	strmcmp \
-	strmxor
+REL_DIR=		build-release
+
+.include "../../mk/bsd.prefs.mk"
+
+.if !empty(MAKE_JOBS)
+MAKE_JOBS_FLAG=		-option -j${MAKE_JOBS}
+.endif
 
 do-build:
-	cd ${WRKSRC} && ${PKGSRC_SETENV} ${MAKE_ENV} sh build.sh -python python${PYVERSSUFFIX} -qt ${PREFIX}/qt4
+	cd ${WRKSRC} && ${PKGSRC_SETENV} ${MAKE_ENV} ${BASH} build.sh \
+	-python python${PYVERSSUFFIX} \
+	-qt5 \
+	-qmake ${PREFIX}/qt5/bin/qmake \
+	-ruby ${PREFIX}/bin/${RUBY_NAME} \
+	${MAKE_JOBS_FLAG} \
+	-prefix ${PREFIX}
 
 do-install:
-	(cd ${WRKSRC}; \
-	pwd; \
-	${INSTALL_PROGRAM} ${REL_DIR}/main/klayout ${INSTALL_BINDIR}; \
-	${INSTALL_LIB} ${REL_DIR}/main/libklayout.so ${INSTALL_LIBDIR} ;\
-	for bin in ${OTHER_BIN}; do \
-	  ${INSTALL_PROGRAM} ${REL_DIR}/main/$$bin ${INSTALL_BINDIR} ;\
-	done ;\
-	${CHMOD} 755 ${INSTALL_BINDIR}/* ;\
-	)
+	cd ${WRKSRC} && \
+	${INSTALL_PROGRAM} ${WRKSRC}/${REL_DIR}/libklayout_* \
+		${DESTDIR}${PREFIX}/lib
+	${INSTALL_PROGRAM} ${WRKSRC}/${REL_DIR}/strm* \
+		${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/${REL_DIR}/klayout \
+		${DESTDIR}${PREFIX}/bin
 
 .include "../../lang/python/pyversion.mk"
 .include "../../lang/ruby/buildlink3.mk"
-.include "../../x11/qt4-libs/buildlink3.mk"
-# libQtDesigner
-.include "../../x11/qt4-tools/buildlink3.mk"
-BUILDLINK_DEPMETHOD.qt4-tools=	full
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qtsvg/buildlink3.mk"
+.include "../../x11/qt5-qttools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/klayout/PLIST b/cad/klayout/PLIST
index 1bcbb316b94..7c551be4c04 100644
--- a/cad/klayout/PLIST
+++ b/cad/klayout/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2016/03/15 15:15:59 mef Exp $
+@comment $NetBSD: PLIST,v 1.2 2018/07/24 13:00:10 ryoon Exp $
 bin/klayout
 bin/strm2cif
 bin/strm2dxf
@@ -8,5 +8,73 @@ bin/strm2oas
 bin/strm2txt
 bin/strmclip
 bin/strmcmp
+bin/strmrun
 bin/strmxor
-lib/libklayout.so
+lib/libklayout_ant.${RUBY_DLEXT}
+lib/libklayout_ant.so.0
+lib/libklayout_ant.so.0.25
+lib/libklayout_ant.so.${PKGVERSION}
+lib/libklayout_bd.${RUBY_DLEXT}
+lib/libklayout_bd.so.0
+lib/libklayout_bd.so.0.25
+lib/libklayout_bd.so.${PKGVERSION}
+lib/libklayout_db.${RUBY_DLEXT}
+lib/libklayout_db.so.0
+lib/libklayout_db.so.0.25
+lib/libklayout_db.so.${PKGVERSION}
+lib/libklayout_drc.${RUBY_DLEXT}
+lib/libklayout_drc.so.0
+lib/libklayout_drc.so.0.25
+lib/libklayout_drc.so.${PKGVERSION}
+lib/libklayout_edt.${RUBY_DLEXT}
+lib/libklayout_edt.so.0
+lib/libklayout_edt.so.0.25
+lib/libklayout_edt.so.${PKGVERSION}
+lib/libklayout_ext.${RUBY_DLEXT}
+lib/libklayout_ext.so.0
+lib/libklayout_ext.so.0.25
+lib/libklayout_ext.so.${PKGVERSION}
+lib/libklayout_gsi.${RUBY_DLEXT}
+lib/libklayout_gsi.so.0
+lib/libklayout_gsi.so.0.25
+lib/libklayout_gsi.so.${PKGVERSION}
+lib/libklayout_gsiqt.${RUBY_DLEXT}
+lib/libklayout_gsiqt.so.0
+lib/libklayout_gsiqt.so.0.25
+lib/libklayout_gsiqt.so.${PKGVERSION}
+lib/libklayout_img.${RUBY_DLEXT}
+lib/libklayout_img.so.0
+lib/libklayout_img.so.0.25
+lib/libklayout_img.so.${PKGVERSION}
+lib/libklayout_lay.${RUBY_DLEXT}
+lib/libklayout_lay.so.0
+lib/libklayout_lay.so.0.25
+lib/libklayout_lay.so.${PKGVERSION}
+lib/libklayout_laybasic.${RUBY_DLEXT}
+lib/libklayout_laybasic.so.0
+lib/libklayout_laybasic.so.0.25
+lib/libklayout_laybasic.so.${PKGVERSION}
+lib/libklayout_lib.${RUBY_DLEXT}
+lib/libklayout_lib.so.0
+lib/libklayout_lib.so.0.25
+lib/libklayout_lib.so.${PKGVERSION}
+lib/libklayout_lym.${RUBY_DLEXT}
+lib/libklayout_lym.so.0
+lib/libklayout_lym.so.0.25
+lib/libklayout_lym.so.${PKGVERSION}
+lib/libklayout_pya.${RUBY_DLEXT}
+lib/libklayout_pya.so.0
+lib/libklayout_pya.so.0.25
+lib/libklayout_pya.so.${PKGVERSION}
+lib/libklayout_rba.${RUBY_DLEXT}
+lib/libklayout_rba.so.0
+lib/libklayout_rba.so.0.25
+lib/libklayout_rba.so.${PKGVERSION}
+lib/libklayout_rdb.${RUBY_DLEXT}
+lib/libklayout_rdb.so.0
+lib/libklayout_rdb.so.0.25
+lib/libklayout_rdb.so.${PKGVERSION}
+lib/libklayout_tl.${RUBY_DLEXT}
+lib/libklayout_tl.so.0
+lib/libklayout_tl.so.0.25
+lib/libklayout_tl.so.${PKGVERSION}
diff --git a/cad/klayout/distinfo b/cad/klayout/distinfo
index 8224e742323..d9d9188ea2a 100644
--- a/cad/klayout/distinfo
+++ b/cad/klayout/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.8 2017/04/08 13:48:52 mef Exp $
+$NetBSD: distinfo,v 1.9 2018/07/24 13:00:10 ryoon Exp $
 
-SHA1 (klayout-0.24.10.tar.gz) = d3c98eaf32301994bc00ebd430e7fb1806671bf8
-RMD160 (klayout-0.24.10.tar.gz) = 6e2c67b1386030344f10bf81d732043639a5d3a0
-SHA512 (klayout-0.24.10.tar.gz) = 0043b91e2dae9321299c217697c93af27bc7d795209bdf95248eee3690b97728854f9f82cc95f77f05a2cfbcae6a716ae594fe2485e04ed0a3f5d950abc0a31b
-Size (klayout-0.24.10.tar.gz) = 11262007 bytes
-SHA1 (patch-build.sh) = 3a1e61100de101cbe82b0c4abfa10a0ab2f7ead7
-SHA1 (patch-config_Makefile_conf_freebsd-32-gcc-release) = 8ee1a6f42465ef650fbd26ec6dcdea4db249d018
-SHA1 (patch-config_Makefile_conf_netbsd-32-gcc-release) = 1fd264f8a25d4410cd48fcfbbbfbf149e65e3b22
-SHA1 (patch-src_Makefile.rules) = ca98445d7e3823cc0b9c2114f0d4c6214ad59e5c
-SHA1 (patch-src_layApplication.cc) = 7d0d3ec81e924ad1aec8a22c6a594148ac58107a
-SHA1 (patch-src_tlStream.cc) = a3c44130e1deaf84c3f966ca25be2af619d49849
+SHA1 (klayout-0.25.3.tar.gz) = 6c5cfb03d494b8e5433a810237db4728708a7ad0
+RMD160 (klayout-0.25.3.tar.gz) = e9eefce0ac672d112de3406e34b1af23ab0eae5f
+SHA512 (klayout-0.25.3.tar.gz) = 4105d312c4051bc0f0ad1e9acd8f3fa990b760c8ecbc58d99c788843e5936ba8f236c0c6e1f34cd4bcb684bf8b7ccefd8271ba9371e1b338baf60e05d89001ac
+Size (klayout-0.25.3.tar.gz) = 18811067 bytes
+SHA1 (patch-config_Makefile.conf.freebsd-32-gcc-release) = fd5b506f8da1c314091523e48e33a949d0fadb94
+SHA1 (patch-config_Makefile.conf.netbsd-32-gcc-release) = 72ab38fd4bb1a1c9bbae61ad7f7cbdafa5706775
+SHA1 (patch-src_layApplication.cc) = fa42542213519e8c04820ab08ce5c1385bf8b860
+SHA1 (patch-src_lay_lay_laySignalHandler.cc) = 4ff62eba653ab187aa90552278ecd464818ca64e
+SHA1 (patch-src_tlStream.cc) = aa3b781acad05e4ec45075b6d08750213ece3820
diff --git a/cad/klayout/patches/patch-build.sh b/cad/klayout/patches/patch-build.sh
deleted file mode 100644
index d467b2ff34a..00000000000
--- a/cad/klayout/patches/patch-build.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-build.sh,v 1.1 2016/03/15 15:15:59 mef Exp $
-
-Add NetBSD and FreeBSD
-
---- build.sh.orig	2016-02-27 07:20:29.000000000 +0900
-+++ build.sh	2016-03-08 23:14:50.000000000 +0900
-@@ -39,6 +39,12 @@ Darwin*)
-   PLATFORM="mac-yosemite-gcc-release"
-   EXEC_HOLDER="klayout.app/Contents/MacOS"
-   ;;
-+FreeBSD)
-+  PLATFORM="freebsd-32-gcc-release"
-+  ;;
-+NetBSD)
-+  PLATFORM="netbsd-32-gcc-release"
-+  ;;
- *)
-   # Assume Linux for the remaining variants
-   case `arch` in
diff --git a/cad/klayout/patches/patch-config_Makefile_conf_freebsd-32-gcc-release b/cad/klayout/patches/patch-config_Makefile.conf.freebsd-32-gcc-release
index 86f2629ab41..b737137bef2 100644
--- a/cad/klayout/patches/patch-config_Makefile_conf_freebsd-32-gcc-release
+++ b/cad/klayout/patches/patch-config_Makefile.conf.freebsd-32-gcc-release
@@ -1,9 +1,7 @@
-$NetBSD: patch-config_Makefile_conf_freebsd-32-gcc-release,v 1.1 2016/03/15 15:15:59 mef Exp $
+$NetBSD: patch-config_Makefile.conf.freebsd-32-gcc-release,v 1.1 2018/07/24 13:00:10 ryoon Exp $
 
-Add FreeBSD, but not checked yet
-
---- /dev/null 2013-04-27 17:36:48.000000000 +0900
-+++ config/Makefile.conf.freebsd-32-gcc-release 2013-04-27 17:37:10.000000000 +0900
+--- config/Makefile.conf.freebsd-32-gcc-release.orig	2018-07-16 03:52:39.157322134 +0000
++++ config/Makefile.conf.freebsd-32-gcc-release
 @@ -0,0 +1,49 @@
 +
 +# Configuration file for
diff --git a/cad/klayout/patches/patch-config_Makefile_conf_netbsd-32-gcc-release b/cad/klayout/patches/patch-config_Makefile.conf.netbsd-32-gcc-release
index 7e31f4b9d02..b344c7be05d 100644
--- a/cad/klayout/patches/patch-config_Makefile_conf_netbsd-32-gcc-release
+++ b/cad/klayout/patches/patch-config_Makefile.conf.netbsd-32-gcc-release
@@ -1,9 +1,7 @@
-$NetBSD: patch-config_Makefile_conf_netbsd-32-gcc-release,v 1.1 2016/03/15 15:15:59 mef Exp $
+$NetBSD: patch-config_Makefile.conf.netbsd-32-gcc-release,v 1.1 2018/07/24 13:00:10 ryoon Exp $
 
-Add NetBSD
-
---- /dev/null 2013-04-27 17:36:48.000000000 +0900
-+++ config/Makefile.conf.netbsd-32-gcc-release 2013-04-27 17:37:10.000000000 +0900
+--- config/Makefile.conf.netbsd-32-gcc-release.orig	2018-07-16 03:52:39.164355967 +0000
++++ config/Makefile.conf.netbsd-32-gcc-release
 @@ -0,0 +1,49 @@
 +
 +# # Configuration file for
@@ -35,8 +33,8 @@ Add NetBSD
 +# 
 +# # Linker
 +LINK=gcc
-+LOPT=@@LDFLAGS@@ -g -Wl,-E -o
-+LOPT_SO=	@COMPILER_RPATH_FLAG@@PREFIX@/lib:@PREFIX@/qt-4/lib:/usr/lib @@LDFLAGS@@ -g -shared -o
++LOPT=   -pthread -L/usr/lib -Wl,-R/usr/lib -L/usr/pkg/lib -Wl,-R/usr/pkg/lib -L/usr/pkg/qt5/lib -L/usr/pkg/qt5/plugins -Wl,-R/usr/pkg/qt5/lib -Wl,-R/usr/pkg/qt5/plugins -L/usr/pkg/lib/pulseaudio -Wl,-R/usr/pkg/lib/pulseaudio -g -Wl,-E -o
++LOPT_SO=	-Wl,-R/usr/pkg/lib:/usr/pkg/qt5/lib:/usr/lib @   -pthread -L/usr/lib -Wl,-R/usr/lib -L/usr/pkg/lib -Wl,-R/usr/pkg/lib -L/usr/pkg/qt5/lib -L/usr/pkg/qt5/plugins -Wl,-R/usr/pkg/qt5/lib -Wl,-R/usr/pkg/qt5/plugins -L/usr/pkg/lib/pulseaudio -Wl,-R/usr/pkg/lib/pulseaudio@ -g -shared -o
 +# 
 +LIBS=${PTHREAD_LIBS} -L$(QTLIB) -lQtGui -lQtCore -lQtXml -lQtNetwork -lQtSql -lQtDesigner -lrt -lm -lcrypt -lz
 +
diff --git a/cad/klayout/patches/patch-src_Makefile.rules b/cad/klayout/patches/patch-src_Makefile.rules
deleted file mode 100644
index 168a794dbac..00000000000
--- a/cad/klayout/patches/patch-src_Makefile.rules
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-src_Makefile.rules,v 1.2 2017/01/01 09:15:00 mef Exp $
-
-date: 2016-11-21 07:14:47 +0900;  author: joerg;
-Restrict a few very memory hungry files to -O1.
-
---- src/Makefile.rules.orig	2016-11-20 01:03:39.000000000 +0000
-+++ src/Makefile.rules
-@@ -165,6 +165,13 @@ vpath %.ui $(SOURCE)
- %.o: %.cc %.d
- 	$(CXX) $(INC) $(CXXOPTS_PROD) $@ $(<)
- 
-+gsiExpression.o: gsiExpression.cc gsiExpression.d
-+	$(CXX) $(INC) $(CXXOPTS_PROD) $@ $(<) -O1
-+pyaMarshal.o: pyaMarshal.cc pyaMarshal.d
-+	$(CXX) $(INC) $(CXXOPTS_PROD) $@ $(<) -O1
-+rba.o: rba.cc rba.d
-+	$(CXX) $(INC) $(CXXOPTS_PROD) $@ $(<) -O1
-+
- %_moc.o: %_moc.cc %.dm
- 	$(CXX) $(INC) $(CXXOPTS_PROD) $@ $(<)
- 
diff --git a/cad/klayout/patches/patch-src_layApplication.cc b/cad/klayout/patches/patch-src_layApplication.cc
index 047c8bf304f..b57fb242b83 100644
--- a/cad/klayout/patches/patch-src_layApplication.cc
+++ b/cad/klayout/patches/patch-src_layApplication.cc
@@ -1,24 +1,15 @@
-$NetBSD: patch-src_layApplication.cc,v 1.2 2017/02/14 21:33:08 joerg Exp $
+$NetBSD: patch-src_layApplication.cc,v 1.3 2018/07/24 13:00:10 ryoon Exp $
 
 To avoid following message
 error: 'struct sigaction' has no member named 'sa_restorer'
 
---- src/layApplication.cc.orig	2016-11-27 22:52:20.000000000 +0000
-+++ src/layApplication.cc
-@@ -69,6 +69,7 @@
- #  include <execinfo.h>
- #endif
+--- src/lay/lay/layApplication.cc.orig	2017-11-08 04:48:15.000000000 +0900
++++ src/lay/lay/layApplication.cc	2017-11-17 20:32:08.822834411 +0900
+@@ -65,6 +65,7 @@
+ #include <QAction>
+ #include <QMessageBox>
  
 +#include <unistd.h>
  #include <iostream>
  #include <memory>
  #include <algorithm>
-@@ -350,7 +351,7 @@ static 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(__NetBSD__)
-   act.sa_restorer = 0;
- #endif
- 
diff --git a/cad/klayout/patches/patch-src_lay_lay_laySignalHandler.cc b/cad/klayout/patches/patch-src_lay_lay_laySignalHandler.cc
new file mode 100644
index 00000000000..d856f9c2c47
--- /dev/null
+++ b/cad/klayout/patches/patch-src_lay_lay_laySignalHandler.cc
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_lay_lay_laySignalHandler.cc,v 1.1 2018/07/24 13:00:10 ryoon Exp $
+
+--- src/lay/lay/laySignalHandler.cc.orig	2018-05-04 19:21:14.000000000 +0000
++++ 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(__NetBSD__)
+   act.sa_restorer = 0;
+ #endif
+ 
diff --git a/cad/klayout/patches/patch-src_tlStream.cc b/cad/klayout/patches/patch-src_tlStream.cc
index 69a44e326cc..9df2a57cf55 100644
--- a/cad/klayout/patches/patch-src_tlStream.cc
+++ b/cad/klayout/patches/patch-src_tlStream.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_tlStream.cc,v 1.2 2017/04/08 13:48:52 mef Exp $
+$NetBSD: patch-src_tlStream.cc,v 1.3 2018/07/24 13:00:10 ryoon Exp $
 
 date: 2017-02-15 06:33:08 +0900;  author: joerg;  state: Exp;  commitid: BDodrFgUrNgNVXFz;
 Add missing includes.
 
 --- src/tlStream.cc.orig	2017-02-09 18:57:16.170616732 +0000
-+++ src/tlStream.cc
++++ src/tl/tl/tlStream.cc
 @@ -28,6 +28,7 @@
  #include <sys/stat.h>
  #include <stdio.h>