varnish: fold Makefile.common back into Makefile

[Tobias Nygren <tnn%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Wed Jun 23 23:42:39 2021 +0200
Changeset:	4380572cdd3f6db5510448011a372bec4ea59ffe

Modified Files:
	varnish/Makefile
Removed Files:
	varnish/Makefile.common

Log Message:
varnish: fold Makefile.common back into Makefile

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4380572cdd3f6db5510448011a372bec4ea59ffe

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 varnish/Makefile        | 85 +++++++++++++++++++++++++++++++++++++++++++++++-
 varnish/Makefile.common | 86 -------------------------------------------------
 2 files changed, 84 insertions(+), 87 deletions(-)

diffs:
diff --git a/varnish/Makefile b/varnish/Makefile
index 7719666bd1..057689c8f0 100644
--- a/varnish/Makefile
+++ b/varnish/Makefile
@@ -1,6 +1,89 @@
 # $NetBSD$
 
 DISTNAME=	varnish-6.6.0
+CATEGORIES=	www
+MASTER_SITES=	https://varnish-cache.org/_downloads/
+EXTRACT_SUFX=	.tgz
 
-.include "../../wip/varnish/Makefile.common"
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=	https://varnish-cache.org/
+COMMENT=	High-performace HTTP accelerator
+LICENSE=	modified-bsd
+
+BUILD_DEPENDS+=		${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils
+
+PYTHON_VERSIONED_DEPENDENCIES=	sphinx:tool
+
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+USE_TOOLS+=	pkg-config gmake
+
+BUILD_DEFS+=	VARBASE
+BUILD_DEFS+=	PKG_SYSCONFBASE
+
+CONF_FILES=		share/examples/varnish/builtin.vcl \
+			${PKG_SYSCONFDIR}/builtin.vcl
+CONF_FILES+=		share/examples/varnish/example.vcl \
+			${PKG_SYSCONFDIR}/example.vcl
+
+.include "../../mk/bsd.prefs.mk"
+
+VRNUSER?=		varnish
+VRNGROUP?=		${VRNUSER}
+STATEDIR=		${VARBASE}/db
+VRNDIR=			${STATEDIR}/${PKGBASE}
+
+OWN_DIRS+=		${VRNDIR}
+OWN_DIRS_PERMS+=	${VRNDIR} ${VRNUSER} ${VRNGROUP} 0770
+
+PKG_GROUPS+=		${VRNGROUP}
+PKG_USERS+=		${VRNUSER}:${VRNGROUP}
+PKG_HOME.${VRNUSER}=	${VRNDIR}
+PKG_SHELL.${VRNUSER}=	${SH}
+PKG_GECOS.${VRNUSER}=	Varnish daemon user
+
+PKG_SYSCONFSUBDIR=	varnish
+
+FILES_SUBST+=		VRNUSER=${VRNUSER}
+FILES_SUBST+=		VRNGROUP=${VRNGROUP}
+
+REPLACE_PYTHON+=	lib/libvcc/vmodtool.py
+REPLACE_PYTHON+=	lib/libvcc/vsctool.py
+
+CONFIGURE_ARGS+=	--localstatedir=${STATEDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE}
+CONFIGURE_ARGS+=	--with-rst2html=${PREFIX}/bin/rst2html-${PYVERSSUFFIX}
+CONFIGURE_ARGS+=	--with-rst2man=${PREFIX}/bin/rst2man-${PYVERSSUFFIX}
+CONFIGURE_ARGS+=	--with-sphinx-build=${PREFIX}/bin/sphinx-build-${PYVERSSUFFIX}
+
+# Explicitly disable epoll on illumos, provided for Linux compat only.
+CONFIGURE_ARGS.SunOS+=	--disable-epoll
+
+.include "../../mk/compiler.mk"
+
+# Fixes build on at least SunOS/i386
+# See https://github.com/varnishcache/varnish-cache/issues/1875
+.if !empty(CC_VERSION:Mgcc*) && ${MACHINE_ARCH} == "i386"
+CFLAGS+=		-fexcess-precision=standard
+.endif
+LDFLAGS+=		-lm # for ldexp
+
+INSTALL_MAKE_FLAGS+=	sysconfdir=${PREFIX}/share/examples/varnish
+
+# not signed/unsigned char safe
+BUILDLINK_TRANSFORM+=	rm:-Werror
+
+PKGCONFIG_OVERRIDE+=	varnishapi.pc.in
+
+RCD_SCRIPTS=		varnishd varnishlog varnishncsa
+
+TEST_TARGET=		check
+
+.include "../../devel/pcre/buildlink3.mk"
+.include "../../devel/libexecinfo/buildlink3.mk"
+.include "../../lang/python/application.mk"
+.include "../../lang/python/versioned_dependencies.mk"
+.include "../../mk/curses.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/varnish/Makefile.common b/varnish/Makefile.common
deleted file mode 100644
index 8860f80064..0000000000
--- a/varnish/Makefile.common
+++ /dev/null
@@ -1,86 +0,0 @@
-# $NetBSD$
-
-CATEGORIES=	www
-MASTER_SITES=	https://varnish-cache.org/_downloads/
-
-MAINTAINER?=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	https://varnish-cache.org/
-COMMENT=	High-performace HTTP accelerator
-LICENSE=	modified-bsd
-EXTRACT_SUFX=	.tgz
-
-BUILD_DEPENDS+=		${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils
-PYTHON_VERSIONED_DEPENDENCIES=	sphinx:tool
-
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config gmake
-
-BUILD_DEFS+=	VARBASE
-BUILD_DEFS+=	PKG_SYSCONFBASE
-
-CONF_FILES=		share/examples/varnish/builtin.vcl \
-			${PKG_SYSCONFDIR}/builtin.vcl
-CONF_FILES+=		share/examples/varnish/example.vcl \
-			${PKG_SYSCONFDIR}/example.vcl
-
-.include "../../mk/bsd.prefs.mk"
-
-VRNUSER?=		varnish
-VRNGROUP?=		${VRNUSER}
-STATEDIR=		${VARBASE}/db
-VRNDIR=			${STATEDIR}/${PKGBASE}
-
-OWN_DIRS+=		${VRNDIR}
-OWN_DIRS_PERMS+=	${VRNDIR} ${VRNUSER} ${VRNGROUP} 0770
-
-PKG_GROUPS+=		${VRNGROUP}
-PKG_USERS+=		${VRNUSER}:${VRNGROUP}
-PKG_HOME.${VRNUSER}=	${VRNDIR}
-PKG_SHELL.${VRNUSER}=	${SH}
-PKG_GECOS.${VRNUSER}=	Varnish daemon user
-
-PKG_SYSCONFSUBDIR=	varnish
-
-FILES_SUBST+=		VRNUSER=${VRNUSER}
-FILES_SUBST+=		VRNGROUP=${VRNGROUP}
-
-REPLACE_PYTHON+=	lib/libvcc/vmodtool.py
-REPLACE_PYTHON+=	lib/libvcc/vsctool.py
-
-CONFIGURE_ARGS+=	--localstatedir=${STATEDIR}
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE}
-CONFIGURE_ARGS+=	--with-rst2html=${PREFIX}/bin/rst2html-${PYVERSSUFFIX}
-CONFIGURE_ARGS+=	--with-rst2man=${PREFIX}/bin/rst2man-${PYVERSSUFFIX}
-CONFIGURE_ARGS+=	--with-sphinx-build=${PREFIX}/bin/sphinx-build-${PYVERSSUFFIX}
-
-# Explicitly disable epoll on illumos, provided for Linux compat only.
-CONFIGURE_ARGS.SunOS+=	--disable-epoll
-
-.include "../../mk/compiler.mk"
-
-# Fixes build on at least SunOS/i386
-# See https://github.com/varnishcache/varnish-cache/issues/1875
-.if !empty(CC_VERSION:Mgcc*) && ${MACHINE_ARCH} == "i386"
-CFLAGS+=		-fexcess-precision=standard
-.endif
-LDFLAGS+=		-lm # for ldexp
-
-INSTALL_MAKE_FLAGS+=	sysconfdir=${PREFIX}/share/examples/varnish
-
-# not signed/unsigned char safe
-BUILDLINK_TRANSFORM+=	rm:-Werror
-
-PKGCONFIG_OVERRIDE+=	varnishapi.pc.in
-
-RCD_SCRIPTS=		varnishd varnishlog varnishncsa
-
-TEST_TARGET=		check
-
-.include "../../devel/pcre/buildlink3.mk"
-.include "../../devel/libexecinfo/buildlink3.mk"
-.include "../../lang/python/application.mk"
-.include "../../lang/python/versioned_dependencies.mk"
-.include "../../mk/curses.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/readline.buildlink3.mk"