Bug 176062 - [maintainer update] www/ocaml-net to 3.6.3
Summary: [maintainer update] www/ocaml-net to 3.6.3
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: John Marino
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-02-12 11:00 UTC by jaapb
Modified: 2014-03-27 01:16 UTC (History)
0 users

See Also:


Attachments
file.diff (1.18 KB, patch)
2013-02-12 11:00 UTC, jaapb
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description jaapb 2013-02-12 11:00:00 UTC
This is an update of www/ocaml-net to its latest version, 3.6.3. Notably, it fixes a build problem on my machine, but there are more changes from 3.5.1:

        * Netmcore_heap.mli: allowing to [add] bigarrays. New
          function [add_string] for creating uninitialized strings on
          heaps. New function [add_immutable] for retaining value sharing.
        * Netsys_mem: New options [Copy_conditionally] and [Keep_atom]
          for function [init_value].
        * netsys_c_subprocess.c: fixing a deadlock issue
          (when calling commands via the Shell library)
        * Netdate: Fix interpretation of the ~localzone argument
          of several functions. Now the timezone is assumed for the
          target time, not the calling time
        * Netdate: Adding localization
        * Netconversion: Adding functions for converting to lowercase/
          uppercase/titlecase, and for case-insensitive comparison
        * Fix Netfs.copy: When the copy method throws EXDEV, it is
          fallen back to a streaming-type copy
        * Several fixes for OS X
        * Daemonizer: now using a signal for waiting until the children
          are up and running
        * Fixes for OCaml-4.00
        * Better endianness check as suggested by Matias Giovannini
        * Fixing handling of `Recv_send_implied sockets in
          socket_multiplex_controller
        * netzip: it is now autodetected whether the camlzip library
          is available under the findlib name "zip" or "camlzip"
        * Netsys_sem: a new abstraction for emulating anonymous
          semaphores on systems that only provide named semaphores,
          like OS X. All users of semaphores inside Ocamlnet now
          base on Netsys_sem.
        * reimplementing Netstring_str for the case the Str engine
          is used. It is now thread-safe without having to use
          mutexes.
        * The default is now -disable-pcre
        * The module Netstring_pcre has been moved to a library of its
          own, namely netstring-pcre. It is only installed if -enable-pcre
        * Nethttp.Header.best_media_type: improved
          (patch by Christopher Zimmemann)
        * Netsys_mem.alloc_memory_pages: one can now mark the memory
          pages as executable
        * src/netsys/configure: disabling POSIX semaphore check
          for win32
        * Fixes for OpenBSD (by Christopher Zimmermann)
        * Netcgi connectors (SCGI, AJP, FCGI): unifying the ~sockaddr
          and ~port arguments. ~port now also assumes a loopback binding.
          (Suggested by Christopher Zimmermann).
        * Allowing posix_spawn again for MacOS. It turns out the
          number of file actions is limited. If we are above the
          limit, posix_spawn is not used.
       * Ssl_exts: adding function for returning the fingerprint of
          a certificate
        * Https_client: new verify callback for additional certificate
          checks

Fix: result of svn diff included.

Patch attached with submission follows:
How-To-Repeat: n/a
Comment 1 Martin Wilke freebsd_committer freebsd_triage 2013-02-12 12:28:35 UTC
State Changed
From-To: open->feedback

hi plist fails 
http://miwibox.org/tb/index.php?action=describe_port&id=1627
Comment 2 Martin Wilke freebsd_committer freebsd_triage 2013-02-14 08:16:47 UTC
Responsible Changed
From-To: freebsd-ports-bugs->miwi

I'll take it.
Comment 3 John Marino 2013-03-23 23:45:30 UTC
The makefile has one problem.

You need to add the equivalent of:
OCAML_PKGDIRS+= netstring-pcre

netstring-pcre is required for textproc/ocaml-tyxml (ports/176065)

If ocaml-net isn't built with it, ocaml-tyxml fails to build.
Comment 4 Martin Wilke freebsd_committer freebsd_triage 2013-03-28 06:19:16 UTC
Responsible Changed
From-To: miwi->bf

pass over to bf, he is dealing with the big ocaml update.
Comment 5 John Marino freebsd_committer freebsd_triage 2014-03-26 18:04:32 UTC
Responsible Changed
From-To: bf->marino

I will overtake this.
Comment 6 John Marino freebsd_committer freebsd_triage 2014-03-26 18:04:57 UTC
State Changed
From-To: feedback->open

no feedback needed
Comment 7 dfilter service freebsd_committer freebsd_triage 2014-03-27 00:29:15 UTC
Author: marino
Date: Thu Mar 27 00:29:11 2014
New Revision: 349308
URL: http://svnweb.freebsd.org/changeset/ports/349308
QAT: https://qat.redports.org/buildarchive/r349308/

Log:
  www/ocaml-net: Upgrade version 3.5.1 -> 3.7.3 and stage
  
  The original PR requested to version 3.6.3, but it was straight-forward
  to jump to the latest version.  The stage support came from the pkgsrc
  version.
  
  PR:		ports/176062
  Submitted by:	maintainer (Jaap Boender)
  Stage support:	Taken from pkgsrc

Added:
  head/www/ocaml-net/files/
  head/www/ocaml-net/files/patch-Makefile   (contents, props changed)
Modified:
  head/www/ocaml-net/Makefile
  head/www/ocaml-net/distinfo

Modified: head/www/ocaml-net/Makefile
==============================================================================
--- head/www/ocaml-net/Makefile	Wed Mar 26 23:29:28 2014	(r349307)
+++ head/www/ocaml-net/Makefile	Thu Mar 27 00:29:11 2014	(r349308)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	net
-PORTVERSION=	3.5.1
+PORTVERSION=	3.7.3
 CATEGORIES=	www
 MASTER_SITES=	http://download.camlcity.org/download/
 PKGNAMEPREFIX=	ocaml-
@@ -11,19 +11,21 @@ DISTNAME=	ocaml${PORTNAME}-${PORTVERSION
 MAINTAINER=	jaapb@kerguelen.org
 COMMENT=	OCaml modules for Internet applications
 
+LICENSE=	GPLv2
+
 BUILD_DEPENDS=	${SA_DIR}/pcre/pcre.a:${PORTSDIR}/devel/ocaml-pcre
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+RUN_DEPENDS=	${SA_DIR}/pcre/pcre.a:${PORTSDIR}/devel/ocaml-pcre
 
 CONFLICTS=	ocaml-equeue-2* ocaml-netclient-0*
 
-USES=		gmake
-USE_OCAML=	yes
+USES=			gmake
+USE_OCAML=		yes
 USE_OCAML_FINDLIB=	yes
 USE_OCAML_LDCONFIG=	yes
 USE_OCAMLFIND_PLIST=	yes
-HAS_CONFIGURE=	yes
+HAS_CONFIGURE=		yes
 
-ALL_TARGET=	all opt
+ALL_TARGET=		all opt
 MAKE_JOBS_UNSAFE=	yes
 
 PLIST_FILES=	bin/netplex-admin \
@@ -32,86 +34,77 @@ PLIST_FILES=	bin/netplex-admin \
 DOCSDIR=	${PREFIX}/share/doc/ocaml/${PKGNAMEPREFIX}${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/ocaml/${PKGNAMEPREFIX}${PORTNAME}
 SA_DIR=		${LOCALBASE}/${OCAML_SITELIBDIR}
-
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 OCAML_PKGDIRS=	netsys netshm equeue shell netstring rpc-generator \
 		rpc pop smtp netclient netcgi2 netgssapi netplex \
-		netcgi2-plex netcamlbox netmulticore rpc-auth-local
+		netcgi2-plex netcamlbox netmulticore rpc-auth-local \
+		netstring-pcre
 OCAML_LDLIBS=	${OCAML_PKGDIRS:S/^/${OCAML_SITELIBDIR}\//}
 
 OPTIONS_DEFINE=	SSL NETHTTPD AUTH_DH GTK2 APACHE ZIP SCRAM EXAMPLES DOCS
-OPTIONS_DEFAULT=	SSL
+OPTIONS_DEFAULT=SSL
 AUTH_DH_DESC=	Diffie-Hellman authorization support
 NETHTTPD_DESC=	Integrated HTTP daemon
 SCRAM_DESC=	SCRAM support
 ZIP_DESC=	Compression support
 APACHE_DESC=	Apache mod connector (experimental)
 
-CONFIGURE_ARGS+=	-disable-gtk
+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
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSSL}
 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
-.else
-CONFIGURE_ARGS+=	-disable-ssl
 .endif
 
 .if ${PORT_OPTIONS:MNETHTTPD}
 CONFIGURE_ARGS+=	-with-nethttpd
 OCAML_PKGDIRS+=		nethttpd nethttpd-for-netcgi2
-.else
-CONFIGURE_ARGS+=	-without-nethttpd
 .endif
 
 .if ${PORT_OPTIONS:MAUTH_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
 .endif
 
 .if ${PORT_OPTIONS:MGTK2}
 CONFIGURE_ARGS+=	-enable-gtk2
-BUILD_DEPENDS+=		lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
-RUN_DEPENDS+=		lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
 OCAML_PKGDIRS+=		equeue-gtk2
-.else
-CONFIGURE_ARGS+=	-disable-gtk2
 .endif
 
 .if ${PORT_OPTIONS:MAPACHE}
 USE_APACHE=		22+
 CONFIGURE_ARGS+=	-enable-apache -apxs ${APXS} -apache ${HTTPD}
 OCAML_PKGDIRS+=		netcgi_apache
-.else
-CONFIGURE_ARGS+=	-disable-apache
 .endif
 
 .if ${PORT_OPTIONS:MZIP}
 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 ${PORT_OPTIONS:MSCRAM}
 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:
@@ -124,12 +117,13 @@ post-patch:
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}/
-	@(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${DOCSDIR}/)
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/
+	@(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}/)
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
-	@${MKDIR} ${EXAMPLESDIR}/
-	@(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}/)
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
+	@(cd ${WRKSRC}/examples/ && \
+		${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}/)
 .endif
 
 .include <bsd.port.mk>

Modified: head/www/ocaml-net/distinfo
==============================================================================
--- head/www/ocaml-net/distinfo	Wed Mar 26 23:29:28 2014	(r349307)
+++ head/www/ocaml-net/distinfo	Thu Mar 27 00:29:11 2014	(r349308)
@@ -1,2 +1,2 @@
-SHA256 (ocamlnet-3.5.1.tar.gz) = 1304eea88aacbc08864e7ff8fce58fab495f41c99b6379784121fc9e92ca8426
-SIZE (ocamlnet-3.5.1.tar.gz) = 3290994
+SHA256 (ocamlnet-3.7.3.tar.gz) = 4ddc6928856d57b613de8889708f04a7bba04571b7bf1c525418cf9e3d8b4468
+SIZE (ocamlnet-3.7.3.tar.gz) = 3352779

Added: head/www/ocaml-net/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/ocaml-net/files/patch-Makefile	Thu Mar 27 00:29:11 2014	(r349308)
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile.rules,v 1.1 2012/07/06 09:29:14 wiz Exp $
+
+make package work with DESTDIR support
+--- Makefile.rules.orig	2012-02-29 18:02:51.000000000 +0000
++++ Makefile.rules
+@@ -148,7 +148,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:
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 8 John Marino freebsd_committer freebsd_triage 2014-03-27 01:16:27 UTC
State Changed
From-To: open->closed

Committed. Thanks!