update from MAINTAINER; plus a bunch of tweaks from me

ok merdely@

www/nginx/Makefile

@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.3 2007/10/08 19:23:43 merdely Exp $
+# $OpenBSD: Makefile,v 1.4 2007/12/31 02:20:01 okan Exp $
 
-COMMENT=	robust and small HTTP server and IMAP/POP3 proxy server
+COMMENT=	robust and small HTTP server and mail proxy server
 
-DISTNAME=	nginx-0.5.32
+DISTNAME=	nginx-0.5.34
-PKGNAME=	${DISTNAME}
 CATEGORIES=	www
 
 HOMEPAGE=	http://nginx.net/
@@ -20,20 +19,14 @@ WANTLIB=		c crypto ssl z
 
 MASTER_SITES=		http://sysoev.ru/nginx/
 
+LIB_DEPENDS=		pcre::devel/pcre
 
-LIB_DEPENDS+=		pcre::devel/pcre
 NGINX_DIR=		/var/nginx
-
+SUBST_VARS=		NGINX_DIR
-SUBST_VARS+=		NGINX_DIR
 
 CONFIGURE_STYLE=	simple
-
+CONFIGURE_ARGS=		--prefix=${SYSCONFDIR}/nginx \
-# Some conf files are relative to --prefix and
+			--conf-path=${SYSCONFDIR}/nginx/nginx.conf \
-# have no --xxx-path of their own. Set this so
-# all runtime configs live in the same place.
-CONFIGURE_ARGS+=	--prefix=${SYSCONFDIR}/nginx
-
-CONFIGURE_ARGS+=	--conf-path=${SYSCONFDIR}/nginx/nginx.conf \
 			--sbin-path=${PREFIX}/sbin/nginx \
 			--pid-path=/var/run/nginx.pid \
 			--lock-path=${NGINX_DIR}/tmp/nginx.lock \
@@ -44,28 +37,28 @@ CONFIGURE_ARGS+=	--conf-path=${SYSCONFDIR}/nginx/nginx.conf \
 			--error-log-path=/var/log/nginx/error.log \
 			--user=_nginx \
 			--group=_nginx \
-			--with-cc-opt="-I ${LOCALBASE}/include" \
-			--with-ld-opt="-L ${LOCALBASE}/lib" \
 			--with-http_ssl_module \
 			--with-http_stub_status_module \
-			--with-imap \
+			--with-mail \
-			--with-imap_ssl_module
+			--with-mail_ssl_module
+
+# Get rid of '#include <malloc.h>' which caused many warnings
+CONFIGURE_ARGS+=	--with-cc-opt="-DNGX_HAVE_MALLOC_H=0"
 
 NO_REGRESS=		Yes
 ALL_TARGET=
 
 pre-configure:
 	@perl -pi -e 's,!!NGINX_DIR!!,${NGINX_DIR},' \
-	${WRKBUILD}/conf/nginx.conf
+		${WRKBUILD}/conf/nginx.conf
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/nginx
+	${INSTALL_DATA_DIR} ${PREFIX}/share/nginx/
 	${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${PREFIX}/sbin
 .for i in koi-win koi-utf win-utf fastcgi_params mime.types nginx.conf
 	${INSTALL_DATA} ${WRKSRC}/conf/${i} ${PREFIX}/share/nginx/
 .endfor
-	${INSTALL_DATA_DIR} ${PREFIX}/share/nginx/html
+	${INSTALL_DATA_DIR} ${PREFIX}/share/nginx/html/
 	${INSTALL_DATA} ${WRKSRC}/html/* ${PREFIX}/share/nginx/html/
 
-
 .include <bsd.port.mk>

www/nginx/distinfo

@@ -1,5 +1,5 @@
-MD5 (nginx-0.5.32.tar.gz) = AIgmm4pZoUawupye4phTuw==
+MD5 (nginx-0.5.34.tar.gz) = j30+/NfKrx8G5Nld+urCOA==
-RMD160 (nginx-0.5.32.tar.gz) = ZxF7YuJr8P8oQwQoZ630OI+k0aE=
+RMD160 (nginx-0.5.34.tar.gz) = oFdlHrkGWx5JHOOMc7yeSJfJgsc=
-SHA1 (nginx-0.5.32.tar.gz) = PLS8CXZ15cGpDlm/UfSiS5habfo=
+SHA1 (nginx-0.5.34.tar.gz) = 929ssawKMW8glYv33GoDcj+1jt8=
-SHA256 (nginx-0.5.32.tar.gz) = jLlcxhuv7HsP4+kfBvLnruexLxKmr4IA1gA4+NXlLKw=
+SHA256 (nginx-0.5.34.tar.gz) = ZOJVu3avoczitluisztNHP8DRlT/IPZLTChdFD8Fmjo=
-SIZE (nginx-0.5.32.tar.gz) = 479982
+SIZE (nginx-0.5.34.tar.gz) = 487815

www/nginx/pkg/DESCR

@@ -1,19 +1,26 @@
-nginx [engine x] is a HTTP server and IMAP/POP3 proxy server.
+nginx [engine x] is a HTTP server and mail proxy server.
 
 The basic HTTP features:
-  * Handling of the static files, index files, and autoindexing
+    * Handling of static files, index files, and autoindexing; open file
-  * Accelerated reverse proxying without caching, simple load 
+      descriptor cache.
-    balancing and fault tolerance
+    * Accelerated reverse proxying without caching, simple load balancing
-  * Accelerated support without caching of the remote FastCGI
+      and fault tolerance.
-    servers, simple load balancing and fault tolerance
+    * Accelerated support without caching of remote FastCGI servers,
-  * Modular architecture, filters including gzipping, byte
+      simple load balancing and fault tolerance.
-    ranges, chunked responses, and SSI-filter; Several subrequests
+    * Modular architecture.  Filters include gzipping, byte ranges,
-    in one page handling in SSI-filter via FastCGI or proxy
+      chunked responses, and SSI.  Multiple SSI inclusions within a
-    running in parallel
+      single page can be processed in parallel if they are handled by
-  * the SSL support
+      FastCGI or proxied servers.
+    * SSL and TLS SNI support.
 
-The IMAP/POP3 proxy server features:
+Mail proxy server features:
-  * User redirection to IMAP/POP3 backend using an external HTTP
+    * User redirection to IMAP/POP3 backend using an external HTTP
-    authentication server
+      authentication server.
-  * Plain text authentication (LOGIN, USER/PASS)
+    * User authentication using an external HTTP authentication server
-  * SSL and STARTTLS support
+      and connection redirection to internal SMTP backend.
+    * Authentication methods:
+          o POP3: USER/PASS, APOP, AUTH LOGIN PLAIN CRAM-MD5
+          o IMAP: LOGIN, AUTH LOGIN PLAIN CRAM-MD5
+          o SMTP: AUTH LOGIN PLAIN CRAM-MD5
+    * SSL support.
+    * STARTTLS and STLS support.

www/nginx/pkg/MESSAGE

@@ -1,13 +1,9 @@
 Documentation on nginx can be found on the wiki:
 	http://wiki.codemongers.com/Main
 
-Quick info for the impatient:
-	http://wiki.codemongers.com/NginxGettingStarted
-
 You may want to put the following into your /etc/rc.local:
 
 # start nginx
 if [ -x ${PREFIX}/sbin/nginx ]; then
-        echo -n ' nginx'
+        echo -n ' nginx'; ${PREFIX}/sbin/nginx
-        ${PREFIX}/sbin/nginx
 fi

www/nginx/pkg/PLIST

@@ -1,6 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2007/09/04 21:58:26 merdely Exp $
+@comment $OpenBSD: PLIST,v 1.2 2007/12/31 02:20:01 okan Exp $
 @newgroup _nginx:593
-@newuser _nginx:593:_nginx:daemon:nginx user:/nonexistant:/sbin/nologin
+@newuser _nginx:593:_nginx:daemon:nginx user:/nonexistent:/sbin/nologin
 sbin/nginx
 @mode 755
 @sample ${NGINX_DIR}/