nginx: merge all into Makefile now this isn't shared

2 files changed, 115 insertions, 126 deletions

diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 09d517f40b2..214f7bf123b 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -1,9 +1,121 @@
-# $NetBSD: Makefile,v 1.110 2022/03/17 02:37:49 osa Exp $
+# $NetBSD: Makefile,v 1.111 2022/03/19 00:17:41 gutteridge Exp $
 
 DISTNAME=	nginx-1.20.2
+PKGREVISION=	6
+CATEGORIES=	www
+MASTER_SITES=	http://nginx.org/download/
+DISTFILES=	${DEFAULT_DISTFILES}
 
 MAINTAINER=	osa@NetBSD.org
+HOMEPAGE=	https://nginx.org/
+COMMENT=	Lightweight HTTP server and mail proxy server
+LICENSE=	2-clause-bsd
 
-PKGREVISION=	6
-.include "../../www/nginx/Makefile.common"
+.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
+CONFIGURE_ARGS+=	--http-scgi-temp-path=${NGINX_DATADIR}/scgi_temp
+
+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 ${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}
+
+.if ${OPSYS} == "Darwin"
+SOEXT=		bundle
+.else
+SOEXT=		so
+.endif
+PLIST_SUBST+=	SOEXT=${SOEXT}
+
+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}/objs/nginx.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
+.if !empty(PKG_OPTIONS:Mnaxsi)
+	${INSTALL_DATA} ${WRKDIR}/${NAXSI_DISTNAME}/naxsi_config/naxsi_core.rules ${DESTDIR}${EGDIR}/conf
+.endif
+.if !empty(PKG_OPTIONS:Mperl)
+	${INSTALL_LIB_DIR} ${DESTDIR}${PERL5_INSTALLVENDORARCH}/auto/nginx
+	${INSTALL_LIB} ${WRKSRC}/objs/src/http/modules/perl/blib/arch/auto/nginx/nginx.${SOEXT} \
+		${DESTDIR}${PERL5_INSTALLVENDORARCH}/auto/nginx
+	${INSTALL_DATA} ${WRKSRC}/objs/src/http/modules/perl/blib/lib/nginx.pm \
+		${DESTDIR}${PERL5_INSTALLVENDORARCH}
+.endif
+.if !empty(PKG_OPTIONS:Mdso)
+	${INSTALL_LIB_DIR} ${DESTDIR}${PREFIX}/libexec/nginx
+	(cd ${WRKSRC}/objs/ && ${FIND} . -name '*.so' -maxdepth 1 -type f \
+		-exec ${INSTALL_PROGRAM} {} ${DESTDIR}${PREFIX}/libexec/nginx \;)
+.endif
+
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/nginx/Makefile.common b/www/nginx/Makefile.common
deleted file mode 100644
index 2465f092287..00000000000
--- a/www/nginx/Makefile.common
+++ /dev/null
@@ -1,123 +0,0 @@
-# $NetBSD: Makefile.common,v 1.23 2022/03/14 02:49:09 osa Exp $
-# used by www/nginx/Makefile
-# used by www/nginx-devel/Makefile
-
-# 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=	https://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
-CONFIGURE_ARGS+=	--http-scgi-temp-path=${NGINX_DATADIR}/scgi_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 ${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}
-
-.if ${OPSYS} == "Darwin"
-SOEXT=		bundle
-.else
-SOEXT=		so
-.endif
-PLIST_SUBST+=	SOEXT=${SOEXT}
-
-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}/objs/nginx.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
-.if !empty(PKG_OPTIONS:Mnaxsi)
-	${INSTALL_DATA} ${WRKDIR}/${NAXSI_DISTNAME}/naxsi_config/naxsi_core.rules ${DESTDIR}${EGDIR}/conf
-.endif
-.if !empty(PKG_OPTIONS:Mperl)
-	${INSTALL_LIB_DIR} ${DESTDIR}${PERL5_INSTALLVENDORARCH}/auto/nginx
-	${INSTALL_LIB} ${WRKSRC}/objs/src/http/modules/perl/blib/arch/auto/nginx/nginx.${SOEXT} \
-		${DESTDIR}${PERL5_INSTALLVENDORARCH}/auto/nginx
-	${INSTALL_DATA} ${WRKSRC}/objs/src/http/modules/perl/blib/lib/nginx.pm \
-		${DESTDIR}${PERL5_INSTALLVENDORARCH}
-.endif
-.if !empty(PKG_OPTIONS:Mdso)
-	${INSTALL_LIB_DIR} ${DESTDIR}${PREFIX}/libexec/nginx
-	(cd ${WRKSRC}/objs/ && ${FIND} . -name '*.so' -maxdepth 1 -type f \
-		-exec ${INSTALL_PROGRAM} {} ${DESTDIR}${PREFIX}/libexec/nginx \;)
-.endif
-
-.include "../../devel/zlib/buildlink3.mk"