CVS commit: pkgsrc/cad/klayout

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/cad/klayout
From: "Makoto Fujiwara" <mef%netbsd.org@localhost>
Date: Sat, 22 May 2021 13:45:53 +0000

Module Name:    pkgsrc
Committed By:   mef
Date:           Sat May 22 13:45:53 UTC 2021

Modified Files:
        pkgsrc/cad/klayout: Makefile PLIST distinfo
        pkgsrc/cad/klayout/patches:
            patch-config_Makefile.conf.freebsd-32-gcc-release
            patch-config_Makefile.conf.netbsd-32-gcc-release
            patch-src_lay_lay_laySignalHandler.cc
Added Files:
        pkgsrc/cad/klayout/patches: patch-src_lay_lay_layApplication.cc
            patch-src_tl_tl_tlStream.cc
Removed Files:
        pkgsrc/cad/klayout/patches: patch-src_layApplication.cc
            patch-src_tlStream.cc

Log Message:
(cad/klayout) Updated 0.26.8 to 0.26.10 ( 0.26.11, 0.27.0 are waiting)

Based on wip/klayout (a little bit old version) by Atzushi Toyokura work.
(pkgsrc)
 - rename patch
 - Add comment on patches
 - more PLIST_SUBST

(upstream changes)
0.26.10         (2020-02-02):

* Enhancement: %GITHUB%/issues/720
  "Safe save" and backups: when saving files, the file is only overwritten after
  the save terminated successfully. This will avoid loss of data for full volumes
  or network share dropouts. In addition, a configurable number of back files can
  be kept (see File/Setup: Application/General).
* Bugfix: %GITHUB%/issues/718
  GDS export issue fixed (breaking of polygons was filling holes)
* Bugfix: %GITHUB%/issues/709
  LVS compare enters infinite loop when it encounters two entirely identical subcircuits
* Bugfix: %GITHUB%/issues/708
  Qt binding: missing support for binary strings as QByteArray representative
* Bugfix: %GITHUB%/issues/707
  QJsonValue's string constructor is ambiguous
* Bugfix: %GITHUB%/issues/704
  Rational Splines not supported DXF
* Bugfix: %GITHUB%/issues/693
  MAGIC files won't find subcells when reading from command line
* Bugfix: HTTP stream reading issue with redirect
  At least on MacOS a segfault happened when reading HTTP stream data
  (e.g. for package manager) from addresses which are redirected.
* Enhancement: Removed %APPDATA% from DLL search path on Windows
  This will avoid installation poisoning by the one from %APPDATA%
  (which ironically is the default installation path). Eventually
  multiple versions can be used in parallel.

0.26.9          (2020-11-27):

* Bugfix: %GITHUB%/issues/658
      Menu items were not put into the right place on MacOS.
* Bugfix: %GITHUB%/issues/652
      "M" factor scaling was not working for Spice reader.
* Bugfix: %GITHUB%/issues/651
      Fixed an issue with DRC "select".
* Bugfix: %GITHUB%/issues/647
      Text orientation was not considered properly in search & replace
* Bugfix: %GITHUB%/issues/646
      A potential crash was fixed happening when a PCell
      library is deleted
* Bugfix: Display bug
      Cell placements with small magnification factors (such that the
      viewport dimensions exceeded the DBU space when seem from inside
      the cell) lead to display errors.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/cad/klayout/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/cad/klayout/PLIST
cvs rdiff -u -r1.13 -r1.14 pkgsrc/cad/klayout/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/cad/klayout/patches/patch-config_Makefile.conf.freebsd-32-gcc-release \
    pkgsrc/cad/klayout/patches/patch-config_Makefile.conf.netbsd-32-gcc-release
cvs rdiff -u -r1.3 -r0 pkgsrc/cad/klayout/patches/patch-src_layApplication.cc
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/cad/klayout/patches/patch-src_lay_lay_layApplication.cc \
    pkgsrc/cad/klayout/patches/patch-src_tl_tl_tlStream.cc
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/cad/klayout/patches/patch-src_lay_lay_laySignalHandler.cc
cvs rdiff -u -r1.4 -r0 pkgsrc/cad/klayout/patches/patch-src_tlStream.cc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/cad/klayout/Makefile
diff -u pkgsrc/cad/klayout/Makefile:1.35 pkgsrc/cad/klayout/Makefile:1.36
--- pkgsrc/cad/klayout/Makefile:1.35    Wed Apr 21 11:41:03 2021
+++ pkgsrc/cad/klayout/Makefile Sat May 22 13:45:52 2021
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2021/04/21 11:41:03 adam Exp $
+# $NetBSD: Makefile,v 1.36 2021/05/22 13:45:52 mef Exp $
 
-DISTNAME=      klayout-0.26.8
-PKGREVISION=   5
+DISTNAME=      klayout-0.26.10
 CATEGORIES=    cad
 MASTER_SITES=  http://www.klayout.org/downloads/source/
 
@@ -11,9 +10,8 @@ COMMENT=      Simple GDS and OASIS file viewe
 LICENSE=       gnu-gpl-v2
 
 USE_LANGUAGES= c c++
-USE_TOOLS+=    gmake bash
+USE_TOOLS+=    gmake bash pax
 
-BUILD_DEPENDS+=        rsync-[0-9]*:../../net/rsync
 CFLAGS+=       -I${PREFIX}/include/python${PYVERSUFFIX}
 NO_CONFIGURE=  yes
 
@@ -31,7 +29,10 @@ BUILDLINK_TRANSFORM.NetBSD+= rm:-ldl
 AUTO_MKDIRS=           yes
 INSTALL_BINDIR=                ${DESTDIR}${PREFIX}/bin
 INSTALL_LIBDIR=                ${DESTDIR}${PREFIX}/lib/klayout
-REL_DIR=               build-release
+REL_DIR=               bin-release
+PLUGINS_DIR=           db_plugins lay_plugins pymod
+
+PLIST_SUBST+=          PKGVERSION_MAJOR_MINOR=${PKGVERSION_NOREV:C/([0-9]+\.[0-9]+)\.[0-9]+/\1/}
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -40,23 +41,19 @@ MAKE_JOBS_FLAG=             -option -j${MAKE_JOBS}
 .endif
 
 do-build:
-       cd ${WRKSRC} && ${PKGSRC_SETENV} ${MAKE_ENV} ${BASH} build.sh \
+       cd ${WRKSRC} && ${MKDIR} ${REL_DIR} && \
+       ${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} \
+       -prefix ${REL_DIR} \
        -rpath ${PREFIX}/lib/klayout
 
 do-install:
-       cd ${WRKSRC} && \
-       rsync     -aH      ${WRKSRC}/${REL_DIR}/libklayout_* \
-               ${INSTALL_LIBDIR} && \
-       rsync     -aH --exclude=\*\.o      ${WRKSRC}/${REL_DIR}/plugins/ \
-               ${INSTALL_LIBDIR}/plugins/ && \
-       rsync     -aH --exclude=\*\.o      ${WRKSRC}/${REL_DIR}/db_plugins/ \
-               ${INSTALL_LIBDIR}/db_plugins/
+       cd ${WRKSRC}/${REL_DIR} && \
+       ${PAX} -wr libklayout* ${PLUGINS_DIR} ${INSTALL_LIBDIR}
        ${INSTALL_PROGRAM} ${WRKSRC}/${REL_DIR}/strm* \
                ${INSTALL_BINDIR}
        ${INSTALL_PROGRAM} ${WRKSRC}/${REL_DIR}/klayout \

Index: pkgsrc/cad/klayout/PLIST
diff -u pkgsrc/cad/klayout/PLIST:1.4 pkgsrc/cad/klayout/PLIST:1.5
--- pkgsrc/cad/klayout/PLIST:1.4        Thu Jan 14 12:25:33 2021
+++ pkgsrc/cad/klayout/PLIST    Sat May 22 13:45:52 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2021/01/14 12:25:33 mef Exp $
+@comment $NetBSD: PLIST,v 1.5 2021/05/22 13:45:52 mef Exp $
 bin/klayout
 bin/strm2cif
 bin/strm2dxf
@@ -13,278 +13,220 @@ bin/strmrun
 bin/strmxor
 lib/klayout/db_plugins/libcif.${RUBY_DLEXT}
 lib/klayout/db_plugins/libcif.so.0
-lib/klayout/db_plugins/libcif.so.0.26
+lib/klayout/db_plugins/libcif.so.${PKGVERSION_MAJOR_MINOR}
 lib/klayout/db_plugins/libcif.so.${PKGVERSION}
 lib/klayout/db_plugins/libdxf.${RUBY_DLEXT}
 lib/klayout/db_plugins/libdxf.so.0
-lib/klayout/db_plugins/libdxf.so.0.26
+lib/klayout/db_plugins/libdxf.so.${PKGVERSION_MAJOR_MINOR}
 lib/klayout/db_plugins/libdxf.so.${PKGVERSION}
 lib/klayout/db_plugins/libgds2.${RUBY_DLEXT}
 lib/klayout/db_plugins/libgds2.so.0
-lib/klayout/db_plugins/libgds2.so.0.26
+lib/klayout/db_plugins/libgds2.so.${PKGVERSION_MAJOR_MINOR}
 lib/klayout/db_plugins/libgds2.so.${PKGVERSION}
 lib/klayout/db_plugins/liblefdef.${RUBY_DLEXT}
 lib/klayout/db_plugins/liblefdef.so.0
-lib/klayout/db_plugins/liblefdef.so.0.26
+lib/klayout/db_plugins/liblefdef.so.${PKGVERSION_MAJOR_MINOR}
 lib/klayout/db_plugins/liblefdef.so.${PKGVERSION}
 lib/klayout/db_plugins/libmag.${RUBY_DLEXT}
 lib/klayout/db_plugins/libmag.so.0
-lib/klayout/db_plugins/libmag.so.0.26
+lib/klayout/db_plugins/libmag.so.${PKGVERSION_MAJOR_MINOR}
 lib/klayout/db_plugins/libmag.so.${PKGVERSION}
 lib/klayout/db_plugins/libnet_tracer.${RUBY_DLEXT}
 lib/klayout/db_plugins/libnet_tracer.so.0
-lib/klayout/db_plugins/libnet_tracer.so.0.26
+lib/klayout/db_plugins/libnet_tracer.so.${PKGVERSION_MAJOR_MINOR}
 lib/klayout/db_plugins/libnet_tracer.so.${PKGVERSION}
 lib/klayout/db_plugins/liboasis.${RUBY_DLEXT}
 lib/klayout/db_plugins/liboasis.so.0
-lib/klayout/db_plugins/liboasis.so.0.26
+lib/klayout/db_plugins/liboasis.so.${PKGVERSION_MAJOR_MINOR}
 lib/klayout/db_plugins/liboasis.so.${PKGVERSION}
 lib/klayout/db_plugins/libpcb.${RUBY_DLEXT}
 lib/klayout/db_plugins/libpcb.so.0
-lib/klayout/db_plugins/libpcb.so.0.26
+lib/klayout/db_plugins/libpcb.so.${PKGVERSION_MAJOR_MINOR}
 lib/klayout/db_plugins/libpcb.so.${PKGVERSION}
+lib/klayout/lay_plugins/libbool_ui.${RUBY_DLEXT}
+lib/klayout/lay_plugins/libbool_ui.so.0
+lib/klayout/lay_plugins/libbool_ui.so.${PKGVERSION_MAJOR_MINOR}
+lib/klayout/lay_plugins/libbool_ui.so.${PKGVERSION}
+lib/klayout/lay_plugins/libcif_ui.${RUBY_DLEXT}
+lib/klayout/lay_plugins/libcif_ui.so.0
+lib/klayout/lay_plugins/libcif_ui.so.${PKGVERSION_MAJOR_MINOR}
+lib/klayout/lay_plugins/libcif_ui.so.${PKGVERSION}
+lib/klayout/lay_plugins/libcommon_ui.${RUBY_DLEXT}
+lib/klayout/lay_plugins/libcommon_ui.so.0
+lib/klayout/lay_plugins/libcommon_ui.so.${PKGVERSION_MAJOR_MINOR}
+lib/klayout/lay_plugins/libcommon_ui.so.${PKGVERSION}
+lib/klayout/lay_plugins/libdiff_ui.${RUBY_DLEXT}
+lib/klayout/lay_plugins/libdiff_ui.so.0
+lib/klayout/lay_plugins/libdiff_ui.so.${PKGVERSION_MAJOR_MINOR}
+lib/klayout/lay_plugins/libdiff_ui.so.${PKGVERSION}
+lib/klayout/lay_plugins/libdxf_ui.${RUBY_DLEXT}
+lib/klayout/lay_plugins/libdxf_ui.so.0
+lib/klayout/lay_plugins/libdxf_ui.so.${PKGVERSION_MAJOR_MINOR}
+lib/klayout/lay_plugins/libdxf_ui.so.${PKGVERSION}
+lib/klayout/lay_plugins/libgds2_ui.${RUBY_DLEXT}
+lib/klayout/lay_plugins/libgds2_ui.so.0
+lib/klayout/lay_plugins/libgds2_ui.so.${PKGVERSION_MAJOR_MINOR}
+lib/klayout/lay_plugins/libgds2_ui.so.${PKGVERSION}
+lib/klayout/lay_plugins/libimport_ui.${RUBY_DLEXT}
+lib/klayout/lay_plugins/libimport_ui.so.0
+lib/klayout/lay_plugins/libimport_ui.so.${PKGVERSION_MAJOR_MINOR}
+lib/klayout/lay_plugins/libimport_ui.so.${PKGVERSION}
+lib/klayout/lay_plugins/liblefdef_ui.${RUBY_DLEXT}
+lib/klayout/lay_plugins/liblefdef_ui.so.0
+lib/klayout/lay_plugins/liblefdef_ui.so.${PKGVERSION_MAJOR_MINOR}
+lib/klayout/lay_plugins/liblefdef_ui.so.${PKGVERSION}
+lib/klayout/lay_plugins/libmag_ui.${RUBY_DLEXT}
+lib/klayout/lay_plugins/libmag_ui.so.0
+lib/klayout/lay_plugins/libmag_ui.so.${PKGVERSION_MAJOR_MINOR}
+lib/klayout/lay_plugins/libmag_ui.so.${PKGVERSION}
+lib/klayout/lay_plugins/libnet_tracer_ui.${RUBY_DLEXT}
+lib/klayout/lay_plugins/libnet_tracer_ui.so.0
+lib/klayout/lay_plugins/libnet_tracer_ui.so.${PKGVERSION_MAJOR_MINOR}
+lib/klayout/lay_plugins/libnet_tracer_ui.so.${PKGVERSION}
+lib/klayout/lay_plugins/liboasis_ui.${RUBY_DLEXT}
+lib/klayout/lay_plugins/liboasis_ui.so.0
+lib/klayout/lay_plugins/liboasis_ui.so.${PKGVERSION_MAJOR_MINOR}
+lib/klayout/lay_plugins/liboasis_ui.so.${PKGVERSION}
+lib/klayout/lay_plugins/libpcb_ui.${RUBY_DLEXT}
+lib/klayout/lay_plugins/libpcb_ui.so.0
+lib/klayout/lay_plugins/libpcb_ui.so.${PKGVERSION_MAJOR_MINOR}
+lib/klayout/lay_plugins/libpcb_ui.so.${PKGVERSION}
+lib/klayout/lay_plugins/libxor_ui.${RUBY_DLEXT}
+lib/klayout/lay_plugins/libxor_ui.so.0
+lib/klayout/lay_plugins/libxor_ui.so.${PKGVERSION_MAJOR_MINOR}
+lib/klayout/lay_plugins/libxor_ui.so.${PKGVERSION}
 lib/klayout/libklayout_QtCore.${RUBY_DLEXT}
 lib/klayout/libklayout_QtCore.so.0
-lib/klayout/libklayout_QtCore.so.0.26
+lib/klayout/libklayout_QtCore.so.${PKGVERSION_MAJOR_MINOR}
 lib/klayout/libklayout_QtCore.so.${PKGVERSION}
 lib/klayout/libklayout_QtDesigner.${RUBY_DLEXT}
 lib/klayout/libklayout_QtDesigner.so.0
-lib/klayout/libklayout_QtDesigner.so.0.26
+lib/klayout/libklayout_QtDesigner.so.${PKGVERSION_MAJOR_MINOR}
 lib/klayout/libklayout_QtDesigner.so.${PKGVERSION}
 lib/klayout/libklayout_QtGui.${RUBY_DLEXT}
 lib/klayout/libklayout_QtGui.so.0
-lib/klayout/libklayout_QtGui.so.0.26
+lib/klayout/libklayout_QtGui.so.${PKGVERSION_MAJOR_MINOR}
 lib/klayout/libklayout_QtGui.so.${PKGVERSION}
 lib/klayout/libklayout_QtMultimedia.${RUBY_DLEXT}
 lib/klayout/libklayout_QtMultimedia.so.0
-lib/klayout/libklayout_QtMultimedia.so.0.26
+lib/klayout/libklayout_QtMultimedia.so.${PKGVERSION_MAJOR_MINOR}
 lib/klayout/libklayout_QtMultimedia.so.${PKGVERSION}
 lib/klayout/libklayout_QtNetwork.${RUBY_DLEXT}
 lib/klayout/libklayout_QtNetwork.so.0
-lib/klayout/libklayout_QtNetwork.so.0.26
+lib/klayout/libklayout_QtNetwork.so.${PKGVERSION_MAJOR_MINOR}
 lib/klayout/libklayout_QtNetwork.so.${PKGVERSION}
 lib/klayout/libklayout_QtPrintSupport.${RUBY_DLEXT}
 lib/klayout/libklayout_QtPrintSupport.so.0
-lib/klayout/libklayout_QtPrintSupport.so.0.26
+lib/klayout/libklayout_QtPrintSupport.so.${PKGVERSION_MAJOR_MINOR}
 lib/klayout/libklayout_QtPrintSupport.so.${PKGVERSION}
 lib/klayout/libklayout_QtSql.${RUBY_DLEXT}
 lib/klayout/libklayout_QtSql.so.0
-lib/klayout/libklayout_QtSql.so.0.26
+lib/klayout/libklayout_QtSql.so.${PKGVERSION_MAJOR_MINOR}
 lib/klayout/libklayout_QtSql.so.${PKGVERSION}
 lib/klayout/libklayout_QtSvg.${RUBY_DLEXT}
 lib/klayout/libklayout_QtSvg.so.0
-lib/klayout/libklayout_QtSvg.so.0.26
+lib/klayout/libklayout_QtSvg.so.${PKGVERSION_MAJOR_MINOR}
 lib/klayout/libklayout_QtSvg.so.${PKGVERSION}
 lib/klayout/libklayout_QtWidgets.${RUBY_DLEXT}
 lib/klayout/libklayout_QtWidgets.so.0
-lib/klayout/libklayout_QtWidgets.so.0.26
+lib/klayout/libklayout_QtWidgets.so.${PKGVERSION_MAJOR_MINOR}
 lib/klayout/libklayout_QtWidgets.so.${PKGVERSION}
 lib/klayout/libklayout_QtXml.${RUBY_DLEXT}
 lib/klayout/libklayout_QtXml.so.0
-lib/klayout/libklayout_QtXml.so.0.26
+lib/klayout/libklayout_QtXml.so.${PKGVERSION_MAJOR_MINOR}
 lib/klayout/libklayout_QtXml.so.${PKGVERSION}
 lib/klayout/libklayout_QtXmlPatterns.${RUBY_DLEXT}
 lib/klayout/libklayout_QtXmlPatterns.so.0
-lib/klayout/libklayout_QtXmlPatterns.so.0.26
+lib/klayout/libklayout_QtXmlPatterns.so.${PKGVERSION_MAJOR_MINOR}
 lib/klayout/libklayout_QtXmlPatterns.so.${PKGVERSION}
 lib/klayout/libklayout_ant.${RUBY_DLEXT}
 lib/klayout/libklayout_ant.so.0
-lib/klayout/libklayout_ant.so.0.26
+lib/klayout/libklayout_ant.so.${PKGVERSION_MAJOR_MINOR}
 lib/klayout/libklayout_ant.so.${PKGVERSION}
 lib/klayout/libklayout_bd.${RUBY_DLEXT}
 lib/klayout/libklayout_bd.so.0
-lib/klayout/libklayout_bd.so.0.26
+lib/klayout/libklayout_bd.so.${PKGVERSION_MAJOR_MINOR}
 lib/klayout/libklayout_bd.so.${PKGVERSION}
 lib/klayout/libklayout_db.${RUBY_DLEXT}
 lib/klayout/libklayout_db.so.0
-lib/klayout/libklayout_db.so.0.26
+lib/klayout/libklayout_db.so.${PKGVERSION_MAJOR_MINOR}
 lib/klayout/libklayout_db.so.${PKGVERSION}
 lib/klayout/libklayout_drc.${RUBY_DLEXT}
 lib/klayout/libklayout_drc.so.0
-lib/klayout/libklayout_drc.so.0.26
+lib/klayout/libklayout_drc.so.${PKGVERSION_MAJOR_MINOR}
 lib/klayout/libklayout_drc.so.${PKGVERSION}
 lib/klayout/libklayout_edt.${RUBY_DLEXT}
 lib/klayout/libklayout_edt.so.0
-lib/klayout/libklayout_edt.so.0.26
+lib/klayout/libklayout_edt.so.${PKGVERSION_MAJOR_MINOR}
 lib/klayout/libklayout_edt.so.${PKGVERSION}
 lib/klayout/libklayout_gsi.${RUBY_DLEXT}
 lib/klayout/libklayout_gsi.so.0
-lib/klayout/libklayout_gsi.so.0.26
+lib/klayout/libklayout_gsi.so.${PKGVERSION_MAJOR_MINOR}
 lib/klayout/libklayout_gsi.so.${PKGVERSION}
-lib/klayout/libklayout_gsi_test.${RUBY_DLEXT}
-lib/klayout/libklayout_gsi_test.so.0
-lib/klayout/libklayout_gsi_test.so.0.26
-lib/klayout/libklayout_gsi_test.so.${PKGVERSION}
 lib/klayout/libklayout_img.${RUBY_DLEXT}
 lib/klayout/libklayout_img.so.0
-lib/klayout/libklayout_img.so.0.26
+lib/klayout/libklayout_img.so.${PKGVERSION_MAJOR_MINOR}
 lib/klayout/libklayout_img.so.${PKGVERSION}
 lib/klayout/libklayout_lay.${RUBY_DLEXT}
 lib/klayout/libklayout_lay.so.0
-lib/klayout/libklayout_lay.so.0.26
+lib/klayout/libklayout_lay.so.${PKGVERSION_MAJOR_MINOR}
 lib/klayout/libklayout_lay.so.${PKGVERSION}
 lib/klayout/libklayout_laybasic.${RUBY_DLEXT}
 lib/klayout/libklayout_laybasic.so.0
-lib/klayout/libklayout_laybasic.so.0.26
+lib/klayout/libklayout_laybasic.so.${PKGVERSION_MAJOR_MINOR}
 lib/klayout/libklayout_laybasic.so.${PKGVERSION}
 lib/klayout/libklayout_lib.${RUBY_DLEXT}
 lib/klayout/libklayout_lib.so.0
-lib/klayout/libklayout_lib.so.0.26
+lib/klayout/libklayout_lib.so.${PKGVERSION_MAJOR_MINOR}
 lib/klayout/libklayout_lib.so.${PKGVERSION}
 lib/klayout/libklayout_lvs.${RUBY_DLEXT}
 lib/klayout/libklayout_lvs.so.0
-lib/klayout/libklayout_lvs.so.0.26
+lib/klayout/libklayout_lvs.so.${PKGVERSION_MAJOR_MINOR}
 lib/klayout/libklayout_lvs.so.${PKGVERSION}
 lib/klayout/libklayout_lym.${RUBY_DLEXT}
 lib/klayout/libklayout_lym.so.0
-lib/klayout/libklayout_lym.so.0.26
+lib/klayout/libklayout_lym.so.${PKGVERSION_MAJOR_MINOR}
 lib/klayout/libklayout_lym.so.${PKGVERSION}
 lib/klayout/libklayout_pya.${RUBY_DLEXT}
 lib/klayout/libklayout_pya.so.0
-lib/klayout/libklayout_pya.so.0.26
+lib/klayout/libklayout_pya.so.${PKGVERSION_MAJOR_MINOR}
 lib/klayout/libklayout_pya.so.${PKGVERSION}
 lib/klayout/libklayout_qtbasic.${RUBY_DLEXT}
 lib/klayout/libklayout_qtbasic.so.0
-lib/klayout/libklayout_qtbasic.so.0.26
+lib/klayout/libklayout_qtbasic.so.${PKGVERSION_MAJOR_MINOR}
 lib/klayout/libklayout_qtbasic.so.${PKGVERSION}
 lib/klayout/libklayout_rba.${RUBY_DLEXT}
 lib/klayout/libklayout_rba.so.0
-lib/klayout/libklayout_rba.so.0.26
+lib/klayout/libklayout_rba.so.${PKGVERSION_MAJOR_MINOR}
 lib/klayout/libklayout_rba.so.${PKGVERSION}
 lib/klayout/libklayout_rdb.${RUBY_DLEXT}
 lib/klayout/libklayout_rdb.so.0
-lib/klayout/libklayout_rdb.so.0.26
+lib/klayout/libklayout_rdb.so.${PKGVERSION_MAJOR_MINOR}
 lib/klayout/libklayout_rdb.so.${PKGVERSION}
 lib/klayout/libklayout_tl.${RUBY_DLEXT}
 lib/klayout/libklayout_tl.so.0
-lib/klayout/libklayout_tl.so.0.26
+lib/klayout/libklayout_tl.so.${PKGVERSION_MAJOR_MINOR}
 lib/klayout/libklayout_tl.so.${PKGVERSION}
-lib/klayout/plugins/Makefile
-lib/klayout/plugins/streamers/Makefile
-lib/klayout/plugins/streamers/cif/Makefile
-lib/klayout/plugins/streamers/cif/db_plugin/Makefile
-lib/klayout/plugins/streamers/cif/lay_plugin/Makefile
-lib/klayout/plugins/streamers/cif/lay_plugin/moc_layCIFReaderPlugin.cpp
-lib/klayout/plugins/streamers/cif/lay_plugin/moc_layCIFWriterPlugin.cpp
-lib/klayout/plugins/streamers/cif/lay_plugin/moc_predefs.h
-lib/klayout/plugins/streamers/cif/lay_plugin/ui_CIFReaderOptionPage.h
-lib/klayout/plugins/streamers/cif/lay_plugin/ui_CIFWriterOptionPage.h
-lib/klayout/plugins/streamers/cif/unit_tests/Makefile
-lib/klayout/plugins/streamers/cif/unit_tests/libcif_tests.${RUBY_DLEXT}
-lib/klayout/plugins/streamers/cif/unit_tests/libcif_tests.so.0
-lib/klayout/plugins/streamers/cif/unit_tests/libcif_tests.so.0.26
-lib/klayout/plugins/streamers/cif/unit_tests/libcif_tests.so.${PKGVERSION}
-lib/klayout/plugins/streamers/common/Makefile
-lib/klayout/plugins/streamers/common/lay_plugin/Makefile
-lib/klayout/plugins/streamers/common/lay_plugin/moc_layCommonReaderPlugin.cpp
-lib/klayout/plugins/streamers/common/lay_plugin/moc_predefs.h
-lib/klayout/plugins/streamers/common/lay_plugin/ui_CommonReaderOptionsPage.h
-lib/klayout/plugins/streamers/dxf/Makefile
-lib/klayout/plugins/streamers/dxf/db_plugin/Makefile
-lib/klayout/plugins/streamers/dxf/lay_plugin/Makefile
-lib/klayout/plugins/streamers/dxf/lay_plugin/moc_layDXFReaderPlugin.cpp
-lib/klayout/plugins/streamers/dxf/lay_plugin/moc_layDXFWriterPlugin.cpp
-lib/klayout/plugins/streamers/dxf/lay_plugin/moc_predefs.h
-lib/klayout/plugins/streamers/dxf/lay_plugin/ui_DXFReaderOptionPage.h
-lib/klayout/plugins/streamers/dxf/lay_plugin/ui_DXFWriterOptionPage.h
-lib/klayout/plugins/streamers/dxf/unit_tests/Makefile
-lib/klayout/plugins/streamers/dxf/unit_tests/libdxf_tests.${RUBY_DLEXT}
-lib/klayout/plugins/streamers/dxf/unit_tests/libdxf_tests.so.0
-lib/klayout/plugins/streamers/dxf/unit_tests/libdxf_tests.so.0.26
-lib/klayout/plugins/streamers/dxf/unit_tests/libdxf_tests.so.${PKGVERSION}
-lib/klayout/plugins/streamers/gds2/Makefile
-lib/klayout/plugins/streamers/gds2/db_plugin/Makefile
-lib/klayout/plugins/streamers/gds2/lay_plugin/Makefile
-lib/klayout/plugins/streamers/gds2/lay_plugin/moc_layGDS2ReaderPlugin.cpp
-lib/klayout/plugins/streamers/gds2/lay_plugin/moc_layGDS2WriterPlugin.cpp
-lib/klayout/plugins/streamers/gds2/lay_plugin/moc_predefs.h
-lib/klayout/plugins/streamers/gds2/lay_plugin/ui_GDS2ReaderOptionPage.h
-lib/klayout/plugins/streamers/gds2/lay_plugin/ui_GDS2WriterOptionPage.h
-lib/klayout/plugins/streamers/gds2/unit_tests/Makefile
-lib/klayout/plugins/streamers/gds2/unit_tests/libgds2_tests.${RUBY_DLEXT}
-lib/klayout/plugins/streamers/gds2/unit_tests/libgds2_tests.so.0
-lib/klayout/plugins/streamers/gds2/unit_tests/libgds2_tests.so.0.26
-lib/klayout/plugins/streamers/gds2/unit_tests/libgds2_tests.so.${PKGVERSION}
-lib/klayout/plugins/streamers/lefdef/Makefile
-lib/klayout/plugins/streamers/lefdef/db_plugin/Makefile
-lib/klayout/plugins/streamers/lefdef/lay_plugin/Makefile
-lib/klayout/plugins/streamers/lefdef/lay_plugin/moc_layLEFDEFImportDialogs.cpp
-lib/klayout/plugins/streamers/lefdef/lay_plugin/moc_predefs.h
-lib/klayout/plugins/streamers/lefdef/lay_plugin/ui_LEFDEFImportOptionsDialog.h
-lib/klayout/plugins/streamers/lefdef/lay_plugin/ui_LEFDEFTechnologyComponentEditor.h
-lib/klayout/plugins/streamers/lefdef/unit_tests/Makefile
-lib/klayout/plugins/streamers/lefdef/unit_tests/liblefdef_tests.${RUBY_DLEXT}
-lib/klayout/plugins/streamers/lefdef/unit_tests/liblefdef_tests.so.0
-lib/klayout/plugins/streamers/lefdef/unit_tests/liblefdef_tests.so.0.26
-lib/klayout/plugins/streamers/lefdef/unit_tests/liblefdef_tests.so.${PKGVERSION}
-lib/klayout/plugins/streamers/magic/Makefile
-lib/klayout/plugins/streamers/magic/db_plugin/Makefile
-lib/klayout/plugins/streamers/magic/lay_plugin/Makefile
-lib/klayout/plugins/streamers/magic/lay_plugin/moc_layMAGReaderPlugin.cpp
-lib/klayout/plugins/streamers/magic/lay_plugin/moc_layMAGWriterPlugin.cpp
-lib/klayout/plugins/streamers/magic/lay_plugin/moc_predefs.h
-lib/klayout/plugins/streamers/magic/lay_plugin/ui_MAGReaderOptionPage.h
-lib/klayout/plugins/streamers/magic/lay_plugin/ui_MAGWriterOptionPage.h
-lib/klayout/plugins/streamers/magic/unit_tests/Makefile
-lib/klayout/plugins/streamers/magic/unit_tests/libmag_tests.${RUBY_DLEXT}
-lib/klayout/plugins/streamers/magic/unit_tests/libmag_tests.so.0
-lib/klayout/plugins/streamers/magic/unit_tests/libmag_tests.so.0.26
-lib/klayout/plugins/streamers/magic/unit_tests/libmag_tests.so.${PKGVERSION}
-lib/klayout/plugins/streamers/oasis/Makefile
-lib/klayout/plugins/streamers/oasis/db_plugin/Makefile
-lib/klayout/plugins/streamers/oasis/lay_plugin/Makefile
-lib/klayout/plugins/streamers/oasis/lay_plugin/ui_OASISWriterOptionPage.h
-lib/klayout/plugins/streamers/oasis/unit_tests/Makefile
-lib/klayout/plugins/streamers/oasis/unit_tests/liboasis_tests.${RUBY_DLEXT}
-lib/klayout/plugins/streamers/oasis/unit_tests/liboasis_tests.so.0
-lib/klayout/plugins/streamers/oasis/unit_tests/liboasis_tests.so.0.26
-lib/klayout/plugins/streamers/oasis/unit_tests/liboasis_tests.so.${PKGVERSION}
-lib/klayout/plugins/streamers/pcb/Makefile
-lib/klayout/plugins/streamers/pcb/db_plugin/Makefile
-lib/klayout/plugins/streamers/pcb/lay_plugin/Makefile
-lib/klayout/plugins/streamers/pcb/lay_plugin/moc_layGerberImportDialog.cpp
-lib/klayout/plugins/streamers/pcb/lay_plugin/moc_predefs.h
-lib/klayout/plugins/streamers/pcb/lay_plugin/ui_GerberImportDialog.h
-lib/klayout/plugins/streamers/pcb/unit_tests/Makefile
-lib/klayout/plugins/streamers/pcb/unit_tests/libpcb_tests.${RUBY_DLEXT}
-lib/klayout/plugins/streamers/pcb/unit_tests/libpcb_tests.so.0
-lib/klayout/plugins/streamers/pcb/unit_tests/libpcb_tests.so.0.26
-lib/klayout/plugins/streamers/pcb/unit_tests/libpcb_tests.so.${PKGVERSION}
-lib/klayout/plugins/tools/Makefile
-lib/klayout/plugins/tools/bool/Makefile
-lib/klayout/plugins/tools/bool/lay_plugin/Makefile
-lib/klayout/plugins/tools/bool/lay_plugin/moc_layBooleanOperationsDialogs.cpp
-lib/klayout/plugins/tools/bool/lay_plugin/moc_predefs.h
-lib/klayout/plugins/tools/bool/lay_plugin/ui_BooleanOptionsDialog.h
-lib/klayout/plugins/tools/bool/lay_plugin/ui_MergeOptionsDialog.h
-lib/klayout/plugins/tools/bool/lay_plugin/ui_SizingOptionsDialog.h
-lib/klayout/plugins/tools/diff/Makefile
-lib/klayout/plugins/tools/diff/lay_plugin/Makefile
-lib/klayout/plugins/tools/diff/lay_plugin/moc_layDiffToolDialog.cpp
-lib/klayout/plugins/tools/diff/lay_plugin/moc_predefs.h
-lib/klayout/plugins/tools/diff/lay_plugin/ui_DiffToolDialog.h
-lib/klayout/plugins/tools/import/Makefile
-lib/klayout/plugins/tools/import/lay_plugin/Makefile
-lib/klayout/plugins/tools/import/lay_plugin/moc_layStreamImportDialog.cpp
-lib/klayout/plugins/tools/import/lay_plugin/moc_predefs.h
-lib/klayout/plugins/tools/import/lay_plugin/ui_StreamImportDialog.h
-lib/klayout/plugins/tools/net_tracer/Makefile
-lib/klayout/plugins/tools/net_tracer/db_plugin/Makefile
-lib/klayout/plugins/tools/net_tracer/lay_plugin/Makefile
-lib/klayout/plugins/tools/net_tracer/lay_plugin/moc_layNetTracerConfig.cpp
-lib/klayout/plugins/tools/net_tracer/lay_plugin/moc_layNetTracerDialog.cpp
-lib/klayout/plugins/tools/net_tracer/lay_plugin/moc_layNetTracerIO.cpp
-lib/klayout/plugins/tools/net_tracer/lay_plugin/moc_predefs.h
-lib/klayout/plugins/tools/net_tracer/lay_plugin/ui_NetTracerConfigPage.h
-lib/klayout/plugins/tools/net_tracer/lay_plugin/ui_NetTracerDialog.h
-lib/klayout/plugins/tools/net_tracer/lay_plugin/ui_NetTracerTechComponentEditor.h
-lib/klayout/plugins/tools/net_tracer/unit_tests/Makefile
-lib/klayout/plugins/tools/net_tracer/unit_tests/libnet_tracer_tests.${RUBY_DLEXT}
-lib/klayout/plugins/tools/net_tracer/unit_tests/libnet_tracer_tests.so.0
-lib/klayout/plugins/tools/net_tracer/unit_tests/libnet_tracer_tests.so.0.26
-lib/klayout/plugins/tools/net_tracer/unit_tests/libnet_tracer_tests.so.${PKGVERSION}
-lib/klayout/plugins/tools/xor/Makefile
-lib/klayout/plugins/tools/xor/lay_plugin/Makefile
-lib/klayout/plugins/tools/xor/lay_plugin/moc_layXORToolDialog.cpp
-lib/klayout/plugins/tools/xor/lay_plugin/moc_predefs.h
-lib/klayout/plugins/tools/xor/lay_plugin/ui_XORToolDialog.h
+lib/klayout/pymod/klayout/QtCore.${RUBY_DLEXT}
+lib/klayout/pymod/klayout/QtDesigner.${RUBY_DLEXT}
+lib/klayout/pymod/klayout/QtGui.${RUBY_DLEXT}
+lib/klayout/pymod/klayout/QtMultimedia.${RUBY_DLEXT}
+lib/klayout/pymod/klayout/QtNetwork.${RUBY_DLEXT}
+lib/klayout/pymod/klayout/QtPrintSupport.${RUBY_DLEXT}
+lib/klayout/pymod/klayout/QtSql.${RUBY_DLEXT}
+lib/klayout/pymod/klayout/QtSvg.${RUBY_DLEXT}
+lib/klayout/pymod/klayout/QtWidgets.${RUBY_DLEXT}
+lib/klayout/pymod/klayout/QtXml.${RUBY_DLEXT}
+lib/klayout/pymod/klayout/QtXmlPatterns.${RUBY_DLEXT}
+lib/klayout/pymod/klayout/__init__.py
+lib/klayout/pymod/klayout/db/__init__.py
+lib/klayout/pymod/klayout/db/pcell_declaration_helper.py
+lib/klayout/pymod/klayout/dbcore.${RUBY_DLEXT}
+lib/klayout/pymod/klayout/lay.${RUBY_DLEXT}
+lib/klayout/pymod/klayout/lib/__init__.py
+lib/klayout/pymod/klayout/libcore.${RUBY_DLEXT}
+lib/klayout/pymod/klayout/rdb/__init__.py
+lib/klayout/pymod/klayout/rdbcore.${RUBY_DLEXT}
+lib/klayout/pymod/klayout/tl/__init__.py
+lib/klayout/pymod/klayout/tlcore.${RUBY_DLEXT}
+lib/klayout/pymod/pya/__init__.py

Index: pkgsrc/cad/klayout/distinfo
diff -u pkgsrc/cad/klayout/distinfo:1.13 pkgsrc/cad/klayout/distinfo:1.14
--- pkgsrc/cad/klayout/distinfo:1.13    Fri Oct 30 15:35:10 2020
+++ pkgsrc/cad/klayout/distinfo Sat May 22 13:45:52 2021
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.13 2020/10/30 15:35:10 mef Exp $
+$NetBSD: distinfo,v 1.14 2021/05/22 13:45:52 mef Exp $
 
-SHA1 (klayout-0.26.8.tar.gz) = a118dde0020b496a73b7614940ae9c9f52be5119
-RMD160 (klayout-0.26.8.tar.gz) = a252316aa189d10bc8f6b70df2834958ecd707f7
-SHA512 (klayout-0.26.8.tar.gz) = a37b324194ed523ee70a1d63034db9ba48cf55d44d3a9d1bc612803cde2425f6909fd0571ad4a66318fc2c6735e19ba11a26ab153e1200adec405c16fc05f144
-Size (klayout-0.26.8.tar.gz) = 54423228 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) = e051576d981989cc09efcb8a8dba5f7b3804a22a
-SHA1 (patch-src_tlStream.cc) = 6650a6742e1bb61ce76b58045596ad3ed11803d7
+SHA1 (klayout-0.26.10.tar.gz) = 6bf6b0e1cfecfc02b75c0c7601901a161e855b83
+RMD160 (klayout-0.26.10.tar.gz) = 91196941a7ed9526cc5a31e3b44489f40adee571
+SHA512 (klayout-0.26.10.tar.gz) = d1c692bad828284270b999abc8600a00e3b6c2f999d5b33361ab10d537bd60db9b4fec0f17d94c917e4ca7df8fcc48c7603b69dbae8f2de6ab0d41eba52f343e
+Size (klayout-0.26.10.tar.gz) = 54444663 bytes
+SHA1 (patch-config_Makefile.conf.freebsd-32-gcc-release) = 0eaac4f5bd5441976f6113f37b1643653f4fdea4
+SHA1 (patch-config_Makefile.conf.netbsd-32-gcc-release) = b18e6708a2b40c69275bb6c285ddebb49e9808bb
+SHA1 (patch-src_lay_lay_layApplication.cc) = fa42542213519e8c04820ab08ce5c1385bf8b860
+SHA1 (patch-src_lay_lay_laySignalHandler.cc) = 7825a63f8d556ab164f67aac646cbe35d4d36abc
+SHA1 (patch-src_tl_tl_tlStream.cc) = 6650a6742e1bb61ce76b58045596ad3ed11803d7

Index: pkgsrc/cad/klayout/patches/patch-config_Makefile.conf.freebsd-32-gcc-release
diff -u pkgsrc/cad/klayout/patches/patch-config_Makefile.conf.freebsd-32-gcc-release:1.1 pkgsrc/cad/klayout/patches/patch-config_Makefile.conf.freebsd-32-gcc-release:1.2
--- pkgsrc/cad/klayout/patches/patch-config_Makefile.conf.freebsd-32-gcc-release:1.1    Tue Jul 24 13:00:10 2018
+++ pkgsrc/cad/klayout/patches/patch-config_Makefile.conf.freebsd-32-gcc-release        Sat May 22 13:45:52 2021
@@ -1,4 +1,8 @@
-$NetBSD: patch-config_Makefile.conf.freebsd-32-gcc-release,v 1.1 2018/07/24 13:00:10 ryoon Exp $
+$NetBSD: patch-config_Makefile.conf.freebsd-32-gcc-release,v 1.2 2021/05/22 13:45:52 mef Exp $
+
+# Configuration file for
+# gcc, FreeBSD
+# release build
 
 --- config/Makefile.conf.freebsd-32-gcc-release.orig   2018-07-16 03:52:39.157322134 +0000
 +++ config/Makefile.conf.freebsd-32-gcc-release
Index: pkgsrc/cad/klayout/patches/patch-config_Makefile.conf.netbsd-32-gcc-release
diff -u pkgsrc/cad/klayout/patches/patch-config_Makefile.conf.netbsd-32-gcc-release:1.1 pkgsrc/cad/klayout/patches/patch-config_Makefile.conf.netbsd-32-gcc-release:1.2
--- pkgsrc/cad/klayout/patches/patch-config_Makefile.conf.netbsd-32-gcc-release:1.1     Tue Jul 24 13:00:10 2018
+++ pkgsrc/cad/klayout/patches/patch-config_Makefile.conf.netbsd-32-gcc-release Sat May 22 13:45:52 2021
@@ -1,4 +1,8 @@
-$NetBSD: patch-config_Makefile.conf.netbsd-32-gcc-release,v 1.1 2018/07/24 13:00:10 ryoon Exp $
+$NetBSD: patch-config_Makefile.conf.netbsd-32-gcc-release,v 1.2 2021/05/22 13:45:52 mef Exp $
+
+# Configuration file for
+# gcc, NetBSD
+# release build
 
 --- config/Makefile.conf.netbsd-32-gcc-release.orig    2018-07-16 03:52:39.164355967 +0000
 +++ config/Makefile.conf.netbsd-32-gcc-release

Index: pkgsrc/cad/klayout/patches/patch-src_lay_lay_laySignalHandler.cc
diff -u pkgsrc/cad/klayout/patches/patch-src_lay_lay_laySignalHandler.cc:1.2 pkgsrc/cad/klayout/patches/patch-src_lay_lay_laySignalHandler.cc:1.3
--- pkgsrc/cad/klayout/patches/patch-src_lay_lay_laySignalHandler.cc:1.2        Fri Oct 30 15:35:11 2020
+++ pkgsrc/cad/klayout/patches/patch-src_lay_lay_laySignalHandler.cc    Sat May 22 13:45:52 2021
@@ -1,4 +1,6 @@
-$NetBSD: patch-src_lay_lay_laySignalHandler.cc,v 1.2 2020/10/30 15:35:11 mef Exp $
+$NetBSD: patch-src_lay_lay_laySignalHandler.cc,v 1.3 2021/05/22 13:45:52 mef Exp $
+
+Add NetBSD
 
 --- src/lay/lay/laySignalHandler.cc.orig       2020-10-25 01:23:18.681179164 +0000
 +++ src/lay/lay/laySignalHandler.cc

Added files:

Index: pkgsrc/cad/klayout/patches/patch-src_lay_lay_layApplication.cc
diff -u /dev/null pkgsrc/cad/klayout/patches/patch-src_lay_lay_layApplication.cc:1.1
--- /dev/null   Sat May 22 13:45:53 2021
+++ pkgsrc/cad/klayout/patches/patch-src_lay_lay_layApplication.cc      Sat May 22 13:45:52 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_lay_lay_layApplication.cc,v 1.1 2021/05/22 13:45:52 mef Exp $
+
+To avoid following message
+error: 'struct sigaction' has no member named 'sa_restorer'
+
+--- 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>
Index: pkgsrc/cad/klayout/patches/patch-src_tl_tl_tlStream.cc
diff -u /dev/null pkgsrc/cad/klayout/patches/patch-src_tl_tl_tlStream.cc:1.1
--- /dev/null   Sat May 22 13:45:53 2021
+++ pkgsrc/cad/klayout/patches/patch-src_tl_tl_tlStream.cc      Sat May 22 13:45:52 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_tl_tl_tlStream.cc,v 1.1 2021/05/22 13:45:52 mef Exp $
+
+date: 2017-02-15 06:33:08 +0900;  author: joerg;  state: Exp;  commitid: BDodrFgUrNgNVXFz;
+Add missing includes.
+
+--- src/tl/tl/tlStream.cc.orig 2020-09-14 19:27:22.000000000 +0000
++++ src/tl/tl/tlStream.cc
+@@ -30,6 +30,7 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include <zlib.h>
++#include <unistd.h>
+ #ifdef _WIN32 
+ #  include <io.h>
+ #endif

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index