To resolv CONFLICT, some file are added again

[Makoto Fujiwara <makoto%ki.nu@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Makoto Fujiwara <makoto%ki.nu@localhost>
Pushed By:	mef
Date:		Wed Jan 13 18:22:28 2021 +0900
Changeset:	a1c7417937b594e21855b06cce7791e1ee8d09d0

Added Files:
	klayout/Makefile
	klayout/distinfo
	klayout/patches/patch-src_lay_lay_laySignalHandler.cc
	klayout/patches/patch-src_tlStream.cc

Log Message:
To resolv CONFLICT, some file are added again

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a1c7417937b594e21855b06cce7791e1ee8d09d0

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

diffstat:
 klayout/Makefile                                   | 61 ++++++++++++++++++++++
 klayout/distinfo                                   | 11 ++++
 .../patches/patch-src_lay_lay_laySignalHandler.cc  | 13 +++++
 klayout/patches/patch-src_tlStream.cc              | 15 ++++++
 4 files changed, 100 insertions(+)

diffs:
diff --git a/klayout/Makefile b/klayout/Makefile
new file mode 100644
index 0000000000..64d10d7cb9
--- /dev/null
+++ b/klayout/Makefile
@@ -0,0 +1,61 @@
+# $NetBSD: Makefile,v 1.32 2021/01/01 09:52:19 ryoon Exp $
+
+DISTNAME=	klayout-0.26.8
+PKGREVISION=	2
+CATEGORIES=	cad
+MASTER_SITES=	http://www.klayout.org/downloads/source/
+
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=	https://www.klayout.de/
+COMMENT=	Simple GDS and OASIS file viewer and Editor
+LICENSE=	gnu-gpl-v2
+
+USE_LANGUAGES=	c c++
+USE_TOOLS+=	gmake bash
+
+CFLAGS+=	-I${PREFIX}/include/python${PYVERSUFFIX}
+NO_CONFIGURE=	yes
+
+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 LDFLAGS
+
+BUILDLINK_TRANSFORM.NetBSD+=	rm:-ldl
+
+AUTO_MKDIRS=		yes
+INSTALL_BINDIR=		${DESTDIR}${PREFIX}/bin
+INSTALL_LIBDIR=		${DESTDIR}${PREFIX}/lib
+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} ${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} && \
+	${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/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qtsvg/buildlink3.mk"
+.include "../../x11/qt5-qttools/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/klayout/distinfo b/klayout/distinfo
new file mode 100644
index 0000000000..6e13f2b12f
--- /dev/null
+++ b/klayout/distinfo
@@ -0,0 +1,11 @@
+$NetBSD: distinfo,v 1.13 2020/10/30 15:35:10 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
diff --git a/klayout/patches/patch-src_lay_lay_laySignalHandler.cc b/klayout/patches/patch-src_lay_lay_laySignalHandler.cc
new file mode 100644
index 0000000000..d0f95c59f6
--- /dev/null
+++ b/klayout/patches/patch-src_lay_lay_laySignalHandler.cc
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_lay_lay_laySignalHandler.cc,v 1.2 2020/10/30 15:35:11 mef Exp $
+
+--- src/lay/lay/laySignalHandler.cc.orig	2020-10-25 01:23:18.681179164 +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__) && !defined(__OpenBSD__)
++#if !defined(__APPLE__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
+   act.sa_restorer = 0;
+ #endif
+ 
diff --git a/klayout/patches/patch-src_tlStream.cc b/klayout/patches/patch-src_tlStream.cc
new file mode 100644
index 0000000000..d38919eca5
--- /dev/null
+++ b/klayout/patches/patch-src_tlStream.cc
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_tlStream.cc,v 1.4 2020/10/30 15:35:11 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