Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1714122887191540"
MIME-Version: 1.0
Date: Fri, 26 Apr 2024 09:14:47 +0000
From: "Hauke Fath" <hauke@netbsd.org>
Subject: CVS commit: pkgsrc/www/hiawatha
To: pkgsrc-changes@NetBSD.org
Reply-To: hauke@netbsd.org
Message-Id: <20240426091447.CBDC7FA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1714122887191540
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	hauke
Date:		Fri Apr 26 09:14:47 UTC 2024

Modified Files:
	pkgsrc/www/hiawatha: distinfo
	pkgsrc/www/hiawatha/patches: patch-CMakeLists.txt

Log Message:
Keep the build system from installing to PKG_SYSCONFDIR.

My local setting is a non-standard /etc/pkg, which was probably
shielded by the pkgsrc framework, hiding the problem.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/hiawatha/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/hiawatha/patches/patch-CMakeLists.txt

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


--_----------=_1714122887191540
Content-Disposition: inline
Content-Length: 2700
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/www/hiawatha/distinfo
diff -u pkgsrc/www/hiawatha/distinfo:1.7 pkgsrc/www/hiawatha/distinfo:1.8
--- pkgsrc/www/hiawatha/distinfo:1.7	Mon Apr 15 14:52:33 2024
+++ pkgsrc/www/hiawatha/distinfo	Fri Apr 26 09:14:47 2024
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2024/04/15 14:52:33 hauke Exp $
+$NetBSD: distinfo,v 1.8 2024/04/26 09:14:47 hauke Exp $
 
 BLAKE2s (hiawatha-v11.5.tar.gz) = d925682455f7c822d0aa5659716fbbf41fc6f04d53883945e0d0fe077794fb18
 SHA512 (hiawatha-v11.5.tar.gz) = c374ce680874aa9aacaa4d8b59cce3209275286e5b8baaabdf53346a0a743cb6decc97136b356c207b33b18db2977a0b1d6e9743cc6f4479860fade389bdd86a
 Size (hiawatha-v11.5.tar.gz) = 1810756 bytes
-SHA1 (patch-CMakeLists.txt) = e7eb2dab5b95bb4849e234d977baba31395cd527
+SHA1 (patch-CMakeLists.txt) = eeefd12db00da32433d38f89f70f0386843ff896
 SHA1 (patch-config_hiawatha.conf.in) = 8a58402b0201ec6cd661f5d949e127edfe4b693a
 SHA1 (patch-extra_letsencrypt_letsencrypt.conf.in) = 718d44e883f8206fd88480c5503d962198992347

Index: pkgsrc/www/hiawatha/patches/patch-CMakeLists.txt
diff -u pkgsrc/www/hiawatha/patches/patch-CMakeLists.txt:1.1 pkgsrc/www/hiawatha/patches/patch-CMakeLists.txt:1.2
--- pkgsrc/www/hiawatha/patches/patch-CMakeLists.txt:1.1	Mon Apr 15 14:52:33 2024
+++ pkgsrc/www/hiawatha/patches/patch-CMakeLists.txt	Fri Apr 26 09:14:47 2024
@@ -1,10 +1,10 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2024/04/15 14:52:33 hauke Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2024/04/26 09:14:47 hauke Exp $
 
 setuid binaries should not be writable by anyone.
 
---- CMakeLists.txt.orig	2024-04-05 17:22:48.812504624 +0000
+--- CMakeLists.txt.orig	2023-10-13 13:21:31.000000000 +0000
 +++ CMakeLists.txt
-@@ -154,7 +154,7 @@ endif()
+@@ -154,16 +154,9 @@ endif()
  # Installation
  install(TARGETS hiawatha wigwam DESTINATION ${CMAKE_INSTALL_SBINDIR})
  install(TARGETS cgi-wrapper DESTINATION ${CMAKE_INSTALL_SBINDIR}
@@ -12,4 +12,13 @@ setuid binaries should not be writable b
 +	PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE SETUID)
  install(TARGETS ssi-cgi DESTINATION ${CMAKE_INSTALL_BINDIR})
  
- foreach(configfile ${config_files})
+-foreach(configfile ${config_files})
+-	install(CODE "copy_if_not_exists(\"${CMAKE_SOURCE_DIR}/${configfile}\" \"${CONFIG_DIR}\")")
+-endforeach()
+-foreach(configfile ${config_files_in})
+-	install(CODE "copy_if_not_exists(\"${CMAKE_CURRENT_BINARY_DIR}/${configfile}\" \"${CONFIG_DIR}\")")
+-endforeach()
+-
+ install(FILES ${manual_pages} DESTINATION ${CMAKE_INSTALL_FULL_MANDIR}/man1)
+ foreach(manpage ${manual_pages_in})
+ 	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${manpage} DESTINATION ${CMAKE_INSTALL_FULL_MANDIR}/man1)


--_----------=_1714122887191540--