pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

hiawatha: remove, www/hiawatha is newer

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Thu Apr 24 10:59:17 2025 +0200
Changeset:	e8c97a6db995633c556632624962015e201318e1

Modified Files:
	Makefile
Removed Files:
	hiawatha/COMMIT_MSG
	hiawatha/DESCR
	hiawatha/Makefile
	hiawatha/PLIST
	hiawatha/TODO
	hiawatha/distinfo
	hiawatha/files/hiawatha.sh
	hiawatha/options.mk

Log Message:
hiawatha: remove, www/hiawatha is newer

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

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

diffstat:
 Makefile                   |   3 +-
 hiawatha/COMMIT_MSG        |   6 ---
 hiawatha/DESCR             |   4 --
 hiawatha/Makefile          |  71 -------------------------
 hiawatha/PLIST             | 130 ---------------------------------------------
 hiawatha/TODO              |   1 -
 hiawatha/distinfo          |   5 --
 hiawatha/files/hiawatha.sh |  39 --------------
 hiawatha/options.mk        |  18 -------
 9 files changed, 2 insertions(+), 275 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index 33e60a78ab..85a09495f2 100644
--- a/Makefile
+++ b/Makefile
@@ -630,6 +630,7 @@ SUBDIR+=	cultivation
 SUBDIR+=	cup
 SUBDIR+=	cups-browsed
 SUBDIR+=	cups-filters
+SUBDIR+=	curitz
 SUBDIR+=	cut-and-run
 SUBDIR+=	cvc3
 SUBDIR+=	cvs-syncmail
@@ -1521,7 +1522,6 @@ SUBDIR+=	herwig
 SUBDIR+=	hex
 SUBDIR+=	hey
 SUBDIR+=	hgsubversion
-SUBDIR+=	hiawatha
 SUBDIR+=	higan
 SUBDIR+=	higgsbounds
 SUBDIR+=	hijra
@@ -4978,6 +4978,7 @@ SUBDIR+=	py-zbar
 SUBDIR+=	py-zeitgeist
 SUBDIR+=	py-zenity
 SUBDIR+=	py-zict
+SUBDIR+=	py-zinolib
 SUBDIR+=	py-zlmdb
 SUBDIR+=	py-zmqrpc
 SUBDIR+=	py27-libusb1
diff --git a/hiawatha/COMMIT_MSG b/hiawatha/COMMIT_MSG
deleted file mode 100644
index c428dfde34..0000000000
--- a/hiawatha/COMMIT_MSG
+++ /dev/null
@@ -1,6 +0,0 @@
-www/hiawatha: update to 11.5
-
-Hiawatha is an advanced and secure webserver for Unix, written with
-being secure as its main goal. Hiawatha has many security features
-that no other web server has. Besides being very secure, it's also
-a very fast. It can be used for with CGI.
diff --git a/hiawatha/DESCR b/hiawatha/DESCR
deleted file mode 100644
index 47ec9311ad..0000000000
--- a/hiawatha/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Hiawatha is an advanced and secure webserver for Unix, written with
-being secure as its main goal. Hiawatha has many security features
-that no other web server has. Besides being very secure, it's also
-a very fast. It can be used for with CGI.
diff --git a/hiawatha/Makefile b/hiawatha/Makefile
deleted file mode 100644
index 9776f8640f..0000000000
--- a/hiawatha/Makefile
+++ /dev/null
@@ -1,71 +0,0 @@
-# $NetBSD$
-
-DISTNAME=	hiawatha-11.5
-CATEGORIES=	www
-MASTER_SITES=	https://www.hiawatha-webserver.org/files/
-
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	https://www.hiawatha-webserver.org/files/
-COMMENT=	Advanced and secure webserver for Unix
-LICENSE=	gnu-gpl-v2
-
-
-USE_CMAKE=	yes
-
-CMAKE_CONFIGURE_ARGS+=	-DUSE_SHARED_MBEDTLS_LIBRARY=OFF
-CMAKE_CONFIGURE_ARGS+=	-DUSE_STATIC_MBEDTLS_LIBRARY=ON
-CMAKE_CONFIGURE_ARGS+=	-DWEBROOT_DIR="${PREFIX}/var/hiawatha"
-CMAKE_CONFIGURE_ARGS+=	-DWORK_DIR="${PREFIX}/var/db/hiawatha"
-CMAKE_CONFIGURE_ARGS+=	-DCONFIG_DIR="${PREFIX}/etc/hiawatha"
-CMAKE_CONFIGURE_ARGS+=	-DLOG_DIR="${PREFIX}/var/log/hiawatha"
-CMAKE_CONFIGURE_ARGS+=	-DCMAKE_INSTALL_MANDIR="${PREFIX}/man"
-CMAKE_CONFIGURE_ARGS+=	-DENABLE_XSLT=ON
-CMAKE_CONFIGURE_ARGS+=	-DPID_DIR="${PREFIX}/var/run"
-
-.include "options.mk"
-
-LDFLAGS+=	"-L${WRKDIR}/hiawatha/mbedtls/library"
-
-REPLACE_PHP+=	extra/letsencrypt/lefh.in
-
-# TODO: having issues requiring PHP
-CHECK_INTERPRETER_SKIP+=	sbin/lefh
-
-EGDIR=	${PREFIX}/share/examples/hiawatha
-ETCDIR=	${PKG_SYSCONFDIR}/hiawatha
-FILESDIR=	${PKGDIR}/../../wip/hiawatha/files
-
-CONF_FILES+=	${EGDIR}/error.xslt ${ETCDIR}/error.xslt
-CONF_FILES+=	${EGDIR}/hiawatha.conf ${ETCDIR}/hiawatha.conf
-CONF_FILES+=	${EGDIR}/index.xslt ${ETCDIR}/index.xslt
-CONF_FILES+=	${EGDIR}/mimetype.conf ${ETCDIR}/mimetype.conf
-CONF_FILES+=	${EGDIR}/cgi-wrapper.conf ${ETCDIR}/cgi-wrapper.conf
-
-INSTALLATION_DIRS+=	${EGDIR} ${RCDIR}
-
-RCD_SCRIPTS=	hiawatha
-
-HIAWATHA_USER?=		hiawatha
-HIAWATHA_GROUP?=	hiawatha
-
-PKG_USERS_VARS+=	HIAWATHA_USER
-PKG_GROUPS_VARS+=	HIAWATHA_GROUP
-PKG_GROUPS=		${HIAWATHA_GROUP}
-PKG_USERS=		${HIAWATHA_USER}:${HIAWATHA_GROUP}
-
-PKG_GECOS.${HIAWATHA_USER}=	HIAWATHA web server user
-PKG_HOME.${HIAWATHA_USER}=	${HIAWATHA_DATADIR}
-PKG_SHELL.${HIAWATHA_USER}=	${NOLOGIN}
-
-post-install:
-	${MV} ${DESTDIR}${ETCDIR}/hiawatha.conf ${DESTDIR}${EGDIR}
-	${MV} ${DESTDIR}${ETCDIR}/mimetype.conf ${DESTDIR}${EGDIR}
-	${MV} ${DESTDIR}${ETCDIR}/cgi-wrapper.conf ${DESTDIR}${EGDIR}
-	${MV} ${DESTDIR}${ETCDIR}/error.xslt ${DESTDIR}${EGDIR}
-	${MV} ${DESTDIR}${ETCDIR}/index.xslt ${DESTDIR}${EGDIR}
-
-.include "../../devel/cmake/build.mk"
-.include "../../lang/php/replace.mk"
-.include "../../textproc/libxslt/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/hiawatha/PLIST b/hiawatha/PLIST
deleted file mode 100644
index afe46371b8..0000000000
--- a/hiawatha/PLIST
+++ /dev/null
@@ -1,130 +0,0 @@
-@comment $NetBSD$
-bin/ssi-cgi
-include/mbedtls/aes.h
-include/mbedtls/aria.h
-include/mbedtls/asn1.h
-include/mbedtls/asn1write.h
-include/mbedtls/base64.h
-include/mbedtls/bignum.h
-include/mbedtls/build_info.h
-include/mbedtls/camellia.h
-include/mbedtls/ccm.h
-include/mbedtls/chacha20.h
-include/mbedtls/chachapoly.h
-include/mbedtls/check_config.h
-include/mbedtls/cipher.h
-include/mbedtls/cmac.h
-include/mbedtls/compat-2.x.h
-include/mbedtls/config_adjust_legacy_crypto.h
-include/mbedtls/config_adjust_legacy_from_psa.h
-include/mbedtls/config_adjust_psa_from_legacy.h
-include/mbedtls/config_adjust_psa_superset_legacy.h
-include/mbedtls/config_adjust_ssl.h
-include/mbedtls/config_adjust_x509.h
-include/mbedtls/config_psa.h
-include/mbedtls/constant_time.h
-include/mbedtls/ctr_drbg.h
-include/mbedtls/debug.h
-include/mbedtls/des.h
-include/mbedtls/dhm.h
-include/mbedtls/ecdh.h
-include/mbedtls/ecdsa.h
-include/mbedtls/ecjpake.h
-include/mbedtls/ecp.h
-include/mbedtls/entropy.h
-include/mbedtls/error.h
-include/mbedtls/gcm.h
-include/mbedtls/hkdf.h
-include/mbedtls/hmac_drbg.h
-include/mbedtls/lms.h
-include/mbedtls/mbedtls_config.h
-include/mbedtls/md.h
-include/mbedtls/md5.h
-include/mbedtls/memory_buffer_alloc.h
-include/mbedtls/net_sockets.h
-include/mbedtls/nist_kw.h
-include/mbedtls/oid.h
-include/mbedtls/pem.h
-include/mbedtls/pk.h
-include/mbedtls/pkcs12.h
-include/mbedtls/pkcs5.h
-include/mbedtls/pkcs7.h
-include/mbedtls/platform.h
-include/mbedtls/platform_time.h
-include/mbedtls/platform_util.h
-include/mbedtls/poly1305.h
-include/mbedtls/private_access.h
-include/mbedtls/psa_util.h
-include/mbedtls/ripemd160.h
-include/mbedtls/rsa.h
-include/mbedtls/sha1.h
-include/mbedtls/sha256.h
-include/mbedtls/sha3.h
-include/mbedtls/sha512.h
-include/mbedtls/ssl.h
-include/mbedtls/ssl_cache.h
-include/mbedtls/ssl_ciphersuites.h
-include/mbedtls/ssl_cookie.h
-include/mbedtls/ssl_ticket.h
-include/mbedtls/threading.h
-include/mbedtls/timing.h
-include/mbedtls/version.h
-include/mbedtls/x509.h
-include/mbedtls/x509_crl.h
-include/mbedtls/x509_crt.h
-include/mbedtls/x509_csr.h
-include/psa/build_info.h
-include/psa/crypto.h
-include/psa/crypto_adjust_auto_enabled.h
-include/psa/crypto_adjust_config_key_pair_types.h
-include/psa/crypto_adjust_config_synonyms.h
-include/psa/crypto_builtin_composites.h
-include/psa/crypto_builtin_key_derivation.h
-include/psa/crypto_builtin_primitives.h
-include/psa/crypto_compat.h
-include/psa/crypto_config.h
-include/psa/crypto_driver_common.h
-include/psa/crypto_driver_contexts_composites.h
-include/psa/crypto_driver_contexts_key_derivation.h
-include/psa/crypto_driver_contexts_primitives.h
-include/psa/crypto_extra.h
-include/psa/crypto_legacy.h
-include/psa/crypto_platform.h
-include/psa/crypto_se_driver.h
-include/psa/crypto_sizes.h
-include/psa/crypto_struct.h
-include/psa/crypto_types.h
-include/psa/crypto_values.h
-lib/hiawatha/letsencrypt/acmev2.php
-lib/hiawatha/letsencrypt/config.php
-lib/hiawatha/letsencrypt/hiawatha_config.php
-lib/hiawatha/letsencrypt/http.php
-lib/hiawatha/letsencrypt/https.php
-lib/hiawatha/letsencrypt/letsencrypt.conf
-lib/hiawatha/letsencrypt/letsencrypt.php
-lib/hiawatha/letsencrypt/logfile.php
-lib/hiawatha/letsencrypt/openssl.conf
-lib/hiawatha/letsencrypt/rsa.php
-lib/hiawatha/libmbedcrypto.a
-lib/hiawatha/libmbedtls.a
-lib/hiawatha/libmbedx509.a
-man/man1/cgi-wrapper.1
-man/man1/hiawatha.1
-man/man1/lefh.1
-man/man1/ssi-cgi.1
-man/man1/wigwam.1
-sbin/cgi-wrapper
-sbin/hiawatha
-sbin/lefh
-sbin/wigwam
-share/examples/hiawatha/cgi-wrapper.conf
-share/examples/hiawatha/error.xslt
-share/examples/hiawatha/hiawatha.conf
-share/examples/hiawatha/index.xslt
-share/examples/hiawatha/mimetype.conf
-share/examples/rc.d/hiawatha
-var/hiawatha/index.html
-@pkgdir var/run
-@pkgdir var/log/hiawatha
-@pkgdir var/db/hiawatha
-@pkgdir etc/hiawatha
diff --git a/hiawatha/TODO b/hiawatha/TODO
deleted file mode 100644
index 9daeafb986..0000000000
--- a/hiawatha/TODO
+++ /dev/null
@@ -1 +0,0 @@
-test
diff --git a/hiawatha/distinfo b/hiawatha/distinfo
deleted file mode 100644
index f70bbc33e5..0000000000
--- a/hiawatha/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD$
-
-BLAKE2s (hiawatha-11.5.tar.gz) = a83a41a21074769b947bb9c404f167c5fe63acfce771e02f7f48d31060320385
-SHA512 (hiawatha-11.5.tar.gz) = 575013567488b76bf37734a882e6608378a236f4f8cce7bb35a3949c97b894c1efa5963ab589f59fe27e6e1ba06ff0490f0c7bf7cfc87cd77bd5b60ca85a4bb6
-Size (hiawatha-11.5.tar.gz) = 1852032 bytes
diff --git a/hiawatha/files/hiawatha.sh b/hiawatha/files/hiawatha.sh
deleted file mode 100644
index 63c25f99c9..0000000000
--- a/hiawatha/files/hiawatha.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: $
-#
-# PROVIDE: hiawatha
-# REQUIRE: DAEMON
-
-pidfile=/usr/pkg/var/run/hiawatha.pid
-
-name="hiawatha"
-command="hiawatha"
-
-cmd=${1:-start}
-
-case ${cmd} in
-	start)
-		echo "Starting ${name}."
-		${command}&
-		echo $! > ${pidfile}
-		;;
-
-	stop)
-		echo "Stopping ${name}."
-		kill `cat ${pidfile}`
-		rm ${pidfile}
-		;;
-
-	restart)
-		( $0 stop )
-		sleep 5
-		$0 start
-		;;
-
-	*)
-		echo 1>&2 "Usage: $0 [restart|start|stop]"
-		exit 1
-		;;
-esac
-exit 0
diff --git a/hiawatha/options.mk b/hiawatha/options.mk
deleted file mode 100644
index 5ac477dc4f..0000000000
--- a/hiawatha/options.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD$
-
-PKG_OPTIONS_VAR=		PKG_OPTIONS.hiawatha
-PKG_SUPPORTED_OPTIONS=		monitor tomahawk
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mmonitor)
-CMAKE_CONFIGURE_ARGS+=	-DENABLE_MONITOR=on
-.else
-CMAKE_CONFIGURE_ARGS+=	-DENABLE_MONITOR=off
-.endif
-
-.if !empty(PKG_OPTIONS:Mtomahawk)
-CMAKE_CONFIGURE_ARGS+=	-DENABLE_TOMAHAWK=on
-.else
-CMAKE_CONFIGURE_ARGS+=	-DENABLE_TOMAHAWK=off
-.endif
Home | Main Index | Thread Index | Old Index