From nobody@FreeBSD.org  Tue Dec 28 13:37:41 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E563F106566B
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 28 Dec 2010 13:37:41 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (unknown [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id D4CD28FC15
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 28 Dec 2010 13:37:41 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id oBSDbfIW031929
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 28 Dec 2010 13:37:41 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id oBSDbfAA031928;
	Tue, 28 Dec 2010 13:37:41 GMT
	(envelope-from nobody)
Message-Id: <201012281337.oBSDbfAA031928@red.freebsd.org>
Date: Tue, 28 Dec 2010 13:37:41 GMT
From: Pietro Cerutti <gahr@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] www/libmicrohttpd -- update to 0.9.4
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: amatus@gnu.org

>Number:         153489
>Category:       ports
>Synopsis:       [patch] www/libmicrohttpd -- update to 0.9.4
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    ohauer
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Dec 28 13:40:12 UTC 2010
>Closed-Date:    Mon Jan 17 20:09:08 UTC 2011
>Last-Modified:  Mon Jan 17 20:20:14 UTC 2011
>Originator:     Pietro Cerutti
>Release:        
>Organization:
The FreeBSD Project
>Environment:
FreeBSD SN2000 9.0-CURRENT FreeBSD 9.0-CURRENT #8: Wed Dec 15 09:07:21 CET 2010     root@SN2000:/usr/obj/usr/src/sys/IMAC  amd64
>Description:
Update to 0.9.4 + PORTREVISION bump of dependent ports.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: www/libmicrohttpd/Makefile
===================================================================
RCS file: /home/pcvs/ports/www/libmicrohttpd/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- www/libmicrohttpd/Makefile	17 Oct 2009 23:14:46 -0000	1.5
+++ www/libmicrohttpd/Makefile	28 Dec 2010 13:31:43 -0000
@@ -6,25 +6,30 @@
 #
 
 PORTNAME=	libmicrohttpd
-PORTVERSION=	0.4.2
+PORTVERSION=	0.9.4
 CATEGORIES=	www
-MASTER_SITES=	http://gnunet.org/libmicrohttpd/download/
+MASTER_SITES=	${MASTER_SITE_GNU}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	amatus@gnu.org
 COMMENT=	C library for embedding HTTP server functionality
 
+LIB_DEPENDS=	gnutls.40:${PORTSDIR}/security/gnutls
+
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 MAKE_ARGS+=	pkgconfigdir=${PREFIX}/libdata/pkgconfig
+CONFIGURE_ARGS+=--with-gnutls=${LOCALBASE} \
+		--enable-https
 
-PLIST_FILES=	lib/libmicrohttpd.so.6 \
+PLIST_FILES=	lib/libmicrohttpd.so.12 \
 		lib/libmicrohttpd.la \
 		lib/libmicrohttpd.so \
 		lib/libmicrohttpd.a \
 		libdata/pkgconfig/libmicrohttpd.pc \
-		include/microhttpd.h \
-		info/microhttpd.info
+		include/microhttpd.h
 
 MAN3=		libmicrohttpd.3
+INFO=		microhttpd microhttpd-tutorial
 
 .include <bsd.port.mk>
Index: www/libmicrohttpd/distinfo
===================================================================
RCS file: /home/pcvs/ports/www/libmicrohttpd/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- www/libmicrohttpd/distinfo	17 Aug 2009 20:18:57 -0000	1.4
+++ www/libmicrohttpd/distinfo	28 Dec 2010 13:10:48 -0000
@@ -1,3 +1,2 @@
-MD5 (libmicrohttpd-0.4.2.tar.gz) = 2853d8f32417e3c5f3b18fda38f96e52
-SHA256 (libmicrohttpd-0.4.2.tar.gz) = 1e095469f7d159e5b9c91106484e10f0b3ce3265c55b9864407bd4ea5952111f
-SIZE (libmicrohttpd-0.4.2.tar.gz) = 837392
+SHA256 (libmicrohttpd-0.9.4.tar.gz) = 109823c81a846211a88ecd59ab4b8d88448f85d6b217ed2cac14e5364a6f32f2
+SIZE (libmicrohttpd-0.9.4.tar.gz) = 751887
Index: www/libmicrohttpd/pkg-descr
===================================================================
RCS file: /home/pcvs/ports/www/libmicrohttpd/pkg-descr,v
retrieving revision 1.1
diff -u -r1.1 pkg-descr
--- www/libmicrohttpd/pkg-descr	14 Feb 2008 06:44:10 -0000	1.1
+++ www/libmicrohttpd/pkg-descr	28 Dec 2010 13:09:31 -0000
@@ -3,4 +3,4 @@
 permits listening on multiple ports. The API is simple and still powerful
 enough to allow programmers to use the entire HTTP feature set.
 
-WWW: http://gnunet.org/libmicrohttpd/
+WWW: http://www.gnu.org/software/libmicrohttpd/
Index: www/libmicrohttpd/files/patch-Makefile.in
===================================================================
RCS file: www/libmicrohttpd/files/patch-Makefile.in
diff -N www/libmicrohttpd/files/patch-Makefile.in
--- www/libmicrohttpd/files/patch-Makefile.in	17 Aug 2009 20:18:58 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2009-08-15 14:59:45.000000000 -0300
-+++ Makefile.in	2009-08-15 15:00:14.000000000 -0300
-@@ -217,7 +217,7 @@
- ACLOCAL_AMFLAGS = -I m4
- SUBDIRS = contrib src doc m4 . 
- EXTRA_DIST = acinclude.m4 libmicrohttpd.pc.in
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = /usr/local/libdata/pkgconfig
- pkgconfig_DATA = libmicrohttpd.pc
- all: MHD_config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
Index: audio/gmpc-mserver/Makefile
===================================================================
RCS file: /home/pcvs/ports/audio/gmpc-mserver/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- audio/gmpc-mserver/Makefile	3 Apr 2010 10:44:00 -0000	1.11
+++ audio/gmpc-mserver/Makefile	28 Dec 2010 13:34:29 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	gmpc-mserver
 PORTVERSION=	0.19.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	http://download.sarine.nl/gmpc-${PORTVERSION:C/\.0$//}/ \
 		http://freebsd.unixfreunde.de/sources/
@@ -18,7 +18,7 @@
 LIB_DEPENDS=	mpd:${PORTSDIR}/audio/libmpd \
 		curl.6:${PORTSDIR}/ftp/curl \
 		tag.1:${PORTSDIR}/audio/taglib \
-		microhttpd:${PORTSDIR}/www/libmicrohttpd
+		microhttpd.12:${PORTSDIR}/www/libmicrohttpd
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
 RUN_DEPEND=	gmpc:${PORTSDIR}/audio/gmpc
 
Index: net-p2p/gnunet/Makefile
===================================================================
RCS file: /home/pcvs/ports/net-p2p/gnunet/Makefile,v
retrieving revision 1.79
diff -u -r1.79 Makefile
--- net-p2p/gnunet/Makefile	4 Dec 2010 07:33:11 -0000	1.79
+++ net-p2p/gnunet/Makefile	28 Dec 2010 13:36:45 -0000
@@ -8,7 +8,7 @@
 
 PORTNAME=	gnunet
 PORTVERSION=	0.8.1b
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net-p2p ipv6
 MASTER_SITES=	GNU \
 		http://gnunet.org/download/
@@ -25,7 +25,7 @@
 		gmp.10:${PORTSDIR}/math/gmp \
 		gcrypt.17:${PORTSDIR}/security/libgcrypt \
 		extractor.2:${PORTSDIR}/textproc/libextractor \
-		microhttpd.6:${PORTSDIR}/www/libmicrohttpd
+		microhttpd.12:${PORTSDIR}/www/libmicrohttpd
 
 OPTIONS=	MYSQL	"Enable MySQL support"		on \
 		PGSQL	"Enable PostgreSQL support"	off \


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->gahr 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue Dec 28 13:40:19 UTC 2010 
Responsible-Changed-Why:  
Submitter has GNATS access (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=153489 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Tue Dec 28 13:40:24 UTC 2010 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: amatus@gnu.org
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/153489: [patch] www/libmicrohttpd -- update to 0.9.4
Date: Tue, 28 Dec 2010 13:40:22 UT

 Maintainer of www/libmicrohttpd,
 
 Please note that PR ports/153489 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/153489
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
Responsible-Changed-From-To: gahr->ohauer 
Responsible-Changed-By: gahr 
Responsible-Changed-When: Fri Jan 14 11:20:21 UTC 2011 
Responsible-Changed-Why:  
Would you mind to commit the part of my patch that relates to TLS? 

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

From: Olli Hauer <ohauer@FreeBSD.org>
To: bug-followup@FreeBSD.org, gahr@FreeBSD.org, gaod@hychen.org
Cc:  
Subject: Re: ports/153489: [patch] www/libmicrohttpd -- update to 0.9.4
Date: Sun, 16 Jan 2011 15:28:09 +0100

 Oh, I haven't seen this PR before...
 
 Is it OK if we make gnutls optional and defaults to OFF?
 
 This way we are "Feature save" (ports freeze) and users can
 choose if they want SSL support or not.
 
 PS:
 I include the new port maintainer to the conversation.
 
 The following patch add your changes for SSL support but
 makes it optional.
 
 I've uploaded the patch additional
 http://people.freebsd.org/~ohauer/diffs/PR_153489_libmicrohttpd.diff
 
 
 
 --- PR_153489_libmicrohttpd.diff begins here ---
 Index: Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/www/libmicrohttpd/Makefile,v
 retrieving revision 1.6
 diff -u -r1.6 Makefile
 --- Makefile    9 Jan 2011 12:07:15 -0000       1.6
 +++ Makefile    16 Jan 2011 14:04:45 -0000
 @@ -9,12 +9,21 @@
  PORTVERSION=   0.9.4
  CATEGORIES=    www
  MASTER_SITES=  ${MASTER_SITE_GNU}
 -MASTER_SITE_SUBDIR=    libmicrohttpd
 +MASTER_SITE_SUBDIR=    ${PORTNAME}
 
  MAINTAINER=    gaod@hychen.org
  COMMENT=       C library for embedding HTTP server functionality
 
  LICENSE=       LGPL21
 +
 +OPTIONS=       GNUTLS "Build with gnutls to support ssl" off
 +.include <bsd.port.options.mk>
 +
 +.if defined(WITH_GNUTLS)
 +LIB_DEPENDS=   gnutls.40:${PORTSDIR}/security/gnutls
 +CONFIGURE_ARGS+=--with-gnutls=${LOCALBASE} --enable-https
 +.endif
 +
  USE_LDCONFIG=  yes
  GNU_CONFIGURE= yes
  MAKE_ARGS+=    pkgconfigdir=${PREFIX}/libdata/pkgconfig
 Index: pkg-descr
 ===================================================================
 RCS file: /home/pcvs/ports/www/libmicrohttpd/pkg-descr,v
 retrieving revision 1.1
 diff -u -r1.1 pkg-descr
 --- pkg-descr   14 Feb 2008 06:44:10 -0000      1.1
 +++ pkg-descr   16 Jan 2011 14:04:45 -0000
 @@ -3,4 +3,4 @@
  permits listening on multiple ports. The API is simple and still powerful
  enough to allow programmers to use the entire HTTP feature set.
 
 -WWW: http://gnunet.org/libmicrohttpd/
 +WWW: http://www.gnu.org/software/libmicrohttpd/
 Index: files/patch-Makefile.in
 ===================================================================
 RCS file: files/patch-Makefile.in
 diff -N files/patch-Makefile.in
 --- files/patch-Makefile.in     17 Aug 2009 20:18:58 -0000      1.1
 +++ /dev/null   1 Jan 1970 00:00:00 -0000
 @@ -1,11 +0,0 @@
 ---- Makefile.in.orig   2009-08-15 14:59:45.000000000 -0300
 -+++ Makefile.in        2009-08-15 15:00:14.000000000 -0300
 -@@ -217,7 +217,7 @@
 - ACLOCAL_AMFLAGS = -I m4
 - SUBDIRS = contrib src doc m4 .
 - EXTRA_DIST = acinclude.m4 libmicrohttpd.pc.in
 --pkgconfigdir = $(libdir)/pkgconfig
 -+pkgconfigdir = /usr/local/libdata/pkgconfig
 - pkgconfig_DATA = libmicrohttpd.pc
 - all: MHD_config.h
 -       $(MAKE) $(AM_MAKEFLAGS) all-recursive
 --- PR_153489_libmicrohttpd.diff ends here ---
 

From: "Pietro Cerutti" <gahr@gahr.ch>
To: Olli Hauer <ohauer@FreeBSD.org>
Cc: bug-followup@FreeBSD.org, gaod@hychen.org
Subject: Re: ports/153489: [patch] www/libmicrohttpd -- update to 0.9.4
Date: Mon, 17 Jan 2011 09:01:51 +0100

 --w2xx78T4DcG3O+DJ
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 On 2011-Jan-16, 15:28, Olli Hauer wrote:
 > Oh, I haven't seen this PR before...
 >=20
 > Is it OK if we make gnutls optional and defaults to OFF?
 
 Yeah that would be fine to me! I'm looking forward for you to commit it
 after the maintainer has approved it :)
 
 > I've uploaded the patch additional
 > http://people.freebsd.org/~ohauer/diffs/PR_153489_libmicrohttpd.diff
 
 I haven't tested it, but that's the idea :)
 
 Thank you both of you!
 
 --=20
 Pietro Cerutti
 The FreeBSD Project
 gahr@FreeBSD.org
 
 PGP Public Key:
 http://gahr.ch/pgp
 
 --w2xx78T4DcG3O+DJ
 Content-Type: application/pgp-signature
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (FreeBSD)
 
 iEYEARECAAYFAk0z928ACgkQwMJqmJVx946MUACeK0m9tZAtxhD4VgLAR+OeuuLd
 OisAnAskf+xS97lzKp2cZismgr7OqCzt
 =eQl0
 -----END PGP SIGNATURE-----
 
 --w2xx78T4DcG3O+DJ--
State-Changed-From-To: feedback->closed 
State-Changed-By: ohauer 
State-Changed-When: Mon Jan 17 20:06:05 UTC 2011 
State-Changed-Why:  
Committed the gnutls part, 
PORTREVISION of the other ports was already bumped with the 
update from PR ports/153530 


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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/153489: commit references a PR
Date: Mon, 17 Jan 2011 20:18:54 +0000 (UTC)

 ohauer      2011-01-17 20:05:33 UTC
 
   FreeBSD ports repository
 
   Modified files:
     www/libmicrohttpd    Makefile pkg-descr 
   Removed files:
     www/libmicrohttpd/files patch-Makefile.in 
   Log:
    - add option to build with gnutls (ssl support)
    - remove patchfile
    - change URI in pkg-descr
    - bump PORTREVISION
   
   PR:             ports/153489
   Submitted by:   Pietro Cerutti <gahr _at_ FreeBSD.org>
   Approved by:    Hung-Yi Chen <gaod _at_ hychen.org> (maintainer) per mail
   Feature safe:   yes
   
   Revision  Changes    Path
   1.7       +11 -1     ports/www/libmicrohttpd/Makefile
   1.2       +0 -11     ports/www/libmicrohttpd/files/patch-Makefile.in (dead)
   1.2       +1 -1      ports/www/libmicrohttpd/pkg-descr
 _______________________________________________
 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:
