From c8de2d33063430ed5d4085d4cc70186ef1ce42d4 Mon Sep 17 00:00:00 2001
From: "Sergey A. Osokin" <osa@FreeBSD.org>
Date: Wed, 12 Oct 2005 14:36:42 +0000
Subject: [PATCH] Update to 0.3.2.

Update port infrastructure: files/nginx.sh -> files/nginx.sh.in.
Add configtest extra command for nginx.sh script (1).

Submitted by:	skv (1)
---
 www/nginx-devel/Makefile                        |  4 ++--
 www/nginx-devel/distinfo                        |  4 ++--
 www/nginx-devel/files/{nginx.sh => nginx.sh.in} | 12 ++++++++++++
 www/nginx/Makefile                              |  4 ++--
 www/nginx/distinfo                              |  4 ++--
 www/nginx/files/{nginx.sh => nginx.sh.in}       | 12 ++++++++++++
 6 files changed, 32 insertions(+), 8 deletions(-)
 rename www/nginx-devel/files/{nginx.sh => nginx.sh.in} (75%)
 rename www/nginx/files/{nginx.sh => nginx.sh.in} (75%)

diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index a9fd9c171947..a8b3720e5a6c 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nginx
-PORTVERSION=	0.2.6
+PORTVERSION=	0.3.2
 CATEGORIES=	www
 MASTER_SITES=	http://sysoev.ru/nginx/
 MASTER_SITES+=	${MASTER_SITE_LOCAL}
@@ -89,7 +89,7 @@ RC_SCRIPTS_SUB=PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
 
 post-extract:
 	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/nginx.sh > ${WRKSRC}/nginx.sh
+		${FILESDIR}/nginx.sh.in > ${WRKSRC}/nginx.sh
 
 post-patch:
 	@${REINPLACE_CMD} 's!%%HTTP_PORT%%!${HTTP_PORT}!; \
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index 49cd59479275..4fc03a14c414 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (nginx-0.2.6.tar.gz) = 8e60eb03dd75226d21068f8d98362152
-SIZE (nginx-0.2.6.tar.gz) = 329236
+MD5 (nginx-0.3.2.tar.gz) = 848a0dd8f6362be8f361a62ea39d1539
+SIZE (nginx-0.3.2.tar.gz) = 331121
diff --git a/www/nginx-devel/files/nginx.sh b/www/nginx-devel/files/nginx.sh.in
similarity index 75%
rename from www/nginx-devel/files/nginx.sh
rename to www/nginx-devel/files/nginx.sh.in
index da3e9d13d694..b28a5bacb706 100644
--- a/www/nginx-devel/files/nginx.sh
+++ b/www/nginx-devel/files/nginx.sh.in
@@ -23,6 +23,18 @@ name="nginx"
 rcvar=`set_rcvar`
 command="%%PREFIX%%/sbin/nginx"
 
+extra_commands="configtest"
+
+configtest_cmd="configtest_cmd"
+configtest_cmd()  {
+	echo "Configuration syntax test for ${name}."
+	if ${command} -t; then
+		:
+	else
+		err 8 "FATAL: bad config for ${name}"
+	fi
+}
+
 load_rc_config $name
 
 pidfile="${nginx_pidfile}"
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index a9fd9c171947..a8b3720e5a6c 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nginx
-PORTVERSION=	0.2.6
+PORTVERSION=	0.3.2
 CATEGORIES=	www
 MASTER_SITES=	http://sysoev.ru/nginx/
 MASTER_SITES+=	${MASTER_SITE_LOCAL}
@@ -89,7 +89,7 @@ RC_SCRIPTS_SUB=PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
 
 post-extract:
 	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/nginx.sh > ${WRKSRC}/nginx.sh
+		${FILESDIR}/nginx.sh.in > ${WRKSRC}/nginx.sh
 
 post-patch:
 	@${REINPLACE_CMD} 's!%%HTTP_PORT%%!${HTTP_PORT}!; \
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index 49cd59479275..4fc03a14c414 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -1,2 +1,2 @@
-MD5 (nginx-0.2.6.tar.gz) = 8e60eb03dd75226d21068f8d98362152
-SIZE (nginx-0.2.6.tar.gz) = 329236
+MD5 (nginx-0.3.2.tar.gz) = 848a0dd8f6362be8f361a62ea39d1539
+SIZE (nginx-0.3.2.tar.gz) = 331121
diff --git a/www/nginx/files/nginx.sh b/www/nginx/files/nginx.sh.in
similarity index 75%
rename from www/nginx/files/nginx.sh
rename to www/nginx/files/nginx.sh.in
index da3e9d13d694..b28a5bacb706 100644
--- a/www/nginx/files/nginx.sh
+++ b/www/nginx/files/nginx.sh.in
@@ -23,6 +23,18 @@ name="nginx"
 rcvar=`set_rcvar`
 command="%%PREFIX%%/sbin/nginx"
 
+extra_commands="configtest"
+
+configtest_cmd="configtest_cmd"
+configtest_cmd()  {
+	echo "Configuration syntax test for ${name}."
+	if ${command} -t; then
+		:
+	else
+		err 8 "FATAL: bad config for ${name}"
+	fi
+}
+
 load_rc_config $name
 
 pidfile="${nginx_pidfile}"