s-nail: use PKGBASE instead of confusing variables

s-nail/Makefile

@@ -15,6 +15,7 @@ EGDIR=			${PREFIX}/share/examples/${PKGBASE}
 MAKE_FLAGS+=		VAL_PREFIX=${PREFIX}
 MAKE_FLAGS+=		VAL_MANDIR=${PREFIX}/${PKGMANDIR}
 MAKE_FLAGS+=		OPT_AUTOCC=no
+INSTALL_MAKE_FLAGS+=	PKGBASE=${PKGBASE}
 
 CONF_FILES=		${EGDIR}/s-nail.rc ${PKG_SYSCONFDIR}/s-nail.rc
 

s-nail/distinfo

@@ -3,4 +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
+SHA1 (patch-mk_make-install.sh) = a7537f2e6b65fc32a6257f1def5b06bc39e2fe91

s-nail/patches/patch-mk_make-install.sh

@@ -8,14 +8,14 @@ Put the default config in EGDIR so we can use CONF_FILES
  __mkdir "${VAL_BINDIR}"
  __mkdir "${VAL_MANDIR}/man1"
  __mkdir "${VAL_SYSCONFDIR}"
-+__mkdir "${VAL_PREFIX}/share/examples/${VAL_SID}${VAL_MAILX}"
++__mkdir "${VAL_PREFIX}/share/examples/${PKGBASE}"
  
  __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}"
++   __copyfile 0444 "${OBJDIR}"/urc.rc "${VAL_PREFIX}/share/examples/${PKGBASE}/${VAL_SYSCONFRC}"
  fi
  
  if [ "${OPT_DOTLOCK}" != 0 ]; then