4 files changed, 50 insertions, 40 deletions
diff --git a/cad/klayout/files/patch-build.sh b/cad/klayout/files/patch-build.sh
index 00c838da0d60..e0d4374c06ef 100644
--- a/cad/klayout/files/patch-build.sh
+++ b/cad/klayout/files/patch-build.sh
@@ -1,6 +1,6 @@
---- build.sh.orig	Tue Mar  6 06:58:29 2007
-+++ build.sh	Sat Jun  2 13:57:50 2007
-@@ -61,12 +61,12 @@
+--- build.sh.orig	Tue May  8 04:41:18 2007
++++ build.sh	Sat Jun  2 16:43:04 2007
+@@ -77,12 +77,12 @@
    exit 1
  fi
  
@@ -15,20 +15,21 @@
    echo "*** ERROR: unable to locate Qt UIC in $QTDIR/bin"
    exit 1
  fi
-@@ -107,11 +107,11 @@
- 
- echo "Build done."
- echo "Final binary is ready in ./$BIN/$EXEC_NAME."
--echo "To run it, you may need to add the following to your LD_LIBRARY_PATH:"
--echo "$QTDIR/lib"
-+#echo "To run it, you may need to add the following to your LD_LIBRARY_PATH:"
-+#echo "$QTDIR/lib"
- 
--LD_LIBRARY_PATH=$QTDIR/lib:$LD_LIBRARY_PATH
--./$BIN/$EXEC_NAME -v
--./$BIN/$EXEC_NAME -h
-+#LD_LIBRARY_PATH=$QTDIR/lib:$LD_LIBRARY_PATH
-+#./$BIN/$EXEC_NAME -v
-+#./$BIN/$EXEC_NAME -h
+@@ -153,12 +153,12 @@
+   echo "Build done."
+   echo ""
+   echo "Final binary is ready in $BIN/$EXEC_NAME."
+-  echo "To run it, you may need to add the following to your LD_LIBRARY_PATH:"
+-  echo "$QTDIR/lib"
++  #echo "To run it, you may need to add the following to your LD_LIBRARY_PATH:"
++  #echo "$QTDIR/lib"
+   
+-  LD_LIBRARY_PATH=$QTDIR/lib:$LD_LIBRARY_PATH
+-  $BIN/$EXEC_NAME -v
+-  $BIN/$EXEC_NAME -h
++  #LD_LIBRARY_PATH=$QTDIR/lib:$LD_LIBRARY_PATH
++  #$BIN/$EXEC_NAME -v
++  #$BIN/$EXEC_NAME -h
  
+ else 
  
diff --git a/cad/klayout/files/patch-config-Makefile.conf b/cad/klayout/files/patch-config-Makefile.conf
index 3d6143fe17c6..18ebee5a12e1 100644
--- a/cad/klayout/files/patch-config-Makefile.conf
+++ b/cad/klayout/files/patch-config-Makefile.conf
@@ -1,17 +1,26 @@
---- /dev/null	Sat Apr 28 23:11:00 2007
-+++ config/Makefile.conf.freebsd-32-gcc-release	Sat Apr 28 23:13:51 2007
-@@ -0,0 +1,14 @@
+--- /dev/null	Sat Jun  2 16:46:55 2007
++++ config/Makefile.conf.freebsd-32-gcc-release	Sat Jun  2 16:49:48 2007
+@@ -0,0 +1,23 @@
 +CC=gcc
-+LINK=g++
 +
 +CCOPT_DEP=-MM -MG -x c++
++
 +CCWARN=-Wall -pedantic -Wno-deprecated -Woverloaded-virtual \
 +       -Wsign-promo -Wsynth -Wno-long-long
-+LOPT=
-+LIBS=-L$(QTDIR)/lib -pthread -lQt3Support -lQtGui -lQtCore -lQtXml -lstdc++
-+CCOPT=-O
 +
-+INC=-I$(QTDIR)/include 
++CCOPT=-c -O -x c++ -o
++CCOPT_SO=-fPIC $(CCOPT)
++
++INC=-I$(TOP_SOURCE) -I$(SOURCE) -I. -I$(QTDIR)/include
++
++DEFS=-DQT_THREAD_SUPPORT -DQT3_SUPPORT
 +
-+DEFS=
++# Linker options
++
++LINK=g++
++
++LOPT=-Wl,-E -o
++LOPT_SO=-shared -fPIC -o
++
++LIBS=-L$(QTDIR)/lib -pthread -lQt3Support -lQtGui -lQtCore -lQtXml -lstdc++
 +
diff --git a/cad/klayout/files/patch-src-Makefile.main b/cad/klayout/files/patch-src-Makefile.main
deleted file mode 100644
index 395dbc29264c..000000000000
--- a/cad/klayout/files/patch-src-Makefile.main
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/Makefile.main.orig	Sat Apr 28 23:22:53 2007
-+++ src/Makefile.main	Sat Apr 28 23:23:04 2007
-@@ -142,8 +142,8 @@
-   layRenderer.ut \
-   dbArray.ut \
-   
--MOC=$(QTDIR)/bin/moc
--UIC=$(QTDIR)/bin/uic
-+MOC=$(QTDIR)/bin/moc-qt4
-+UIC=$(QTDIR)/bin/uic-qt4
- RCC=$(QTDIR)/bin/rcc
- 
- INCFLAGS=\
diff --git a/cad/klayout/files/patch-src-Makefile.rules b/cad/klayout/files/patch-src-Makefile.rules
new file mode 100644
index 000000000000..4bf96bf5ce62
--- /dev/null
+++ b/cad/klayout/files/patch-src-Makefile.rules
@@ -0,0 +1,13 @@
+--- src/Makefile.rules.orig	Tue May  8 04:41:19 2007
++++ src/Makefile.rules	Sat Jun  2 16:45:56 2007
+@@ -16,8 +16,8 @@
+ endif
+ CCOPTS=$(CCWARN) $(DEFS) $(CCOPT)
+ 
+-MOC=$(QTDIR)/bin/moc
+-UIC=$(QTDIR)/bin/uic
++MOC=$(QTDIR)/bin/moc-qt4
++UIC=$(QTDIR)/bin/uic-qt4
+ RCC=$(QTDIR)/bin/rcc
+ 
+ # this target must be first: