pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

klayout: Use Qt 5 instead of Qt 4



Module Name:	pkgsrc-wip
Committed By:	Ryo ONODERA <ryoon%NetBSD.org@localhost>
Pushed By:	ryoon
Date:		Mon Jul 16 21:58:03 2018 +0900
Changeset:	145fe68984ed05f29654ddd0f9485b7581552a0d

Modified Files:
	klayout/Makefile

Log Message:
klayout: Use Qt 5 instead of Qt 4

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

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

diffstat:
 klayout/Makefile | 52 +++++++++++++++++++++-------------------------------
 1 file changed, 21 insertions(+), 31 deletions(-)

diffs:
diff --git a/klayout/Makefile b/klayout/Makefile
index 5500064790..bae60f6abf 100644
--- a/klayout/Makefile
+++ b/klayout/Makefile
@@ -22,46 +22,36 @@ 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=	post-patch
-SUBST_VARS.rpath=	COMPILER_RPATH_FLAG PREFIX
-SUBST_SED.rpath=	-e 's|@@LDFLAGS@@|${LDFLAGS}|'
+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
 
 do-build:
-	cd ${WRKSRC} && ${PKGSRC_SETENV} ${MAKE_ENV} ${BASH} build.sh -python python${PYVERSSUFFIX} \
-	-qt4 \
-	-qmake ${PREFIX}/qt4/bin/qmake \
-	-ruby ${PREFIX}/bin/${RUBY_NAME}
+	cd ${WRKSRC} && ${PKGSRC_SETENV} ${MAKE_ENV} ${BASH} build.sh \
+	-python python${PYVERSSUFFIX} \
+	-qt5 \
+	-qmake ${PREFIX}/qt5/bin/qmake \
+	-ruby ${PREFIX}/bin/${RUBY_NAME} \
+	-prefix ${PREFIX} \
+	-option -j${MAKE_JOBS}
 
 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"


Home | Main Index | Thread Index | Old Index