From owner-svn-ports-head@FreeBSD.ORG Sat May 16 11:36:50 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B6E4E960; Sat, 16 May 2015 11:36:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 990301BA0; Sat, 16 May 2015 11:36:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4GBaos9014796; Sat, 16 May 2015 11:36:50 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4GBan66014790; Sat, 16 May 2015 11:36:49 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201505161136.t4GBan66014790@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Sat, 16 May 2015 11:36:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r386519 - in head/www/ocaml-net: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 May 2015 11:36:50 -0000 Author: marino Date: Sat May 16 11:36:49 2015 New Revision: 386519 URL: https://svnweb.freebsd.org/changeset/ports/386519 Log: www/ocamlnet: Upgrade version 3.7.4 => 4.0.3 to unbreak Several options were removed / changed / added. I maintained as many as I could, but did not add new ones e.g. gnutls which probably requires another ocaml package. Somebody that needs more options than this needs to adopt the port and support them. This port broke with the latest ocaml, so upgrading was necessary to fix the build. Added: head/www/ocaml-net/files/patch-Makefile.rules (contents, props changed) Deleted: head/www/ocaml-net/files/patch-Makefile Modified: head/www/ocaml-net/Makefile head/www/ocaml-net/distinfo Modified: head/www/ocaml-net/Makefile ============================================================================== --- head/www/ocaml-net/Makefile Sat May 16 11:23:06 2015 (r386518) +++ head/www/ocaml-net/Makefile Sat May 16 11:36:49 2015 (r386519) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= net -PORTVERSION= 3.7.3 +PORTVERSION= 4.0.3 CATEGORIES= www MASTER_SITES= http://download.camlcity.org/download/ PKGNAMEPREFIX= ocaml- @@ -41,50 +41,29 @@ PORTEXAMPLES= * OCAML_PKGDIRS= netsys netshm equeue shell netstring rpc-generator \ rpc pop smtp netclient netcgi2 netgssapi netplex \ netcgi2-plex netcamlbox netmulticore rpc-auth-local \ - netstring-pcre + netstring-pcre netunidata OCAML_LDLIBS= ${OCAML_PKGDIRS:S/^/${OCAML_SITELIBDIR}\//} -OPTIONS_DEFINE= SSL NETHTTPD AUTH_DH GTK2 APACHE ZIP SCRAM EXAMPLES DOCS -OPTIONS_DEFAULT=SSL -AUTH_DH_DESC= Diffie-Hellman authorization support +OPTIONS_DEFINE= NETHTTPD GTK2 APACHE ZIP EXAMPLES DOCS +OPTIONS_DEFAULT= NETHTTPD_DESC= Integrated HTTP daemon -SCRAM_DESC= SCRAM support ZIP_DESC= Compression support APACHE_DESC= Apache mod connector (experimental) CONFIGURE_ARGS+=-disable-gtk \ -enable-pcre -SSL_BUILD_DEPENDS= ${SA_DIR}/ssl/ssl.a:${PORTSDIR}/security/ocaml-ssl -SSL_RUN_DEPENDS= ${SA_DIR}/ssl/ssl.a:${PORTSDIR}/security/ocaml-ssl - -AUTH_DH_BUILD_DEPENDS= ${SA_DIR}/cryptgps/cryptgps.a:${PORTSDIR}/security/ocaml-cryptgps -AUTH_DH_RUN_DEPENDS= ${SA_DIR}/cryptgps/cryptgps.a:${PORTSDIR}/security/ocaml-cryptgps - GTK2_BUILD_DEPENDS= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 GTK2_RUN_DEPENDS= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 ZIP_BUILD_DEPENDS= ${SA_DIR}/zip/zip.a:${PORTSDIR}/archivers/ocaml-zip ZIP_RUN_DEPENDS= ${SA_DIR}/zip/zip.a:${PORTSDIR}/archivers/ocaml-zip -SCRAM_BUILD_DEPENDS= ${SA_DIR}/cryptokit/cryptokit.a:${PORTSDIR}/security/ocaml-cryptokit -SCRAM_RUN_DEPENDS= ${SA_DIR}/cryptokit/cryptokit.a:${PORTSDIR}/security/ocaml-cryptokit - .include -.if ${PORT_OPTIONS:MSSL} -CONFIGURE_ARGS+= -enable-ssl -OCAML_PKGDIRS+= equeue-ssl rpc-ssl -.endif - .if ${PORT_OPTIONS:MNETHTTPD} CONFIGURE_ARGS+= -with-nethttpd -OCAML_PKGDIRS+= nethttpd nethttpd-for-netcgi2 -.endif - -.if ${PORT_OPTIONS:MAUTH_DH} -CONFIGURE_ARGS+= -with-rpc-auth-dh -OCAML_PKGDIRS+= rpc-auth-dh +OCAML_PKGDIRS+= nethttpd .endif .if ${PORT_OPTIONS:MGTK2} @@ -95,7 +74,7 @@ OCAML_PKGDIRS+= equeue-gtk2 .if ${PORT_OPTIONS:MAPACHE} USE_APACHE= 22+ CONFIGURE_ARGS+= -enable-apache -apxs ${APXS} -apache ${HTTPD} -OCAML_PKGDIRS+= netcgi_apache +OCAML_PKGDIRS+= netcgi2-apache .endif .if ${PORT_OPTIONS:MZIP} @@ -103,18 +82,8 @@ CONFIGURE_ARGS+= -enable-zip OCAML_PKGDIRS+= netzip .endif -.if ${PORT_OPTIONS:MSCRAM} -CONFIGURE_ARGS+= -enable-crypto -OCAML_PKGDIRS+= netmech-scram -.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 + @${REINPLACE_CMD} -e 's/camlzip/zip/' ${WRKSRC}/configure post-install: .if ${PORT_OPTIONS:MDOCS} Modified: head/www/ocaml-net/distinfo ============================================================================== --- head/www/ocaml-net/distinfo Sat May 16 11:23:06 2015 (r386518) +++ head/www/ocaml-net/distinfo Sat May 16 11:36:49 2015 (r386519) @@ -1,2 +1,2 @@ -SHA256 (ocamlnet-3.7.3.tar.gz) = 4ddc6928856d57b613de8889708f04a7bba04571b7bf1c525418cf9e3d8b4468 -SIZE (ocamlnet-3.7.3.tar.gz) = 3352779 +SHA256 (ocamlnet-4.0.3.tar.gz) = d3b030715fe2c5f395ff9c08f0a8d3baa8830161300ba29e5aa8fabb92b182c1 +SIZE (ocamlnet-4.0.3.tar.gz) = 4334416 Added: head/www/ocaml-net/files/patch-Makefile.rules ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/ocaml-net/files/patch-Makefile.rules Sat May 16 11:36:49 2015 (r386519) @@ -0,0 +1,12 @@ +--- Makefile.rules.orig 2015-04-26 23:27:28 UTC ++++ Makefile.rules +@@ -155,7 +155,8 @@ realuninstall: $(UNINSTOTHER) uninstall- + .PHONY: install-findlib + install-findlib: META + files=`$(COLLECT_FILES) *.mli *.cmi *.cma *.cmxa *.a dll* META $(INSTALL_EXTRA)` && \ +- $(OCAMLFIND) install $(PKGNAME) $$files ++ $(OCAMLFIND) install -destdir $(DESTDIR)/$(PREFIX)/lib/ocaml/site-lib \ ++ -ldconf /dev/null $(PKGNAME) $$files + + .PHONY: uninstall-findlib + uninstall-findlib: