pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

klayout: rename patches to the outputs of mkpatches



Module Name:	pkgsrc-wip
Committed By:	Ryo ONODERA <ryoon%NetBSD.org@localhost>
Pushed By:	ryoon
Date:		Mon Jul 16 21:54:47 2018 +0900
Changeset:	a86bde0536950f9edcb51dc919282713835f4336

Added Files:
	klayout/patches/patch-config_Makefile.conf.freebsd-32-gcc-release
	klayout/patches/patch-config_Makefile.conf.netbsd-32-gcc-release
Removed Files:
	klayout/patches/patch-config_Makefile_conf_freebsd-32-gcc-release
	klayout/patches/patch-config_Makefile_conf_netbsd-32-gcc-release

Log Message:
klayout: rename patches to the outputs of mkpatches

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a86bde0536950f9edcb51dc919282713835f4336

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 ...tch-config_Makefile.conf.freebsd-32-gcc-release | 54 +++++++++++++++++++++
 ...atch-config_Makefile.conf.netbsd-32-gcc-release | 54 +++++++++++++++++++++
 ...tch-config_Makefile_conf_freebsd-32-gcc-release | 56 ----------------------
 ...atch-config_Makefile_conf_netbsd-32-gcc-release | 56 ----------------------
 4 files changed, 108 insertions(+), 112 deletions(-)

diffs:
diff --git a/klayout/patches/patch-config_Makefile.conf.freebsd-32-gcc-release b/klayout/patches/patch-config_Makefile.conf.freebsd-32-gcc-release
new file mode 100644
index 0000000000..f37b03600b
--- /dev/null
+++ b/klayout/patches/patch-config_Makefile.conf.freebsd-32-gcc-release
@@ -0,0 +1,54 @@
+$NetBSD$
+
+--- config/Makefile.conf.freebsd-32-gcc-release.orig	2018-07-16 03:52:39.157322134 +0000
++++ 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)
++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} -c -o
++CXXOPT_SO=-fPIC $(CXXOPT)
++
++# C
++CC?=gcc
++CCOPT_DEP=-MM -MG
++CCWARN=
++CCOPT=${CFLAGS} -c -o
++CCOPT_SO=-fPIC $(CCOPT)
++
++# Linker
++LINK?=${CXX}
++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
++
++.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/klayout/patches/patch-config_Makefile.conf.netbsd-32-gcc-release b/klayout/patches/patch-config_Makefile.conf.netbsd-32-gcc-release
new file mode 100644
index 0000000000..d772ad422a
--- /dev/null
+++ b/klayout/patches/patch-config_Makefile.conf.netbsd-32-gcc-release
@@ -0,0 +1,54 @@
+$NetBSD$
+
+--- config/Makefile.conf.netbsd-32-gcc-release.orig	2018-07-16 03:52:39.164355967 +0000
++++ config/Makefile.conf.netbsd-32-gcc-release
+@@ -0,0 +1,49 @@
++
++# # Configuration file for
++# # gcc, NetBSD
++# # release build
++# 
++# # Compiler options
++# 
++AR=ar -r
++# 
++# # Compiler general
++INC=-I$(TOP_SOURCE) -I$(SOURCE) -I. -I$(QTINCLUDE)
++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} -c -o
++CXXOPT_SO=-fPIC $(CXXOPT)
++# 
++# # C
++CC=gcc
++CCOPT_DEP=-MM -MG
++CCWARN=
++CCOPT=${CFLAGS} -c -o
++CCOPT_SO=-fPIC $(CCOPT)
++# 
++# # Linker
++LINK=gcc
++LOPT=   -pthread -L/usr/lib -Wl,-R/usr/lib -L/usr/pkg/lib -Wl,-R/usr/pkg/lib -L/usr/pkg/qt5/lib -L/usr/pkg/qt5/plugins -Wl,-R/usr/pkg/qt5/lib -Wl,-R/usr/pkg/qt5/plugins -L/usr/pkg/lib/pulseaudio -Wl,-R/usr/pkg/lib/pulseaudio -g -Wl,-E -o
++LOPT_SO=	-Wl,-R/usr/pkg/lib:/usr/pkg/qt5/lib:/usr/lib @   -pthread -L/usr/lib -Wl,-R/usr/lib -L/usr/pkg/lib -Wl,-R/usr/pkg/lib -L/usr/pkg/qt5/lib -L/usr/pkg/qt5/plugins -Wl,-R/usr/pkg/qt5/lib -Wl,-R/usr/pkg/qt5/plugins -L/usr/pkg/lib/pulseaudio -Wl,-R/usr/pkg/lib/pulseaudio@ -g -shared -o
++# 
++LIBS=${PTHREAD_LIBS} -L$(QTLIB) -lQtGui -lQtCore -lQtXml -lQtNetwork -lQtSql -lQtDesigner -lrt -lm -lcrypt -lz
++
++#.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/klayout/patches/patch-config_Makefile_conf_freebsd-32-gcc-release b/klayout/patches/patch-config_Makefile_conf_freebsd-32-gcc-release
deleted file mode 100644
index 86f2629ab4..0000000000
--- a/klayout/patches/patch-config_Makefile_conf_freebsd-32-gcc-release
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD: patch-config_Makefile_conf_freebsd-32-gcc-release,v 1.1 2016/03/15 15:15:59 mef Exp $
-
-Add FreeBSD, but not checked yet
-
---- /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
-+# gcc, FreeBSD
-+# release build
-+
-+# Compiler options
-+
-+AR=ar -r
-+
-+# Compiler general
-+INC=-I$(TOP_SOURCE) -I$(SOURCE) -I. -I$(QTINCLUDE)
-+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} -c -o
-+CXXOPT_SO=-fPIC $(CXXOPT)
-+
-+# C
-+CC?=gcc
-+CCOPT_DEP=-MM -MG
-+CCWARN=
-+CCOPT=${CFLAGS} -c -o
-+CCOPT_SO=-fPIC $(CCOPT)
-+
-+# Linker
-+LINK?=${CXX}
-+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
-+
-+.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/klayout/patches/patch-config_Makefile_conf_netbsd-32-gcc-release b/klayout/patches/patch-config_Makefile_conf_netbsd-32-gcc-release
deleted file mode 100644
index 7e31f4b9d0..0000000000
--- a/klayout/patches/patch-config_Makefile_conf_netbsd-32-gcc-release
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD: patch-config_Makefile_conf_netbsd-32-gcc-release,v 1.1 2016/03/15 15:15:59 mef Exp $
-
-Add NetBSD
-
---- /dev/null 2013-04-27 17:36:48.000000000 +0900
-+++ config/Makefile.conf.netbsd-32-gcc-release 2013-04-27 17:37:10.000000000 +0900
-@@ -0,0 +1,49 @@
-+
-+# # Configuration file for
-+# # gcc, NetBSD
-+# # release build
-+# 
-+# # Compiler options
-+# 
-+AR=ar -r
-+# 
-+# # Compiler general
-+INC=-I$(TOP_SOURCE) -I$(SOURCE) -I. -I$(QTINCLUDE)
-+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} -c -o
-+CXXOPT_SO=-fPIC $(CXXOPT)
-+# 
-+# # C
-+CC=gcc
-+CCOPT_DEP=-MM -MG
-+CCWARN=
-+CCOPT=${CFLAGS} -c -o
-+CCOPT_SO=-fPIC $(CCOPT)
-+# 
-+# # Linker
-+LINK=gcc
-+LOPT=@@LDFLAGS@@ -g -Wl,-E -o
-+LOPT_SO=	@COMPILER_RPATH_FLAG@@PREFIX@/lib:@PREFIX@/qt-4/lib:/usr/lib @@LDFLAGS@@ -g -shared -o
-+# 
-+LIBS=${PTHREAD_LIBS} -L$(QTLIB) -lQtGui -lQtCore -lQtXml -lQtNetwork -lQtSql -lQtDesigner -lrt -lm -lcrypt -lz
-+
-+#.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)/*
-+


Home | Main Index | Thread Index | Old Index