summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2013-04-19 06:09:00 +0000
committerAlfredo Tupone <tupone@gentoo.org>2013-04-19 06:09:00 +0000
commit46cb562a44946b3f1bd792a058324a2ae27b6d05 (patch)
tree13721c2b339c8f083884a50c67a0c44c94058922 /app-misc/geneweb/files
parentPunt -libusbx-1.0.13.patch which is no longer required by current dev-libs/li... (diff)
downloadhistorical-46cb562a44946b3f1bd792a058324a2ae27b6d05.tar.gz
historical-46cb562a44946b3f1bd792a058324a2ae27b6d05.tar.bz2
historical-46cb562a44946b3f1bd792a058324a2ae27b6d05.zip
Version bump to 6.06
Package-Manager: portage-2.1.11.55/cvs/Linux x86_64 Manifest-Sign-Key: 0x0145142D
Diffstat (limited to 'app-misc/geneweb/files')
-rw-r--r--app-misc/geneweb/files/geneweb-6.06-gentoo.patch56
-rw-r--r--app-misc/geneweb/files/geneweb-6.06-parallellbuild.patch23
2 files changed, 79 insertions, 0 deletions
diff --git a/app-misc/geneweb/files/geneweb-6.06-gentoo.patch b/app-misc/geneweb/files/geneweb-6.06-gentoo.patch
new file mode 100644
index 000000000000..9a2e275dd526
--- /dev/null
+++ b/app-misc/geneweb/files/geneweb-6.06-gentoo.patch
@@ -0,0 +1,56 @@
+--- setup/setup.ml.old 2007-08-07 19:25:13.000000000 +0200
++++ setup/setup.ml 2007-08-07 19:24:59.000000000 +0200
+@@ -5,8 +5,8 @@
+
+ value port = ref 2316;
+ value default_lang = ref "en";
+-value setup_dir = ref ".";
+-value bin_dir = ref "";
++value setup_dir = ref "/usr/share/geneweb";
++value bin_dir = ref "/usr/bin";
+ value lang_param = ref "";
+ value only_file = ref "";
+
+--- tools/Makefile.inc.unix.old 2008-04-23 15:22:50.000000000 +0200
++++ tools/Makefile.inc.unix 2008-04-23 15:23:04.000000000 +0200
+@@ -5,11 +5,11 @@
+ CAMLP5F=-DUNIX
+ CAMLP5D=+camlp5
+ LIBUNIX=-cclib -lunix
+-OCAMLC=ocamlc.opt -warn-error A
+-OCAMLOPT=ocamlopt.opt -warn-error A
++OCAMLC=ocamlc.opt
++OCAMLOPT=ocamlopt.opt
+ OCAMLI=
+ OCAMLD=
+-STRIP=strip
++STRIP=true
+ RM=/bin/rm -f
+ EXE=
+ STATIC=-ccopt -static
+--- Makefile.old 2013-04-18 22:13:39.285809438 +0200
++++ Makefile 2013-04-18 22:14:10.073514138 +0200
+@@ -18,7 +18,6 @@
+ cd gwb2ged; $(MAKE) all
+ cd setup; $(MAKE) all
+ cd gwtp; $(MAKE) all
+- cd gui; $(MAKE) all
+
+ opt::
+ cd wserver; $(MAKE) opt
+@@ -28,7 +27,6 @@
+ cd gwb2ged; $(MAKE) opt
+ cd setup; $(MAKE) opt
+ cd gwtp; $(MAKE) opt
+- cd gui; $(MAKE) opt
+
+ install:
+ mkdir -p $(PREFIX)/bin
+@@ -111,7 +109,6 @@
+ cp setup/lang/lexicon.txt $(DESTDIR)/gw/setup/lang/.
+ cp setup/gwsetup $(DESTDIR)/gw/gwsetup$(EXE)
+ cp gui/gw/gui_lex.txt $(DESTDIR)/gw/.
+- cp gui/gui $(DESTDIR)/gw/gui$(EXE)
+ cp LICENSE $(DESTDIR)/LICENSE.txt
+ cp etc/START.htm $(DESTDIR)/.
+ cp CHANGES $(DESTDIR)/CHANGES.txt
diff --git a/app-misc/geneweb/files/geneweb-6.06-parallellbuild.patch b/app-misc/geneweb/files/geneweb-6.06-parallellbuild.patch
new file mode 100644
index 000000000000..a1b5fe742a17
--- /dev/null
+++ b/app-misc/geneweb/files/geneweb-6.06-parallellbuild.patch
@@ -0,0 +1,23 @@
+--- wserver/Makefile.old 2011-03-11 13:47:04.000000000 +0100
++++ wserver/Makefile 2011-03-11 13:47:20.000000000 +0100
+@@ -5,7 +5,8 @@
+ OBJS=wserver.cmo
+
+ all:: pa_macro5.cmo $(OBJS)
+-opt:: pa_macro5.cmo $(OBJS:.cmo=.cmx)
++opt:: pa_macro5.cmo
++ $(MAKE) $(OBJS:.cmo=.cmx)
+
+ pa_macro5.cmo: pa_macro5.ml
+ camlp5r pa_extend.cmo q_MLast.cmo -o pa_macro5.ppo pa_macro5.ml
+--- src/Makefile.old 2013-04-18 21:29:52.727049806 +0200
++++ src/Makefile 2013-04-18 21:30:58.838414496 +0200
+@@ -153,6 +153,8 @@
+ ) | \
+ sort | uniq | grep -v '^$$' > i18n
+
++config.cmi: gwdb.cmi
++
+ always:
+
+ depend: