Attachment #155837 for bug #199602

View | Details | Raw Unified | Return to bug 199602
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	mongoose
PORTVERSION=	5.6
CATEGORIES=	www

MAINTAINER=	lytboris@gmail.com

USE_GITHUB=	yes
GH_ACCOUNT=	cesanta
GH_TAGNAME=	${GH_COMMIT}
GH_COMMIT=	632b3a3

USES=		gmake dos2unix

ALL_TARGET=	web_server
MAKE_ENV=	LIBS=-lpthread
BUILD_WRKSRC=	${WRKSRC}/examples/web_server

USE_RC_SUBR=	mongoose


PLIST_FILES=	bin/mongoose

do-install:
	${MV} ${BUILD_WRKSRC}/web_server ${BUILD_WRKSRC}/mongoose
	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/mongoose ${STAGEDIR}${PREFIX}/bin

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (mongoose-5.3.tar.gz) = 3ced399521edfa75a020f2b9457c5b4ba40c518139bb5237c1d88e4b2c85de16	1	SHA256 (mongoose-5.6.tar.gz) = 8d8bef7ec3b14b5fbc20bb52ddb9916cd847240feed9f60c614d6db6d360f357
2	SIZE (mongoose-5.3.tar.gz) = 109908	2	SIZE (mongoose-5.6.tar.gz) = 111409




--- mongoose.c
+++ mongoose.c
@@ -1162,20 +1162,6 @@ typedef pid_t process_id_t;
 #define MONGOOSE_IDLE_TIMEOUT_SECONDS 300
 #endif
 
-#ifdef NS_DISABLE_SOCKETPAIR
-#define MONGOOSE_NO_CGI
-#endif
-

-#define MONGOOSE_NO_DIRECTORY_LISTING
-#define MONGOOSE_NO_LOGGING
-#define MONGOOSE_NO_SSI
-#define MONGOOSE_NO_DL
-#endif
-
 struct vec {

   int len;
--- mongoose.h
+++ mongoose.h
@@ -22,6 +22,43 @@
 
 #define MONGOOSE_VERSION "5.6"

+#ifdef NS_DISABLE_SOCKETPAIR
+#ifndef MONGOOSE_NO_CGI
+#define MONGOOSE_NO_CGI
+#endif

+#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
+#ifndef MONGOOSE_NO_DAV

Return to bug 199602

Lines 2-8 Link Here

(-)Makefile (-5 / +5 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= mongoose	4	PORTNAME= mongoose
5	PORTVERSION= 5.3	5	PORTVERSION= 5.6
6	CATEGORIES= www	6	CATEGORIES= www
7		7
8	MAINTAINER= lytboris@gmail.com	8	MAINTAINER= lytboris@gmail.com
Lines 13-25 Link Here
13	USE_GITHUB= yes	13	USE_GITHUB= yes
14	GH_ACCOUNT= cesanta	14	GH_ACCOUNT= cesanta
15	GH_TAGNAME= ${GH_COMMIT}	15	GH_TAGNAME= ${GH_COMMIT}
16	GH_COMMIT= 30a7965	16	GH_COMMIT= 632b3a3
17		17
18	USES= gmake dos2unix	18	USES= gmake dos2unix
19		19
20	ALL_TARGET= server	20	ALL_TARGET= web_server
21	MAKE_ENV= LIBS=-lpthread	21	MAKE_ENV= LIBS=-lpthread
22	BUILD_WRKSRC= ${WRKSRC}/examples	22	BUILD_WRKSRC= ${WRKSRC}/examples/web_server
23		23
24	USE_RC_SUBR= mongoose	24	USE_RC_SUBR= mongoose
25		25
Lines 83-89 Link Here
83	PLIST_FILES= bin/mongoose	83	PLIST_FILES= bin/mongoose
84		84
85	do-install:	85	do-install:
86	${MV} ${BUILD_WRKSRC}/server ${BUILD_WRKSRC}/mongoose	86	${MV} ${BUILD_WRKSRC}/web_server ${BUILD_WRKSRC}/mongoose
87	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/mongoose ${STAGEDIR}${PREFIX}/bin	87	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/mongoose ${STAGEDIR}${PREFIX}/bin
88		88
89	.include <bsd.port.mk>	89	.include <bsd.port.mk>

Lines 1-10 Link Here

(-)files/patch-mongoose.c (-6 / +10 lines)
1	--- mongoose.c	1	--- mongoose.c
2	+++ mongoose.c	2	+++ mongoose.c
3	@@ -1162,19 +1162,6 @@ typedef pid_t process_id_t;	3	@@ -1162,20 +1162,6 @@ typedef pid_t process_id_t;
4	#define MONGOOSE_IDLE_TIMEOUT_SECONDS 30	4	#define MONGOOSE_IDLE_TIMEOUT_SECONDS 300
5	#endif	5	#endif
6		6
7	-#ifdef MONGOOSE_NO_SOCKETPAIR	7	-#ifdef NS_DISABLE_SOCKETPAIR
8	-#define MONGOOSE_NO_CGI	8	-#define MONGOOSE_NO_CGI
9	-#endif	9	-#endif
10	-	10	-
Lines 15-20 Link Here
15	-#define MONGOOSE_NO_DIRECTORY_LISTING	15	-#define MONGOOSE_NO_DIRECTORY_LISTING
16	-#define MONGOOSE_NO_LOGGING	16	-#define MONGOOSE_NO_LOGGING
17	-#define MONGOOSE_NO_SSI	17	-#define MONGOOSE_NO_SSI
		18	-#define MONGOOSE_NO_DL
18	-#endif	19	-#endif
19	-	20	-
20	struct vec {	21	struct vec {
Lines 22-32 Link Here
22	int len;	23	int len;
23	--- mongoose.h	24	--- mongoose.h
24	+++ mongoose.h	25	+++ mongoose.h
25	@@ -22,6 +22,40 @@	26	@@ -22,6 +22,43 @@
26		27
27	#define MONGOOSE_VERSION "5.4"	28	#define MONGOOSE_VERSION "5.6"
28		29
29	+#ifdef MONGOOSE_NO_SOCKETPAIR	30	+#ifdef NS_DISABLE_SOCKETPAIR
30	+#ifndef MONGOOSE_NO_CGI	31	+#ifndef MONGOOSE_NO_CGI
31	+#define MONGOOSE_NO_CGI	32	+#define MONGOOSE_NO_CGI
32	+#endif	33	+#endif
Lines 51-57 Link Here
51	+#ifndef MONGOOSE_NO_SSI	52	+#ifndef MONGOOSE_NO_SSI
52	+#define MONGOOSE_NO_SSI	53	+#define MONGOOSE_NO_SSI
53	+#endif	54	+#endif
		55	+#ifndef MONGOOSE_NO_DL
		56	+#define MONGOOSE_NO_DL
54	+#endif	57	+#endif
		58	+#endif
55	+	59	+
56	+// DAV requires MONGOOSE_NO_DIRECTORY_LISTING	60	+// DAV requires MONGOOSE_NO_DIRECTORY_LISTING
57	+#ifndef MONGOOSE_NO_DAV	61	+#ifndef MONGOOSE_NO_DAV