CVS commit: pkgsrc/www/yaws

["Filip Hajny" <fhajny%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   fhajny
Date:           Fri Apr 13 16:12:14 UTC 2018

Modified Files:
        pkgsrc/www/yaws: Makefile PLIST distinfo
        pkgsrc/www/yaws/files: yaws.conf
        pkgsrc/www/yaws/patches: patch-ai
Added Files:
        pkgsrc/www/yaws/files/smf: manifest.xml
        pkgsrc/www/yaws/patches: patch-scripts_yaws.template

Log Message:
www/yaws: Update to 2.0.5. Add SMF support.

No changelog or release notes. Commit log available from the website:

  http://yaws.hyber.org/


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/www/yaws/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/yaws/PLIST pkgsrc/www/yaws/distinfo
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/www/yaws/files/yaws.conf
cvs rdiff -u -r0 -r1.1 pkgsrc/www/yaws/files/smf/manifest.xml
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/www/yaws/patches/patch-ai
cvs rdiff -u -r0 -r1.1 pkgsrc/www/yaws/patches/patch-scripts_yaws.template

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

Modified files:

Index: pkgsrc/www/yaws/Makefile
diff -u pkgsrc/www/yaws/Makefile:1.14 pkgsrc/www/yaws/Makefile:1.15
--- pkgsrc/www/yaws/Makefile:1.14       Sat Jul  9 06:39:15 2016
+++ pkgsrc/www/yaws/Makefile    Fri Apr 13 16:12:13 2018
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2016/07/09 06:39:15 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2018/04/13 16:12:13 fhajny Exp $
 #
 
-DISTNAME=              yaws-1.97
-PKGREVISION=           5
+DISTNAME=              yaws-2.0.5
 CATEGORIES=            www
 MASTER_SITES=          http://yaws.hyber.org/download/
 
@@ -13,51 +12,42 @@ LICENSE=            modified-bsd
 
 BUILD_DEFS+=           VARBASE
 
-USE_TOOLS+=            gmake perl pax autoconf
+USE_TOOLS+=            gmake perl tar
 GNU_CONFIGURE=         yes
-AUTOCONF_REQD=         2.50
 
-CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}/yaws
+PKG_SYSCONFSUBDIR=     yaws
+
+.include "../../mk/bsd.prefs.mk"
+
 CONFIGURE_ARGS+=       --localstatedir=${VARBASE}
 CONFIGURE_ARGS+=       --with-extrainclude=${PAMBASE}/include/security
+CONFIGURE_ARGS+=       ERLANG_INSTALL_LIB_DIR_yaws=${PREFIX}/lib/yaws
+CONFIGURE_ARGS+=       wwwdir=${WWWDIR}
+
+# Not compatible with SunOS PAM headers
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ARGS+=       --disable-pam
+.endif
 
 EGDIR=                 ${PREFIX}/share/examples/yaws
-CONF_FILES=            ${EGDIR}/yaws.conf ${PKG_SYSCONFDIR}/yaws/yaws.conf
+CONF_FILES=            ${EGDIR}/yaws.conf ${PKG_SYSCONFDIR}/yaws.conf
 RCD_SCRIPTS=           yaws
 RCD_SCRIPT_SRC.yaws=   ${WRKSRC}/scripts/netbsd/yaws.sh
 
-LIBDIR=                        ${PREFIX}/lib/yaws
 WWWDIR=                        ${PREFIX}/share/yaws/www
-INSTALLATION_DIRS=     ${EGDIR}
-INSTALLATION_DIRS+=    ${LIBDIR}/ebin ${LIBDIR}/include
-INSTALLATION_DIRS+=    ${LIBDIR}/priv ${WWWDIR}
 
 OWN_DIRS=              ${VARBASE}/log/yaws
 
 REPLACE_PYTHON=                www/cgi-bin/foo.py
-#CHECK_INTERPRETER_SKIP=       ${WWWDIR}/cgi-bin/foo.py
 CHECK_INTERPRETER_SKIP=        share/yaws/www/cgi-bin/foo.py
 
-INSTALLATION_DIRS+=    bin
-INSTALLATION_DIRS+=    ${PKGMANDIR}/man1
-INSTALLATION_DIRS+=    ${PKGMANDIR}/man5
-
-# remove after upgrading to a now()-less yaws:
-SUBST_CLASSES+=                now
-SUBST_STAGE.now=       post-patch
-SUBST_FILES.now=       */*.erl
-SUBST_SED.now=         -e 's|\([^:a-zA-Z]\)now()|\1erlang:timestamp()|g'
-SUBST_SED.now+=                -e 's|\([^:a-zA-Z]\)erlang:now()|\1erlang:timestamp()|g'
-SUBST_MESSAGE.now=     Replacing now().
-
-post-patch:
-       ${RM} ${WRKDIR}/yaws
-       ${RM} -Rf ${WRKSRC}/www/.xvpics
-       ${RM} -Rf ${WRKSRC}/www/testdir
-       ${FIND} ${WRKSRC} -name \*.orig -o -name .empty | ${XARGS} ${RM} -f
+INSTALL_MAKE_FLAGS+=   sysconfdir=${PREFIX}/share/examples
+
+FILES_SUBST+=          PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
 
-pre-configure:
-       cd ${WRKSRC} && autoconf
+post-extract:
+       cd ${WRKSRC} && ${CHMOD} -R g-w www
+       ${RM} -Rf ${WRKSRC}/www/testdir
 
 post-configure:
        ${SED} -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" \
@@ -65,22 +55,9 @@ post-configure:
                -e "s|@VARBASE@|${VARBASE}|g" \
                ${FILESDIR}/yaws.conf > ${WRKDIR}/yaws.conf
 
-do-install:
-       ${INSTALL_SCRIPT} ${WRKSRC}/bin/yaws ${DESTDIR}${PREFIX}/bin
-       ${INSTALL_DATA} ${WRKDIR}/yaws.conf ${DESTDIR}${EGDIR}
-
-       ${INSTALL_DATA} ${WRKSRC}/ebin/* ${DESTDIR}${LIBDIR}/ebin
-       ${INSTALL_DATA} ${WRKSRC}/include/* ${DESTDIR}${LIBDIR}/include
-       cd ${WRKSRC}/priv && pax -rw . ${DESTDIR}${LIBDIR}/priv
-
-       cd ${WRKSRC}/www && pax -rw . ${DESTDIR}${WWWDIR}
-
-       ${INSTALL_MAN} ${WRKSRC}/man/yaws.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-       ${INSTALL_MAN} ${WRKSRC}/man/*.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
-
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PKG_SYSCONFDIR}/yaws
-
-BUILDLINK_API_DEPENDS.erlang+= erlang>=18.0
+post-install:
+       ${RM} -f ${DESTDIR}${WWWDIR}/code/Makefile*
+       ${RM} -f ${DESTDIR}${WWWDIR}/shoppingcart/Makefile*
 
 .include "../../lang/erlang/buildlink3.mk"
 .include "../../mk/pam.buildlink3.mk"

Index: pkgsrc/www/yaws/PLIST
diff -u pkgsrc/www/yaws/PLIST:1.4 pkgsrc/www/yaws/PLIST:1.5
--- pkgsrc/www/yaws/PLIST:1.4   Tue Mar 11 14:05:18 2014
+++ pkgsrc/www/yaws/PLIST       Fri Apr 13 16:12:13 2018
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.4 2014/03/11 14:05:18 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.5 2018/04/13 16:12:13 fhajny Exp $
 bin/yaws
+lib/pkgconfig/yaws.pc
 lib/yaws/ebin/haxe.beam
-lib/yaws/ebin/json.beam
 lib/yaws/ebin/json2.beam
 lib/yaws/ebin/jsonrpc.beam
 lib/yaws/ebin/mime_type_c.beam
@@ -20,6 +20,7 @@ lib/yaws/ebin/yaws_config.beam
 lib/yaws/ebin/yaws_ctl.beam
 lib/yaws/ebin/yaws_debug.beam
 lib/yaws/ebin/yaws_dime.beam
+lib/yaws/ebin/yaws_dynopts.beam
 lib/yaws/ebin/yaws_exhtml.beam
 lib/yaws/ebin/yaws_generated.beam
 lib/yaws/ebin/yaws_html.beam
@@ -50,8 +51,16 @@ lib/yaws/ebin/yaws_ticker.beam
 lib/yaws/ebin/yaws_trace.beam
 lib/yaws/ebin/yaws_vdir.beam
 lib/yaws/ebin/yaws_websockets.beam
+lib/yaws/ebin/yaws_ws_sup.beam
 lib/yaws/ebin/yaws_xmlrpc.beam
 lib/yaws/ebin/yaws_zlib.beam
+lib/yaws/examples/ebin/advanced_echo_callback.beam
+lib/yaws/examples/ebin/authmod_gssapi.beam
+lib/yaws/examples/ebin/basic_echo_callback.beam
+lib/yaws/examples/ebin/basic_echo_callback_extended.beam
+lib/yaws/examples/ebin/myappmod.beam
+lib/yaws/examples/ebin/server_sent_events.beam
+lib/yaws/examples/ebin/shopcart.beam
 lib/yaws/include/soap-envelope.hrl
 lib/yaws/include/soap.hrl
 lib/yaws/include/wsdl11soap12.hrl
@@ -60,12 +69,8 @@ lib/yaws/include/yaws_api.hrl
 lib/yaws/include/yaws_dav.hrl
 lib/yaws/include/yaws_lock.hrl
 lib/yaws/include/yaws_soap.hrl
-lib/yaws/priv/charset.def
-lib/yaws/priv/charset.def.in
 lib/yaws/priv/envelope.xsd
-lib/yaws/priv/epam
-lib/yaws/priv/lib/.gitignore
-lib/yaws/priv/lib/setuid_drv.so
+lib/yaws/priv/lib/setuid_drv.la
 lib/yaws/priv/mime.types
 lib/yaws/priv/soap-envelope.xsd
 lib/yaws/priv/soap.xsd
@@ -76,22 +81,25 @@ man/man1/yaws.1
 man/man5/yaws.conf.5
 man/man5/yaws_api.5
 man/man5/yaws_soap_lib.5
+share/examples/yaws/dhparams.pem
+share/examples/yaws/yaws-cert.pem
+share/examples/yaws/yaws-key.pem
 share/examples/yaws/yaws.conf
+share/examples/yaws/yaws.conf.template
 share/yaws/www/END
 share/yaws/www/END2
 share/yaws/www/HEAD
-share/yaws/www/Makefile
 share/yaws/www/TAB.inc
 share/yaws/www/api.yaws
 share/yaws/www/appmods.yaws
 share/yaws/www/arg.yaws
 share/yaws/www/arg2.yaws
+share/yaws/www/articles.yaws
 share/yaws/www/bindings.yaws
 share/yaws/www/cgi-bin/foo.py
 share/yaws/www/cgi.yaws
 share/yaws/www/code.yaws
-share/yaws/www/code/Makefile
-share/yaws/www/code/myappmod.beam
+share/yaws/www/code/.deps/myappmod.Pbeam
 share/yaws/www/code/myappmod.erl
 share/yaws/www/compile_layout.dia
 share/yaws/www/compile_layout.png
@@ -248,6 +256,7 @@ share/yaws/www/process_tree.png
 share/yaws/www/query.yaws
 share/yaws/www/readcookie.yaws
 share/yaws/www/readpcookie.yaws
+share/yaws/www/rebar_release.yaws
 share/yaws/www/redirect.yaws
 share/yaws/www/redirect2.yaws
 share/yaws/www/redirect3.yaws
@@ -258,13 +267,12 @@ share/yaws/www/session.yaws
 share/yaws/www/session1.yaws
 share/yaws/www/setcookie.yaws
 share/yaws/www/setpcookie.yaws
-share/yaws/www/shoppingcart/Makefile
+share/yaws/www/shoppingcart/.deps/shopcart.Pbeam
 share/yaws/www/shoppingcart/buy.yaws
 share/yaws/www/shoppingcart/index.yaws
-share/yaws/www/shoppingcart/junk.jpg
+share/yaws/www/shoppingcart/junk.png
 share/yaws/www/shoppingcart/loginpost.yaws
 share/yaws/www/shoppingcart/logout.yaws
-share/yaws/www/shoppingcart/shopcart.beam
 share/yaws/www/shoppingcart/shopcart.erl
 share/yaws/www/shoppingcart/shopcart_form.yaws
 share/yaws/www/shoppingcart/source.html
@@ -301,4 +309,4 @@ share/yaws/www/yaws.eps
 share/yaws/www/ybed.erl
 share/yaws/www/ybed_sup.erl
 share/yaws/www/yman.yaws
-@pkgdir etc/yaws
+@pkgdir lib/yaws/examples/include
Index: pkgsrc/www/yaws/distinfo
diff -u pkgsrc/www/yaws/distinfo:1.4 pkgsrc/www/yaws/distinfo:1.5
--- pkgsrc/www/yaws/distinfo:1.4        Wed Nov  4 02:47:42 2015
+++ pkgsrc/www/yaws/distinfo    Fri Apr 13 16:12:13 2018
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.4 2015/11/04 02:47:42 agc Exp $
+$NetBSD: distinfo,v 1.5 2018/04/13 16:12:13 fhajny Exp $
 
-SHA1 (yaws-1.97.tar.gz) = 4b8b811c40e6408ba03d25d31fa004483aede2b2
-RMD160 (yaws-1.97.tar.gz) = 21c6138cf982b67f608ef8fd7228d17c754fe959
-SHA512 (yaws-1.97.tar.gz) = b91fa598ea91a190e341dda35f7bc0ee468454fd5eb6bf7cbae722c59816e6b6da81a08aea5f2f6fa49fafaeccd42c85025ed21be9f208c4e2b73b624586db12
-Size (yaws-1.97.tar.gz) = 1242089 bytes
-SHA1 (patch-ai) = fff8d3007722922d1b40ab579817626616740be6
+SHA1 (yaws-2.0.5.tar.gz) = ab9ad5cc79a179d303cdae12d37abcb703ecef1a
+RMD160 (yaws-2.0.5.tar.gz) = bcaa6d9230fbcf6b83dfdedbfad5c878c15c10b0
+SHA512 (yaws-2.0.5.tar.gz) = ef800751765673cecef6d095a99aa8e632a3ea980382d83b4afb33e42927ff768520bb2933210d48085d191a0afcae3817bccfbe1db5d0ec515f71e335c8f2e5
+Size (yaws-2.0.5.tar.gz) = 1660693 bytes
+SHA1 (patch-ai) = 097339fc81ab7421f90f337b11094b655e7a9bee
+SHA1 (patch-scripts_yaws.template) = a7941269c33a345916b05845c11312ca3d47c066

Index: pkgsrc/www/yaws/files/yaws.conf
diff -u pkgsrc/www/yaws/files/yaws.conf:1.1.1.1 pkgsrc/www/yaws/files/yaws.conf:1.2
--- pkgsrc/www/yaws/files/yaws.conf:1.1.1.1     Fri Aug 26 13:46:43 2011
+++ pkgsrc/www/yaws/files/yaws.conf     Fri Apr 13 16:12:13 2018
@@ -121,7 +121,7 @@ use_fdsrv = false
 #      listen = 0.0.0.0
 #      dir_listings = true
 #      <ssl>
-#              keyfile = @PKG_SYSCONFDIR@/yaws/yaws-key.pem
-#              certfile = @PKG_SYSCONFDIR@/yaws/yaws-cert.pem
+#              keyfile = @PKG_SYSCONFDIR@/yaws-key.pem
+#              certfile = @PKG_SYSCONFDIR@/yaws-cert.pem
 #      </ssl>
 #</server>

Index: pkgsrc/www/yaws/patches/patch-ai
diff -u pkgsrc/www/yaws/patches/patch-ai:1.1.1.1 pkgsrc/www/yaws/patches/patch-ai:1.2
--- pkgsrc/www/yaws/patches/patch-ai:1.1.1.1    Fri Aug 26 13:46:43 2011
+++ pkgsrc/www/yaws/patches/patch-ai    Fri Apr 13 16:12:13 2018
@@ -1,22 +1,32 @@
-$NetBSD: patch-ai,v 1.1.1.1 2011/08/26 13:46:43 cheusov Exp $
+$NetBSD: patch-ai,v 1.2 2018/04/13 16:12:13 fhajny Exp $
 
 Replace '%var%' with '@VAR@'
---- scripts/netbsd/yaws.sh.orig        2009-07-05 22:20:13.000000000 +0400
-+++ scripts/netbsd/yaws.sh     2009-10-01 03:53:05.000000000 +0400
+
+--- scripts/netbsd/yaws.sh.orig        2018-04-10 10:32:09.000000000 +0000
++++ scripts/netbsd/yaws.sh
 @@ -1,4 +1,4 @@
 -#!/bin/sh
 +#!@RCD_SCRIPTS_SHELL@
  #
  
  #
-@@ -19,8 +19,8 @@
+@@ -18,8 +18,8 @@ fi
  
  name="yaws"
  rcvar=$name
--yaws_command="%prefix%bin/${name}"
--required_files="%etcdir%yaws/yaws.conf"
+-yaws_command="%bindir%/${name}"
+-required_files="%etcdir%/yaws/yaws.conf"
 +yaws_command="@PREFIX@/bin/${name}"
-+required_files="@PKG_SYSCONFDIR@/yaws/yaws.conf"
++required_files="@PKG_SYSCONFDIR@/yaws.conf"
  
  start_cmd="yaws_start"
  stop_cmd="yaws_stop"
+@@ -35,7 +35,7 @@ fi
+ 
+ yaws_start() {
+     echo -n "Starting Yaws: "
+-    $yaws_command $yaws_id $yaws_flags --daemon --conf %etcdir%/yaws/yaws.conf >/dev/null
++    $yaws_command $yaws_id $yaws_flags --daemon --conf @PKG_SYSCONFDIR@/yaws.conf >/dev/null
+     $yaws_command $yaws_id --wait-started=10 >/dev/null
+     RETVAL=$?
+     if [ $RETVAL = 0 ]; then

Added files:

Index: pkgsrc/www/yaws/files/smf/manifest.xml
diff -u /dev/null pkgsrc/www/yaws/files/smf/manifest.xml:1.1
--- /dev/null   Fri Apr 13 16:12:14 2018
+++ pkgsrc/www/yaws/files/smf/manifest.xml      Fri Apr 13 16:12:13 2018
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
+<service_bundle type="manifest" name="export">
+  <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
+    <create_default_instance enabled="false" />
+    <single_instance />
+    <dependency name='network' grouping='require_all' restart_on='error' type='service'>
+      <service_fmri value='svc:/milestone/network:default' />
+    </dependency>
+    <dependency name='filesystem-local' grouping='require_all' restart_on='none' type='service'>
+      <service_fmri value='svc:/system/filesystem/local:default' />
+    </dependency>
+    <exec_method type="method" name="start" exec="@PREFIX@/bin/yaws --daemon --conf %{config_file}" timeout_seconds="60" />
+    <exec_method type="method" name="stop" exec=":kill" timeout_seconds="60" />
+    <property_group name="startd" type="framework">
+      <propval name="duration" type="astring" value="contract" />
+      <propval name="ignore_error" type="astring" value="core,signal" />
+    </property_group>
+    <property_group name="application" type="application">
+      <propval name="config_file" type="astring" value="@PKG_SYSCONFDIR@/yaws.conf" />
+    </property_group>
+    <template>
+      <common_name>
+        <loctext xml:lang="C">Yaws webserver</loctext>
+      </common_name>
+    </template>
+  </service>
+</service_bundle>

Index: pkgsrc/www/yaws/patches/patch-scripts_yaws.template
diff -u /dev/null pkgsrc/www/yaws/patches/patch-scripts_yaws.template:1.1
--- /dev/null   Fri Apr 13 16:12:14 2018
+++ pkgsrc/www/yaws/patches/patch-scripts_yaws.template Fri Apr 13 16:12:13 2018
@@ -0,0 +1,18 @@
+$NetBSD: patch-scripts_yaws.template,v 1.1 2018/04/13 16:12:13 fhajny Exp $
+
+Portability.
+
+--- scripts/yaws.template.orig 2018-04-10 10:32:09.000000000 +0000
++++ scripts/yaws.template
+@@ -399,9 +399,9 @@ while [ $# -gt 0 ]
+           if [ -z "$1" ]; then
+               echo error: missing encoding argument
+               help
+-          elif [ "$1" == "latin1" ]; then
++          elif [ "$1" = "latin1" ]; then
+               encoding="latin1";
+-          elif [ "$1" == "unicode" ]; then
++          elif [ "$1" = "unicode" ]; then
+               encoding="unicode";
+           else
+               echo error: unsupported encoding argument