Date: Fri, 4 Nov 2016 21:25:49 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r425361 - in head/cad/klayout: . files Message-ID: <201611042125.uA4LPn8a034889@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Fri Nov 4 21:25:49 2016 New Revision: 425361 URL: https://svnweb.freebsd.org/changeset/ports/425361 Log: - Update to 0.24.8. - Fix dependency on Python shlib. - Enable _MAKE_JOBS. - Do not override system-wide CFLAGS, CXXFLAGS, and LDFLAGS. Added: head/cad/klayout/files/patch-src-layApplication.cc (contents, props changed) Modified: head/cad/klayout/Makefile head/cad/klayout/distinfo head/cad/klayout/files/patch-build.sh head/cad/klayout/files/patch-config-Makefile.conf Modified: head/cad/klayout/Makefile ============================================================================== --- head/cad/klayout/Makefile Fri Nov 4 20:31:00 2016 (r425360) +++ head/cad/klayout/Makefile Fri Nov 4 21:25:49 2016 (r425361) @@ -1,19 +1,20 @@ # $FreeBSD$ PORTNAME= klayout -PORTVERSION= 0.23.8 +PORTVERSION= 0.24.8 CATEGORIES= cad -MASTER_SITES= http://178.77.72.242/downloads/ +MASTER_SITES= http://www.klayout.org/downloads/ MAINTAINER= hrs@FreeBSD.org COMMENT= Qt-based GDS2 Viewer LICENSE= GPLv2 -USES= gmake +USES= compiler:c++0x gmake python:build USE_RUBY= yes USE_QT4= corelib designer gui network moc_build sql uic_build \ rcc_build qt3support xml +USE_LDCONFIG= yes PLIST_FILES= bin/klayout \ bin/strm2cif \ bin/strm2dxf \ @@ -30,7 +31,9 @@ BROKEN_sparc64= Does not compile on spar do-build: cd ${WRKSRC} && \ - ${SETENV} CC=${CC} CXX=${CXX} \ + ${SETENV} CC=${CC} CXX=${CXX} CFLAGS="${CFLAGS}" \ + CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \ + _MAKE_JOBS="${_MAKE_JOBS}" \ ${SH} build.sh -platform ${PLATFORMKEYWORD} \ -qtbin ${QT_PREFIX}/bin \ -qtinc ${QT_INCDIR} \ Modified: head/cad/klayout/distinfo ============================================================================== --- head/cad/klayout/distinfo Fri Nov 4 20:31:00 2016 (r425360) +++ head/cad/klayout/distinfo Fri Nov 4 21:25:49 2016 (r425361) @@ -1,2 +1,3 @@ -SHA256 (klayout-0.23.8.tar.gz) = e20c2d76d805d52e20ccc6f465158797e9d360d1d0c88b4a07de8f07887f2945 -SIZE (klayout-0.23.8.tar.gz) = 9559359 +TIMESTAMP = 1478282144 +SHA256 (klayout-0.24.8.tar.gz) = e3ad6b88b6d6e774d55a22cbdbb932d3506988a857a508bee3dc1eb16861bd98 +SIZE (klayout-0.24.8.tar.gz) = 11262068 Modified: head/cad/klayout/files/patch-build.sh ============================================================================== --- head/cad/klayout/files/patch-build.sh Fri Nov 4 20:31:00 2016 (r425360) +++ head/cad/klayout/files/patch-build.sh Fri Nov 4 21:25:49 2016 (r425361) @@ -1,17 +1,17 @@ ---- build.sh.orig 2014-02-24 05:44:13.000000000 +0900 -+++ build.sh 2014-05-22 11:58:57.000000000 +0900 -@@ -1,7 +1,7 @@ - #!/bin/sh - +--- build.sh.orig 2016-06-20 01:35:28.000000000 +0900 ++++ build.sh 2016-11-05 05:47:55.089440000 +0900 +@@ -3,7 +3,7 @@ EXEC_NAME=klayout + IS_MAC="no" + EXEC_HOLDER="" -OTHER_BIN="" +OTHER_BIN="strm2gds strm2oas strm2txt strm2cif strm2dxf strmcmp strmclip strmxor" CURR_DIR=`pwd` PLATFORM="linux-32-gcc-release" -@@ -33,6 +33,9 @@ - exit 1 - fi +@@ -39,6 +39,9 @@ + PLATFORM="mac-yosemite-gcc-release" + EXEC_HOLDER="klayout.app/Contents/MacOS" ;; +FreeBSD) + PLATFORM="freebsd-32-gcc-release" @@ -19,7 +19,7 @@ *) # Assume Linux for the remaining variants case `arch` in -@@ -261,7 +264,7 @@ +@@ -374,7 +377,7 @@ echo " 64 bit coordinates enabled" fi @@ -28,7 +28,7 @@ if [ "$gcc_path" = "" ]; then echo "*** ERROR: unable to locate gcc in path" exit 1 -@@ -284,11 +287,11 @@ +@@ -398,11 +401,11 @@ ;; esac @@ -42,21 +42,44 @@ echo "*** ERROR: unable to locate Qt UIC in $QTBIN" exit 1 fi -@@ -409,12 +412,12 @@ - if [ $WIN_CYGWIN = 0 ]; then +@@ -463,11 +466,7 @@ + cd $CURR_DIR + fi + +-if ( gmake -v >/dev/null 2>/dev/null ); then +- MAKE_PRG=gmake +-else +- MAKE_PRG=make +-fi ++MAKE_PRG="gmake ${_MAKE_JOBS}" + + mkdir -p $BUILD + echo "WIN_CYGWIN=$WIN_CYGWIN" >$BUILD/Makefile +@@ -515,6 +514,9 @@ + echo "HAVE_PYTHON=$HAVE_PYTHON" >>$BUILD/Makefile.env + echo "HAVE_QTBINDINGS=$HAVE_QTBINDINGS" >>$BUILD/Makefile.env + echo "HAVE_64BIT_COORD=$HAVE_64BIT_COORD" >>$BUILD/Makefile.env ++echo "CFLAGS=$CFLAGS" >>$BUILD/Makefile.env ++echo "CXXFLAGS=$CXXFLAGS" >>$BUILD/Makefile.env ++echo "LDLAGS=$LDFLAGS" >>$BUILD/Makefile.env + + echo "Building plugins: $PLUGINS" + echo "" +@@ -549,12 +551,12 @@ + fi echo "" - echo "Final binary is ready in $BIN/$EXEC_NAME." + echo "Final binary is ready in $EXEC_FULL_PATH." - echo "To run it, you may need to add the following to your LD_LIBRARY_PATH:" - echo "$QTLIB" -+ #echo "To run it, you may need to add the following to your LD_LIBRARY_PATH:" -+ #echo "$QTLIB" - ++# echo "To run it, you may need to add the following to your LD_LIBRARY_PATH:" ++# echo "$QTLIB" + - LD_LIBRARY_PATH=$QTLIB:$LD_LIBRARY_PATH -- $BIN/$EXEC_NAME -v -- $BIN/$EXEC_NAME -h -+ #LD_LIBRARY_PATH=$QTLIB:$LD_LIBRARY_PATH -+ #$BIN/$EXEC_NAME -v -+ #$BIN/$EXEC_NAME -h +- $EXEC_FULL_PATH -v +- $EXEC_FULL_PATH -h ++# LD_LIBRARY_PATH=$QTLIB:$LD_LIBRARY_PATH ++# $EXEC_FULL_PATH -v ++# $EXEC_FULL_PATH -h fi exit 0 Modified: head/cad/klayout/files/patch-config-Makefile.conf ============================================================================== --- head/cad/klayout/files/patch-config-Makefile.conf Fri Nov 4 20:31:00 2016 (r425360) +++ head/cad/klayout/files/patch-config-Makefile.conf Fri Nov 4 21:25:49 2016 (r425361) @@ -19,14 +19,14 @@ +CXXOPT_DEP=-MM -MG +CXXWARN=-Wall -Wno-deprecated -Woverloaded-virtual \ + -Wsign-promo -Wsynth -Wno-long-long -Wno-strict-aliasing -+CXXOPT=${CXXFLAGS} -c -o ++CXXOPT=${CXXFLAGS} -g -c -o +CXXOPT_SO=-fPIC $(CXXOPT) + +# C +CC?=gcc +CCOPT_DEP=-MM -MG +CCWARN= -+CCOPT=${CFLAGS} -c -o ++CCOPT=${CFLAGS} -g -c -o +CCOPT_SO=-fPIC $(CCOPT) + +# Linker @@ -34,7 +34,7 @@ +LOPT=${LDFLAGS} -g -Wl,-E -o +LOPT_SO=${LDFLAGS} -g -shared -o + -+LIBS=${PTHREAD_LIBS} -L$(QTLIB) -lQtGui -lQtCore -lQtXml -lQtNetwork -lQtSql -lQtDesigner -lrt -lm -lcrypt -lz ++LIBS=${PTHREAD_LIBS} -lexecinfo -L$(QTLIB) -lQtGui -lQtCore -lQtXml -lQtNetwork -lQtSql -lQtDesigner -lrt -lm -lcrypt -lz + +.PHONY: install +install: Added: head/cad/klayout/files/patch-src-layApplication.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/klayout/files/patch-src-layApplication.cc Fri Nov 4 21:25:49 2016 (r425361) @@ -0,0 +1,19 @@ +--- src/layApplication.cc.orig 2016-06-20 01:35:29.000000000 +0900 ++++ src/layApplication.cc 2016-11-05 04:21:44.257764000 +0900 +@@ -20,6 +20,7 @@ + + */ + ++#include <sys/param.h> + + #include "layApplication.h" + #include "layConfig.h" +@@ -351,7 +352,7 @@ + act.sa_sigaction = signal_handler; + sigemptyset (&act.sa_mask); + act.sa_flags = SA_SIGINFO; +-#if !defined(__APPLE__) ++#if !defined(__APPLE__) && !defined(__FreeBSD__) + act.sa_restorer = 0; + #endif +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611042125.uA4LPn8a034889>