pkgsrc-WIP-changes archive

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

jigasi: really use logging.properties as configuration file



Module Name:	pkgsrc-wip
Committed By:	Pierre Pronchery <khorben%defora.org@localhost>
Pushed By:	khorben
Date:		Tue Jan 3 14:52:01 2023 +0100
Changeset:	e9815e86ce8de02548df32b289697e63676f36bd

Modified Files:
	jigasi/Makefile
	jigasi/distinfo
Added Files:
	jigasi/patches/patch-jigasi.sh

Log Message:
jigasi: really use logging.properties as configuration file

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

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

diffstat:
 jigasi/Makefile                |  5 +++++
 jigasi/distinfo                |  1 +
 jigasi/patches/patch-jigasi.sh | 12 ++++++++++++
 3 files changed, 18 insertions(+)

diffs:
diff --git a/jigasi/Makefile b/jigasi/Makefile
index bd215eed9b..d22bfe3627 100644
--- a/jigasi/Makefile
+++ b/jigasi/Makefile
@@ -49,6 +49,11 @@ SUBST_STAGE.java=	post-configure
 SUBST_FILES.java=	jigasi.sh
 SUBST_SED.java=		-e 's,exec java,exec ${JAVA_BINPREFIX}-java,'
 
+SUBST_CLASSES+=		logging
+SUBST_STAGE.logging=	post-configure
+SUBST_FILES.logging=	jigasi.sh
+SUBST_SED.logging=	-e 's,$$SCRIPT_DIR/lib/logging\.properties,${PKG_SYSCONFDIR}/logging.properties,'
+
 INSTALLATION_DIRS=	bin
 INSTALLATION_DIRS+=	${EGDIR}
 INSTALLATION_DIRS+=	share/${GITHUB_PROJECT}/lib
diff --git a/jigasi/distinfo b/jigasi/distinfo
index 59a2f0cb0f..0be79b4d50 100644
--- a/jigasi/distinfo
+++ b/jigasi/distinfo
@@ -6,3 +6,4 @@ Size (jigasi/jigasi-1.1.tar.gz) = 278449 bytes
 BLAKE2s (jigasi/jigasi-java-deps-1.1.tar.gz) = dafa64d0ec62e74d8306fe7ca86a2204c9791dfd155452f8f129da4baa5c4e15
 SHA512 (jigasi/jigasi-java-deps-1.1.tar.gz) = 3db64ce903989fdc2be3440efecc423bf5578e8305ea5a6d572dcb47a4b3e6b99afc5fe7a03b550d07a667bc3e233d656ac4177a954eaa12cc26784e4c45e523
 Size (jigasi/jigasi-java-deps-1.1.tar.gz) = 91802308 bytes
+SHA1 (patch-jigasi.sh) = 229166dec00387ac0b8912b3ef145f68b46c2f17
diff --git a/jigasi/patches/patch-jigasi.sh b/jigasi/patches/patch-jigasi.sh
new file mode 100644
index 0000000000..518a7d0e9d
--- /dev/null
+++ b/jigasi/patches/patch-jigasi.sh
@@ -0,0 +1,12 @@
+$NetBSD$
+
+Fix quoting for additional command-line parameters
+
+--- jigasi.sh.orig	2023-01-03 13:50:40.995992729 +0000
++++ jigasi.sh
+@@ -29,4 +29,4 @@ fi
+ 
+ if [ -z "$JIGASI_MAX_MEMORY" ]; then JIGASI_MAX_MEMORY=3072m; fi
+ 
+-LD_LIBRARY_PATH=$libs exec java -Xmx$JIGASI_MAX_MEMORY -Djava.library.path=$libs $LOGGING_CONFIG_PARAM $JAVA_SYS_PROPS -cp $cp $mainClass $@
++LD_LIBRARY_PATH=$libs exec java -Xmx$JIGASI_MAX_MEMORY -Djava.library.path=$libs $LOGGING_CONFIG_PARAM $JAVA_SYS_PROPS -cp $cp $mainClass "$@"


Home | Main Index | Thread Index | Old Index