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

--- pkgsrc/www/yaws/Makefile	2015/06/12 10:52:16	1.11
+++ pkgsrc/www/yaws/Makefile	2022/10/23 13:45:57	1.24
@@ -1,55 +1,63 @@
-# $NetBSD: Makefile,v 1.11 2015/06/12 10:52:16 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2022/10/23 13:45:57 nros Exp $
 #
 
-DISTNAME=		yaws-1.97
-PKGREVISION=		3
+DISTNAME=		yaws-2.1.1
 CATEGORIES=		www
-MASTER_SITES=		http://yaws.hyber.org/download/
+MASTER_SITES=		${MASTER_SITE_GITHUB:=erlyaws/}
+GITHUB_TAG=		${DISTNAME}
 
 MAINTAINER=		bartosz.kuzma@gmail.com
 HOMEPAGE=		http://yaws.hyber.org/
 COMMENT=		High perfomance HTTP 1.1 webserver written in Erlang
 LICENSE=		modified-bsd
 
+WRKSRC=			${WRKDIR}/yaws-${DISTNAME}
+
 BUILD_DEFS+=		VARBASE
 
-USE_TOOLS+=		gmake perl pax autoconf
+USE_LIBTOOL=		yes
+USE_TOOLS+=		aclocal autoconf automake autoreconf 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}
+
+# supress generation of pdf and ps files
+CONFIGURE_ENV+=		ac_cv_prog_DVIPS=
+
+# 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
-
-post-patch:
-	${RM} ${WRKDIR}/yaws
-	${RM} -Rf ${WRKSRC}/www/.xvpics
+INSTALL_MAKE_FLAGS+=	sysconfdir=${PREFIX}/share/examples
+
+FILES_SUBST+=		PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
+
+post-extract:
+	cd ${WRKSRC} && ${CHMOD} -R g-w www
 	${RM} -Rf ${WRKSRC}/www/testdir
-	${FIND} ${WRKSRC} -name \*.orig -o -name .empty | ${XARGS} ${RM} -f
 
 pre-configure:
-	cd ${WRKSRC} && autoconf
+	cd ${WRKSRC} && autoreconf -fi
 
 post-configure:
 	${SED} -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" \
@@ -57,20 +65,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
+post-install:
+	${RM} -f ${DESTDIR}${WWWDIR}/code/Makefile*
+	${RM} -f ${DESTDIR}${WWWDIR}/shoppingcart/Makefile*
 
 .include "../../lang/erlang/buildlink3.mk"
 .include "../../mk/pam.buildlink3.mk"