pkgsrc-WIP-changes archive

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

s-nail: patch the install so we can use CONF_FLIES correctly



Module Name:	pkgsrc-wip
Committed By:	Kevin Bloom <kevin.bloom%posteo.net@localhost>
Pushed By:	nuclearkev
Date:		Tue Jan 9 21:09:12 2024 -0500
Changeset:	ee9752595b3f9f9fa23fa3dc254807ea7ea4a68c

Modified Files:
	s-nail/Makefile
	s-nail/PLIST
	s-nail/distinfo
Added Files:
	s-nail/patches/patch-mk_make-install.sh

Log Message:
s-nail: patch the install so we can use CONF_FLIES correctly

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

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

diffstat:
 s-nail/Makefile                         |  3 ++-
 s-nail/PLIST                            |  3 ++-
 s-nail/distinfo                         |  1 +
 s-nail/patches/patch-mk_make-install.sh | 21 +++++++++++++++++++++
 4 files changed, 26 insertions(+), 2 deletions(-)

diffs:
diff --git a/s-nail/Makefile b/s-nail/Makefile
index 6fc89e9300..3235f2d5a7 100644
--- a/s-nail/Makefile
+++ b/s-nail/Makefile
@@ -11,11 +11,12 @@ LICENSE=		original-bsd AND osl AND mpl-1.1
 
 MAKE_FILE=		makefile
 
+EGDIR=			${PREFIX}/share/examples/${PKGBASE}
 MAKE_FLAGS+=		VAL_PREFIX=${PREFIX}
 MAKE_FLAGS+=		VAL_MANDIR=${PREFIX}/${PKGMANDIR}
 MAKE_FLAGS+=		OPT_AUTOCC=no
 
-CONF_FILES=		${PREFIX}/etc/s-nail.rc ${PKG_SYSCONFDIR}/s-nail.rc
+CONF_FILES=		${EGDIR}/s-nail.rc ${PKG_SYSCONFDIR}/s-nail.rc
 
 .include "../../devel/libidn2/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
diff --git a/s-nail/PLIST b/s-nail/PLIST
index a74d273e04..dc97bd4f16 100644
--- a/s-nail/PLIST
+++ b/s-nail/PLIST
@@ -1,5 +1,6 @@
 @comment $NetBSD$
 bin/s-nail
-etc/s-nail.rc
 libexec/s-nail-dotlock
 man/man1/s-nail.1
+share/examples/s-nail/s-nail.rc
+@comment etc/s-nail.rc
diff --git a/s-nail/distinfo b/s-nail/distinfo
index 90dc02538f..9d0e619194 100644
--- a/s-nail/distinfo
+++ b/s-nail/distinfo
@@ -3,3 +3,4 @@ $NetBSD: distinfo,v 1.3 2021/10/26 10:54:29 nia Exp $
 BLAKE2s (s-nail-14.9.24.tar.gz) = 649bd9205d714677bcdefdef0d5370432025d20858d06f99d3a0cb728c815a0d
 SHA512 (s-nail-14.9.24.tar.gz) = 15101019a9c14fef8162fbce1a15133d2c70f27476b08a7f183d195fb52ed2854731984f833236c543fd681e299c3d93ec508154573b5897d707a0ec5c216575
 Size (s-nail-14.9.24.tar.gz) = 1105199 bytes
+SHA1 (patch-mk_make-install.sh) = 41944de74e675aa4b4c3a273ba234e7508c99173
diff --git a/s-nail/patches/patch-mk_make-install.sh b/s-nail/patches/patch-mk_make-install.sh
new file mode 100644
index 0000000000..330cf65e88
--- /dev/null
+++ b/s-nail/patches/patch-mk_make-install.sh
@@ -0,0 +1,21 @@
+$NetBSD$
+
+Put the default config in EGDIR so we can use CONF_FILES
+
+--- mk/make-install.sh.orig	2022-03-26 15:28:51.000000000 +0000
++++ mk/make-install.sh
+@@ -51,12 +51,13 @@ echo >> "${OBJDIR}/${VAL_UAGENT}-uninsta
+ __mkdir "${VAL_BINDIR}"
+ __mkdir "${VAL_MANDIR}/man1"
+ __mkdir "${VAL_SYSCONFDIR}"
++__mkdir "${VAL_PREFIX}/share/examples/${VAL_SID}${VAL_MAILX}"
+ 
+ __stripfile "${OBJDIR}"/"${VAL_UAGENT}"
+ __copyfile 0755 "${OBJDIR}"/"${VAL_UAGENT}" "${VAL_BINDIR}"/"${VAL_UAGENT}"
+ __copyfile 0444 "${OBJDIR}"/uman.1 "${VAL_MANDIR}"/man1/"${VAL_UAGENT}".1
+ if [ -f "${DESTDIR}${VAL_SYSCONFDIR}/${VAL_SYSCONFRC}" ]; then :; else
+-   __copyfile 0444 "${OBJDIR}"/urc.rc "${VAL_SYSCONFDIR}/${VAL_SYSCONFRC}"
++   __copyfile 0444 "${OBJDIR}"/urc.rc "${VAL_PREFIX}/share/examples/${VAL_SID}${VAL_MAILX}/${VAL_SYSCONFRC}"
+ fi
+ 
+ if [ "${OPT_DOTLOCK}" != 0 ]; then


Home | Main Index | Thread Index | Old Index