ports/153489: [patch] www/libmicrohttpd -- update to 0.9.4

[Pietro Cerutti]

>Number:         153489
>Category:       ports
>Synopsis:       [patch] www/libmicrohttpd -- update to 0.9.4
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Dec 28 13:40:12 UTC 2010
>Closed-Date:
>Last-Modified:
>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 at 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 at 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:
>Unformatted: