Index: head/cad/klayout/Makefile =================================================================== --- head/cad/klayout/Makefile (revision 426773) +++ head/cad/klayout/Makefile (revision 426774) @@ -1,51 +1,51 @@ # $FreeBSD$ PORTNAME= klayout PORTVERSION= 0.24.8 CATEGORIES= cad MASTER_SITES= http://www.klayout.org/downloads/ MAINTAINER= hrs@FreeBSD.org COMMENT= Qt-based GDS2 Viewer LICENSE= GPLv2 -USES= compiler:c++0x gmake python:build +USES= compiler:c++0x execinfo 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 \ bin/strm2gds \ bin/strm2oas \ bin/strm2txt \ bin/strmclip \ bin/strmcmp \ bin/strmxor \ lib/libklayout.so PLATFORMKEYWORD=freebsd-32-gcc-release BROKEN_sparc64= Does not compile on sparc64: gcc bug do-build: cd ${WRKSRC} && \ ${SETENV} CC=${CC} CXX=${CXX} CFLAGS="${CFLAGS}" \ CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \ - _MAKE_JOBS="${_MAKE_JOBS}" \ + _MAKE_JOBS="${_MAKE_JOBS}" LOCALBASE="${LOCALBASE}" \ ${SH} build.sh -platform ${PLATFORMKEYWORD} \ -qtbin ${QT_PREFIX}/bin \ -qtinc ${QT_INCDIR} \ -qtlib ${QT_LIBDIR} \ -python ${PYTHON_CMD} do-install: cd ${WRKSRC}/bin.${PLATFORMKEYWORD} && \ ${INSTALL_PROGRAM} ${PLIST_FILES:Mbin/*:S,^bin/,,} \ ${STAGEDIR}${PREFIX}/bin cd ${WRKSRC}/build.${PLATFORMKEYWORD}/main && \ ${INSTALL_LIB} ${PLIST_FILES:Mlib/*:S,^lib/,,} \ ${STAGEDIR}${PREFIX}/lib .include Index: head/cad/klayout/files/patch-build.sh =================================================================== --- head/cad/klayout/files/patch-build.sh (revision 426773) +++ head/cad/klayout/files/patch-build.sh (revision 426774) @@ -1,85 +1,85 @@ ---- build.sh.orig 2016-06-20 01:35:28.000000000 +0900 -+++ build.sh 2016-11-05 05:47:55.089440000 +0900 +--- build.sh.orig 2016-06-19 16:35:28 UTC ++++ build.sh @@ -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" -@@ -39,6 +39,9 @@ +@@ -39,6 +39,9 @@ Darwin*) PLATFORM="mac-yosemite-gcc-release" EXEC_HOLDER="klayout.app/Contents/MacOS" ;; +FreeBSD) + PLATFORM="freebsd-32-gcc-release" + ;; *) # Assume Linux for the remaining variants case `arch` in -@@ -374,7 +377,7 @@ +@@ -374,7 +377,7 @@ if [ $HAVE_64BIT_COORD != 0 ]; then echo " 64 bit coordinates enabled" fi -gcc_path=`type gcc 2>/dev/null` +gcc_path=`type $CC 2>/dev/null` if [ "$gcc_path" = "" ]; then echo "*** ERROR: unable to locate gcc in path" exit 1 -@@ -398,11 +401,11 @@ +@@ -398,11 +401,11 @@ mac-*) ;; esac -if [ ! -r $QTBIN/moc ]; then +if [ ! -r $QTBIN/moc-qt4 ]; then echo "*** ERROR: unable to locate Qt MOC in $QTBIN" exit 1 fi -if [ ! -r $QTBIN/uic ]; then +if [ ! -r $QTBIN/uic-qt4 ]; then echo "*** ERROR: unable to locate Qt UIC in $QTBIN" exit 1 fi -@@ -463,11 +466,7 @@ +@@ -463,11 +466,7 @@ else 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 @@ +@@ -515,6 +514,9 @@ echo "PYTHONINCLUDE=$PYTHONINCLUDE" >>$B 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 @@ +@@ -549,12 +551,12 @@ if [ $WIN_CYGWIN = 0 ]; then fi echo "" 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" - LD_LIBRARY_PATH=$QTLIB:$LD_LIBRARY_PATH - $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 Index: head/cad/klayout/files/patch-config-Makefile.conf =================================================================== --- head/cad/klayout/files/patch-config-Makefile.conf (revision 426773) +++ head/cad/klayout/files/patch-config-Makefile.conf (revision 426774) @@ -1,52 +1,52 @@ ---- /dev/null 2013-04-27 17:36:48.000000000 +0900 -+++ config/Makefile.conf.freebsd-32-gcc-release 2013-04-27 17:37:10.000000000 +0900 +--- config/Makefile.conf.freebsd-32-gcc-release.orig 2016-11-22 02:57:42 UTC ++++ config/Makefile.conf.freebsd-32-gcc-release @@ -0,0 +1,49 @@ + +# Configuration file for +# gcc, FreeBSD +# release build + +# Compiler options + +AR=ar -r + +# Compiler general -+INC=-I$(TOP_SOURCE) -I$(SOURCE) -I. -I$(QTINCLUDE) ++INC=-I$(TOP_SOURCE) -I$(SOURCE) -I. -I$(QTINCLUDE) -isystem $(LOCALBASE)/include +DEFS=-DQT_THREAD_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII + +# C++ +CXX?=gcc +CXXOPT_DEP=-MM -MG +CXXWARN=-Wall -Wno-deprecated -Woverloaded-virtual \ + -Wsign-promo -Wsynth -Wno-long-long -Wno-strict-aliasing +CXXOPT=${CXXFLAGS} -g -c -o +CXXOPT_SO=-fPIC $(CXXOPT) + +# C +CC?=gcc +CCOPT_DEP=-MM -MG +CCWARN= +CCOPT=${CFLAGS} -g -c -o +CCOPT_SO=-fPIC $(CCOPT) + +# Linker +LINK?=${CXX} +LOPT=${LDFLAGS} -g -Wl,-E -o +LOPT_SO=${LDFLAGS} -g -shared -o + -+LIBS=${PTHREAD_LIBS} -lexecinfo -L$(QTLIB) -lQtGui -lQtCore -lQtXml -lQtNetwork -lQtSql -lQtDesigner -lrt -lm -lcrypt -lz ++LIBS=${PTHREAD_LIBS} -L$(QTLIB) -lQtGui -lQtCore -lQtXml -lQtNetwork -lQtSql -lQtDesigner -lrt -lm -lcrypt -lz -L$(LOCALBASE)/lib -lexecinfo + +.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)/* + Index: head/cad/klayout/files/patch-src-Makefile.rules =================================================================== --- head/cad/klayout/files/patch-src-Makefile.rules (revision 426773) +++ head/cad/klayout/files/patch-src-Makefile.rules (revision 426774) @@ -1,13 +1,13 @@ ---- src/Makefile.rules.orig Fri Nov 9 04:31:39 2007 -+++ src/Makefile.rules Sun Jan 6 18:59:35 2008 -@@ -25,8 +25,8 @@ - CCOPTS=$(CCWARN) $(DEFS) $(CCOPT) - CCOPTS_DEP=$(DEFS) $(CCOPT_DEP) +--- src/Makefile.rules.orig 2016-06-19 16:35:32 UTC ++++ src/Makefile.rules +@@ -73,8 +73,8 @@ ifeq ($(LOPT_TEST),) + LOPT_TEST=$(LOPT) + endif -MOC=$(QTBIN)/moc -UIC=$(QTBIN)/uic +MOC=$(QTBIN)/moc-qt4 +UIC=$(QTBIN)/uic-qt4 RCC=$(QTBIN)/rcc - # this target must be first: + TESTSRC=$(TOP_SOURCE)/.. Index: head/cad/klayout/files/patch-src-layApplication.cc =================================================================== --- head/cad/klayout/files/patch-src-layApplication.cc (revision 426773) +++ head/cad/klayout/files/patch-src-layApplication.cc (revision 426774) @@ -1,27 +1,27 @@ ---- src/layApplication.cc.orig 2016-06-20 01:35:29.000000000 +0900 -+++ src/layApplication.cc 2016-11-16 08:59:47.386261000 +0900 +--- src/layApplication.cc.orig 2016-06-19 16:35:29 UTC ++++ src/layApplication.cc @@ -20,6 +20,7 @@ */ +#include #include "layApplication.h" #include "layConfig.h" @@ -74,6 +75,7 @@ #include #include #include +#include namespace lay { -@@ -351,7 +353,7 @@ +@@ -351,7 +353,7 @@ static void install_signal_handlers () act.sa_sigaction = signal_handler; sigemptyset (&act.sa_mask); act.sa_flags = SA_SIGINFO; -#if !defined(__APPLE__) +#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__DragonFly__) act.sa_restorer = 0; #endif Index: head/cad/klayout/files/patch-src-tlStream.cc =================================================================== --- head/cad/klayout/files/patch-src-tlStream.cc (revision 426773) +++ head/cad/klayout/files/patch-src-tlStream.cc (revision 426774) @@ -1,37 +1,37 @@ ---- src/tlStream.cc.orig 2014-03-14 22:31:20.000000000 +0900 -+++ src/tlStream.cc 2014-03-14 22:33:08.000000000 +0900 +--- src/tlStream.cc.orig 2016-06-19 16:35:29 UTC ++++ src/tlStream.cc @@ -31,6 +31,7 @@ #ifdef _WIN32 # include #endif +#include #include "tlStream.h" #include "tlHttpStream.h" -@@ -624,7 +625,7 @@ +@@ -624,7 +625,7 @@ InputFile::~InputFile () #if defined(_WIN32) _close (m_fd); #else - close (m_fd); + ::close (m_fd); #endif m_fd = -1; } -@@ -654,7 +655,7 @@ +@@ -654,7 +655,7 @@ InputFile::reset () #elif defined(_WIN64) _lseek (m_fd, 0, SEEK_SET); #else - lseek (m_fd, 0, SEEK_SET); + ::lseek (m_fd, 0, SEEK_SET); #endif } } -@@ -1068,7 +1069,7 @@ +@@ -1068,7 +1069,7 @@ OutputFile::seek (size_t s) #elif defined(_WIN32) _lseek (m_fd, s, SEEK_SET); #else - lseek (m_fd, s, SEEK_SET); + ::lseek (m_fd, s, SEEK_SET); #endif }