From owner-svn-ports-all@FreeBSD.ORG Fri Mar 14 13:54:50 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 06C40548; Fri, 14 Mar 2014 13:54:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E7F57DA4; Fri, 14 Mar 2014 13:54:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2EDsncI011586; Fri, 14 Mar 2014 13:54:49 GMT (envelope-from hrs@svn.freebsd.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2EDsmoD011576; Fri, 14 Mar 2014 13:54:48 GMT (envelope-from hrs@svn.freebsd.org) Message-Id: <201403141354.s2EDsmoD011576@svn.freebsd.org> From: Hiroki Sato Date: Fri, 14 Mar 2014 13:54:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r348233 - in head/cad/klayout: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Mar 2014 13:54:50 -0000 Author: hrs Date: Fri Mar 14 13:54:48 2014 New Revision: 348233 URL: http://svnweb.freebsd.org/changeset/ports/348233 QAT: https://qat.redports.org/buildarchive/r348233/ Log: - Update to 0.23.3. - STAGEDIR support. Added: head/cad/klayout/files/patch-src-tlStream.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 head/cad/klayout/pkg-descr Modified: head/cad/klayout/Makefile ============================================================================== --- head/cad/klayout/Makefile Fri Mar 14 13:54:31 2014 (r348232) +++ head/cad/klayout/Makefile Fri Mar 14 13:54:48 2014 (r348233) @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= klayout -PORTVERSION= 0.21.19 +PORTVERSION= 0.23.3 CATEGORIES= cad -MASTER_SITES= http://www.klayout.de/ +MASTER_SITES= http://178.77.72.242/downloads/ MAINTAINER= hrs@FreeBSD.org COMMENT= A Qt-based GDS2 Viewer @@ -12,7 +12,8 @@ COMMENT= A Qt-based GDS2 Viewer LICENSE= GPLv2 USES= gmake -USE_QT4= corelib gui network moc_build sql uic_build \ +USE_RUBY= yes +USE_QT4= corelib designer gui network moc_build sql uic_build \ rcc_build qt3support xml PLIST_FILES= bin/klayout \ bin/strm2cif \ @@ -22,22 +23,24 @@ PLIST_FILES= bin/klayout \ bin/strm2txt \ bin/strmclip \ bin/strmcmp \ - bin/strmxor + bin/strmxor \ + lib/libklayout.so +PLATFORMKEYWORD=freebsd-32-gcc-release -PLATFORMKEYWORD= freebsd-32-gcc-release - -NO_STAGE= yes do-build: cd ${WRKSRC} && \ - ${SH} build.sh -platform ${PLATFORMKEYWORD} \ - -qtbin ${QT_PREFIX}/bin \ - -qtinc ${QT_INCDIR} \ - -qtlib ${QT_LIBDIR} + ${SH} build.sh -platform ${PLATFORMKEYWORD} \ + -qtbin ${QT_PREFIX}/bin \ + -qtinc ${QT_INCDIR} \ + -qtlib ${QT_LIBDIR} do-install: cd ${WRKSRC}/bin.${PLATFORMKEYWORD} && \ - ${INSTALL_PROGRAM} ${PLIST_FILES:Mbin/*:S,^bin/,,} \ - ${PREFIX}/bin + ${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 Modified: head/cad/klayout/distinfo ============================================================================== --- head/cad/klayout/distinfo Fri Mar 14 13:54:31 2014 (r348232) +++ head/cad/klayout/distinfo Fri Mar 14 13:54:48 2014 (r348233) @@ -1,2 +1,2 @@ -SHA256 (klayout-0.21.19.tar.gz) = 330c7b13635760eeacc8bfbb5c6a9e4e57e0597b89208718882e9d08c2fe0fdb -SIZE (klayout-0.21.19.tar.gz) = 2025980 +SHA256 (klayout-0.23.3.tar.gz) = 0b7c7cb1866d13cf71ed9e5b65638995ff9b04e8b2a269cbe79e66d8e6802d54 +SIZE (klayout-0.23.3.tar.gz) = 9541259 Modified: head/cad/klayout/files/patch-build.sh ============================================================================== --- head/cad/klayout/files/patch-build.sh Fri Mar 14 13:54:31 2014 (r348232) +++ head/cad/klayout/files/patch-build.sh Fri Mar 14 13:54:48 2014 (r348233) @@ -1,5 +1,5 @@ ---- build.sh.orig 2010-12-28 05:22:08.000000000 +0900 -+++ build.sh 2011-01-04 16:58:54.000000000 +0900 +--- build.sh.orig 2014-02-24 05:44:13.000000000 +0900 ++++ build.sh 2014-03-14 21:49:48.000000000 +0900 @@ -1,7 +1,7 @@ #!/bin/sh @@ -9,7 +9,17 @@ CURR_DIR=`pwd` PLATFORM="linux-32-gcc-release" -@@ -217,11 +217,11 @@ +@@ -33,6 +33,9 @@ + exit 1 + fi + ;; ++FreeBSD) ++ PLATFORM="freebsd-32-gcc-release" ++ ;; + *) + # Assume Linux for the remaining variants + case `arch` in +@@ -284,11 +287,11 @@ ;; esac @@ -23,7 +33,7 @@ echo "*** ERROR: unable to locate Qt UIC in $QTBIN" exit 1 fi -@@ -331,12 +331,12 @@ +@@ -409,12 +412,12 @@ if [ $WIN_CYGWIN = 0 ]; then echo "" echo "Final binary is ready in $BIN/$EXEC_NAME." Modified: head/cad/klayout/files/patch-config-Makefile.conf ============================================================================== --- head/cad/klayout/files/patch-config-Makefile.conf Fri Mar 14 13:54:31 2014 (r348232) +++ head/cad/klayout/files/patch-config-Makefile.conf Fri Mar 14 13:54:48 2014 (r348233) @@ -1,5 +1,5 @@ ---- /dev/null 2011-02-10 22:38:57.000000000 +0900 -+++ config/Makefile.conf.freebsd-32-gcc-release 2011-02-10 22:39:43.000000000 +0900 +--- /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 @@ -0,0 +1,49 @@ + +# Configuration file for @@ -12,29 +12,29 @@ + +# Compiler general +INC=-I$(TOP_SOURCE) -I$(SOURCE) -I. -I$(QTINCLUDE) -+DEFS=-DQT_THREAD_SUPPORT -DQT3_SUPPORT ++DEFS=-DQT_THREAD_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII + +# C++ -+CXX=gcc ++CXX?=gcc +CXXOPT_DEP=-MM -MG -+CXXWARN=-Wall -pedantic -Wno-deprecated -Woverloaded-virtual \ ++CXXWARN=-Wall -Wno-deprecated -Woverloaded-virtual \ + -Wsign-promo -Wsynth -Wno-long-long -Wno-strict-aliasing -+CXXOPT=-c -O3 -o -+CXXOPT_SO=-fPIC $(CXXOPT) ++CXXOPT=${CXXFLAGS} -c -o ++CXXOPT_SO=-fPIC $(CXXOPT) + +# C -+CC=gcc ++CC?=gcc +CCOPT_DEP=-MM -MG +CCWARN= -+CCOPT=-c -O3 -o ++CCOPT=${CFLAGS} -c -o +CCOPT_SO=-fPIC $(CCOPT) + +# Linker -+LINK=g++ -+LOPT=-g -Wl,-E -o -+LOPT_SO=-g -shared -fPIC -o ++LINK?=${CC} ++LOPT=${LDFLAGS} -g -Wl,-E -o ++LOPT_SO=${LDFLAGS} -g -shared -fPIC -o + -+LIBS=-L$(QTLIB) -lQtGui -lQtCore -lQtXml -lrt -lstdc++ -lcrypt ++LIBS=${PTHREAD_LIBS} -L$(QTLIB) -lQtGui -lQtCore -lQtXml -lQtNetwork -lQtSql -lQtDesigner -lrt -lstdc++ -lcrypt -lz + +.PHONY: install +install: Added: head/cad/klayout/files/patch-src-tlStream.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/klayout/files/patch-src-tlStream.cc Fri Mar 14 13:54:48 2014 (r348233) @@ -0,0 +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 +@@ -31,6 +31,7 @@ + #ifdef _WIN32 + # include + #endif ++#include + + #include "tlStream.h" + #include "tlHttpStream.h" +@@ -624,7 +625,7 @@ + #if defined(_WIN32) + _close (m_fd); + #else +- close (m_fd); ++ ::close (m_fd); + #endif + m_fd = -1; + } +@@ -654,7 +655,7 @@ + #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 @@ + #elif defined(_WIN32) + _lseek (m_fd, s, SEEK_SET); + #else +- lseek (m_fd, s, SEEK_SET); ++ ::lseek (m_fd, s, SEEK_SET); + #endif + } + Modified: head/cad/klayout/pkg-descr ============================================================================== --- head/cad/klayout/pkg-descr Fri Mar 14 13:54:31 2014 (r348232) +++ head/cad/klayout/pkg-descr Fri Mar 14 13:54:48 2014 (r348233) @@ -1,3 +1,3 @@ KLayout is a viewer for GDS2 files. -WWW: http://www.klayout.de/index.html +WWW: http://www.klayout.de/index.html