svn commit: r384492 - in head/www/mongoose: . files

[Sergey Matveychuk]

Author: sem
Date: Wed Apr 22 13:33:55 2015
New Revision: 384492
URL: https://svnweb.freebsd.org/changeset/ports/384492

Log:
  - Update to 5.6
  
  PR:		199602
  Submitted by:	maintainer

Modified:
  head/www/mongoose/Makefile
  head/www/mongoose/distinfo
  head/www/mongoose/files/patch-mongoose.c

Modified: head/www/mongoose/Makefile
==============================================================================
--- head/www/mongoose/Makefile	Wed Apr 22 13:22:43 2015	(r384491)
+++ head/www/mongoose/Makefile	Wed Apr 22 13:33:55 2015	(r384492)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mongoose
-PORTVERSION=	5.3
+PORTVERSION=	5.6
 CATEGORIES=	www
 
 MAINTAINER=	lytboris at gmail.com
@@ -13,13 +13,13 @@ LICENSE=	GPLv2
 USE_GITHUB=	yes
 GH_ACCOUNT=	cesanta
 GH_TAGNAME=	${GH_COMMIT}
-GH_COMMIT=	30a7965
+GH_COMMIT=	632b3a3
 
 USES=		gmake dos2unix
 
-ALL_TARGET=	server
+ALL_TARGET=	web_server
 MAKE_ENV=	LIBS=-lpthread
-BUILD_WRKSRC=	${WRKSRC}/examples
+BUILD_WRKSRC=	${WRKSRC}/examples/web_server
 
 USE_RC_SUBR=	mongoose
 
@@ -83,7 +83,7 @@ MAKE_ENV+=	CFLAGS_EXTRA="-DMONGOOSE_NO_W
 PLIST_FILES=	bin/mongoose
 
 do-install:
-	${MV} ${BUILD_WRKSRC}/server ${BUILD_WRKSRC}/mongoose
+	${MV} ${BUILD_WRKSRC}/web_server ${BUILD_WRKSRC}/mongoose
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/mongoose ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>

Modified: head/www/mongoose/distinfo
==============================================================================
--- head/www/mongoose/distinfo	Wed Apr 22 13:22:43 2015	(r384491)
+++ head/www/mongoose/distinfo	Wed Apr 22 13:33:55 2015	(r384492)
@@ -1,2 +1,2 @@
-SHA256 (mongoose-5.3.tar.gz) = 3ced399521edfa75a020f2b9457c5b4ba40c518139bb5237c1d88e4b2c85de16
-SIZE (mongoose-5.3.tar.gz) = 109908
+SHA256 (mongoose-5.6.tar.gz) = 8d8bef7ec3b14b5fbc20bb52ddb9916cd847240feed9f60c614d6db6d360f357
+SIZE (mongoose-5.6.tar.gz) = 111409

Modified: head/www/mongoose/files/patch-mongoose.c
==============================================================================
--- head/www/mongoose/files/patch-mongoose.c	Wed Apr 22 13:22:43 2015	(r384491)
+++ head/www/mongoose/files/patch-mongoose.c	Wed Apr 22 13:33:55 2015	(r384492)
@@ -1,10 +1,10 @@
 --- mongoose.c
 +++ mongoose.c
-@@ -1162,19 +1162,6 @@ typedef pid_t process_id_t;
- #define MONGOOSE_IDLE_TIMEOUT_SECONDS 30
+@@ -1162,20 +1162,6 @@ typedef pid_t process_id_t;
+ #define MONGOOSE_IDLE_TIMEOUT_SECONDS 300
  #endif
  
--#ifdef MONGOOSE_NO_SOCKETPAIR
+-#ifdef NS_DISABLE_SOCKETPAIR
 -#define MONGOOSE_NO_CGI
 -#endif
 -
@@ -15,6 +15,7 @@
 -#define MONGOOSE_NO_DIRECTORY_LISTING
 -#define MONGOOSE_NO_LOGGING
 -#define MONGOOSE_NO_SSI
+-#define MONGOOSE_NO_DL
 -#endif
 -
  struct vec {
@@ -22,11 +23,11 @@
    int len;
 --- mongoose.h
 +++ mongoose.h
-@@ -22,6 +22,40 @@
+@@ -22,6 +22,43 @@
  
- #define MONGOOSE_VERSION "5.4"
+ #define MONGOOSE_VERSION "5.6"
 
-+#ifdef MONGOOSE_NO_SOCKETPAIR
++#ifdef NS_DISABLE_SOCKETPAIR
 +#ifndef MONGOOSE_NO_CGI
 +#define MONGOOSE_NO_CGI
 +#endif
@@ -51,6 +52,9 @@
 +#ifndef MONGOOSE_NO_SSI
 +#define MONGOOSE_NO_SSI
 +#endif
++#ifndef MONGOOSE_NO_DL
++#define MONGOOSE_NO_DL
++#endif
 +#endif
 +
 +// DAV requires MONGOOSE_NO_DIRECTORY_LISTING