pkgsrc-WIP-changes archive

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

signify: re-enable building on Linux.



Module Name:	pkgsrc-wip
Committed By:	Paolo Vincenzo Olivo <vms%retrobsd.ddns.net@localhost>
Pushed By:	vms
Date:		Sun Jul 3 12:06:39 2022 +0200
Changeset:	0b99c99a5c76346684357ed3a2eb4ce03963deb0

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

Log Message:
signify: re-enable building on Linux.

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

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

diffstat:
 signify/Makefile               |  6 ++++--
 signify/distinfo               |  2 +-
 signify/patches/patch-Makefile | 15 +++++++++++++--
 3 files changed, 18 insertions(+), 5 deletions(-)

diffs:
diff --git a/signify/Makefile b/signify/Makefile
index 565cda0531..66f1815c81 100644
--- a/signify/Makefile
+++ b/signify/Makefile
@@ -12,8 +12,6 @@ HOMEPAGE=	https://flak.tedunangst.com/post/signify
 COMMENT=	Cryptographically sign and verify files, from OpenBSD
 LICENSE=	original-bsd AND modified-bsd AND isc AND public-domain
 
-ONLY_FOR_PLATFORM+=	NetBSD-*-*
-
 USE_TOOLS+=	gmake
 MAKEFLAGS+=	ALL=src/usr.bin/signify/signify
 
@@ -29,9 +27,13 @@ OUTDIR=	${WRKSRC}/src/usr.bin/signify
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 MAKE_DIRS+=		${PKG_SYSCONFDIR}/signify
 
+.include "../../mk/bsd.prefs.mk"
+
 post-patch:
+.if ${OPSYS} == "NetBSD"
 # The sys/* overrides are not needed on NetSD
 	${RM} ${WRKSRC}/src/liboutils/include/sys/*
+.endif
 
 do-install:
 	${INSTALL_PROGRAM} ${OUTDIR}/signify ${DESTDIR}${PREFIX}/bin
diff --git a/signify/distinfo b/signify/distinfo
index faea570fa1..c74ef42b13 100644
--- a/signify/distinfo
+++ b/signify/distinfo
@@ -3,4 +3,4 @@ $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) = e747befcd4c5d955ed1651289338f12410bb09ce
+SHA1 (patch-Makefile) = f4d399a31884f65590c90e508f1ebd32f3e885fd
diff --git a/signify/patches/patch-Makefile b/signify/patches/patch-Makefile
index 811b249803..a1e128333a 100644
--- a/signify/patches/patch-Makefile
+++ b/signify/patches/patch-Makefile
@@ -5,12 +5,23 @@ already supported by NetBSD.
 
 --- Makefile.orig	2021-10-14 15:34:52.000000000 +0000
 +++ Makefile
-@@ -21,7 +21,7 @@ src/bin/md5/md5: src/bin/md5/md5.o src/b
+@@ -2,6 +2,7 @@ CFLAGS?=-Wall -O2
+ CPPFLAGS=-include src/liboutils/outils.h -isystem src/liboutils/include -Isrc/bin/md5 -D_GNU_SOURCE -D_DEFAULT_SOURCE -DNO_UTIL -D_PATH_INCLUDE="\"-I$(PREFIX)/share/calendar\""
+ LDFLAGS=-Wl,--as-needed
+ LIBS=-lm
++UNAME_S := $(shell uname -s)
+ 
+ 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,7 +22,11 @@ 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
  
--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/strlcpy.o src/liboutils/base64.o src/liboutils/explicit_bzero.o src/liboutils/ohash.o src/liboutils/arc4random.o src/liboutils/getentropy_linux.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 src/liboutils/freezero.o
++ifeq ($(UNAME_S),NetBSD)
 +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/explicit_bzero.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 src/liboutils/freezero.o
++else
+ 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/strlcpy.o src/liboutils/base64.o src/liboutils/explicit_bzero.o src/liboutils/ohash.o src/liboutils/arc4random.o src/liboutils/getentropy_linux.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 src/liboutils/freezero.o
++endif
  
  src/usr.bin/calendar/calendar: src/usr.bin/calendar/calendar.o src/usr.bin/calendar/day.o src/usr.bin/calendar/io.o src/usr.bin/calendar/ostern.o src/usr.bin/calendar/paskha.o src/usr.bin/calendar/pesach.o src/liboutils/arc4random_uniform.o src/liboutils/arc4random.o src/liboutils/getentropy_linux.o src/liboutils/explicit_bzero.o src/liboutils/pledge.o src/liboutils/sha2.o src/liboutils/strtonum.o
  


Home | Main Index | Thread Index | Old Index