pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/www/tipidee
Module Name: pkgsrc
Committed By: schmonz
Date: Thu May 1 16:12:13 UTC 2025
Modified Files:
pkgsrc/www/tipidee: Makefile PLIST distinfo
Added Files:
pkgsrc/www/tipidee: DEINSTALL INSTALL
pkgsrc/www/tipidee/patches:
patch-.._tipidee-man-pages-v0.0.5.0.1_Makefile
Log Message:
tipidee: install tipidee.conf{,.cdb} and a missing manual.
Fix PKG_SYSCONFDIR paths in manual pages.
While here, avoid -fstack-check on NetBSD for the moment (tipidee-config
dumps core, reported upstream).
Bump PKGREVISION.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/www/tipidee/DEINSTALL \
pkgsrc/www/tipidee/INSTALL
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/tipidee/Makefile \
pkgsrc/www/tipidee/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/tipidee/PLIST
cvs rdiff -u -r0 -r1.1 \
pkgsrc/www/tipidee/patches/patch-.._tipidee-man-pages-v0.0.5.0.1_Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/www/tipidee/Makefile
diff -u pkgsrc/www/tipidee/Makefile:1.7 pkgsrc/www/tipidee/Makefile:1.8
--- pkgsrc/www/tipidee/Makefile:1.7 Thu Nov 14 14:13:04 2024
+++ pkgsrc/www/tipidee/Makefile Thu May 1 16:12:13 2025
@@ -1,38 +1,54 @@
-# $NetBSD: Makefile,v 1.7 2024/11/14 14:13:04 schmonz Exp $
+# $NetBSD: Makefile,v 1.8 2025/05/01 16:12:13 schmonz Exp $
DISTNAME= tipidee-0.0.5.1
+PKGREVISION= 1
CATEGORIES= www
MASTER_SITES= ${HOMEPAGE}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${MANPAGES_DIST}
+# man-pages version is usually not exactly in-sync with PKGVERSION_NOREV
+MANPAGES_VERSION= 0.0.5.0.1
+MANPAGES_DIST= tipidee-man-pages-${MANPAGES_VERSION}.tar.gz
+SITES.${MANPAGES_DIST}= -https://git.sr.ht/~flexibeast/tipidee-man-pages/archive/v${MANPAGES_VERSION}.tar.gz
MAINTAINER= schmonz%NetBSD.org@localhost
HOMEPAGE= https://skarnet.org/software/tipidee/
COMMENT= Minimalistic web server
LICENSE= isc
-# man-pages version is usually not exactly in-sync with PKGVERSION_NOREV
-MANPAGES_VERSION= 0.0.5.0.1
-MANPAGES_DIST= tipidee-man-pages-${MANPAGES_VERSION}.tar.gz
-SITES.${MANPAGES_DIST}= -https://git.sr.ht/~flexibeast/tipidee-man-pages/archive/v${MANPAGES_VERSION}.tar.gz
-
DEPENDS+= s6-networking>=2.7.0.4:../../net/s6-networking
+WRKMANSRC= ${WRKDIR}/${PKGBASE}-man-pages-v${MANPAGES_VERSION}
+
USE_TOOLS+= gmake
HAS_CONFIGURE= yes
CONFIGURE_ARGS+= --prefix=${PREFIX}
CONFIGURE_ARGS+= --with-sysdeps=${PREFIX}/lib/skalibs/sysdeps
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
-INSTALLATION_DIRS+= ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${PKGMANDIR}/man8
-
-.PHONY: do-install-manpages
-post-install: do-install-manpages
-do-install-manpages:
- cd ${WRKDIR}/${PKGBASE}-man-pages-*; for i in 1 5 8; do \
- for j in man$$i/*.$$i; do \
- ${INSTALL_MAN} $$j \
- ${DESTDIR}${PREFIX}/${PKGMANDIR}/man$$i; \
- done \
+SUBST_CLASSES+= sysconfdir
+SUBST_STAGE.sysconfdir= pre-configure
+SUBST_FILES.sysconfdir= ${WRKMANSRC}/man*/*
+SUBST_SED.sysconfdir= -e 's|/etc/tipidee|/etc/pkg/tipidee|g'
+
+EGDIR= share/examples/${PKGBASE}
+CONF_FILES+= ${PREFIX}/${EGDIR}/tipidee.conf \
+ ${PKG_SYSCONFDIR}/tipidee.conf
+
+INSTALLATION_DIRS+= ${EGDIR}
+INSTALLATION_DIRS+= ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${PKGMANDIR}/man7 ${PKGMANDIR}/man8
+
+INSTALL_DIRS+= . ${WRKMANSRC}
+INSTALL_ENV+= PREFIX=${PREFIX:Q} MAN_DIR=${PREFIX:Q}/${PKGMANDIR:Q}
+
+# 0.0.5.1 tipidee-config dumps core, reported upstream
+BUILDLINK_TRANSFORM.NetBSD+= rm:-fstack-check
+
+.PHONY: do-install-examples
+post-install: do-install-examples
+do-install-examples:
+ cd ${WRKSRC}/examples; for i in tipidee.conf; do \
+ ${INSTALL_DATA} $$i \
+ ${DESTDIR}${PREFIX}/${EGDIR}/$$i; \
done
.include "../../devel/skalibs/buildlink3.mk"
Index: pkgsrc/www/tipidee/distinfo
diff -u pkgsrc/www/tipidee/distinfo:1.7 pkgsrc/www/tipidee/distinfo:1.8
--- pkgsrc/www/tipidee/distinfo:1.7 Thu Nov 14 14:13:04 2024
+++ pkgsrc/www/tipidee/distinfo Thu May 1 16:12:13 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2024/11/14 14:13:04 schmonz Exp $
+$NetBSD: distinfo,v 1.8 2025/05/01 16:12:13 schmonz Exp $
BLAKE2s (tipidee-0.0.5.1.tar.gz) = 22fb876fd86d0cc7a65ed351ea7dcb6163e535a55a2ee01e5df21831529c1960
SHA512 (tipidee-0.0.5.1.tar.gz) = 2f0ae2b3f7c7782785e8498e482bb4cfbb58c0bbe1689b2d3a5a4970783704147e8e5b96737970e2a542ee409e2b179a199a990fbf20b3ea4083cd47d16960cf
@@ -6,3 +6,4 @@ Size (tipidee-0.0.5.1.tar.gz) = 85889 by
BLAKE2s (tipidee-man-pages-0.0.5.0.1.tar.gz) = c9585c5fdc818a8e4f94bbc73e53237d7b1e8078191af5d40ec4e992aff563a7
SHA512 (tipidee-man-pages-0.0.5.0.1.tar.gz) = 56b41a556362ba9c86fad31341e0de7ca7183d07bf369a498a7546185a7989435a101f9a09811709683151bc34d82a866481183b91d759d68e6b94cfa7706392
Size (tipidee-man-pages-0.0.5.0.1.tar.gz) = 21644 bytes
+SHA1 (patch-.._tipidee-man-pages-v0.0.5.0.1_Makefile) = 63b893f6063e3761cf541e51c6273c6a2db12d9c
Index: pkgsrc/www/tipidee/PLIST
diff -u pkgsrc/www/tipidee/PLIST:1.4 pkgsrc/www/tipidee/PLIST:1.5
--- pkgsrc/www/tipidee/PLIST:1.4 Thu Nov 14 14:13:04 2024
+++ pkgsrc/www/tipidee/PLIST Thu May 1 16:12:13 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2024/11/14 14:13:04 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.5 2025/05/01 16:12:13 schmonz Exp $
bin/tipidee-config
bin/tipideed
include/tipidee/conf.h
@@ -17,6 +17,8 @@ libexec/ls.cgi
libexec/tipidee-config-preprocess
man/man1/ls.cgi.1
man/man5/tipidee.conf.5
+man/man7/tipidee-quickstart.7
man/man8/tipidee-config-preprocess.8
man/man8/tipidee-config.8
man/man8/tipideed.8
+share/examples/tipidee/tipidee.conf
Added files:
Index: pkgsrc/www/tipidee/DEINSTALL
diff -u /dev/null pkgsrc/www/tipidee/DEINSTALL:1.1
--- /dev/null Thu May 1 16:12:13 2025
+++ pkgsrc/www/tipidee/DEINSTALL Thu May 1 16:12:13 2025
@@ -0,0 +1,10 @@
+# $NetBSD: DEINSTALL,v 1.1 2025/05/01 16:12:13 schmonz Exp $
+
+case "${STAGE}" in
+
+POST-DEINSTALL)
+ s="${PKG_SYSCONFDIR}/tipidee.conf"
+ [ -f "${s}.cdb" ] && ! [ -f "${s}" ] && ${RM} -f "${s}.cdb"
+ ;;
+
+esac
Index: pkgsrc/www/tipidee/INSTALL
diff -u /dev/null pkgsrc/www/tipidee/INSTALL:1.1
--- /dev/null Thu May 1 16:12:13 2025
+++ pkgsrc/www/tipidee/INSTALL Thu May 1 16:12:13 2025
@@ -0,0 +1,9 @@
+# $NetBSD: INSTALL,v 1.1 2025/05/01 16:12:13 schmonz Exp $
+
+case "${STAGE}" in
+
+POST-INSTALL)
+ ${PREFIX}/bin/tipidee-config
+ ;;
+
+esac
Index: pkgsrc/www/tipidee/patches/patch-.._tipidee-man-pages-v0.0.5.0.1_Makefile
diff -u /dev/null pkgsrc/www/tipidee/patches/patch-.._tipidee-man-pages-v0.0.5.0.1_Makefile:1.1
--- /dev/null Thu May 1 16:12:13 2025
+++ pkgsrc/www/tipidee/patches/patch-.._tipidee-man-pages-v0.0.5.0.1_Makefile Thu May 1 16:12:13 2025
@@ -0,0 +1,21 @@
+$NetBSD: patch-.._tipidee-man-pages-v0.0.5.0.1_Makefile,v 1.1 2025/05/01 16:12:13 schmonz Exp $
+
+Succeed at installing manual pages.
+
+--- ../tipidee-man-pages-v0.0.5.0.1/Makefile.orig 2025-05-01 15:54:00.997702981 +0000
++++ ../tipidee-man-pages-v0.0.5.0.1/Makefile
+@@ -24,10 +24,10 @@ all:
+ @echo "Nothing to be done. Ready for 'make install'."
+
+ install:
+- cd man1; install -D -m 0644 -t ${DESTDIR}${man1_dir} $(man1_targets)
+- cd man5; install -D -m 0644 -t ${DESTDIR}${man5_dir} $(man5_targets)
+- cd man7; install -D -m 0644 -t ${DESTDIR}${man7_dir} $(man7_targets)
+- cd man8; install -D -m 0644 -t ${DESTDIR}${man8_dir} $(man8_targets)
++ cd man1; ${BSD_INSTALL_MAN} $(man1_targets) ${DESTDIR}${man1_dir}
++ cd man5; ${BSD_INSTALL_MAN} $(man5_targets) ${DESTDIR}${man5_dir}
++ cd man7; ${BSD_INSTALL_MAN} $(man7_targets) ${DESTDIR}${man7_dir}
++ cd man8; ${BSD_INSTALL_MAN} $(man8_targets) ${DESTDIR}${man8_dir}
+
+ uninstall:
+ cd $(man1_dir); rm -f $(man1_targets)
Home |
Main Index |
Thread Index |
Old Index