(klayout) Trying to add do-install: target

[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 23:29:12 2016 +0900
Changeset:	e4daaa79a33986d21d45040688fdffa87c9fe01e

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

Log Message:
(klayout) Trying to add do-install: target

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

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

diffstat:
 klayout/Makefile                                   | 33 ++++++++++++++++++++--
 klayout/PLIST                                      | 11 ++++++++
 klayout/TODO                                       | 20 +------------
 klayout/distinfo                                   |  2 +-
 ...atch-config_Makefile_conf_netbsd-32-gcc-release | 26 ++++++++---------
 5 files changed, 57 insertions(+), 35 deletions(-)

diffs:
diff --git a/klayout/Makefile b/klayout/Makefile
index 728f5d6..7a7ad12 100644
--- a/klayout/Makefile
+++ b/klayout/Makefile
@@ -9,13 +9,13 @@ HOMEPAGE=	http://www.klayout.org/downloads/
 COMMENT=	Simple GDS and OASIS file viewer and Editor
 LICENSE=	gnu-gpl-v2
 
-BROKEN=		make install step does not work yet.
+BROKEN=		lib/libklayout.so is not installed yet
 
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake
 
 CFLAGS+=	-I${PREFIX}/include/python${PYVERSUFFIX}
-LD_LIBRARY_PATH=${PREFIX}/lib
+#LD_LIBRARY_PATH=${PREFIX}/lib
 NO_CONFIGURE=	yes
 
 SUBST_CLASSES+= 	rpath
@@ -25,9 +25,38 @@ SUBST_STAGE.rpath=	post-patch
 SUBST_VARS.rpath=	COMPILER_RPATH_FLAG PREFIX
 SUBST_SED.rpath=	'-e s|@@LDFLAGS@@|${LDFLAGS}|'
 
+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 \
+
 do-build:
 	(cd ${WRKSRC}; sh build.sh -python python${PYVERSSUFFIX} -qt ${PREFIX}/qt4)
 
+do-install:
+	(cd ${WRKSRC}; \
+	pwd; \
+	${INSTALL_PROGRAM} ${REL_DIR}/main/klayout ${INSTALL_BINDIR}; \
+	for bin in ${OTHER_BIN}; do \
+	  ${INSTALL_PROGRAM} ${REL_DIR}/main/$$bin ${INSTALL_BINDIR} ;\
+	done ;\
+	for plugin in ${PLUGINS}; do \
+	  ${INSTALL_PROGRAM} ${REL_DIR}/main/libklayout.so ${INSTALL_LIBDIR} ;\
+	done ;\
+	${CHMOD} 755 ${INSTALL_BINDIR}/* ;\
+	)
+
 .include "../../lang/python/pyversion.mk"
 .include "../../lang/ruby/buildlink3.mk"
 .include "../../x11/qt4-libs/buildlink3.mk"
diff --git a/klayout/PLIST b/klayout/PLIST
index 48d96a5..0a715fb 100644
--- a/klayout/PLIST
+++ b/klayout/PLIST
@@ -1 +1,12 @@
 @comment $NetBSD$
+bin/klayout
+bin/strm2cif
+bin/strm2dxf
+bin/strm2gds
+bin/strm2gdstxt
+bin/strm2oas
+bin/strm2txt
+bin/strmclip
+bin/strmcmp
+bin/strmxor
+lib/libklayout.so
diff --git a/klayout/TODO b/klayout/TODO
index 4885d00..8799152 100644
--- a/klayout/TODO
+++ b/klayout/TODO
@@ -1,25 +1,7 @@
 - Tested only on NetBSD/amd64 7.0 and 7.99.25
-- Currently rpath or LD_LIBRARY_PATH is not properly set
-- make install is not implemented yet.
-  (thus PLIST is not ready)
-- (Test is done before make package, by:
-   env LD_LIBRARY_PATH=/usr/pkg/lib:/usr/pkg/qt4/lib   \
-   /export/WRKOBJDIR/wip/klayout/work/klayout-0.24.5/bin.netbsd-32-gcc-release/klayout
-  )
 - Several hard coding for string gcc ar etc
 - ruby version handling is not properly setup
 - MAKE_JOBS= may not be in effect ?
 
+- lib/libklayout.so is not installed yet
 
-(sample log)
------------------
-Build done.
-
-Final binary is ready in /export/WRKOBJDIR/wip/klayout/work/klayout-0.24.5/bin.netbsd-32-gcc-release/klayout.
-To run it, you may need to add the following to your LD_LIBRARY_PATH:
-/usr/pkg/qt4/lib
-Shared object "libruby23.so.23" not found
-Shared object "libruby23.so.23" not found
-=> Unwrapping files-to-be-installed.
-762.07s 77.20s 14:00.81 99% 0+0k 0+609io 470pf+0w
------------------
diff --git a/klayout/distinfo b/klayout/distinfo
index c6df556..b9ba278 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) = 591d78a1d399ff08f290c1193ea008da51cd498c
+SHA1 (patch-config_Makefile_conf_netbsd-32-gcc-release) = 1fd264f8a25d4410cd48fcfbbbfbf149e65e3b22
 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 868f8ca..ab79ecf 100644
--- a/klayout/patches/patch-config_Makefile_conf_netbsd-32-gcc-release
+++ b/klayout/patches/patch-config_Makefile_conf_netbsd-32-gcc-release
@@ -40,17 +40,17 @@ Add NetBSD
 +# 
 +LIBS=${PTHREAD_LIBS} -L$(QTLIB) -lQtGui -lQtCore -lQtXml -lQtNetwork -lQtSql -lQtDesigner -lrt -lm -lcrypt -lz
 +
-+.PHONY: install
-+install:
-+	mkdir -p $(INSTALL_BINDIR)
-+	cp main/$(EXEC_NAME) $(INSTALL_BINDIR)
-+	for bin in $(OTHER_BIN) ; \
-+	do \
-+	cp main/$$bin $(INSTALL_BINDIR) ; \
-+	done
-+	for plugin in $(PLUGINS) ; \
-+	do \
-+	cp $$plugin/*.so $(INSTALL_BINDIR) ; \
-+	done
-+	chmod 755 $(INSTALL_BINDIR) $(INSTALL_BINDIR)/*
++#.PHONY: install
++#install:
++#	mkdir -p $(INSTALL_BINDIR)
++#	cp main/$(EXEC_NAME) $(INSTALL_BINDIR)
++#	for bin in $(OTHER_BIN) ; \
++#	do \
++#	cp main/$$bin $(INSTALL_BINDIR) ; \
++#	done
++#	for plugin in $(PLUGINS) ; \
++#	do \
++#	cp $$plugin/*.so $(INSTALL_BINDIR) ; \
++#	done
++#	chmod 755 $(INSTALL_BINDIR) $(INSTALL_BINDIR)/*
 +