pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

hiawatha: Fixed config files



Module Name:	pkgsrc-wip
Committed By:	Kevin Bloom <kevin.bloom%posteo.net@localhost>
Pushed By:	nuclearkev
Date:		Mon Mar 25 10:30:28 2024 -0400
Changeset:	198427ce52d59aaf74ee84c944bd5708d28c8fb6

Modified Files:
	hiawatha/Makefile
	hiawatha/PLIST
	hiawatha/TODO

Log Message:
hiawatha: Fixed config files

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

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

diffstat:
 hiawatha/Makefile | 20 ++++++++++++++++++++
 hiawatha/PLIST    | 11 ++++++-----
 hiawatha/TODO     |  2 +-
 3 files changed, 27 insertions(+), 6 deletions(-)

diffs:
diff --git a/hiawatha/Makefile b/hiawatha/Makefile
index f551eb8035..dd4990f334 100644
--- a/hiawatha/Makefile
+++ b/hiawatha/Makefile
@@ -11,6 +11,8 @@ LICENSE=	gnu-gpl-v2
 
 USE_CMAKE=	yes
 
+EGDIR=	${PREFIX}/share/examples/hiawatha
+
 CMAKE_ARGS+=	-DUSE_SHARED_MBEDTLS_LIBRARY=OFF
 CMAKE_ARGS+=	-DUSE_STATIC_MBEDTLS_LIBRARY=ON
 CMAKE_ARGS+=	-DWEBROOT_DIR="${PREFIX}/var/hiawatha"
@@ -28,6 +30,24 @@ REPLACE_PHP+=	extra/letsencrypt/lefh.in
 # TODO: having issues requiring PHP
 CHECK_INTERPRETER_SKIP+=	sbin/lefh
 
+
+ETCDIR=	${PKG_SYSCONFDIR}/hiawatha
+
+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}
+
+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 "../../lang/php/replace.mk"
 .include "../../devel/cmake/build.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
diff --git a/hiawatha/PLIST b/hiawatha/PLIST
index a50c943362..7a5a8f3898 100644
--- a/hiawatha/PLIST
+++ b/hiawatha/PLIST
@@ -1,10 +1,5 @@
 @comment $NetBSD$
 bin/ssi-cgi
-etc/hiawatha/cgi-wrapper.conf
-etc/hiawatha/error.xslt
-etc/hiawatha/hiawatha.conf
-etc/hiawatha/index.xslt
-etc/hiawatha/mimetype.conf
 include/mbedtls/aes.h
 include/mbedtls/aria.h
 include/mbedtls/asn1.h
@@ -122,7 +117,13 @@ 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
 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
index 2f2fd33a71..87511982fa 100644
--- a/hiawatha/TODO
+++ b/hiawatha/TODO
@@ -1,2 +1,2 @@
-Fix CONF_FILES
 test
+rc file


Home | Main Index | Thread Index | Old Index