ports/176117: [maintainer update] www/ocsigen to 2.2.0
Jaap Boender
jaapb at kerguelen.org
Wed Feb 13 16:00:01 UTC 2013
>Number: 176117
>Category: ports
>Synopsis: [maintainer update] www/ocsigen to 2.2.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Feb 13 16:00:01 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Jaap Boender
>Release: 9.1-RELEASE
>Organization:
>Environment:
FreeBSD purcell.mdx.ac.uk 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r243825: Tue Dec 4 09:23:10 UTC 2012 root at farrell.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
This is an update of www/ocsigen to its newest version, 2.2.0. The list of changes is quite long, so I won't list them here, see ${WRKSRC}/ocsigenserver-2.2.0/CHANGES for more details.
I've tested this with all other patches to ocaml packages already applied (ports/176061 and ports/176065 are required; ports/173364, ports/176057, ports/176060, ports/176062, ports/176067 and ports/176115 are probably optional) so not sure how it works with ocaml 3.
>How-To-Repeat:
n/a
>Fix:
result of svn diff attached.
Patch attached with submission follows:
Index: Makefile
===================================================================
--- Makefile (revision 311755)
+++ Makefile (working copy)
@@ -5,38 +5,44 @@
# $FreeBSD$
PORTNAME= ocsigen
-PORTVERSION= 1.1.0
-PORTREVISION= 1
+PORTVERSION= 2.2.0
CATEGORIES= www
-MASTER_SITES= http://www.ocsigen.org/download/
+MASTER_SITES= http://ocsigen.org/download/
+DISTNAME= ocsigenserver-${PORTVERSION}
MAINTAINER= jaapb at kerguelen.org
COMMENT= Web programming framework for OCaml
-BUILD_DEPENDS= ocaml-net>=2:${PORTSDIR}/www/ocaml-net \
+BUILD_DEPENDS= ${SA_DIR}/react/react.a:${PORTSDIR}/devel/ocaml-react \
${SA_DIR}/ssl/ssl.a:${PORTSDIR}/security/ocaml-ssl \
- ${SA_DIR}/lwt/lwt.a:${PORTSDIR}/devel/ocaml-lwt \
- ${SA_DIR}/cryptokit/cryptokit.a:${PORTSDIR}/security/ocaml-cryptokit
-RUN_DEPENDS= ocaml-net>=2:${PORTSDIR}/www/ocaml-net \
- ${SA_DIR}/ssl/ssl.a:${PORTSDIR}/security/ocaml-ssl \
- ${SA_DIR}/lwt/lwt.a:${PORTSDIR}/devel/ocaml-lwt \
- ${SA_DIR}/cryptokit/cryptokit.a:${PORTSDIR}/security/ocaml-cryptokit
+ ocaml-net>=3:${PORTSDIR}/www/ocaml-net \
+ ocaml-lwt>=2.4.2:${PORTSDIR}/devel/ocaml-lwt \
+ ${SA_DIR}/pcre/pcre.a:${PORTSDIR}/devel/ocaml-pcre \
+ ${SA_DIR}/cryptokit/cryptokit.a:${PORTSDIR}/security/ocaml-cryptokit \
+ ${SA_DIR}/text/text.a:${PORTSDIR}/textproc/ocaml-text \
+ ocaml-tyxml>=2.2.0:${PORTSDIR}/textproc/ocaml-tyxml
USE_OCAML= yes
USE_OCAML_FINDLIB= yes
USE_OCAMLFIND_PLIST= yes
USE_OCAML_LDCONFIG= yes
+OCAML_PKGDIRS= ocsigenserver
+OCAML_LDLIBS= ${OCAML_SITELIBDIR}/ocsigenserver
+MAKE_JOBS_UNSAFE= yes
SA_DIR= ${PREFIX}/${OCAML_SITELIBDIR}
-OPTIONS= SQLITE "Use sqlite as a database backend" OFF \
- CAMLZIP "Use camlzip for compression" ON
+OPTIONS_DEFINE= CAMLZIP
+SQLITE_DESC= Use sqlite as a database backend
+DBM_DESC= Use dbm as a database backend
+CAMLZIP_DESC= Use camlzip for compression
+OPTIONS_MULTI= DB
+OPTIONS_MULTI_DB= SQLITE DBM
USE_GMAKE= yes
HAS_CONFIGURE= yes
-CONFIGURE_ARGS= --name ${PORTNAME} \
- --disable-nativecode \
- --disable-debug \
+CONFIGURE_ARGS= --disable-debug \
+ --enable-natdynlink \
--ocsigen-user ${WWWOWN} \
--ocsigen-group ${WWWGRP} \
--bindir ${PREFIX}/bin \
@@ -45,42 +51,46 @@
--docdir ${DOCSDIR} \
--sysconfdir ${PREFIX}/etc \
--staticpagesdir ${PREFIX}/share/ocsigen/www \
- --uploaddir /tmp \
- --disable-ocamlduce
+ --uploaddir /tmp
-ALL_TARGET= depend all
-INSTALL_TARGET= installnodoc
+ALL_TARGET= all
+INSTALL_TARGET= install
.if !defined(NOPORTDOCS)
-INSTALL_TARGET+= docinstall
+ALL_TARGET+= doc
+INSTALL_TARGET+= install.doc
PORTDOCS= *
.endif
-MAN1= ocsigen.1
+MAN= ocsigenserver.1
.include <bsd.port.pre.mk>
-.if defined(WITH_SQLITE)
+.if ${PORT_OPTIONS:MSQLITE}
BUILD_DEPENDS+= ${SA_DIR}/sqlite3/sqlite3.a:${PORTSDIR}/databases/ocaml-sqlite3
RUN_DEPENDS+= ${SA_DIR}/sqlite3/sqlite3.a:${PORTSDIR}/databases/ocaml-sqlite3
-CONFIGURE_ARGS+= --enable-sqlite
-PLIST_FILES+= lib/ocsigen/extensions/ocsipersist-sqlite.cma
+CONFIGURE_ARGS+= --with-sqlite
.else
-CONFIGURE_ARGS+= --disable-sqlite
+CONFIGURE_ARGS+= --without-sqlite
.endif
-.if defined(WITHOUT_CAMLZIP)
-CONFIGURE_ARGS+= --disable-camlzip
+.if ${PORT_OPTIONS:MDBM}
+CONFIGURE_ARGS+= --with-dbm
+BUILD_DEPENDS+= ${LOCALBASE}/lib/ocaml/dbm.a:${PORTSDIR}/databases/ocaml-dbm
+RUN_DEPENDS+= ${LOCALBASE}/lib/ocaml/dbm.a:${PORTSDIR}/databases/ocaml-dbm
.else
-CONFIGURE_ARGS+= --enable-camlzip
+CONFIGURE_ARGS+= --without-dbm
+.endif
+
+.if ${PORT_OPTIONS:MCAMLZIP}
+CONFIGURE_ARGS+= --with-camlzip
+.else
+CONFIGURE_ARGS+= --without-camlzip
BUILD_DEPENDS+= ocaml-zip>=1.03_2:${PORTSDIR}/archivers/ocaml-zip
RUN_DEPENDS+= ocaml-zip>=1.03_2:${PORTSDIR}/archivers/ocaml-zip
PLIST_FILES+= lib/ocsigen/extensions/deflatemod.cmo
.endif
-post-install:
- @if [ ! -f ${PREFIX}/etc/${PORTNAME}/ocsigen.conf ]; then \
- ${CP} -p ${PREFIX}/etc/${PORTNAME}/ocsigen.conf.sample \
- ${PREFIX}/etc/${PORTNAME}/ocsigen.conf; \
- fi
+do-configure:
+ @cd ${WRKSRC} && ${SH} configure ${CONFIGURE_ARGS}
.include <bsd.port.post.mk>
Index: distinfo
===================================================================
--- distinfo (revision 311755)
+++ distinfo (working copy)
@@ -1,2 +1,2 @@
-SHA256 (ocsigen-1.1.0.tar.gz) = 9cad514c1162eaee8a48de0acb58c061eca8777fdc0eed0538ebd09f844ebcd2
-SIZE (ocsigen-1.1.0.tar.gz) = 683710
+SHA256 (ocsigenserver-2.2.0.tar.gz) = 21d4d08dd00550647fc08cef214c0a651574671ee3542b7445f76b8234de1f68
+SIZE (ocsigenserver-2.2.0.tar.gz) = 1259122
Index: pkg-plist
===================================================================
--- pkg-plist (revision 311755)
+++ pkg-plist (working copy)
@@ -1,64 +1,31 @@
-bin/ocsigen
-etc/ocsigen/mime.types
-etc/ocsigen/ocsigen.conf
-etc/ocsigen/ocsigen.conf.sample
-etc/ocsigen/ocsigen.conf.opt.sample
-lib/ocsigen/METAS/META.eliom_examples
-lib/ocsigen/METAS/META.ocsigen_ext
-lib/ocsigen/examples/miniwiki.cmo
-lib/ocsigen/examples/monitoring.cmo
-lib/ocsigen/examples/tutoeliom.cmi
-lib/ocsigen/examples/tutoeliom.cmo
-lib/ocsigen/extensions/accesscontrol.cmo
-lib/ocsigen/extensions/authbasic.cmo
-lib/ocsigen/extensions/cgimod.cmo
-lib/ocsigen/extensions/eliom.cma
-lib/ocsigen/extensions/ocsidbm
-lib/ocsigen/extensions/ocsipersist-dbm.cma
-lib/ocsigen/extensions/outputfilter.cmo
-lib/ocsigen/extensions/redirectmod.cmo
-lib/ocsigen/extensions/revproxy.cmo
-lib/ocsigen/extensions/staticmod.cmo
-lib/ocsigen/extensions/userconf.cmo
-share/ocsigen/www/ocsigen/miniwiki/style.css
-share/ocsigen/www/ocsigen/ocsigenstuff/LICENSE
-share/ocsigen/www/ocsigen/ocsigenstuff/back.png
-share/ocsigen/www/ocsigen/ocsigenstuff/cdimage.png
-share/ocsigen/www/ocsigen/ocsigenstuff/deb.png
-share/ocsigen/www/ocsigen/ocsigenstuff/dvi.png
-share/ocsigen/www/ocsigen/ocsigenstuff/folder_open.png
-share/ocsigen/www/ocsigen/ocsigenstuff/html.png
-share/ocsigen/www/ocsigen/ocsigenstuff/image.png
-share/ocsigen/www/ocsigen/ocsigenstuff/ocsigen5.png
-share/ocsigen/www/ocsigen/ocsigenstuff/pdf.png
-share/ocsigen/www/ocsigen/ocsigenstuff/postscript.png
-share/ocsigen/www/ocsigen/ocsigenstuff/readme.png
-share/ocsigen/www/ocsigen/ocsigenstuff/rpm.png
-share/ocsigen/www/ocsigen/ocsigenstuff/sound.png
-share/ocsigen/www/ocsigen/ocsigenstuff/source_c.png
-share/ocsigen/www/ocsigen/ocsigenstuff/source_java.png
-share/ocsigen/www/ocsigen/ocsigenstuff/source_pl.png
-share/ocsigen/www/ocsigen/ocsigenstuff/source_py.png
-share/ocsigen/www/ocsigen/ocsigenstuff/style.css
-share/ocsigen/www/ocsigen/ocsigenstuff/tar.png
-share/ocsigen/www/ocsigen/ocsigenstuff/tex.png
-share/ocsigen/www/ocsigen/ocsigenstuff/tgz.png
-share/ocsigen/www/ocsigen/ocsigenstuff/txt.png
-share/ocsigen/www/ocsigen/ocsigenstuff/unknown.png
-share/ocsigen/www/ocsigen/ocsigenstuff/video.png
-share/ocsigen/www/ocsigen/tutorial/bulles-bleues.png
-share/ocsigen/www/ocsigen/tutorial/ocsigen5.png
-share/ocsigen/www/ocsigen/tutorial/style.css
- at dirrm share/ocsigen/www/ocsigen/miniwiki
- at dirrm share/ocsigen/www/ocsigen/ocsigenstuff
- at dirrm share/ocsigen/www/ocsigen/tutorial
- at dirrm share/ocsigen/www/ocsigen
- at dirrm share/ocsigen/www
- at dirrm share/ocsigen
- at dirrm lib/ocsigen/METAS
- at dirrm lib/ocsigen/examples
- at dirrm lib/ocsigen/extensions
- at dirrm lib/ocsigen
- at dirrm etc/ocsigen
- at unexec if cmp -s %D/etc/${PORTNAME}/ocsigen.conf.sample %D/etc/${PORTNAME}/ocsigen.conf; then rm -f %D/etc/${PORTNAME}/ocsigen.conf; fi
- at exec if [ ! -f %D/etc/${PORTNAME}/ocsigen.conf ] ; then cp -p %D/%F %B/${PORTNAME}/ocsigen.conf; fi
+ at comment $FreeBSD$
+bin/ocsigenserver
+bin/ocsigenserver.opt
+etc/ocsigenserver.conf.sample
+etc/ocsigenserver.conf
+etc/mime.types
+share/ocsigen/www/index.html
+share/ocsigen/www/ocsigenstuff/back.png
+share/ocsigen/www/ocsigenstuff/cdimage.png
+share/ocsigen/www/ocsigenstuff/deb.png
+share/ocsigen/www/ocsigenstuff/dvi.png
+share/ocsigen/www/ocsigenstuff/folder_open.png
+share/ocsigen/www/ocsigenstuff/html.png
+share/ocsigen/www/ocsigenstuff/image.png
+share/ocsigen/www/ocsigenstuff/ocsigen5.png
+share/ocsigen/www/ocsigenstuff/pdf.png
+share/ocsigen/www/ocsigenstuff/postscript.png
+share/ocsigen/www/ocsigenstuff/readme.png
+share/ocsigen/www/ocsigenstuff/rpm.png
+share/ocsigen/www/ocsigenstuff/sound.png
+share/ocsigen/www/ocsigenstuff/source_c.png
+share/ocsigen/www/ocsigenstuff/source_java.png
+share/ocsigen/www/ocsigenstuff/source_pl.png
+share/ocsigen/www/ocsigenstuff/source_py.png
+share/ocsigen/www/ocsigenstuff/tar.png
+share/ocsigen/www/ocsigenstuff/tex.png
+share/ocsigen/www/ocsigenstuff/tgz.png
+share/ocsigen/www/ocsigenstuff/txt.png
+share/ocsigen/www/ocsigenstuff/unknown.png
+share/ocsigen/www/ocsigenstuff/video.png
+share/ocsigen/www/ocsigenstuff/style.css
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list