Fri Feb 22 15:37:58 2013 UTC ()
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


(imil)
diff -r1.33 -r1.34 pkgsrc/www/nginx/Makefile
diff -r0 -r1.1 pkgsrc/www/nginx/Makefile.common
cvs diff -r1.33 -r1.34 pkgsrc/www/nginx/Makefile (expand / switch to unified diff)

--- pkgsrc/www/nginx/Makefile 2013/02/18 20:32:09 1.33
+++ pkgsrc/www/nginx/Makefile 2013/02/22 15:37:58 1.34
@@ -1,105 +1,7 @@ @@ -1,105 +1,7 @@
1# $NetBSD: Makefile,v 1.33 2013/02/18 20:32:09 imil Exp $ 1# $NetBSD: Makefile,v 1.34 2013/02/22 15:37:58 imil Exp $
2 2
3DISTNAME= nginx-1.2.7 3DISTNAME= nginx-1.2.7
4CATEGORIES= www 4PKGREVISION= 1
5MASTER_SITES= http://nginx.org/download/ 
6DISTFILES= ${DEFAULT_DISTFILES} 
7 
8MAINTAINER= joerg@NetBSD.org 5MAINTAINER= joerg@NetBSD.org
9HOMEPAGE= http://nginx.org/ 
10COMMENT= Lightweight HTTP server and mail proxy server 
11LICENSE= 2-clause-bsd 
12 
13.include "../../mk/bsd.prefs.mk" 
14 
15NGINX_USER?= nginx 
16NGINX_GROUP?= nginx 
17NGINX_DATADIR?= ${VARBASE}/db/nginx 
18NGINX_LOGDIR?= ${VARBASE}/log/nginx 
19NGINX_PIDDIR?= ${VARBASE}/run 
20 
21BUILD_DEFS+= NGINX_DATADIR NGINX_LOGDIR NGINX_PIDDIR VARBASE 
22 
23PKG_USERS_VARS+= NGINX_USER 
24PKG_GROUPS_VARS+= NGINX_GROUP 
25PKG_GROUPS= ${NGINX_GROUP} 
26PKG_USERS= ${NGINX_USER}:${NGINX_GROUP} 
27 
28PKG_GECOS.${NGINX_USER}=NGINX server user 
29PKG_HOME.${NGINX_USER}= ${NGINX_DATADIR} 
30PKG_SHELL.${NGINX_USER}=${NOLOGIN} 
31 
32USE_PKGLOCALEDIR= yes 
33HAS_CONFIGURE= yes 
34CONFIGURE_ARGS+= --user=${NGINX_USER} 
35CONFIGURE_ARGS+= --group=${NGINX_GROUP} 
36CONFIGURE_ARGS+= --with-ld-opt=-L${PREFIX}/lib\ -Wl,-R${PREFIX}/lib 
37CONFIGURE_ARGS+= --prefix=${PREFIX} 
38CONFIGURE_ARGS+= --sbin-path=${PREFIX}/sbin 
39CONFIGURE_ARGS+= --conf-path=${PKG_SYSCONFDIR}/nginx.conf 
40CONFIGURE_ARGS+= --pid-path=${NGINX_PIDDIR}/nginx.pid 
41CONFIGURE_ARGS+= --lock-path=${NGINX_DATADIR}/nginx.lock 
42CONFIGURE_ARGS+= --error-log-path=${NGINX_LOGDIR}/error.log 
43CONFIGURE_ARGS+= --http-log-path=${NGINX_LOGDIR}/access.log 
44CONFIGURE_ARGS+= --http-client-body-temp-path=${NGINX_DATADIR}/client_body_temp 
45CONFIGURE_ARGS+= --http-proxy-temp-path=${NGINX_DATADIR}/proxy_temp 
46CONFIGURE_ARGS+= --http-fastcgi-temp-path=${NGINX_DATADIR}/fstcgi_temp 
47 
48.include "../../mk/bsd.prefs.mk" 
49 
50PKG_SYSCONFSUBDIR= nginx 
51 
52.include "options.mk" 
53 
54EGDIR= ${PREFIX}/share/examples/nginx 
55EGFILES+= fastcgi.conf fastcgi_params koi-utf koi-win \ 
56 mime.types nginx.conf win-utf 
57 
58.for file in ${EGFILES} 
59CONF_FILES+= ${EGDIR}/conf/${file} ${PKG_SYSCONFDIR}/${file} 
60. if !empty(PKG_OPTIONS:Mnaxsi) 
61CONF_FILES+= ${EGDIR}/conf/naxsi_core.rules 
62CONF_FILES+= ${PKG_SYSCONFDIR}/naxsi_core.rules 
63. endif 
64.endfor 
65 
66RCD_SCRIPTS= nginx 
67 
68INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin share/examples/nginx/conf \ 
69 share/examples/nginx/html 
70MAKE_DIRS+= ${NGINX_PIDDIR} 
71OWN_DIRS= ${NGINX_LOGDIR} 
72OWN_DIRS_PERMS+= ${NGINX_DATADIR} ${NGINX_USER} ${NGINX_GROUP} 0700 
73 
74BUILD_TARGET= build 
75 
76SUBST_CLASSES+= paths 
77SUBST_STAGE.paths= pre-configure 
78SUBST_FILES.paths= conf/nginx.conf 
79SUBST_SED.paths= -e 's,%%PKG_SYSCONFDIR%%,${PKG_SYSCONFDIR},g' 
80SUBST_SED.paths+= -e 's,%%NGINX_LOGDIR%%,${NGINX_LOGDIR},g' 
81SUBST_SED.paths+= -e 's,%%NGINX_PIDDIR%%,${NGINX_PIDDIR},g' 
82SUBST_SED.paths+= -e 's,%%NGINX_USER%%,${NGINX_USER},g' 
83SUBST_SED.paths+= -e 's,%%NGINX_GROUP%%,${NGINX_GROUP},g' 
84 
85MESSAGE_SUBST+= NGINX_LOGDIR=${NGINX_LOGDIR} 
86MESSAGE_SUBST+= NGINX_PIDDIR=${NGINX_PIDDIR} 
87MESSAGE_SUBST+= NGINX_USER=${NGINX_USER} 
88MESSAGE_SUBST+= NGINX_GROUP=${NGINX_GROUP} 
89 
90do-install: 
91 ${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${DESTDIR}${PREFIX}/sbin/nginx 
92.for file in ${EGFILES} 
93 ${INSTALL_DATA} ${WRKSRC}/conf/${file} ${DESTDIR}${EGDIR}/conf/${file} 
94.endfor 
95 ${INSTALL_DATA} ${WRKSRC}/html/50x.html ${DESTDIR}${EGDIR}/html/50x.html 
96 ${INSTALL_DATA} ${WRKSRC}/html/index.html ${DESTDIR}${EGDIR}/html/index.html 
97 ${INSTALL_MAN} ${WRKSRC}/man/nginx.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 
98.if !empty(PKG_OPTIONS:Mnaxsi) 
99 ${INSTALL_DATA} ${WRKDIR}/${NAXSI}/naxsi_config/naxsi_core.rules ${DESTDIR}${EGDIR}/conf 
100.endif 
101 
102 6
103.include "../../devel/zlib/buildlink3.mk" 7.include "../../www/nginx/Makefile.common"
104.include "../../mk/bsd.pkg.mk" 
105.include "Makefile.cflags" 
File Added: pkgsrc/www/nginx/Attic/Makefile.common
# $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"