From jyyou@cs.nctu.edu.tw  Thu May 17 01:02:07 2012
Return-Path: <jyyou@cs.nctu.edu.tw>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id EC9B5106564A
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 17 May 2012 01:02:07 +0000 (UTC)
	(envelope-from jyyou@cs.nctu.edu.tw)
Received: from csmailer.cs.nctu.edu.tw (csmailer.cs.nctu.edu.tw [140.113.235.130])
	by mx1.freebsd.org (Postfix) with ESMTP id A61DF8FC08
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 17 May 2012 01:02:07 +0000 (UTC)
Received: from csmailer.cs.nctu.edu.tw (localhost [127.0.0.1])
	by csmailer.cs.nctu.edu.tw (Postfix) with ESMTP id F3D2228D;
	Thu, 17 May 2012 09:00:49 +0800 (CST)
Received: from csduty.cs.nctu.edu.tw (csduty [140.113.235.102])
	by csmailer.cs.nctu.edu.tw (Postfix) with ESMTP id C1E56286;
	Thu, 17 May 2012 08:59:18 +0800 (CST)
Received: (from jyyou@localhost)
	by csduty.cs.nctu.edu.tw (8.14.4/8.14.4/Submit) id q4H0xFBI068299;
	Thu, 17 May 2012 08:59:15 +0800 (CST)
	(envelope-from jyyou)
Message-Id: <201205170059.q4H0xFBI068299@csduty.cs.nctu.edu.tw>
Date: Thu, 17 May 2012 08:59:15 +0800 (CST)
From: Jyun-Yan You <jyyou@cs.nctu.edu.tw>
To: FreeBSD-gnats-submit@freebsd.org
Cc: jaapb@kerguelen.org
Subject: [PATCH] www/ocaml-net: update to 3.5.1
X-Send-Pr-Version: 3.113
X-GNATS-Notify: jaapb@kerguelen.org

>Number:         167987
>Category:       ports
>Synopsis:       [PATCH] www/ocaml-net: update to 3.5.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    scheidell
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu May 17 01:10:01 UTC 2012
>Closed-Date:    Tue May 22 13:13:02 UTC 2012
>Last-Modified:  Tue May 22 13:20:02 UTC 2012
>Originator:     Jyun-Yan You
>Release:        FreeBSD 8.2-RELEASE-p3 amd64
>Organization:
>Environment:
System: FreeBSD csduty.cs.nctu.edu.tw 8.2-RELEASE-p3 FreeBSD 8.2-RELEASE-p3 #0: Tue Sep 27 18:45:57 UTC 2011
>Description:
- Update to 3.5.1

Port maintainer (jaapb@kerguelen.org) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- ocaml-net-3.5.1.patch begins here ---
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
--- ocaml-net-3.5.1.patch ends here ---

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Thu May 17 01:10:19 UTC 2012 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=167987 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: jaapb@kerguelen.org
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/167987: [PATCH] www/ocaml-net: update to 3.5.1
Date: Thu, 17 May 2012 01:10:16 UT

 Maintainer of www/ocaml-net,
 
 Please note that PR ports/167987 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/167987
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Jaap Boender <jaapb@kerguelen.org>
To: bug-followup@freebsd.org
Cc:  
Subject: Re: ports/167987: [PATCH] www/ocaml-net: update to 3.5.1
Date: Thu, 17 May 2012 10:27:09 +0200

 I've quickly tested the patch; it looks fine and compiles without problems, so 
 yes, I approve of it. Thanks to the submitter!
 
   Jaap
State-Changed-From-To: feedback->open 
State-Changed-By: linimon 
State-Changed-When: Thu May 17 09:19:21 UTC 2012 
State-Changed-Why:  
Maintainer approved. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=167987 
Responsible-Changed-From-To: freebsd-ports-bugs->scheidell 
Responsible-Changed-By: scheidell 
Responsible-Changed-When: Sat May 19 15:10:19 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=167987 
State-Changed-From-To: open->feedback 
State-Changed-By: scheidell 
State-Changed-When: Sat May 19 16:12:55 UTC 2012 
State-Changed-Why:  
Complies and packages fine. 
One suggestion, clarification. 
PORTDOCS/EXAMPLESDOC macro's already take into account defines, so this is 'more' correct (less confusion) 
-.if !defined(NOPORTDOCS) 
PORTDOCS=      * 
PORTEXAMPLES=  * 
-.endif 

also, (and I don't know why anyone would do it), but PORTDOCS and PORTEXAMPLES are two different defines. 
I don't know why anyone would define NOPORTDOCS without defining NOPORTEXAMPLES, but: 
"in theory, practice and theory are the same, in practice, they arn't" 

so, the more correct way is to look for each define independently. 
If no objections, I will commit the above, plus this: 

post-install: 
.if !defined(NOPORTDOCS) 
@${MKDIR} ${DOCSDIR}/ 
@(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} * ${DOCSDIR}/) 
- 
+.endif 
+.if !defined(NOPORTEXAMPLES) 

(basically: 

PORTDOCS=       * 
PORTEXAMPLES=   * 


and: 

post-install: 
.if !defined(NOPORTDOCS) 
@${MKDIR} ${DOCSDIR}/ 
@(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} * ${DOCSDIR}/) 
.endif 
.if !defined(NOPORTEXAMPLES) 
@${MKDIR} ${EXAMPLESDIR}/ 
@(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} * ${EXAMPLESDIR}/) 
.endif 


http://www.freebsd.org/cgi/query-pr.cgi?pr=167987 
State-Changed-From-To: feedback->closed 
State-Changed-By: scheidell 
State-Changed-When: Tue May 22 13:12:59 UTC 2012 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=167987 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/167987: commit references a PR
Date: Tue, 22 May 2012 13:12:55 +0000 (UTC)

 scheidell    2012-05-22 13:12:46 UTC
 
   FreeBSD ports repository
 
   Modified files:
     www/ocaml-net        Makefile distinfo 
   Log:
   - Update to 3.5.1 [1]
   - Honor NOPORTEXAMPLES if NOPORTDOCS not defined [2]
   
   PR:             ports/167987 [1]
   Submitted by:   Jyun-Yan You <jyyou@cs.nctu.edu.tw> [1]
   Reviewed by:    scheidell@ (me) [2]
   Approved by:    Jaap Boender <jaapb@kerguelen.org> (maintainer)
   
   Revision  Changes    Path
   1.28      +48 -26    ports/www/ocaml-net/Makefile
   1.11      +2 -2      ports/www/ocaml-net/distinfo
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
