(klayout) adhoc fix added for shared library linking

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

Module Name:	pkgsrc-wip
Committed By:	Makoto Fujiwara <makoto%ki.nu@localhost>
Pushed By:	mef
Date:		Thu Mar 10 21:24:22 2016 +0900
Changeset:	f998032476228b5628b161bc8449aa4f70e1c12d

Modified Files:
	klayout/Makefile
	klayout/distinfo
	klayout/patches/patch-config_Makefile_conf_netbsd-32-gcc-release

Log Message:
(klayout) adhoc fix added for shared library linking

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

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

diffstat:
 klayout/Makefile                                                 | 3 ++-
 klayout/distinfo                                                 | 2 +-
 klayout/patches/patch-config_Makefile_conf_netbsd-32-gcc-release | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diffs:
diff --git a/klayout/Makefile b/klayout/Makefile
index 5c77b0a..728f5d6 100644
--- a/klayout/Makefile
+++ b/klayout/Makefile
@@ -9,7 +9,7 @@ HOMEPAGE=	http://www.klayout.org/downloads/
 COMMENT=	Simple GDS and OASIS file viewer and Editor
 LICENSE=	gnu-gpl-v2
 
-BROKEN=		Shared library linking fails, see TODO, thank you.
+BROKEN=		make install step does not work yet.
 
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake
@@ -23,6 +23,7 @@ SUBST_MESSAGE.rpath=	Add COMPILER_RPATH_FLAG and PREFIX to NetBSD specific confi
 SUBST_FILES.rpath+=	config/Makefile.conf.netbsd-32-gcc-release
 SUBST_STAGE.rpath=	post-patch
 SUBST_VARS.rpath=	COMPILER_RPATH_FLAG PREFIX
+SUBST_SED.rpath=	'-e s|@@LDFLAGS@@|${LDFLAGS}|'
 
 do-build:
 	(cd ${WRKSRC}; sh build.sh -python python${PYVERSSUFFIX} -qt ${PREFIX}/qt4)
diff --git a/klayout/distinfo b/klayout/distinfo
index 0c8723b..c6df556 100644
--- a/klayout/distinfo
+++ b/klayout/distinfo
@@ -6,5 +6,5 @@ SHA512 (klayout-0.24.5.tar.gz) = b1b8e80060adf089b9059802656421629bd4ddb781fe924
 Size (klayout-0.24.5.tar.gz) = 11251829 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) = 224acc80fabc6cbb5ecaf138086a8ce14c2914a7
+SHA1 (patch-config_Makefile_conf_netbsd-32-gcc-release) = 591d78a1d399ff08f290c1193ea008da51cd498c
 SHA1 (patch-src_layApplication.cc) = d3f115836e75a76ab2322048d8698c0dcd6c7492
diff --git a/klayout/patches/patch-config_Makefile_conf_netbsd-32-gcc-release b/klayout/patches/patch-config_Makefile_conf_netbsd-32-gcc-release
index b390869..868f8ca 100644
--- a/klayout/patches/patch-config_Makefile_conf_netbsd-32-gcc-release
+++ b/klayout/patches/patch-config_Makefile_conf_netbsd-32-gcc-release
@@ -35,8 +35,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=@@LDFLAGS@@ -g -Wl,-E -o
++LOPT_SO=	@COMPILER_RPATH_FLAG@@PREFIX@/lib:@PREFIX@/qt-4/lib:/usr/lib @@LDFLAGS@@ -g -shared -o
 +# 
 +LIBS=${PTHREAD_LIBS} -L$(QTLIB) -lQtGui -lQtCore -lQtXml -lQtNetwork -lQtSql -lQtDesigner -lrt -lm -lcrypt -lz
 +