summaryrefslogtreecommitdiff
path: root/www/ocsigen/files
diff options
context:
space:
mode:
Diffstat (limited to 'www/ocsigen/files')
-rw-r--r--www/ocsigen/files/patch-Makefile114
-rw-r--r--www/ocsigen/files/patch-configure121
-rw-r--r--www/ocsigen/files/patch-modules_Makefile11
-rw-r--r--www/ocsigen/files/patch-server_Makefile11
-rw-r--r--www/ocsigen/files/patch-xmlp4_oldocaml_Makefile11
5 files changed, 37 insertions, 231 deletions
diff --git a/www/ocsigen/files/patch-Makefile b/www/ocsigen/files/patch-Makefile
index b39fa3cdd23b..2858690086f9 100644
--- a/www/ocsigen/files/patch-Makefile
+++ b/www/ocsigen/files/patch-Makefile
@@ -1,80 +1,40 @@
---- Makefile.orig Thu Mar 15 12:27:51 2007
-+++ Makefile Mon Apr 23 10:18:24 2007
-@@ -16,7 +16,7 @@
- CAMLDOC = $(OCAMLFIND) ocamldoc $(LIB)
- TOINSTALL = modules/tutorial.cmo modules/tutorial.cmi modules/monitoring.cmo server/parseconfig.cmi server/ocsigen.cmi server/ocsigenmod.cma server/staticmod.cmi server/staticmod.cmo server/ocsigenboxes.cmi xmlp4/ohl-xhtml/xHTML.cmi xmlp4/ohl-xhtml/xML.cmi xmlp4/ohl-xhtml/xhtml.cma xmlp4/xhtmltypes.cmi xmlp4/simplexmlparser.cmi xmlp4/xhtmlsyntax.cma META lwt/lwt.cmi lwt/lwt_unix.cmi server/preemptive.cmi http/predefined_senders.cmi baselib/messages.cmi $(DUCEFILES)
- EXAMPLES = modules/tutorial.cmo modules/tutorial.cmi modules/monitoring.cmo $(DUCEEXAMPLES)
--PP = -pp "camlp4o ./lib/xhtmlsyntax.cma -loc loc"
-+PP = -pp "$(CAMLP4O) ./lib/xhtmlsyntax.cma -loc loc"
+--- Makefile.orig 2008-07-01 13:50:21.000000000 +0200
++++ Makefile 2008-07-08 11:25:25.000000000 +0200
+@@ -284,7 +284,6 @@
- all: $(REPS)
-
-@@ -62,7 +62,7 @@
- @for i in $(REPS) ; do touch "$$i"/.depend; $(MAKE) -C $$i depend ; done
-
-
--.PHONY: install fullinstall doc
-+.PHONY: install fullinstall doc docinstall
- install:
- mkdir -p $(PREFIX)/$(MODULEINSTALLDIR)
- mkdir -p $(PREFIX)/$(EXAMPLESINSTALLDIR)
-@@ -73,10 +73,10 @@
- -rm META
-
-
--fullinstall: doc install
-+fullinstall: install
- mkdir -p $(PREFIX)/$(CONFIGDIR)
- mkdir -p $(PREFIX)/$(STATICPAGESDIR)
-- -mv $(PREFIX)/$(CONFIGDIR)/ocsigen.conf $(PREFIX)/$(CONFIGDIR)/ocsigen.conf.old
-+# -mv $(PREFIX)/$(CONFIGDIR)/ocsigen.conf $(PREFIX)/$(CONFIGDIR)/ocsigen.conf.old
- cat files/ocsigen.conf \
+ installnodoc: partialinstall
+ mkdir -p $(TEMPROOT)$(CONFIGDIR)
+- mkdir -p $(TEMPROOT)$(CONFIGDIR)/conf.d
+ mkdir -p $(TEMPROOT)$(STATICPAGESDIR)
+ mkdir -p $(TEMPROOT)$(STATICPAGESDIR)/miniwiki
+ mkdir -p $(TEMPROOT)$(STATICPAGESDIR)/tutorial
+@@ -295,7 +294,6 @@
+ [ -p $(TEMPROOT)$(COMMANDPIPE) ] || { mkfifo $(TEMPROOT)$(COMMANDPIPE); \
+ chmod 660 $(TEMPROOT)$(COMMANDPIPE); \
+ $(CHOWN) -R $(OCSIGENUSER):$(OCSIGENGROUP) $(TEMPROOT)$(COMMANDPIPE);}
+-# -mv $(TEMPROOT)$(CONFIGDIR)/$(OCSIGENNAME).conf $(TEMPROOT)$(CONFIGDIR)/$(OCSIGENNAME).conf.old
+ cat files/ocsigen.conf.in \
| sed s%_LOGDIR_%$(LOGDIR)%g \
| sed s%_STATICPAGESDIR_%$(STATICPAGESDIR)%g \
-@@ -84,7 +84,7 @@
- | sed s%_OCSIGENUSER_%$(OCSIGENUSER)%g \
- | sed s%_OCSIGENGROUP_%$(OCSIGENGROUP)%g \
- | sed s%_MODULEINSTALLDIR_%$(MODULEINSTALLDIR)/$(OCSIGENNAME)%g \
-- > $(PREFIX)/$(CONFIGDIR)/ocsigen.conf
-+ > $(PREFIX)/$(CONFIGDIR)/ocsigen.conf.sample
- -mv $(PREFIX)/$(CONFIGDIR)/mime.types $(PREFIX)/$(CONFIGDIR)/mime.types.old
- cp -f files/mime.types $(PREFIX)/$(CONFIGDIR)
- mkdir -p $(PREFIX)/$(LOGDIR)
-@@ -92,8 +92,19 @@
- $(CHOWN) -R $(OCSIGENUSER):$(OCSIGENGROUP) $(PREFIX)/$(STATICPAGESDIR)
- chmod u+rwx $(PREFIX)/$(LOGDIR)
- chmod a+rx $(PREFIX)/$(CONFIGDIR)
-- chmod a+r $(PREFIX)/$(CONFIGDIR)/ocsigen.conf
-+ chmod a+r $(PREFIX)/$(CONFIGDIR)/ocsigen.conf.sample
- chmod a+r $(PREFIX)/$(CONFIGDIR)/mime.types
-+# [ -d /etc/logrotate.d ] && \
-+# { mkdir -p ${PREFIX}/etc/logrotate.d ; \
-+# cat files/logrotate.IN \
-+# | sed s%LOGDIR%$(LOGDIR)%g \
-+# | sed s%USER%$(OCSIGENUSER)%g \
-+# | sed s%GROUP%$(OCSIGENGROUP)%g \
-+# > $(PREFIX)/etc/logrotate.d/$(OCSIGENNAME); }
-+ install -d -m 755 $(PREFIX)/$(MANDIR)
-+ install -m 644 files/ocsigen.1 $(PREFIX)/$(MANDIR)
-+
-+docinstall: doc
- mkdir -p $(PREFIX)/$(DOCDIR)
- install -d -m 755 $(PREFIX)/$(DOCDIR)/lwt
- install -d -m 755 $(PREFIX)/$(DOCDIR)/oc
-@@ -102,16 +113,6 @@
- install -m 644 doc/oc/* $(PREFIX)/$(DOCDIR)/oc
- chmod a+rx $(PREFIX)/$(DOCDIR)
- chmod a+r $(PREFIX)/$(DOCDIR)/*
-- [ -d /etc/logrotate.d ] && \
-- { mkdir -p ${PREFIX}/etc/logrotate.d ; \
-- cat files/logrotate.IN \
-- | sed s%LOGDIR%$(LOGDIR)%g \
-- | sed s%USER%$(OCSIGENUSER)%g \
-- | sed s%GROUP%$(OCSIGENGROUP)%g \
-- > $(PREFIX)/etc/logrotate.d/$(OCSIGENNAME); }
-- install -d -m 755 $(PREFIX)/$(MANDIR)
-- install -m 644 files/ocsigen.1 $(PREFIX)/$(MANDIR)
--
-
- .PHONY: uninstall fulluninstall
- uninstall:
+@@ -318,21 +316,10 @@
+ | sed s%[.]cmo%.cmxs%g \
+ | sed s%[.]cma%.cmxs%g \
+ > $(TEMPROOT)$(CONFIGDIR)/$(OCSIGENNAME).conf.opt.sample
+- -mv $(TEMPROOT)$(CONFIGDIR)/mime.types $(TEMPROOT)$(CONFIGDIR)/mime.types.old
+ cp -f files/mime.types $(TEMPROOT)$(CONFIGDIR)
+ mkdir -p $(TEMPROOT)$(LOGDIR)
+ chmod u+rwx $(TEMPROOT)$(LOGDIR)
+- chmod a+rx $(TEMPROOT)$(CONFIGDIR)
+- chmod a+rx $(TEMPROOT)$(CONFIGDIR)/conf.d
+- [ -f $(TEMPROOT)$(CONFIGDIR)/$(OCSIGENNAME).conf ] || \
+- { cp $(TEMPROOT)$(CONFIGDIR)/$(OCSIGENNAME).conf.sample \
+- $(TEMPROOT)$(CONFIGDIR)/$(OCSIGENNAME).conf; \
+- chmod a+r $(TEMPROOT)$(CONFIGDIR)/$(OCSIGENNAME).conf; }
+ chmod a+r $(TEMPROOT)$(CONFIGDIR)/$(OCSIGENNAME).conf.sample
+- [ -f $(TEMPROOT)$(CONFIGDIR)/$(OCSIGENNAME).conf ] || \
+- { cp $(TEMPROOT)$(CONFIGDIR)/$(OCSIGENNAME).conf.opt.sample \
+- $(TEMPROOT)$(CONFIGDIR)/$(OCSIGENNAME).conf.opt; \
+- chmod a+r $(TEMPROOT)$(CONFIGDIR)/$(OCSIGENNAME).conf.opt; }
+ chmod a+r $(TEMPROOT)$(CONFIGDIR)/$(OCSIGENNAME).conf.opt.sample
+ chmod a+r $(TEMPROOT)$(CONFIGDIR)/mime.types
+ $(INSTALL) -m 644 files/tutorial/style.css $(TEMPROOT)$(STATICPAGESDIR)/tutorial
diff --git a/www/ocsigen/files/patch-configure b/www/ocsigen/files/patch-configure
deleted file mode 100644
index 2fbf03161d4c..000000000000
--- a/www/ocsigen/files/patch-configure
+++ /dev/null
@@ -1,121 +0,0 @@
---- configure.orig Thu Mar 15 12:27:54 2007
-+++ configure Mon Apr 23 10:17:10 2007
-@@ -51,10 +51,13 @@
- libdir="/usr/local/lib"
- mandir="/usr/local/share/man/man1/"
- docdir="/usr/share/doc"
-+ sysconfdir="/etc"
- name="ocsigen"
- prefix="/"
- ocsigen_user="www-data"
- ocsigen_group="www-data"
-+ staticpagesdir="/var/www/$name"
-+ uploaddir="/tmp"
- }
-
- set_defaults
-@@ -132,6 +135,9 @@
- echo " --libdir $libdir"
- echo " --mandir $mandir"
- echo " --docdir $docdir"
-+ echo " --sysconfdir $sysconfdir"
-+ echo " --staticpagesdir $staticpagesdir"
-+ echo " --uploaddir $uploaddir"
- echo " --name $name"
- }
-
-@@ -174,6 +180,15 @@
- --docdir dir
- Install documentation in this directory
-
-+--sysconfdir dir
-+ Install system configuration files in this directory
-+
-+--staticpagesdir dir
-+ Serve static pages from this directory
-+
-+--uploaddir dir
-+ Put uploaded files in this directory
-+
- --name name
- The name of the server (and directory for the modules)
-
-@@ -266,6 +281,21 @@
- shift
- shift
- ;;
-+ --sysconfdir)
-+ sysconfdir="$2"
-+ shift
-+ shift
-+ ;;
-+ --staticpagesdir)
-+ staticpagesdir="$2"
-+ shift
-+ shift
-+ ;;
-+ --uploaddir)
-+ uploaddir="$2"
-+ shift
-+ shift
-+ ;;
- --name)
- name="$2"
- shift
-@@ -293,6 +323,17 @@
-
-
- ######################################################################
-+# Check camlp4o
-+printf "%s" "Finding out which camlp4o to use... "
-+if which camlp4o.byte >/dev/null 2>/dev/null; then
-+ echo "camlp4o.byte"
-+ camlp4o="camlp4o.byte"
-+else
-+ echo "camlp4o"
-+ camlp4o="camlp4o"
-+fi
-+
-+######################################################################
- # Check ocamlfind
-
- printf "%s" "Checking for findlib... "
-@@ -322,9 +363,10 @@
- ######################################################################
- # Check whether OCaml version is > 3.9
- version=`ocamlc -version`
--ocamlversion=`n1=${version:0:1}; \
-- n2=${version:2:2}; \
-- n3=${version:5}; \
-+ocamlversion=`n1=${version%%.[0-9][0-9].[0-9]}; \
-+ tail=${version##[0-9].}; \
-+ n2=${tail%%.[0-9]}; \
-+ n3=${tail##[0-9][0-9].}; \
- if [ $n1 = "3" ] && [ $n2 -le 9 ]; then \
- echo "OLD"; \
- else \
-@@ -380,6 +422,7 @@
- # ocamlfind will choose automatically the compiler.
- OCAMLFIND=ocamlfind
- CAMLP4=camlp4
-+CAMLP4O="$camlp4o"
- CAMLLEX=ocamllex
- CAMLYACC=ocamlyacc
- CAMLCNAME=ocamlc
-@@ -429,13 +472,13 @@
- LOGDIR = /var/log/\$(OCSIGENNAME)
-
- # Config files:
--CONFIGDIR = /etc/\$(OCSIGENNAME)
-+CONFIGDIR = $sysconfdir
-
- # Where to put static pages:
--STATICPAGESDIR = /var/www/\$(OCSIGENNAME)
-+STATICPAGESDIR = $staticpagesdir
-
- # Default directory for file upload:
--UPLOADDIR = /tmp
-+UPLOADDIR = $uploaddir
-
- # Where to put Ocsigen documentation:
- DOCDIR = $docdir/\$(OCSIGENNAME)
diff --git a/www/ocsigen/files/patch-modules_Makefile b/www/ocsigen/files/patch-modules_Makefile
deleted file mode 100644
index f8250ce25857..000000000000
--- a/www/ocsigen/files/patch-modules_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/Makefile.orig Thu Mar 15 12:27:54 2007
-+++ modules/Makefile Mon Apr 23 10:18:59 2007
-@@ -21,7 +21,7 @@
- CAMLOPT = $(OCAMLFIND) ocamlopt $(DBG) $(LIB)
- CAMLDEP = $(OCAMLFIND) ocamldep
- LIB = -I ../lib
--PP = -pp "camlp4o ../lib/xhtmlsyntax.cma -loc loc"
-+PP = -pp "$(CAMLP4O) ../lib/xhtmlsyntax.cma -loc loc"
-
- OBJS = $(FILES:.ml=.cmo)
-
diff --git a/www/ocsigen/files/patch-server_Makefile b/www/ocsigen/files/patch-server_Makefile
deleted file mode 100644
index 4be21ce600e0..000000000000
--- a/www/ocsigen/files/patch-server_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- server/Makefile.orig Thu Mar 15 12:27:55 2007
-+++ server/Makefile Mon Apr 23 10:19:29 2007
-@@ -41,7 +41,7 @@
- CAMLDEP = $(OCAMLFIND) ocamldep
- LIB = -thread -package netstring,$(NETSYS)ssl -I ../lib -I +camlp4
- PP =
--PP2 = -pp "camlp4o ../lib/xhtmlsyntax.cma -- -loc loc"
-+PP2 = -pp "$(CAMLP4O) ../lib/xhtmlsyntax.cma -- -loc loc"
-
- CMAO = nums.cma dynlink.cma unix.cma \
- ssl.cma pcre.cma $(NETSYSCMA) netstring.cma \
diff --git a/www/ocsigen/files/patch-xmlp4_oldocaml_Makefile b/www/ocsigen/files/patch-xmlp4_oldocaml_Makefile
deleted file mode 100644
index 7373473f31f7..000000000000
--- a/www/ocsigen/files/patch-xmlp4_oldocaml_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- xmlp4/oldocaml/Makefile.orig Thu Mar 15 12:27:52 2007
-+++ xmlp4/oldocaml/Makefile Mon Apr 23 10:19:55 2007
-@@ -13,7 +13,7 @@
- CAMLOPT = $(OCAMLFIND) ocamlopt $(DBG) $(LIB)
- CAMLDEP = $(OCAMLFIND) ocamldep
- LIB = -I `$(CAMLP4) -where` -I ../../lib
--PP = -pp "camlp4o pa_extend.cmo q_MLast.cmo -- -loc loc"
-+PP = -pp "$(CAMLP4O) pa_extend.cmo q_MLast.cmo -- -loc loc"
- PPLEXER = -pp "camlp4r -- -loc loc"
-
- SRCLIBREP = ../../lib
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-07 11:46:10 +0000