Preparing www/nginx-devel import by splitting up Makefile into

Makefile + Makefile.common. nginx is highly backward compatible
and 99% of stable series Makefile applies to devel.

Bumping PKGREVISION

2 files changed, 108 insertions, 101 deletions

diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 1da6df1b707..e246da75973 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -1,105 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2013/02/18 20:32:09 imil Exp $
+# $NetBSD: Makefile,v 1.34 2013/02/22 15:37:58 imil Exp $
 
 DISTNAME=		nginx-1.2.7
-CATEGORIES=		www
-MASTER_SITES=		http://nginx.org/download/
-DISTFILES=		${DEFAULT_DISTFILES}
-
+PKGREVISION=		1
 MAINTAINER=		joerg@NetBSD.org
-HOMEPAGE=		http://nginx.org/
-COMMENT=		Lightweight HTTP server and mail proxy server
-LICENSE=		2-clause-bsd
-
-.include "../../mk/bsd.prefs.mk"
-
-NGINX_USER?=		nginx
-NGINX_GROUP?=		nginx
-NGINX_DATADIR?=		${VARBASE}/db/nginx
-NGINX_LOGDIR?=		${VARBASE}/log/nginx
-NGINX_PIDDIR?=		${VARBASE}/run
-
-BUILD_DEFS+=		NGINX_DATADIR NGINX_LOGDIR NGINX_PIDDIR VARBASE
-
-PKG_USERS_VARS+=	NGINX_USER
-PKG_GROUPS_VARS+=	NGINX_GROUP
-PKG_GROUPS=		${NGINX_GROUP}
-PKG_USERS=		${NGINX_USER}:${NGINX_GROUP}
-
-PKG_GECOS.${NGINX_USER}=NGINX server user
-PKG_HOME.${NGINX_USER}=	${NGINX_DATADIR}
-PKG_SHELL.${NGINX_USER}=${NOLOGIN}
-
-USE_PKGLOCALEDIR=	yes
-HAS_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--user=${NGINX_USER}
-CONFIGURE_ARGS+=	--group=${NGINX_GROUP}
-CONFIGURE_ARGS+=	--with-ld-opt=-L${PREFIX}/lib\ -Wl,-R${PREFIX}/lib
-CONFIGURE_ARGS+=	--prefix=${PREFIX}
-CONFIGURE_ARGS+=	--sbin-path=${PREFIX}/sbin
-CONFIGURE_ARGS+=	--conf-path=${PKG_SYSCONFDIR}/nginx.conf
-CONFIGURE_ARGS+=	--pid-path=${NGINX_PIDDIR}/nginx.pid
-CONFIGURE_ARGS+=	--lock-path=${NGINX_DATADIR}/nginx.lock
-CONFIGURE_ARGS+=	--error-log-path=${NGINX_LOGDIR}/error.log
-CONFIGURE_ARGS+=	--http-log-path=${NGINX_LOGDIR}/access.log
-CONFIGURE_ARGS+=	--http-client-body-temp-path=${NGINX_DATADIR}/client_body_temp
-CONFIGURE_ARGS+=	--http-proxy-temp-path=${NGINX_DATADIR}/proxy_temp
-CONFIGURE_ARGS+=	--http-fastcgi-temp-path=${NGINX_DATADIR}/fstcgi_temp
-
-.include "../../mk/bsd.prefs.mk"
-
-PKG_SYSCONFSUBDIR=	nginx
-
-.include "options.mk"
-
-EGDIR=			${PREFIX}/share/examples/nginx
-EGFILES+=		fastcgi.conf fastcgi_params koi-utf koi-win \
-			mime.types nginx.conf win-utf
-
-.for file in ${EGFILES}
-CONF_FILES+=	${EGDIR}/conf/${file} ${PKG_SYSCONFDIR}/${file}
-.	if !empty(PKG_OPTIONS:Mnaxsi)
-CONF_FILES+=	${EGDIR}/conf/naxsi_core.rules
-CONF_FILES+=	${PKG_SYSCONFDIR}/naxsi_core.rules
-.	endif
-.endfor
-
-RCD_SCRIPTS=		nginx
-
-INSTALLATION_DIRS=	${PKGMANDIR}/man8 sbin share/examples/nginx/conf \
-			share/examples/nginx/html
-MAKE_DIRS+=		${NGINX_PIDDIR}
-OWN_DIRS=		${NGINX_LOGDIR}
-OWN_DIRS_PERMS+=	${NGINX_DATADIR} ${NGINX_USER} ${NGINX_GROUP} 0700
-
-BUILD_TARGET=		build
-
-SUBST_CLASSES+=		paths
-SUBST_STAGE.paths=	pre-configure
-SUBST_FILES.paths=	conf/nginx.conf
-SUBST_SED.paths=	-e 's,%%PKG_SYSCONFDIR%%,${PKG_SYSCONFDIR},g'
-SUBST_SED.paths+=	-e 's,%%NGINX_LOGDIR%%,${NGINX_LOGDIR},g'
-SUBST_SED.paths+=	-e 's,%%NGINX_PIDDIR%%,${NGINX_PIDDIR},g'
-SUBST_SED.paths+=	-e 's,%%NGINX_USER%%,${NGINX_USER},g'
-SUBST_SED.paths+=	-e 's,%%NGINX_GROUP%%,${NGINX_GROUP},g'
-
-MESSAGE_SUBST+=		NGINX_LOGDIR=${NGINX_LOGDIR}
-MESSAGE_SUBST+=		NGINX_PIDDIR=${NGINX_PIDDIR}
-MESSAGE_SUBST+=		NGINX_USER=${NGINX_USER}
-MESSAGE_SUBST+=		NGINX_GROUP=${NGINX_GROUP}
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${DESTDIR}${PREFIX}/sbin/nginx
-.for file in ${EGFILES}
-	${INSTALL_DATA} ${WRKSRC}/conf/${file} ${DESTDIR}${EGDIR}/conf/${file}
-.endfor
-	${INSTALL_DATA} ${WRKSRC}/html/50x.html ${DESTDIR}${EGDIR}/html/50x.html
-	${INSTALL_DATA} ${WRKSRC}/html/index.html ${DESTDIR}${EGDIR}/html/index.html
-	${INSTALL_MAN} ${WRKSRC}/man/nginx.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
-.if !empty(PKG_OPTIONS:Mnaxsi)
-	${INSTALL_DATA} ${WRKDIR}/${NAXSI}/naxsi_config/naxsi_core.rules ${DESTDIR}${EGDIR}/conf
-.endif
-
 
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
-.include "Makefile.cflags"
+.include "../../www/nginx/Makefile.common"
diff --git a/www/nginx/Makefile.common b/www/nginx/Makefile.common
new file mode 100644
index 00000000000..6d8c6322303
--- /dev/null
+++ b/www/nginx/Makefile.common
@@ -0,0 +1,105 @@
+# $NetBSD: Makefile.common,v 1.1 2013/02/22 15:37:58 imil Exp $
+
+# Used by both www/nginx and www/nginx-devel
+# Do *not* add any version-specific data here, any change
+# in this file will affect both packages
+
+CATEGORIES=		www
+MASTER_SITES=		http://nginx.org/download/
+DISTFILES=		${DEFAULT_DISTFILES}
+
+HOMEPAGE=		http://nginx.org/
+COMMENT=		Lightweight HTTP server and mail proxy server
+LICENSE=		2-clause-bsd
+
+.include "../../mk/bsd.prefs.mk"
+
+NGINX_USER?=		nginx
+NGINX_GROUP?=		nginx
+NGINX_DATADIR?=		${VARBASE}/db/nginx
+NGINX_LOGDIR?=		${VARBASE}/log/nginx
+NGINX_PIDDIR?=		${VARBASE}/run
+
+BUILD_DEFS+=		NGINX_DATADIR NGINX_LOGDIR NGINX_PIDDIR VARBASE
+
+PKG_USERS_VARS+=	NGINX_USER
+PKG_GROUPS_VARS+=	NGINX_GROUP
+PKG_GROUPS=		${NGINX_GROUP}
+PKG_USERS=		${NGINX_USER}:${NGINX_GROUP}
+
+PKG_GECOS.${NGINX_USER}=NGINX server user
+PKG_HOME.${NGINX_USER}=	${NGINX_DATADIR}
+PKG_SHELL.${NGINX_USER}=${NOLOGIN}
+
+USE_PKGLOCALEDIR=	yes
+HAS_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--user=${NGINX_USER}
+CONFIGURE_ARGS+=	--group=${NGINX_GROUP}
+CONFIGURE_ARGS+=	--with-ld-opt=-L${PREFIX}/lib\ -Wl,-R${PREFIX}/lib
+CONFIGURE_ARGS+=	--prefix=${PREFIX}
+CONFIGURE_ARGS+=	--sbin-path=${PREFIX}/sbin
+CONFIGURE_ARGS+=	--conf-path=${PKG_SYSCONFDIR}/nginx.conf
+CONFIGURE_ARGS+=	--pid-path=${NGINX_PIDDIR}/nginx.pid
+CONFIGURE_ARGS+=	--lock-path=${NGINX_DATADIR}/nginx.lock
+CONFIGURE_ARGS+=	--error-log-path=${NGINX_LOGDIR}/error.log
+CONFIGURE_ARGS+=	--http-log-path=${NGINX_LOGDIR}/access.log
+CONFIGURE_ARGS+=	--http-client-body-temp-path=${NGINX_DATADIR}/client_body_temp
+CONFIGURE_ARGS+=	--http-proxy-temp-path=${NGINX_DATADIR}/proxy_temp
+CONFIGURE_ARGS+=	--http-fastcgi-temp-path=${NGINX_DATADIR}/fstcgi_temp
+
+PKG_SYSCONFSUBDIR=	nginx
+
+.include "../../www/nginx/options.mk"
+
+EGDIR=			${PREFIX}/share/examples/nginx
+EGFILES+=		fastcgi.conf fastcgi_params koi-utf koi-win \
+			mime.types nginx.conf win-utf
+
+.for file in ${EGFILES}
+CONF_FILES+=	${EGDIR}/conf/${file} ${PKG_SYSCONFDIR}/${file}
+.	if !empty(PKG_OPTIONS:Mnaxsi)
+CONF_FILES+=	${EGDIR}/conf/naxsi_core.rules
+CONF_FILES+=	${PKG_SYSCONFDIR}/naxsi_core.rules
+.	endif
+.endfor
+
+RCD_SCRIPTS=		nginx
+
+INSTALLATION_DIRS=	${PKGMANDIR}/man8 sbin share/examples/nginx/conf \
+			share/examples/nginx/html
+MAKE_DIRS+=		${NGINX_PIDDIR}
+OWN_DIRS=		${NGINX_LOGDIR}
+OWN_DIRS_PERMS+=	${NGINX_DATADIR} ${NGINX_USER} ${NGINX_GROUP} 0700
+
+BUILD_TARGET=		build
+
+SUBST_CLASSES+=		paths
+SUBST_STAGE.paths=	pre-configure
+SUBST_FILES.paths=	conf/nginx.conf
+SUBST_SED.paths=	-e 's,%%PKG_SYSCONFDIR%%,${PKG_SYSCONFDIR},g'
+SUBST_SED.paths+=	-e 's,%%NGINX_LOGDIR%%,${NGINX_LOGDIR},g'
+SUBST_SED.paths+=	-e 's,%%NGINX_PIDDIR%%,${NGINX_PIDDIR},g'
+SUBST_SED.paths+=	-e 's,%%NGINX_USER%%,${NGINX_USER},g'
+SUBST_SED.paths+=	-e 's,%%NGINX_GROUP%%,${NGINX_GROUP},g'
+
+MESSAGE_SUBST+=		NGINX_LOGDIR=${NGINX_LOGDIR}
+MESSAGE_SUBST+=		NGINX_PIDDIR=${NGINX_PIDDIR}
+MESSAGE_SUBST+=		NGINX_USER=${NGINX_USER}
+MESSAGE_SUBST+=		NGINX_GROUP=${NGINX_GROUP}
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${DESTDIR}${PREFIX}/sbin/nginx
+.for file in ${EGFILES}
+	${INSTALL_DATA} ${WRKSRC}/conf/${file} ${DESTDIR}${EGDIR}/conf/${file}
+.endfor
+	${INSTALL_DATA} ${WRKSRC}/html/50x.html ${DESTDIR}${EGDIR}/html/50x.html
+	${INSTALL_DATA} ${WRKSRC}/html/index.html ${DESTDIR}${EGDIR}/html/index.html
+	${INSTALL_MAN} ${WRKSRC}/man/nginx.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
+.if !empty(PKG_OPTIONS:Mnaxsi)
+	${INSTALL_DATA} ${WRKDIR}/${NAXSI}/naxsi_config/naxsi_core.rules ${DESTDIR}${EGDIR}/conf
+.endif
+
+
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
+.include "../../www/nginx/Makefile.cflags"