From e3890f0a4eb0e9656a1b92656077d4342bb6999a Mon Sep 17 00:00:00 2001
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Mon, 21 Dec 2009 17:34:36 +0000
Subject: Style fixes:

- Remove an unnecessary patch[*].
- Use build.sh to install binaries and reduce diff between Makefile
  for FreeBSD and for Linux in the distribution.

Pointed out by:	till plewe[*]
---
 cad/klayout/Makefile                         |  2 +-
 cad/klayout/files/patch-build.sh             | 26 ++++++++++--------------
 cad/klayout/files/patch-config-Makefile.conf | 30 ++++++++++++++++++++++++----
 cad/klayout/files/patch-src-layGridNet.h     | 10 ----------
 4 files changed, 38 insertions(+), 30 deletions(-)
 delete mode 100644 cad/klayout/files/patch-src-layGridNet.h

diff --git a/cad/klayout/Makefile b/cad/klayout/Makefile
index bf1d63de123b..b14830e224bd 100644
--- a/cad/klayout/Makefile
+++ b/cad/klayout/Makefile
@@ -35,7 +35,7 @@ do-build:
 			-qtlib ${QT_LIBDIR}
 
 do-install:
-	cd ${WRKSRC}/build.${PLATFORMKEYWORD}/main && \
+	cd ${WRKSRC}/bin.${PLATFORMKEYWORD} && \
 		${INSTALL_PROGRAM} ${PLIST_FILES:S,^bin/,,} \
 		${PREFIX}/bin
 
diff --git a/cad/klayout/files/patch-build.sh b/cad/klayout/files/patch-build.sh
index c58a376aa639..3f084c0f889e 100644
--- a/cad/klayout/files/patch-build.sh
+++ b/cad/klayout/files/patch-build.sh
@@ -1,5 +1,14 @@
 --- build.sh.orig	2009-12-18 07:52:08.000000000 +0900
-+++ build.sh	2009-12-21 01:30:05.000000000 +0900
++++ build.sh	2009-12-22 02:13:06.000000000 +0900
+@@ -1,7 +1,7 @@
+ #!/bin/sh 
+ 
+ EXEC_NAME=klayout
+-OTHER_BIN="strm2gds strm2oas strmcmp strmclip"
++OTHER_BIN="strm2gds strm2oas strm2txt strmcmp strmclip strmxor"
+ 
+ CURR_DIR=`pwd`
+ USOURCE=$CURR_DIR/src
 @@ -158,11 +158,11 @@
    ;;
  esac
@@ -14,20 +23,7 @@
    echo "*** ERROR: unable to locate Qt UIC in $QTBIN"
    exit 1
  fi
-@@ -268,21 +268,21 @@
- 
- # -- Installing binaries  --
- 
--echo "Installing binaries .."
--cd $BUILD
--$MAKE_PRG install
--cd $CURR_DIR
-+#echo "Installing binaries .."
-+#cd $BUILD
-+#$MAKE_PRG install
-+#cd $CURR_DIR
- echo "Build done."
- 
+@@ -277,12 +277,12 @@
  if [ $WIN_CYGWIN = 0 ]; then
    echo ""
    echo "Final binary is ready in $BIN/$EXEC_NAME."
diff --git a/cad/klayout/files/patch-config-Makefile.conf b/cad/klayout/files/patch-config-Makefile.conf
index b31393f01b42..08e6e5255667 100644
--- a/cad/klayout/files/patch-config-Makefile.conf
+++ b/cad/klayout/files/patch-config-Makefile.conf
@@ -1,6 +1,13 @@
---- /dev/null	2008-05-05 02:46:45.000000000 +0900
-+++ config/Makefile.conf.freebsd-32-gcc-release	2008-05-05 02:47:41.000000000 +0900
-@@ -0,0 +1,23 @@
+--- /dev/null	2009-12-22 01:22:00.000000000 +0900
++++ config/Makefile.conf.freebsd-32-gcc-release	2009-12-22 01:05:33.000000000 +0900
+@@ -0,0 +1,45 @@
++
++# Configuration file for 
++# gcc, FreeBSD
++# release build
++
++# Compiler options
++
 +AR=ar -r
 +CC=gcc
 +
@@ -10,7 +17,7 @@
 +       -Wsign-promo -Wsynth -Wno-long-long -Wno-strict-aliasing
 +
 +CCOPT=-c -O -x c++ -o
-+CCOPT_SO=-fPIC $(CCOPT)
++CCOPT_SO=-fPIC $(CCOPT) 
 +
 +INC=-I$(TOP_SOURCE) -I$(SOURCE) -I. -I$(QTINCLUDE)
 +
@@ -24,3 +31,18 @@
 +LOPT_SO=-shared -fPIC -o
 +
 +LIBS=-L$(QTLIB) -pthread -lQtGui -lQtCore -lQtXml -lstdc++ -lcrypt
++
++.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)/*
++
diff --git a/cad/klayout/files/patch-src-layGridNet.h b/cad/klayout/files/patch-src-layGridNet.h
deleted file mode 100644
index dc93352355e7..000000000000
--- a/cad/klayout/files/patch-src-layGridNet.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/layGridNet.h.orig	Fri Nov  9 04:31:38 2007
-+++ src/layGridNet.h	Sun Jan  6 19:11:46 2008
-@@ -24,6 +24,7 @@
- #ifndef HDR_layGridNet
- #define HDR_layGridNet
- 
-+#include <QtCore/qobjectdefs.h>
- #include "layViewObject.h"
- #include "layPlugin.h"
- #include "dbTypes.h"
-- 
cgit v1.2.3