diff options
Diffstat (limited to 'package.patch')
| -rw-r--r-- | package.patch | 100 |
1 files changed, 44 insertions, 56 deletions
diff --git a/package.patch b/package.patch index 35adc1ad7e1b..cb88a8b5d598 100644 --- a/package.patch +++ b/package.patch @@ -1,28 +1,31 @@ -diff '--color=auto' --unified --recursive --text src/mulle-bashfunctions-4.1.1/src/mulle-bashfunctions-all.sh src.mod/mulle-bashfunctions-4.1.1/src/mulle-bashfunctions-all.sh ---- src/mulle-bashfunctions-4.1.1/src/mulle-bashfunctions-all.sh 2022-07-12 10:35:08.000000000 +0100 -+++ src.mod/mulle-bashfunctions-4.1.1/src/mulle-bashfunctions-all.sh 2022-08-01 11:09:46.927637560 +0100 -@@ -2324,7 +2324,7 @@ +diff '--color=auto' --unified --recursive --text src/mulle-bashfunctions-5.0.3/bin/installer src.mod/mulle-bashfunctions-5.0.3/bin/installer +--- src/mulle-bashfunctions-5.0.3/bin/installer 2023-01-18 01:03:07.000000000 +0000 ++++ src.mod/mulle-bashfunctions-5.0.3/bin/installer 2023-04-04 17:48:44.540576844 +0100 +@@ -184,7 +184,7 @@ prefix="${RVAL}" + bin="${prefix}/bin" +- libexec="${prefix}/libexec/mulle-bashfunctions/${PROJECT_VERSION}" ++ libexec="${prefix}/lib/mulle-bashfunctions/${PROJECT_VERSION}" + share="${prefix}/share/mulle-bashfunctions/${PROJECT_VERSION}" -- RVAL="${prefix}/libexec/${subdir}" -+ RVAL="${prefix}/lib/${subdir}" - if [ ! -f "${RVAL}/${matchfile}" ] - then - RVAL="${exedirpath}/src" -@@ -2345,7 +2345,7 @@ + mkdir -p "${bin}" || installer_fail "could not create ${bin}" +diff '--color=auto' --unified --recursive --text src/mulle-bashfunctions-5.0.3/mulle-bash src.mod/mulle-bashfunctions-5.0.3/mulle-bash +--- src/mulle-bashfunctions-5.0.3/mulle-bash 2023-01-18 01:03:07.000000000 +0000 ++++ src.mod/mulle-bashfunctions-5.0.3/mulle-bash 2023-04-04 17:48:14.690665058 +0100 +@@ -674,7 +674,7 @@ - if [ ! -f "${RVAL}/${matchfile}" ] + local libexec_dir + +- libexec_dir="${prefix}/libexec/mulle-bashfunctions" ++ libexec_dir="${prefix}/lib/mulle-bashfunctions" + + if [ ! -z "${qualifier}" ] then -- printf "%s\n" "$0 fatal error: Could not find \"${subdir}\" libexec (${PWD#${MULLE_USER_PWD}/})" >&2 -+ printf "%s\n" "$0 fatal error: Could not find \"${subdir}\" lib (${PWD#${MULLE_USER_PWD}/})" >&2 - exit 1 - fi - } -diff '--color=auto' --unified --recursive --text src/mulle-bashfunctions-4.1.1/src/mulle-bashfunctions-embed.sh src.mod/mulle-bashfunctions-4.1.1/src/mulle-bashfunctions-embed.sh ---- src/mulle-bashfunctions-4.1.1/src/mulle-bashfunctions-embed.sh 2022-07-12 10:35:08.000000000 +0100 -+++ src.mod/mulle-bashfunctions-4.1.1/src/mulle-bashfunctions-embed.sh 2022-08-01 11:09:46.934304219 +0100 -@@ -2139,7 +2139,7 @@ +diff '--color=auto' --unified --recursive --text src/mulle-bashfunctions-5.0.3/src/mulle-bashfunctions-all.sh src.mod/mulle-bashfunctions-5.0.3/src/mulle-bashfunctions-all.sh +--- src/mulle-bashfunctions-5.0.3/src/mulle-bashfunctions-all.sh 2023-01-18 01:03:07.000000000 +0000 ++++ src.mod/mulle-bashfunctions-5.0.3/src/mulle-bashfunctions-all.sh 2023-04-04 17:50:15.460329901 +0100 +@@ -2210,7 +2210,7 @@ prefix="${RVAL}" @@ -31,19 +34,10 @@ diff '--color=auto' --unified --recursive --text src/mulle-bashfunctions-4.1.1/s if [ ! -f "${RVAL}/${matchfile}" ] then RVAL="${exedirpath}/src" -@@ -2160,7 +2160,7 @@ - - if [ ! -f "${RVAL}/${matchfile}" ] - then -- printf "%s\n" "$0 fatal error: Could not find \"${subdir}\" libexec (${PWD#${MULLE_USER_PWD}/})" >&2 -+ printf "%s\n" "$0 fatal error: Could not find \"${subdir}\" lib (${PWD#${MULLE_USER_PWD}/})" >&2 - exit 1 - fi - } -diff '--color=auto' --unified --recursive --text src/mulle-bashfunctions-4.1.1/src/mulle-bashfunctions-minimal.sh src.mod/mulle-bashfunctions-4.1.1/src/mulle-bashfunctions-minimal.sh ---- src/mulle-bashfunctions-4.1.1/src/mulle-bashfunctions-minimal.sh 2022-07-12 10:35:08.000000000 +0100 -+++ src.mod/mulle-bashfunctions-4.1.1/src/mulle-bashfunctions-minimal.sh 2022-08-01 11:09:46.940970880 +0100 -@@ -2324,7 +2324,7 @@ +diff '--color=auto' --unified --recursive --text src/mulle-bashfunctions-5.0.3/src/mulle-bashfunctions-embed.sh src.mod/mulle-bashfunctions-5.0.3/src/mulle-bashfunctions-embed.sh +--- src/mulle-bashfunctions-5.0.3/src/mulle-bashfunctions-embed.sh 2023-01-18 01:03:07.000000000 +0000 ++++ src.mod/mulle-bashfunctions-5.0.3/src/mulle-bashfunctions-embed.sh 2023-04-04 17:49:44.427077392 +0100 +@@ -2025,7 +2025,7 @@ prefix="${RVAL}" @@ -52,19 +46,10 @@ diff '--color=auto' --unified --recursive --text src/mulle-bashfunctions-4.1.1/s if [ ! -f "${RVAL}/${matchfile}" ] then RVAL="${exedirpath}/src" -@@ -2345,7 +2345,7 @@ - - if [ ! -f "${RVAL}/${matchfile}" ] - then -- printf "%s\n" "$0 fatal error: Could not find \"${subdir}\" libexec (${PWD#${MULLE_USER_PWD}/})" >&2 -+ printf "%s\n" "$0 fatal error: Could not find \"${subdir}\" lib (${PWD#${MULLE_USER_PWD}/})" >&2 - exit 1 - fi - } -diff '--color=auto' --unified --recursive --text src/mulle-bashfunctions-4.1.1/src/mulle-bashfunctions.sh src.mod/mulle-bashfunctions-4.1.1/src/mulle-bashfunctions.sh ---- src/mulle-bashfunctions-4.1.1/src/mulle-bashfunctions.sh 2022-07-12 10:35:08.000000000 +0100 -+++ src.mod/mulle-bashfunctions-4.1.1/src/mulle-bashfunctions.sh 2022-08-01 11:09:46.914304241 +0100 -@@ -2324,7 +2324,7 @@ +diff '--color=auto' --unified --recursive --text src/mulle-bashfunctions-5.0.3/src/mulle-bashfunctions-minimal.sh src.mod/mulle-bashfunctions-5.0.3/src/mulle-bashfunctions-minimal.sh +--- src/mulle-bashfunctions-5.0.3/src/mulle-bashfunctions-minimal.sh 2023-01-18 01:03:07.000000000 +0000 ++++ src.mod/mulle-bashfunctions-5.0.3/src/mulle-bashfunctions-minimal.sh 2023-04-04 17:50:41.263598596 +0100 +@@ -2210,7 +2210,7 @@ prefix="${RVAL}" @@ -73,19 +58,22 @@ diff '--color=auto' --unified --recursive --text src/mulle-bashfunctions-4.1.1/s if [ ! -f "${RVAL}/${matchfile}" ] then RVAL="${exedirpath}/src" -@@ -2345,7 +2345,7 @@ +diff '--color=auto' --unified --recursive --text src/mulle-bashfunctions-5.0.3/src/mulle-bashfunctions.sh src.mod/mulle-bashfunctions-5.0.3/src/mulle-bashfunctions.sh +--- src/mulle-bashfunctions-5.0.3/src/mulle-bashfunctions.sh 2023-01-18 01:03:07.000000000 +0000 ++++ src.mod/mulle-bashfunctions-5.0.3/src/mulle-bashfunctions.sh 2023-04-04 17:50:59.760220253 +0100 +@@ -2210,7 +2210,7 @@ + prefix="${RVAL}" + +- RVAL="${prefix}/libexec/${subdir}" ++ RVAL="${prefix}/lib/${subdir}" if [ ! -f "${RVAL}/${matchfile}" ] then -- printf "%s\n" "$0 fatal error: Could not find \"${subdir}\" libexec (${PWD#${MULLE_USER_PWD}/})" >&2 -+ printf "%s\n" "$0 fatal error: Could not find \"${subdir}\" lib (${PWD#${MULLE_USER_PWD}/})" >&2 - exit 1 - fi - } -diff '--color=auto' --unified --recursive --text src/mulle-bashfunctions-4.1.1/src/mulle-init.sh src.mod/mulle-bashfunctions-4.1.1/src/mulle-init.sh ---- src/mulle-bashfunctions-4.1.1/src/mulle-init.sh 2022-07-12 10:35:08.000000000 +0100 -+++ src.mod/mulle-bashfunctions-4.1.1/src/mulle-init.sh 2022-08-01 11:04:21.128004584 +0100 -@@ -155,7 +155,7 @@ + RVAL="${exedirpath}/src" +diff '--color=auto' --unified --recursive --text src/mulle-bashfunctions-5.0.3/src/mulle-init.sh src.mod/mulle-bashfunctions-5.0.3/src/mulle-init.sh +--- src/mulle-bashfunctions-5.0.3/src/mulle-init.sh 2023-01-18 01:03:07.000000000 +0000 ++++ src.mod/mulle-bashfunctions-5.0.3/src/mulle-init.sh 2023-04-04 17:49:07.930510298 +0100 +@@ -178,7 +178,7 @@ # now setup the global variable |