Re: nginx-0.3.41 и FreeBSD порт

["Sergey A. Osokin" <osa@xxxxxxxxxxx>]

On Fri, Apr 21, 2006 at 04:56:12PM +0400, Andrey Y. Ostanovsky wrote:
> Sergey A. Osokin wrote:
> > принять участие в тестирование патча обновления
> > порта nginx для FreeBSD.
> >
> > Изменения:
> >
> > *) обновление до 0.3.41
> > *) к переменным порта VARDIR, LOGDIR, TMPDIR добавлен префикс NGINX_
> > *) фичи START_AFTER_INSTALL и STOP_BEFORE_REMOVE удалены
> >
> > Спасибо.
> >   
> Не очень понял - что, собственно, надо тестировать?

Очевидно, изменения :-)

> Из пожеланий -
> сделать сохраняемый конфиг порта, а то приходится добавлять директиву
> для сборки с ssl в /etc/make.conf

Патч ниже.

Просьба указывать uname -prs.
Спасибо.

-- 
Sergey A. Osokin,
System Engineer,
Macomnet, Internet Dept.
tel: +7 (495) 796-9079
fax: +7 (495) 796-9067

Index: ports/www/nginx/Makefile
===================================================================
RCS file: /home/pcvs/ports/www/nginx/Makefile,v
retrieving revision 1.70
diff -u -r1.70 Makefile
--- ports/www/nginx/Makefile    21 Apr 2006 11:24:50 -0000      1.70
+++ ports/www/nginx/Makefile    23 Apr 2006 17:51:40 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=      nginx
-PORTVERSION=   0.3.40
+PORTVERSION=   0.3.41
 CATEGORIES=    www
 MASTER_SITES=  http://sysoev.ru/nginx/
 MASTER_SITES+= ${MASTER_SITE_LOCAL}
@@ -15,28 +15,30 @@
 MAINTAINER=    osa@xxxxxxxxxxx
 COMMENT=       Robust and small WWW server
 
-VARDIR?=       ${DESTDIR}/var
-LOGDIR?=       ${VARDIR}/log
-RUNDIR?=       ${VARDIR}/run
-TMPDIR?=       ${VARDIR}/tmp/nginx
+NGINX_VARDIR?= ${DESTDIR}/var
+NGINX_LOGDIR?= ${NGINX_VARDIR}/log
+NGINX_RUNDIR?= ${NGINX_VARDIR}/run
+NGINX_TMPDIR?= ${NGINX_VARDIR}/tmp/nginx
 HTTP_PORT?=    80
 
-USE_RC_SUBR=   yes
+USE_RC_SUBR=   nginx.sh
 HAS_CONFIGURE= yes
 CONFIGURE_ARGS+=--prefix=${PREFIX}/etc/nginx                 --with-cc-opt="-I ${LOCALBASE}/include"                 --with-ld-opt="-L ${LOCALBASE}/lib"                 --conf-path=${PREFIX}/etc/nginx/nginx.conf                 --sbin-path=${PREFIX}/sbin/nginx -               --pid-path=${RUNDIR}/nginx.pid -               --http-client-body-temp-path=${TMPDIR}/client_body_temp -               --http-proxy-temp-path=${TMPDIR}/proxy_temp -               --http-fastcgi-temp-path=${TMPDIR}/fastcgi_temp -               --http-log-path=${LOGDIR}/nginx-access.log -               --error-log-path=${LOGDIR}/nginx-error.log +               --pid-path=${NGINX_RUNDIR}/nginx.pid +               --http-client-body-temp-path=${NGINX_TMPDIR}/client_body_temp +               --http-proxy-temp-path=${NGINX_TMPDIR}/proxy_temp +               --http-fastcgi-temp-path=${NGINX_TMPDIR}/fastcgi_temp +               --http-log-path=${NGINX_LOGDIR}/nginx-access.log +               --error-log-path=${NGINX_LOGDIR}/nginx-error.log                 --with-http_stub_status_module                 --user=${WWWOWN} --group=${WWWGRP}
 
+OPTIONS=
+
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=--with-debug
 STRIP=         #do not strip if nginx with debug information
@@ -82,7 +84,7 @@
 PLIST_SUB+=    START_AFTER_INSTALL="@comment "
 .endif
 
-PLIST_SUB+=    TMPDIR=${TMPDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
+PLIST_SUB+=    NGINX_TMPDIR=${NGINX_TMPDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
 RC_SCRIPTS_SUB=PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
 
@@ -99,8 +101,8 @@
        @cd ${WRKSRC} && ${MAKE}
 
 do-install:
-       ${MKDIR} ${PREFIX}/etc/nginx ${TMPDIR}
-       ${CHOWN} ${WWWOWN}:${WWWGRP} ${TMPDIR}
+       ${MKDIR} ${PREFIX}/etc/nginx ${NGINX_TMPDIR}
+       ${CHOWN} ${WWWOWN}:${WWWGRP} ${NGINX_TMPDIR}
        ${INSTALL_SCRIPT} ${WRKSRC}/nginx.sh ${PREFIX}/etc/rc.d
        ${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${PREFIX}/sbin
        ${INSTALL_DATA} ${WRKSRC}/conf/koi-win ${PREFIX}/etc/nginx
Index: ports/www/nginx/distinfo
===================================================================
RCS file: /home/pcvs/ports/www/nginx/distinfo,v
retrieving revision 1.65
diff -u -r1.65 distinfo
--- ports/www/nginx/distinfo    21 Apr 2006 11:24:50 -0000      1.65
+++ ports/www/nginx/distinfo    23 Apr 2006 17:51:40 -0000
@@ -1,3 +1,3 @@
-MD5 (nginx-0.3.40.tar.gz) = f2c8338962228ed1dc9cb0fff1fbd10b
-SHA256 (nginx-0.3.40.tar.gz) = 
6e5fb751c431b5f8280557f0c8a627df7f6ee5772449fffa6a348ad8f93404e5
-SIZE (nginx-0.3.40.tar.gz) = 387838
+MD5 (nginx-0.3.41.tar.gz) = 9709c7b07374640606b2f154f2e54417
+SHA256 (nginx-0.3.41.tar.gz) = 
5efc679af481854ac1b331cfd068c7fb222366dd09b5463ce6edb8e740d591e6
+SIZE (nginx-0.3.41.tar.gz) = 387999
Index: ports/www/nginx/pkg-plist
===================================================================
RCS file: /home/pcvs/ports/www/nginx/pkg-plist,v
retrieving revision 1.6
diff -u -r1.6 pkg-plist
--- ports/www/nginx/pkg-plist   22 Jan 2006 02:57:34 -0000      1.6
+++ ports/www/nginx/pkg-plist   23 Apr 2006 17:51:40 -0000
@@ -15,10 +15,7 @@
 %%WWWDATA%%@exec chmod a-w www/nginx-dist
 %%WWWDATA%%@unexec if [ -L %D/www/nginx ]; then rm -f %D/www/nginx; fi
 %%WWWDATA%%@dirrm www/nginx-dist
-%%STOP_BEFORE_REMOVE%%@unexec %D/etc/rc.d/nginx.sh stop || true
 sbin/nginx
-etc/rc.d/nginx.sh
-@exec [ -d %%TMPDIR%% ] || mkdir -p %%TMPDIR%%
-@exec chown %%WWWOWN%%:%%WWWGRP%% %%TMPDIR%%
-@unexec rm -fr %%TMPDIR%%
-%%START_AFTER_INSTALL%%@exec %D/etc/rc.d/nginx.sh start
+@exec [ -d %%NGINX_TMPDIR%% ] || mkdir -p %%NGINX_TMPDIR%%
+@exec chown %%WWWOWN%%:%%WWWGRP%% %%NGINX_TMPDIR%%
+@unexec rm -fr %%NGINX_TMPDIR%%