ports/122890: Update port: www/ocaml-net (revision, added options)
Jaap Boender
jaapb at kerguelen.org
Fri Apr 18 14:50:01 UTC 2008
>Number: 122890
>Category: ports
>Synopsis: Update port: www/ocaml-net (revision, added options)
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Apr 18 14:50:00 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Jaap Boender
>Release: 7.0-STABLE
>Organization:
>Environment:
FreeBSD marion-dufresne.pps.jussieu.fr 7.0-STABLE FreeBSD 7.0-STABLE #2: Thu Mar 6 11:50:31 CET 2008 root at marion-dufresne.pps.jussieu.fr:/usr/obj/usr/src/sys/MARION-DUFRESNE i386
>Description:
I've added an OPTIONS part to the ocamlnet port, so that several optional parts can be compiled. Furthermore, it now uses the bsd.ocaml.mk I submitted in ports/122844
>How-To-Repeat:
n/a
>Fix:
shar attached
Patch attached with submission follows:
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# /usr/ports/www/ocaml-net
# /usr/ports/www/ocaml-net/Makefile
# /usr/ports/www/ocaml-net/distinfo
# /usr/ports/www/ocaml-net/pkg-descr
# /usr/ports/www/ocaml-net/files
# /usr/ports/www/ocaml-net/files/patch-Makefile.rules
# /usr/ports/www/ocaml-net/files/patch-src_equeue-gtk1_Makefile
# /usr/ports/www/ocaml-net/files/patch-src_equeue-gtk1_Makefile.pre
# /usr/ports/www/ocaml-net/files/patch-src_equeue-gtk2_Makefile.pre
# /usr/ports/www/ocaml-net/files/patch-src_nethttpd-for-netcgi1_Makefile
# /usr/ports/www/ocaml-net/files/patch-src_nethttpd-for-netcgi1_Makefile.pre
# /usr/ports/www/ocaml-net/files/patch-src_nethttpd-for-netcgi2_Makefile
# /usr/ports/www/ocaml-net/files/patch-src_nethttpd-for-netcgi2_Makefile.pre
# /usr/ports/www/ocaml-net/files/patch_src_netplex_Makefile
# /usr/ports/www/ocaml-net/files/patch_src_netplex_Makefile.pre
# /usr/ports/www/ocaml-net/files/patch_src_netstring_Makefile.def
# /usr/ports/www/ocaml-net/files/patch-src_netcgi2-apache_Makefile.def
#
echo c - /usr/ports/www/ocaml-net
mkdir -p /usr/ports/www/ocaml-net > /dev/null 2>&1
echo x - /usr/ports/www/ocaml-net/Makefile
sed 's/^X//' >/usr/ports/www/ocaml-net/Makefile << 'END-of-/usr/ports/www/ocaml-net/Makefile'
X# New ports collection makefile for: ocaml-net
X# Date created: 01 March 2003
X# Whom: Stephane Legrand <stephane at freebsd.org>
X#
X# $FreeBSD: ports/www/ocaml-net/Makefile,v 1.12 2008/04/10 06:46:34 stas Exp $
X#
X
XPORTNAME= net
XPORTVERSION= 2.2.9
XPORTREVISION= 2
XCATEGORIES= www
XMASTER_SITES= http://download.camlcity.org/download/
XPKGNAMEPREFIX= ocaml-
XDISTNAME= ocaml${PORTNAME}-${PORTVERSION}
X
XMAINTAINER= manfred.lotz at yahoo.de
XCOMMENT= OCaml modules for Internet applications
X
XBUILD_DEPENDS= ${SA_DIR}/pcre/pcre.a:${PORTSDIR}/devel/ocaml-pcre
XRUN_DEPENDS= ${SA_DIR}/pcre/pcre.a:${PORTSDIR}/devel/ocaml-pcre
X
XCONFLICTS= ocaml-equeue-2* ocaml-netclient-0*
X
XUSE_GMAKE= yes
XUSE_OCAML= yes
XUSE_OCAML_FINDLIB= yes
XUSE_OCAML_LDCONFIG= yes
XUSE_OCAML_PLIST= yes
XHAS_CONFIGURE= yes
X
XALL_TARGET= all opt
X
XPLIST_FILES= bin/netplex-admin \
X bin/ocamlrpcgen
X
XDOCSDIR= ${PREFIX}/share/doc/ocaml/${PKGNAMEPREFIX}${PORTNAME}
XEXAMPLESDIR= ${PREFIX}/share/examples/ocaml/${PKGNAMEPREFIX}${PORTNAME}
XSA_DIR= ${LOCALBASE}/${OCAML_SITELIBDIR}
X
X.if !defined(NOPORTDOCS)
XPORTDOCS= *
XPORTEXAMPLES= *
X.endif
X
XOCAML_PKGDIRS= netsys netshm equeue shell netstring rpc-generator \
X rpc pop smtp netclient netcgi1 netcgi2 cgi netplex \
X netcgi2-plex
X
XOPTIONS= SSL "Enable SSL support" ON \
X NETHTTPD "Enable the integrated HTTP daemon" OFF \
X AUTH_DH "Enable Diffie-Hellman authorization support" OFF \
X GTK "Enable GTK support" OFF \
X GTK2 "Enable GTK2 support" OFF \
X APACHE "Enable Apache mod connector (experimental)" OFF
X
X.include <bsd.port.pre.mk>
X
X.if defined(WITHOUT_SSL)
XCONFIGURE_ARGS+= -disable-ssl
X.else
XCONFIGURE_ARGS+= -enable-ssl
XBUILD_DEPENDS+= ${SA_DIR}/ssl/ssl.a:${PORTSDIR}/security/ocaml-ssl
XRUN_DEPENDS+= ${SA_DIR}/ssl/ssl.a:${PORTSDIR}/security/ocaml-ssl
XOCAML_PKGDIRS+= equeue-ssl rpc-ssl
X.endif
X
X.if defined(WITH_NETHTTPD)
XCONFIGURE_ARGS+= -with-nethttpd
XOCAML_PKGDIRS+= nethttpd nethttpd-for-netcgi1 nethttpd-for-netcgi2
X.else
XCONFIGURE_ARGS+= -without-nethttpd
X.endif
X
X.if defined(WITH_AUTH_DH)
XCONFIGURE_ARGS+= -with-rpc-auth-dh
XBUILD_DEPENDS+= ${SA_DIR}/cryptgps/cryptgps.a:${PORTSDIR}/security/ocaml-cryptgps
XRUN_DEPENDS+= ${SA_DIR}/cryptgps/cryptgps.a:${PORTSDIR}/security/ocaml-cryptgps
XOCAML_PKGDIRS+= rpc-auth-dh
X.else
XCONFIGURE_ARGS+= -without-rpc-auth-dh
X.endif
X
X.if defined(WITH_GTK)
XCONFIGURE_ARGS+= -enable-gtk
XBUILD_DEPENDS+= lablgtk:${PORTSDIR}/x11-toolkits/ocaml-lablgtk
XRUN_DEPENDS+= lablgtk:${PORTSDIR}/x11-toolkits/ocaml-lablgtk
XOCAML_PKGDIRS+= equeue-gtk1
X.else
XCONFIGURE_ARGS+= -disable-gtk
X.endif
X
X.if defined(WITH_GTK2)
XCONFIGURE_ARGS+= -enable-gtk2
XBUILD_DEPENDS+= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
XRUN_DEPENDS+= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
XOCAML_PKGDIRS+= equeue-gtk2
X.else
XCONFIGURE_ARGS+= -disable-gtk2
X.endif
X
X.if defined(WITH_APACHE)
XUSE_APACHE= 1.3+
XCONFIGURE_ARGS+= -enable-apache -apxs ${APXS} -apache ${HTTPD}
XOCAML_PKGDIRS+= netcgi_apache
X.else
XCONFIGURE_ARGS+= -disable-apache
X.endif
X
Xpost-install:
X.if !defined(NOPORTDOCS)
X @${MKDIR} ${DOCSDIR}/
X @(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${DOCSDIR}/)
X
X @${MKDIR} ${EXAMPLESDIR}/
X @(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}/)
X.endif
X
X.include <bsd.port.post.mk>
END-of-/usr/ports/www/ocaml-net/Makefile
echo x - /usr/ports/www/ocaml-net/distinfo
sed 's/^X//' >/usr/ports/www/ocaml-net/distinfo << 'END-of-/usr/ports/www/ocaml-net/distinfo'
XMD5 (ocamlnet-2.2.9.tar.gz) = 3655e3be3bb2806e0a1f48bb7ce16fb3
XSHA256 (ocamlnet-2.2.9.tar.gz) = 134530a4357879e095bdbbb5f21f78634a16ef4d787eb151676b7fee7e4c0dc9
XSIZE (ocamlnet-2.2.9.tar.gz) = 1877257
END-of-/usr/ports/www/ocaml-net/distinfo
echo x - /usr/ports/www/ocaml-net/pkg-descr
sed 's/^X//' >/usr/ports/www/ocaml-net/pkg-descr << 'END-of-/usr/ports/www/ocaml-net/pkg-descr'
XA collection of modules for the Objective Caml language which focus
Xon application-level Internet protocols and conventions.
X
XOcamlnet consists of a number of libraries:
X
X * netstring is about processing strings that occur in network context
X * netcgi1 and netcgi2 focus on portable web applications
X * nethttpd is a web server component (HTTP server implementation)
X * netplex is a generic server framework
X * rpc implements OncRPC
X * netclient implements clients for HTTP, FTP, and Telnet
X * equeue is an event queue used for many protocol implementations
X * shell is about calling external commands
X * netshm provides shared memory for IPC purposes
X * netsys contains bindings for system functions
X * smtp and pop are two further client implementations
X
XWWW: http://sourceforge.net/projects/ocamlnet
X
X- Manfred Lotz
X <manfred.lotz at yahoo.de>
END-of-/usr/ports/www/ocaml-net/pkg-descr
echo c - /usr/ports/www/ocaml-net/files
mkdir -p /usr/ports/www/ocaml-net/files > /dev/null 2>&1
echo x - /usr/ports/www/ocaml-net/files/patch-Makefile.rules
sed 's/^X//' >/usr/ports/www/ocaml-net/files/patch-Makefile.rules << 'END-of-/usr/ports/www/ocaml-net/files/patch-Makefile.rules'
X--- Makefile.rules.orig 2008-04-04 11:39:24.000000000 +0200
X+++ Makefile.rules 2008-04-04 11:39:31.000000000 +0200
X@@ -13,7 +13,7 @@
X OCAMLFIND = ocamlfind
X OCAMLYACC = ocamlyacc
X OCAMLLEX = ocamllex
X-CAMLP4 = camlp4
X+CAMLP4 = camlp5
X OCAMLMKLIB = ocamlmklib
X OCAMLDOC = $(OCAMLFIND) ocamldoc
X
END-of-/usr/ports/www/ocaml-net/files/patch-Makefile.rules
echo x - /usr/ports/www/ocaml-net/files/patch-src_equeue-gtk1_Makefile
sed 's/^X//' >/usr/ports/www/ocaml-net/files/patch-src_equeue-gtk1_Makefile << 'END-of-/usr/ports/www/ocaml-net/files/patch-src_equeue-gtk1_Makefile'
X--- src/equeue-gtk1/Makefile.orig 2008-04-04 11:48:22.000000000 +0200
X+++ src/equeue-gtk1/Makefile 2008-04-04 11:48:41.000000000 +0200
X@@ -9,7 +9,7 @@
X
X INCLUDES += $(INC_EQUEUE)
X
X-PP_OPTIONS = -syntax camlp4o -package camlp4.macro $(GTK_DEFINES)
X+PP_OPTIONS = -syntax camlp5o -package camlp5.macro $(GTK_DEFINES)
X
X include $(TOP_DIR)/Makefile.rules
X
END-of-/usr/ports/www/ocaml-net/files/patch-src_equeue-gtk1_Makefile
echo x - /usr/ports/www/ocaml-net/files/patch-src_equeue-gtk1_Makefile.pre
sed 's/^X//' >/usr/ports/www/ocaml-net/files/patch-src_equeue-gtk1_Makefile.pre << 'END-of-/usr/ports/www/ocaml-net/files/patch-src_equeue-gtk1_Makefile.pre'
X--- src/equeue-gtk1/Makefile.pre.orig 2008-04-04 11:48:28.000000000 +0200
X+++ src/equeue-gtk1/Makefile.pre 2008-04-04 11:48:54.000000000 +0200
X@@ -6,6 +6,6 @@
X
X include ./Makefile.gtk
X
X-PP_OPTIONS = -syntax camlp4o -package camlp4.macro $(GTK_DEFINES)
X+PP_OPTIONS = -syntax camlp5o -package camlp5.macro $(GTK_DEFINES)
X
X include $(TOP_DIR)/Makefile.rules
END-of-/usr/ports/www/ocaml-net/files/patch-src_equeue-gtk1_Makefile.pre
echo x - /usr/ports/www/ocaml-net/files/patch-src_equeue-gtk2_Makefile.pre
sed 's/^X//' >/usr/ports/www/ocaml-net/files/patch-src_equeue-gtk2_Makefile.pre << 'END-of-/usr/ports/www/ocaml-net/files/patch-src_equeue-gtk2_Makefile.pre'
X--- src/equeue-gtk2/Makefile.pre.orig 2008-04-04 11:49:45.000000000 +0200
X+++ src/equeue-gtk2/Makefile.pre 2008-04-04 11:50:02.000000000 +0200
X@@ -6,7 +6,7 @@
X
X include ./Makefile.gtk
X
X-PP_OPTIONS = -syntax camlp4o -package camlp4.macro $(GTK_DEFINES)
X+PP_OPTIONS = -syntax camlp5o -package camlp5.macro $(GTK_DEFINES)
X
X include $(TOP_DIR)/Makefile.rules
X
END-of-/usr/ports/www/ocaml-net/files/patch-src_equeue-gtk2_Makefile.pre
echo x - /usr/ports/www/ocaml-net/files/patch-src_nethttpd-for-netcgi1_Makefile
sed 's/^X//' >/usr/ports/www/ocaml-net/files/patch-src_nethttpd-for-netcgi1_Makefile << 'END-of-/usr/ports/www/ocaml-net/files/patch-src_nethttpd-for-netcgi1_Makefile'
X--- src/nethttpd-for-netcgi1/Makefile.orig 2008-04-04 11:51:17.000000000 +0200
X+++ src/nethttpd-for-netcgi1/Makefile 2008-04-04 11:51:19.000000000 +0200
X@@ -8,7 +8,7 @@
X nethttpd_engine.mli nethttpd_services.mli nethttpd_plex.mli
X
X INCLUDES += $(INC_EQUEUE) $(INC_NETSTRING) $(INC_NETCGI1) $(INC_NETPLEX)
X-PP_OPTIONS = -package "camlp4, camlp4.macro" -syntax "camlp4o"
X+PP_OPTIONS = -package "camlp5, camlp5.macro" -syntax "camlp5o"
X
X #PP_OPTIONS_FINDLIB += -ppopt "-DTesting"
X # do this to enable test coverage calculations
END-of-/usr/ports/www/ocaml-net/files/patch-src_nethttpd-for-netcgi1_Makefile
echo x - /usr/ports/www/ocaml-net/files/patch-src_nethttpd-for-netcgi1_Makefile.pre
sed 's/^X//' >/usr/ports/www/ocaml-net/files/patch-src_nethttpd-for-netcgi1_Makefile.pre << 'END-of-/usr/ports/www/ocaml-net/files/patch-src_nethttpd-for-netcgi1_Makefile.pre'
X--- src/nethttpd-for-netcgi1/Makefile.pre.orig 2008-04-04 11:51:29.000000000 +0200
X+++ src/nethttpd-for-netcgi1/Makefile.pre 2008-04-04 11:51:00.000000000 +0200
X@@ -6,6 +6,6 @@
X
X INSTALL_EXTRA += LICENSE
X
X-PP_OPTIONS = -package "camlp4, camlp4.macro" -syntax "camlp4o"
X+PP_OPTIONS = -package "camlp5, camlp5.macro" -syntax "camlp5o"
X
X include $(TOP_DIR)/Makefile.rules
END-of-/usr/ports/www/ocaml-net/files/patch-src_nethttpd-for-netcgi1_Makefile.pre
echo x - /usr/ports/www/ocaml-net/files/patch-src_nethttpd-for-netcgi2_Makefile
sed 's/^X//' >/usr/ports/www/ocaml-net/files/patch-src_nethttpd-for-netcgi2_Makefile << 'END-of-/usr/ports/www/ocaml-net/files/patch-src_nethttpd-for-netcgi2_Makefile'
X--- src/nethttpd-for-netcgi2/Makefile.orig 2008-04-04 11:53:21.000000000 +0200
X+++ src/nethttpd-for-netcgi2/Makefile 2008-04-04 11:53:38.000000000 +0200
X@@ -9,7 +9,7 @@
X nethttpd_intro.txt
X
X INCLUDES += $(INC_EQUEUE) $(INC_NETSTRING) $(INC_NETCGI2) $(INC_NETPLEX)
X-PP_OPTIONS = -package "camlp4, camlp4.macro" -syntax "camlp4o"
X+PP_OPTIONS = -package "camlp5, camlp5.macro" -syntax "camlp5o"
X
X #PP_OPTIONS_FINDLIB += -ppopt "-DTesting"
X # do this to enable test coverage calculations
END-of-/usr/ports/www/ocaml-net/files/patch-src_nethttpd-for-netcgi2_Makefile
echo x - /usr/ports/www/ocaml-net/files/patch-src_nethttpd-for-netcgi2_Makefile.pre
sed 's/^X//' >/usr/ports/www/ocaml-net/files/patch-src_nethttpd-for-netcgi2_Makefile.pre << 'END-of-/usr/ports/www/ocaml-net/files/patch-src_nethttpd-for-netcgi2_Makefile.pre'
X--- src/nethttpd-for-netcgi2/Makefile.pre.orig 2008-04-04 11:53:27.000000000 +0200
X+++ src/nethttpd-for-netcgi2/Makefile.pre 2008-04-04 11:53:44.000000000 +0200
X@@ -15,7 +15,7 @@
X
X INSTALL_EXTRA += LICENSE
X
X-PP_OPTIONS = -package "camlp4, camlp4.macro" -syntax "camlp4o"
X+PP_OPTIONS = -package "camlp5, camlp5.macro" -syntax "camlp5o"
X
X include $(TOP_DIR)/Makefile.rules
X
END-of-/usr/ports/www/ocaml-net/files/patch-src_nethttpd-for-netcgi2_Makefile.pre
echo x - /usr/ports/www/ocaml-net/files/patch_src_netplex_Makefile
sed 's/^X//' >/usr/ports/www/ocaml-net/files/patch_src_netplex_Makefile << 'END-of-/usr/ports/www/ocaml-net/files/patch_src_netplex_Makefile'
X--- src/netplex/Makefile.orig 2008-04-04 11:54:28.000000000 +0200
X+++ src/netplex/Makefile 2008-04-04 11:54:32.000000000 +0200
X@@ -19,7 +19,7 @@
X ALLMT_EXTRA = netplex_mt.cmo
X OPTMT_EXTRA = netplex_mt.cmx
X
X-PP_OPTIONS = -syntax camlp4o -package camlp4
X+PP_OPTIONS = -syntax camlp5o -package camlp5
X
X OCAMLC_OPTIONS_FOR_netplex_mt.ml = $(THREAD)
X OCAMLOPT_OPTIONS_FOR_netplex_mt.ml = $(THREAD)
END-of-/usr/ports/www/ocaml-net/files/patch_src_netplex_Makefile
echo x - /usr/ports/www/ocaml-net/files/patch_src_netplex_Makefile.pre
sed 's/^X//' >/usr/ports/www/ocaml-net/files/patch_src_netplex_Makefile.pre << 'END-of-/usr/ports/www/ocaml-net/files/patch_src_netplex_Makefile.pre'
X--- src/netplex/Makefile.pre.orig 2008-04-04 11:54:36.000000000 +0200
X+++ src/netplex/Makefile.pre 2008-04-04 11:54:41.000000000 +0200
X@@ -9,7 +9,7 @@
X INSTALL_EXTRA = netplex-packlist netplex_mt.cmo netplex_mt.cmx netplex_mt.o
X INSTOTHER = install-netplex-admin
X
X-PP_OPTIONS = -syntax camlp4o -package camlp4
X+PP_OPTIONS = -syntax camlp5o -package camlp5
X
X include $(TOP_DIR)/Makefile.rules
X
END-of-/usr/ports/www/ocaml-net/files/patch_src_netplex_Makefile.pre
echo x - /usr/ports/www/ocaml-net/files/patch_src_netstring_Makefile.def
sed 's/^X//' >/usr/ports/www/ocaml-net/files/patch_src_netstring_Makefile.def << 'END-of-/usr/ports/www/ocaml-net/files/patch_src_netstring_Makefile.def'
X--- src/netstring/Makefile.def.orig 2008-04-04 11:45:27.000000000 +0200
X+++ src/netstring/Makefile.def 2008-04-04 11:45:41.000000000 +0200
X@@ -46,7 +46,7 @@
X netchannels_tut.txt netmime_tut.txt netsendmail_tut.txt \
X netulex_tut.txt neturl_tut.txt
X
X-PP_OPTIONS = -package camlp4 -syntax camlp4o
X+PP_OPTIONS = -package camlp5 -syntax camlp5o
X
X OCAMLC_OPTIONS_FOR_netstring_mt.ml = $(THREAD)
X OCAMLOPT_OPTIONS_FOR_netstring_mt.ml = $(THREAD)
END-of-/usr/ports/www/ocaml-net/files/patch_src_netstring_Makefile.def
echo x - /usr/ports/www/ocaml-net/files/patch-src_netcgi2-apache_Makefile.def
sed 's/^X//' >/usr/ports/www/ocaml-net/files/patch-src_netcgi2-apache_Makefile.def << 'END-of-/usr/ports/www/ocaml-net/files/patch-src_netcgi2-apache_Makefile.def'
X--- src/netcgi2-apache/Makefile.def.orig 2007-11-01 23:12:31.000000000 +0100
X+++ src/netcgi2-apache/Makefile.def 2008-04-18 16:29:01.000000000 +0200
X@@ -47,7 +47,7 @@
X ### Requires `caml_startup' instead of `caml_main' in handler.c
X mod_netcgi_apache.so: $(MOD_OBJECTS)
X $(APXS) -c -o $@ $^ -L$(APACHE_OCAMLLIBDIR) $(APACHE_OCAMLLIBS)
X- test -f .libs/$@ && cp .libs/$@ .
X+ -test -f .libs/$@ && cp .libs/$@ .
X
X netcgi_apache_mod.lo: netcgi_apache_mod.o
X netcgi_apache_mod.o: netcgi_apache_mod.cmo
END-of-/usr/ports/www/ocaml-net/files/patch-src_netcgi2-apache_Makefile.def
exit
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list