Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/pkgsrc/www/cherokee/Attic/Makefile,v rcsdiff: /ftp/cvs/cvsroot/pkgsrc/www/cherokee/Attic/Makefile,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.13.4.1 retrieving revision 1.35 diff -u -p -r1.13.4.1 -r1.35 --- pkgsrc/www/cherokee/Attic/Makefile 2010/07/04 07:28:52 1.13.4.1 +++ pkgsrc/www/cherokee/Attic/Makefile 2017/01/01 14:44:03 1.35 @@ -1,85 +1,52 @@ -# $NetBSD: Makefile,v 1.13.4.1 2010/07/04 07:28:52 agc Exp $ -# +# $NetBSD: Makefile,v 1.35 2017/01/01 14:44:03 wiz Exp $ -DISTNAME= cherokee-0.5.3 -PKGREVISION= 5 +DISTNAME= cherokee-1.2.101 +PKGREVISION= 10 CATEGORIES= www -MASTER_SITES= http://www.cherokee-project.com/download/0.5/0.5.3/ +MASTER_SITES= http://www.cherokee-project.com/download/1.2/${PKGVERSION_NOREV}/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.cherokee-project.com/ COMMENT= Flexible and fast web server - -PKG_DESTDIR_SUPPORT= user-destdir +LICENSE= gnu-gpl-v2 GNU_CONFIGURE= yes USE_LIBTOOL= yes -USE_TOOLS+= bison flex +USE_TOOLS+= gmake msgfmt -CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} +CONFIGURE_ARGS+= --localstatedir=${VARBASE} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --with-wwwroot=${PREFIX}/share/cherokee PKGCONFIG_OVERRIDE= cherokee.pc.in -INSTALL_MAKE_FLAGS+= sysconfdir=${EGDIR:Q} +INSTALL_MAKE_FLAGS+= sysconfdir=${EGDIR} OWN_DIRS= ${PKG_SYSCONFDIR}/cherokee -OWN_DIRS+= ${PKG_SYSCONFDIR}/cherokee/mods-enabled -OWN_DIRS+= ${PKG_SYSCONFDIR}/cherokee/sites-enabled OWN_DIRS+= ${VARBASE}/log OWN_DIRS+= ${VARBASE}/run EGDIR= ${PREFIX}/share/examples/cherokee -MESSAGE_SUBST+= EGDIR=${EGDIR:Q} -CONF_FILES= -.for f in advanced.conf \ - cherokee.conf \ - icons.conf \ - mime.compression.types \ - mime.types -CONF_FILES+= ${EGDIR}/cherokee/${f} ${PKG_SYSCONFDIR}/cherokee/${f} -.endfor -CONF_FILES+= ${EGDIR}/cherokee/sites-available/default \ - ${PKG_SYSCONFDIR}/cherokee/sites-enabled/default +MESSAGE_SUBST+= EGDIR=${EGDIR} +CONF_FILES+= ${EGDIR}/cherokee/cherokee.conf \ + ${PKG_SYSCONFDIR}/cherokee/cherokee.conf RCD_SCRIPTS= cherokee -SUBST_CLASSES+= varbase -SUBST_STAGE.varbase= pre-configure -SUBST_MESSAGE.varbase= Fixing references to local state directory. -SUBST_SED.varbase= -e 's|/var/|${VARBASE}/|g' -SUBST_FILES.varbase= cherokee.conf.sample.pre -SUBST_FILES.varbase+= http-cherokee.xml -SUBST_FILES.varbase+= cherokee-logrotate.1 -SUBST_FILES.varbase+= sites-default.sample.pre - -PKG_OPTIONS_VAR= PKG_OPTIONS.cherokee -PKG_OPTIONS_OPTIONAL_GROUPS= ssl -PKG_OPTIONS_GROUP.ssl= gnutls openssl -PKG_SUGGESTED_OPTIONS+= inet6 gnutls -PKG_SUPPORTED_OPTIONS+= inet6 -.include "../../mk/bsd.options.mk" - -.if !empty(PKG_OPTIONS:Minet6) -CONFIGURE_ARGS+= --enable-ipv6 -.else -CONFIGURE_ARGS+= --disable-ipv6 -.endif - -.if !empty(PKG_OPTIONS:Mgnutls) -CONFIGURE_ARGS+= --enable-tls=gnutls -.include "../../security/gnutls/buildlink3.mk" -.include "../../security/gnutls/libgnutls-config.mk" -CONF_FILES+= ${EGDIR}/cherokee/mods-available/ssl \ - ${PKG_SYSCONFDIR}/cherokee/mods-enabled/ssl -.elif !empty(PKG_OPTIONS:Mopenssl) -CONFIGURE_ARGS+= --enable-tls=openssl -.include "../../security/openssl/buildlink3.mk" -CONF_FILES+= ${EGDIR}/cherokee/mods-available/ssl \ - ${PKG_SYSCONFDIR}/cherokee/mods-enabled/ssl -.else -CONFIGURE_ARGS+= --disable-tls -.endif - INSTALLATION_DIRS+= ${EGDIR}/pam.d +PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # not yet ported as of 1.2.101 + +.include "options.mk" + +BUILD_DEFS+= VARBASE + +REPLACE_PYTHON= admin/CTK/CTK-run.pre \ + admin/server.py admin/upgrade_config.py \ + cherokee/cherokee-admin-launcher \ + cherokee/cherokee-tweak + +# Needs installation: +TEST_TARGET= test + +.include "../../devel/pcre/buildlink3.mk" +.include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk"