Attachment 124504 Details for Bug 167987 – ocaml-net-3.5.1.patch

[patch] ocaml-net-3.5.1.patch

ocaml-net-3.5.1.patch (text/plain), 4.91 KB, created by Jyun-Yan You on 2012-05-17 02:10:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jyun-Yan You

Created: 2012-05-17 02:10:01 UTC

Size: 4.91 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/www/ocaml-net/Makefile /amd/gcs/98/9855518/src/ports/www/ocaml-net/Makefile
>--- /usr/ports/www/ocaml-net/Makefile	2012-02-15 22:31:49.000000000 +0800
>+++ /amd/gcs/98/9855518/src/ports/www/ocaml-net/Makefile	2012-05-16 23:48:05.145990000 +0800
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	net
>-PORTVERSION=	3.3.3
>+PORTVERSION=	3.5.1
> CATEGORIES=	www
> MASTER_SITES=	http://download.camlcity.org/download/
> PKGNAMEPREFIX=	ocaml-
>@@ -15,8 +15,7 @@
> MAINTAINER=	jaapb@kerguelen.org
> COMMENT=	OCaml modules for Internet applications
> 
>-BUILD_DEPENDS=	${SA_DIR}/pcre/pcre.a:${PORTSDIR}/devel/ocaml-pcre \
>-		camlp5:${PORTSDIR}/devel/ocaml-camlp5
>+BUILD_DEPENDS=	${SA_DIR}/pcre/pcre.a:${PORTSDIR}/devel/ocaml-pcre
> RUN_DEPENDS:=	${BUILD_DEPENDS}
> 
> CONFLICTS=	ocaml-equeue-2* ocaml-netclient-0*
>@@ -45,7 +44,7 @@
> 
> OCAML_PKGDIRS=	netsys netshm equeue shell netstring rpc-generator \
> 		rpc pop smtp netclient netcgi2 netgssapi netplex \
>-		netcgi2-plex netcamlbox netmulticore
>+		netcgi2-plex netcamlbox netmulticore rpc-auth-local
> OCAML_LDLIBS=	${OCAML_PKGDIRS:S/^/${OCAML_SITELIBDIR}\//}
> 
> OPTIONS=	SSL "Enable SSL support" ON \
>@@ -53,42 +52,44 @@
> 		AUTH_DH "Enable Diffie-Hellman authorization support" OFF \
> 		GTK "Enable GTK support" OFF \
> 		GTK2 "Enable GTK2 support" OFF \
>-		APACHE "Enable Apache mod connector (experimental)" OFF
>+		APACHE "Enable Apache mod connector (experimental)" OFF \
>+		ZIP "Enable compression support" OFF \
>+		SCRAM "Enable SCRAM support" OFF
> 
> .include <bsd.port.options.mk>
> 
> .if defined(WITHOUT_SSL)
>-CONFIGURE_ARGS+=        -disable-ssl
>+CONFIGURE_ARGS+=	-disable-ssl
> .else
>-CONFIGURE_ARGS+=        -enable-ssl
>-BUILD_DEPENDS+=         ${SA_DIR}/ssl/ssl.a:${PORTSDIR}/security/ocaml-ssl
>-RUN_DEPENDS+=           ${SA_DIR}/ssl/ssl.a:${PORTSDIR}/security/ocaml-ssl
>-OCAML_PKGDIRS+=         equeue-ssl rpc-ssl
>+CONFIGURE_ARGS+=	-enable-ssl
>+BUILD_DEPENDS+=		${SA_DIR}/ssl/ssl.a:${PORTSDIR}/security/ocaml-ssl
>+RUN_DEPENDS+=		${SA_DIR}/ssl/ssl.a:${PORTSDIR}/security/ocaml-ssl
>+OCAML_PKGDIRS+=		equeue-ssl rpc-ssl
> .endif
> 
> .if defined(WITH_NETHTTPD)
>-CONFIGURE_ARGS+=        -with-nethttpd
>-OCAML_PKGDIRS+=         nethttpd nethttpd-for-netcgi2
>+CONFIGURE_ARGS+=	-with-nethttpd
>+OCAML_PKGDIRS+=		nethttpd nethttpd-for-netcgi2
> .else
>-CONFIGURE_ARGS+=        -without-nethttpd
>+CONFIGURE_ARGS+=	-without-nethttpd
> .endif
> 
> .if defined(WITH_AUTH_DH)
>-CONFIGURE_ARGS+=        -with-rpc-auth-dh
>-BUILD_DEPENDS+=         ${SA_DIR}/cryptgps/cryptgps.a:${PORTSDIR}/security/ocaml-cryptgps
>-RUN_DEPENDS+=           ${SA_DIR}/cryptgps/cryptgps.a:${PORTSDIR}/security/ocaml-cryptgps
>-OCAML_PKGDIRS+=         rpc-auth-dh
>+CONFIGURE_ARGS+=	-with-rpc-auth-dh
>+BUILD_DEPENDS+=		${SA_DIR}/cryptgps/cryptgps.a:${PORTSDIR}/security/ocaml-cryptgps
>+RUN_DEPENDS+=		${SA_DIR}/cryptgps/cryptgps.a:${PORTSDIR}/security/ocaml-cryptgps
>+OCAML_PKGDIRS+=		rpc-auth-dh
> .else
>-CONFIGURE_ARGS+=        -without-rpc-auth-dh
>+CONFIGURE_ARGS+=	-without-rpc-auth-dh
> .endif
> 
> .if defined(WITH_GTK)
>-CONFIGURE_ARGS+=        -enable-gtk
>-BUILD_DEPENDS+=         lablgtk:${PORTSDIR}/x11-toolkits/ocaml-lablgtk
>-RUN_DEPENDS+=           lablgtk:${PORTSDIR}/x11-toolkits/ocaml-lablgtk
>-OCAML_PKGDIRS+=         equeue-gtk1
>+CONFIGURE_ARGS+=	-enable-gtk
>+BUILD_DEPENDS+=		lablgtk:${PORTSDIR}/x11-toolkits/ocaml-lablgtk
>+RUN_DEPENDS+=		lablgtk:${PORTSDIR}/x11-toolkits/ocaml-lablgtk
>+OCAML_PKGDIRS+=		equeue-gtk1
> .else
>-CONFIGURE_ARGS+=        -disable-gtk
>+CONFIGURE_ARGS+=	-disable-gtk
> .endif
> 
> .if defined(WITH_GTK2)
>@@ -108,9 +109,31 @@
> CONFIGURE_ARGS+=	-disable-apache
> .endif
> 
>+.if defined(WITH_ZIP)
>+CONFIGURE_ARGS+=	-enable-zip
>+BUILD_DEPENDS+=		${SA_DIR}/zip/zip.a:${PORTSDIR}/archivers/ocaml-zip
>+RUN_DEPENDS+=		${SA_DIR}/zip/zip.a:${PORTSDIR}/archivers/ocaml-zip
>+OCAML_PKGDIRS+=		netzip
>+.else
>+CONFIGURE_ARGS+=	-disable-zip
>+.endif
>+
>+.if defined(WITH_SCRAM)
>+CONFIGURE_ARGS+=	-enable-crypto
>+BUILD_DEPENDS+=		${SA_DIR}/cryptokit/cryptokit.a:${PORTSDIR}/security/ocaml-cryptokit
>+RUN_DEPENDS+=		${SA_DIR}/cryptokit/cryptokit.a:${PORTSDIR}/security/ocaml-cryptokit
>+OCAML_PKGDIRS+=		netmech-scram
>+.else
>+CONFIGURE_ARGS+=	-disable-crypto
>+.endif
>+
> post-patch:
> 	${REINPLACE_CMD} -e '/\.libs/d' \
> 		${WRKSRC}/src/netcgi2-apache/Makefile.def
>+	${REINPLACE_CMD} -e 's/camlzip/zip/' \
>+		${WRKSRC}/configure \
>+		${WRKSRC}/src/netzip/META.in \
>+		${WRKSRC}/src/netzip/Makefile
> 
> post-install:
> .if !defined(NOPORTDOCS)
>diff -ruN --exclude=CVS /usr/ports/www/ocaml-net/distinfo /amd/gcs/98/9855518/src/ports/www/ocaml-net/distinfo
>--- /usr/ports/www/ocaml-net/distinfo	2011-06-21 17:51:11.000000000 +0800
>+++ /amd/gcs/98/9855518/src/ports/www/ocaml-net/distinfo	2012-05-16 23:48:05.135991000 +0800
>@@ -1,2 +1,2 @@
>-SHA256 (ocamlnet-3.3.3.tar.gz) = e7f93a2490f29c065157a2a711be7251066cf4ce035f27114b9d09d0cbdd950a
>-SIZE (ocamlnet-3.3.3.tar.gz) = 3123945
>+SHA256 (ocamlnet-3.5.1.tar.gz) = 1304eea88aacbc08864e7ff8fce58fab495f41c99b6379784121fc9e92ca8426
>+SIZE (ocamlnet-3.5.1.tar.gz) = 3290994

Actions: View | Diff

Attachments on bug 167987: 124504