clixon: default config file to $sysconfdir/clixon.xml.

[Havard Eidnes <he%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Havard Eidnes <he%NetBSD.org@localhost>
Pushed By:	he
Date:		Wed Sep 18 06:27:40 2024 +0000
Changeset:	833f51a2daa5b2af1088f178e01a3b5a37bebf76

Modified Files:
	clixon/Makefile
	clixon/distinfo
	clixon/patches/patch-configure.ac

Log Message:
clixon: default config file to $sysconfdir/clixon.xml.

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

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

diffstat:
 clixon/Makefile                   |  3 +++
 clixon/distinfo                   |  2 +-
 clixon/patches/patch-configure.ac | 10 ++++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diffs:
diff --git a/clixon/Makefile b/clixon/Makefile
index aab3af7ae8..47a02e4169 100644
--- a/clixon/Makefile
+++ b/clixon/Makefile
@@ -30,6 +30,9 @@ PKG_GROUPS_VARS+=	CLIXON_GROUP
 CONFIGURE_ARGS+=	--with-restconf=native
 #CONFIGURE_ARGS+=	--without-restconf
 
+CONFIGURE_ARGS+=	--prefix=${PREFIX}
+CONFIGURE_ARGS+=	--localstatedir=/var
+
 # Don't pick these from the PATH in the build scaffolding...
 CONFIGURE_ENV+=	GREP=/usr/bin/grep
 CONFIGURE_ENV+=	TAIL_BIN=/usr/bin/tail
diff --git a/clixon/distinfo b/clixon/distinfo
index 9e2ae20055..45b05f0d77 100644
--- a/clixon/distinfo
+++ b/clixon/distinfo
@@ -3,7 +3,7 @@ $NetBSD$
 BLAKE2s (clixon-7.1.0.tar.gz) = f330d82961e55010206ae020fa093bca891e9b2ed7e783ccd139b1cf035cc1e4
 SHA512 (clixon-7.1.0.tar.gz) = 604d281474a39ccc7c4b16747c465417e346333dc38d138e6ba8a08bc1b5f266c35f75c6e3779e43ef623ac52efe202552f88f9fc17bb595c2163c463a22a05d
 Size (clixon-7.1.0.tar.gz) = 1698601 bytes
-SHA1 (patch-configure.ac) = 110ebae711864a80ca4d44acea1435ef0c28f3da
+SHA1 (patch-configure.ac) = 322c11ac995197f668c812b7c880e537c29f80cd
 SHA1 (patch-etc_Makefile.in) = 70090dc658aa85037e0ec5e34c47b7ddafa5cebc
 SHA1 (patch-lib_clixon_clixon__datastore.h) = 7ca3c2fdcd626f1a2368128f4faedec6528b1a56
 SHA1 (patch-lib_src_clixon__proc.c) = e10bbf7b5c1fdd96f9bde76734c2c75ae94cb910
diff --git a/clixon/patches/patch-configure.ac b/clixon/patches/patch-configure.ac
index 94a4bb1a8f..b77248cadd 100644
--- a/clixon/patches/patch-configure.ac
+++ b/clixon/patches/patch-configure.ac
@@ -1,6 +1,7 @@
 $NetBSD$
 
 Fix test for bison, allow "/usr/pkg/bin/bison -y"...
+Also fix default location of clixon.xml config file.
 
 --- configure.ac.orig	2024-09-17 11:36:31.323368820 +0000
 +++ configure.ac
@@ -13,3 +14,12 @@ Fix test for bison, allow "/usr/pkg/bin/bison -y"...
     AC_MSG_ERROR(CLIXON does not find bison.  There are several problems with yacc and byacc. Please install bison. YACC="$YACC")
  fi
  # Hardcoded to bison -y, seems to work in all bisons?
+@@ -354,7 +354,7 @@ if test "$enable_netsnmp" = "yes"; then
+ fi 
+ 
+ # Set default config file location
+-CLIXON_DEFAULT_CONFIG=/usr/local/etc/clixon.xml
++CLIXON_DEFAULT_CONFIG=${SYSCONFDIR}/clixon.xml
+ AC_ARG_WITH([configfile],
+ 	    [AS_HELP_STRING([--with-configfile=FILE],[Set default path to config file])],
+ 	    [CLIXON_DEFAULT_CONFIG="$withval"],)