Thu Apr 23 09:31:34 2015 UTC ()
Explicitly disable epoll on illumos, provided for Linux compat only.


(jperkin)
diff -r1.24 -r1.25 pkgsrc/www/varnish/Makefile
cvs diff -r1.24 -r1.25 pkgsrc/www/varnish/Makefile (switch to unified diff)

--- pkgsrc/www/varnish/Makefile 2015/03/09 00:47:05 1.24
+++ pkgsrc/www/varnish/Makefile 2015/04/23 09:31:34 1.25
@@ -1,66 +1,68 @@ @@ -1,66 +1,68 @@
1# $NetBSD: Makefile,v 1.24 2015/03/09 00:47:05 mspo Exp $ 1# $NetBSD: Makefile,v 1.25 2015/04/23 09:31:34 jperkin Exp $
2# 2#
3 3
4DISTNAME= varnish-3.0.6 4DISTNAME= varnish-3.0.6
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= www 6CATEGORIES= www
7MASTER_SITES= http://repo.varnish-cache.org/source/ 7MASTER_SITES= http://repo.varnish-cache.org/source/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://varnish-cache.org/ 10HOMEPAGE= http://varnish-cache.org/
11COMMENT= High-performace HTTP accelerator 11COMMENT= High-performace HTTP accelerator
12LICENSE= modified-bsd 12LICENSE= modified-bsd
13 13
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
15USE_LIBTOOL= yes 15USE_LIBTOOL= yes
16USE_TOOLS+= pkg-config gmake 16USE_TOOLS+= pkg-config gmake
17BUILD_DEFS+= VARBASE 17BUILD_DEFS+= VARBASE
18 18
19EGDIR= ${PREFIX}/share/examples/varnish 19EGDIR= ${PREFIX}/share/examples/varnish
20CONF_FILES= ${EGDIR}/default.vcl ${PKG_SYSCONFDIR}/default.vcl 20CONF_FILES= ${EGDIR}/default.vcl ${PKG_SYSCONFDIR}/default.vcl
21 21
22VRNUSER?= varnish 22VRNUSER?= varnish
23VRNGROUP?= ${VRNUSER} 23VRNGROUP?= ${VRNUSER}
24STATEDIR= ${VARBASE}/db 24STATEDIR= ${VARBASE}/db
25VRNDIR= ${STATEDIR}/${PKGBASE} 25VRNDIR= ${STATEDIR}/${PKGBASE}
26 26
27CONFIGURE_ARGS+= --localstatedir=${STATEDIR} 27CONFIGURE_ARGS+= --localstatedir=${STATEDIR}
28CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 28CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
29OWN_DIRS+= ${VRNDIR} 29OWN_DIRS+= ${VRNDIR}
30OWN_DIRS_PERMS+= ${VRNDIR} ${VRNUSER} ${VRNGROUP} 0770 30OWN_DIRS_PERMS+= ${VRNDIR} ${VRNUSER} ${VRNGROUP} 0770
31 31
32PKG_GROUPS+= ${VRNGROUP} 32PKG_GROUPS+= ${VRNGROUP}
33PKG_USERS+= ${VRNUSER}:${VRNGROUP} 33PKG_USERS+= ${VRNUSER}:${VRNGROUP}
34PKG_HOME.${VRNUSER}= ${VRNDIR} 34PKG_HOME.${VRNUSER}= ${VRNDIR}
35PKG_SHELL.${VRNUSER}= ${SH} 35PKG_SHELL.${VRNUSER}= ${SH}
36PKG_GECOS.${VRNUSER}= Varnish daemon user 36PKG_GECOS.${VRNUSER}= Varnish daemon user
37 37
38FILES_SUBST+= VRNUSER=${VRNUSER} 38FILES_SUBST+= VRNUSER=${VRNUSER}
39FILES_SUBST+= VRNGROUP=${VRNGROUP} 39FILES_SUBST+= VRNGROUP=${VRNGROUP}
40 40
41RCD_SCRIPTS= varnishd varnishlog varnishncsa 41RCD_SCRIPTS= varnishd varnishlog varnishncsa
42PYTHON_FOR_BUILD_ONLY= yes 42PYTHON_FOR_BUILD_ONLY= yes
43 43
44REPLACE_PYTHON+= lib/libvcl/generate.py 44REPLACE_PYTHON+= lib/libvcl/generate.py
45REPLACE_PYTHON+= lib/libvmod_std/vmod.py 45REPLACE_PYTHON+= lib/libvmod_std/vmod.py
46 46
47.include "../../lang/python/pyversion.mk" 47.include "../../lang/python/pyversion.mk"
48BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils 48BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils
49CONFIGURE_ARGS+= --with-rst2man=${PREFIX}/bin/rst2man-${PYVERSSUFFIX}.py 49CONFIGURE_ARGS+= --with-rst2man=${PREFIX}/bin/rst2man-${PYVERSSUFFIX}.py
50CONFIGURE_ARGS+= --with-rst2html=${PREFIX}/bin/rst2html-${PYVERSSUFFIX}.py 50CONFIGURE_ARGS+= --with-rst2html=${PREFIX}/bin/rst2html-${PYVERSSUFFIX}.py
51 51
52.include "../../devel/pcre/buildlink3.mk" 52.include "../../devel/pcre/buildlink3.mk"
53.include "../../mk/bsd.prefs.mk" 53.include "../../mk/bsd.prefs.mk"
54 54
55.if ${OPSYS} == "SunOS" 55.if ${OPSYS} == "SunOS"
 56# Explicitly disable epoll on illumos, provided for Linux compat only.
 57CONFIGURE_ENV+= ac_cv_func_epoll_ctl=no
56. if ${PKGSRC_COMPILER} == "sunpro" 58. if ${PKGSRC_COMPILER} == "sunpro"
57CONFIGURE_ENV+= VCC_CC="cc ${_COMPILER_ABI_FLAG.${ABI}} -Kpic -G -o %o %s" 59CONFIGURE_ENV+= VCC_CC="cc ${_COMPILER_ABI_FLAG.${ABI}} -Kpic -G -o %o %s"
58. else 60. else
59CONFIGURE_ENV+= VCC_CC="gcc ${_COMPILER_ABI_FLAG.${ABI}} -fpic -shared -o %o %s" 61CONFIGURE_ENV+= VCC_CC="gcc ${_COMPILER_ABI_FLAG.${ABI}} -fpic -shared -o %o %s"
60. endif 62. endif
61.endif 63.endif
62 64
63.include "../../mk/curses.buildlink3.mk" 65.include "../../mk/curses.buildlink3.mk"
64.include "../../mk/pthread.buildlink3.mk" 66.include "../../mk/pthread.buildlink3.mk"
65.include "../../mk/readline.buildlink3.mk" 67.include "../../mk/readline.buildlink3.mk"
66.include "../../mk/bsd.pkg.mk" 68.include "../../mk/bsd.pkg.mk"