signify: global package revision.

[Paolo Vincenzo Olivo <vms%retrobsd.ddns.net@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Paolo Vincenzo Olivo <vms%retrobsd.ddns.net@localhost>
Pushed By:	vms
Date:		Mon Jul 4 14:38:26 2022 +0200
Changeset:	bb202649522effb4e1fcee18f77e10c0dcc269bd

Modified Files:
	signify/Makefile
	signify/distinfo
	signify/patches/patch-Makefile

Log Message:
signify: global package revision.

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

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

diffstat:
 signify/Makefile               | 16 +++++++++++-----
 signify/distinfo               |  2 +-
 signify/patches/patch-Makefile |  6 +-----
 3 files changed, 13 insertions(+), 11 deletions(-)

diffs:
diff --git a/signify/Makefile b/signify/Makefile
index d31d00e501..3fcd51e794 100644
--- a/signify/Makefile
+++ b/signify/Makefile
@@ -19,11 +19,11 @@ INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 MAKE_DIRS+=		${PKG_SYSCONFDIR}/signify
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
-OUTDIR=		${WRKSRC}/src/usr.bin/signify
-LIBSRCDIR=	${WRKSRC}/src/liboutils
+OUTDIR:=	${WRKSRC}/src/usr.bin/signify
+LIBSRCDIR:=	${WRKSRC}/src/liboutils
 
 .include "../../mk/bsd.prefs.mk"
-
+# do not hard-code configuration dir
 SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths+=	${OUTDIR}/signify.c
@@ -31,11 +31,16 @@ SUBST_FILES.paths+=	${OUTDIR}/signify.1
 SUBST_SED.paths=	-e 's|/etc/signify|${PKG_SYSCONFDIR}/signify|g'
 
 .if ${OPSYS} == "SunOS"
+# SunOS stdint(3) doesn't provide `u_int*' typedefs
 SUBST_CLASSES+=		ints
 SUBST_STAGE.ints=	pre-configure
 SUBST_FILES.ints+=	${LIBSRCDIR}/*.c
 SUBST_FILES.ints+=	${LIBSRCDIR}/include/*.h
 SUBST_SED.ints=		-e 's|u_int|uint|g'
+
+# link against libresolv to fix referencing
+# errors to `__b64_ntop' | `__b64_pton'
+MAKEFLAGS+=	LIBS='-lresolv -lrt -lm'
 .endif
 
 post-patch:
@@ -44,8 +49,9 @@ post-patch:
 	${RM} ${WRKSRC}/src/liboutils/include/sys/*
 
 .elif ${OPSYS} == "SunOS"
-# Solaris lacks MIN/MAX macros in sys/params.h
-	${CP} ${FILESDIR}/minmax.h ${LIBSRCDIR}
+# Solaris lacks MIN/MAX macros in sys/param.h
+	cd ${LIBSRCDIR} && ${CP} ${FILESDIR}/minmax.h . 					\
+	&& ${CAT} outils.h >> minmax.h && ${MV} minmax.h outils.h
 .endif
 
 do-install:
diff --git a/signify/distinfo b/signify/distinfo
index a92abe4c95..372e7c05ca 100644
--- a/signify/distinfo
+++ b/signify/distinfo
@@ -3,5 +3,5 @@ $NetBSD$
 BLAKE2s (outils-0.10.tar.gz) = dd72f25dae8d5f6a742371ffcc7c8275f690a0e25eff5f85010067797823ecc8
 SHA512 (outils-0.10.tar.gz) = 58ba7854e7c96ba73ba984d6a33c1972640f6657d1fc138bc78a7eb29e5d7e7321386837183455631dbddda87ae2f40438e6891a5560685faf7530bed1e73031
 Size (outils-0.10.tar.gz) = 280502 bytes
-SHA1 (patch-Makefile) = 03764a51ba29f703cda88a74b81bd600762124f4
+SHA1 (patch-Makefile) = 24b1a27723d79abfcf11dbce872c540b6f9cadaa
 SHA1 (patch-src_liboutils_sha2.c) = 03182d6019efd9d60ff05eee9cef8de53632caa8
diff --git a/signify/patches/patch-Makefile b/signify/patches/patch-Makefile
index f142f7c010..eeaaf5e9b2 100644
--- a/signify/patches/patch-Makefile
+++ b/signify/patches/patch-Makefile
@@ -13,7 +13,7 @@ already supported on GNU/Linux systems.
  
  ALL=src/usr.bin/apply/apply src/usr.bin/jot/jot src/usr.bin/lam/lam src/usr.bin/lndir/lndir src/bin/md5/md5 src/usr.bin/rs/rs src/usr.bin/signify/signify src/usr.bin/calendar/calendar src/usr.bin/vis/vis src/usr.bin/unvis/unvis src/usr.bin/what/what src/usr.sbin/rdate/rdate 
  all: $(ALL)
-@@ -21,8 +22,24 @@ src/bin/md5/md5: src/bin/md5/md5.o src/b
+@@ -21,8 +22,20 @@ src/bin/md5/md5: src/bin/md5/md5.o src/b
  
  src/usr.bin/rs/rs: src/usr.bin/rs/rs.o src/usr.bin/rs/utf8.o src/liboutils/pledge.o src/liboutils/strtonum.o src/liboutils/reallocarray.o
  
@@ -23,10 +23,6 @@ already supported on GNU/Linux systems.
 +
 +else ifeq ($(UNAME_S),SunOS)
 +
-+CPPFLAGS+=-include src/liboutils/minmax.h
-+
-+LIBS=-lrt -lresolv -lm
-+
 +src/usr.bin/signify/signify: src/usr.bin/signify/signify.o src/usr.bin/signify/crypto_api.o src/usr.bin/signify/fe25519.o src/usr.bin/signify/mod_ed25519.o src/usr.bin/signify/mod_ge25519.o src/usr.bin/signify/sc25519.o src/usr.bin/signify/zsig.o src/liboutils/pledge.o src/liboutils/ohash.o src/liboutils/readpassphrase.o src/liboutils/sha2.o src/liboutils/sha256hl.o src/liboutils/sha512_256hl.o src/liboutils/sha512hl.o src/liboutils/timingsafe_bcmp.o src/liboutils/bcrypt_pbkdf.o src/liboutils/blowfish.o
 +
 +else