suricata: executables go into sbin, config files into etc, remove egdir

[kami (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	kami <kisskamizeg%gmail.com@localhost>
Pushed By:	kami
Date:		Sun Oct 5 15:54:54 2025 +0200
Changeset:	8879362567435a059f6cc619d21bc05cae4c5838

Modified Files:
	suricata/Makefile
	suricata/PLIST
	suricata/TODO

Log Message:
suricata: executables go into sbin, config files into etc, remove egdir

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

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

diffstat:
 suricata/Makefile | 19 ++++++++++---------
 suricata/PLIST    | 22 ++++++++--------------
 suricata/TODO     |  1 -
 3 files changed, 18 insertions(+), 24 deletions(-)

diffs:
diff --git a/suricata/Makefile b/suricata/Makefile
index 1d639b94b8..e3733b2162 100644
--- a/suricata/Makefile
+++ b/suricata/Makefile
@@ -18,12 +18,14 @@ USE_TOOLS+=		pkg-config
 
 USE_LANGUAGES=		c c++
 
-LIBS.NetBSD+=		 -lm
+LIBS.NetBSD+=		-lm
 
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR} --localstatedir=${VARBASE}
-EGDIR=                  ${PREFIX}/share/examples/suricata
-INSTALLATION_DIRS+=     ${EGDIR}
-INSTALL_MAKE_FLAGS=     ${MAKE_FLAGS} sysconfdir=${EGDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
+# ! all execs go into sbin !
+CONFIGURE_ARGS+=	--bindir=${PREFIX}/sbin
+
+BUILD_DEFS+=		VARBASE
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.suricata
 PKG_SUPPORTED_OPTIONS=	enable-unittests enable-debug enable-profiling
@@ -49,14 +51,13 @@ CONFIGURE_ARGS+=	--enable-profiling
 
 #
 # Generate and place some initial configuration files into EGDIR!
-# 
+#
 post-install:
 	cd ${WRKSRC} \
 	&& env ${INSTALL_ENV} ${MAKE_ENV} \
 		${MAKE_PROGRAM} install-conf \
-			&& ${MV} ${DESTDIR}${PREFIX}/etc/suricata/* ${DESTDIR}${EGDIR} \
-				&& find ${DESTDIR}${EGDIR} -type f -print | sort \
-					> ${WRKDIR}/PLIST_DYNAMIC
+			&& find ${DESTDIR}${PREFIX}/etc/suricata -type f -print | sort \
+				> ${WRKDIR}/PLIST_DYNAMIC
 # plist gen helper
 PLIST.SRC+=	${WRKDIR}/PLIST_DYNAMIC
 
diff --git a/suricata/PLIST b/suricata/PLIST
index 07e61fa4d8..6ca078a4ef 100644
--- a/suricata/PLIST
+++ b/suricata/PLIST
@@ -1,8 +1,8 @@
 @comment $NetBSD$
-bin/suricata
-bin/suricata-update
-bin/suricatactl
-bin/suricatasc
+etc/suricata/classification.config
+etc/suricata/reference.config
+etc/suricata/suricata.yaml
+etc/suricata/threshold.config
 lib/suricata/python/suricata/__init__.py
 lib/suricata/python/suricata/config/defaults.py
 lib/suricata/python/suricata/update/__init__.py
@@ -48,6 +48,10 @@ man/man1/suricata.1
 man/man1/suricatactl-filestore.1
 man/man1/suricatactl.1
 man/man1/suricatasc.1
+sbin/suricata
+sbin/suricata-update
+sbin/suricatactl
+sbin/suricatasc
 share/doc/suricata/AUTHORS
 share/doc/suricata/Basic_Setup.txt
 share/doc/suricata/GITGUIDE
@@ -57,10 +61,6 @@ share/doc/suricata/README
 share/doc/suricata/Setting_up_IPSinline_for_Linux.txt
 share/doc/suricata/TODO
 share/doc/suricata/Third_Party_Installation_Guides.txt
-share/examples/suricata/classification.config
-share/examples/suricata/reference.config
-share/examples/suricata/suricata.yaml
-share/examples/suricata/threshold.config
 share/suricata/classification.config
 share/suricata/reference.config
 share/suricata/rules/app-layer-events.rules
@@ -90,9 +90,3 @@ share/suricata/rules/ssh-events.rules
 share/suricata/rules/stream-events.rules
 share/suricata/rules/tls-events.rules
 share/suricata/rules/websocket-events.rules
-@pkgdir var/run/suricata
-@pkgdir var/log/suricata/files
-@pkgdir var/log/suricata/certs
-@pkgdir var/lib/suricata/data
-@pkgdir var/lib/suricata/cache/sgh
-@pkgdir etc/suricata
diff --git a/suricata/TODO b/suricata/TODO
index 0b33acefad..bf672e5325 100644
--- a/suricata/TODO
+++ b/suricata/TODO
@@ -16,7 +16,6 @@
 - run executables, fix errors
 
 * Package / Install
-- suricata executables should go into sbin
 - create /var subdirs
   - log/suricata
 - run suricata-update during install or disp message