diff options
| author | salo <salo@pkgsrc.org> | 2003-07-23 16:03:55 +0000 |
|---|---|---|
| committer | salo <salo@pkgsrc.org> | 2003-07-23 16:03:55 +0000 |
| commit | 6472eaf122beb383fa3435c9a9ee0f1497e8f482 (patch) | |
| tree | 5a6a075a6e61e364055b3e58d4741484a1e40239 /security/skey/patches | |
| parent | f3f12ec1fbe0b7e88997300ef5ac4333d8a5cc86 (diff) | |
| download | pkgsrc-6472eaf122beb383fa3435c9a9ee0f1497e8f482.tar.gz | |
Better INSTALL_* fix for PR pkg/22234 by Jonathan Perkin.
Use buildlink2.
ONLY_FOR_PLATFORM -> NOT_FOR_PLATFORM (*BSD have skey in base system.)
Workaround a bug in GCC on sparc64.
Whitespace.
Diffstat (limited to 'security/skey/patches')
| -rw-r--r-- | security/skey/patches/patch-aa | 40 | ||||
| -rw-r--r-- | security/skey/patches/patch-ab | 13 |
2 files changed, 44 insertions, 9 deletions
diff --git a/security/skey/patches/patch-aa b/security/skey/patches/patch-aa index 1685ca25adf..042371917fb 100644 --- a/security/skey/patches/patch-aa +++ b/security/skey/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.1 2003/07/23 14:34:29 jmmv Exp $ +$NetBSD: patch-aa,v 1.2 2003/07/23 16:03:56 salo Exp $ ---- Makefile.in.orig Thu May 10 17:10:49 2001 -+++ Makefile.in Wed Jul 23 12:31:50 2003 -@@ -18,10 +18,10 @@ +--- Makefile.in.orig Thu May 10 18:10:49 2001 ++++ Makefile.in Wed Jul 23 17:18:18 2003 +@@ -18,15 +18,18 @@ AR=@AR@ RANLIB=@RANLIB@ INSTALL=@INSTALL@ @@ -10,14 +10,36 @@ $NetBSD: patch-aa,v 1.1 2003/07/23 14:34:29 jmmv Exp $ -INSTALL_MAN=${INSTALL} -c -m 444 -INSTALL_SCRIPT=${INSTALL} -c -m 555 -INSTALL_DATA=${INSTALL} -c -m 444 -+INSTALL_PROGRAM=@INSTALL_PROGRAM@ -+INSTALL_MAN=@INSTALL_DATA@ -+INSTALL_SCRIPT=@INSTALL_SCRIPT@ -+INSTALL_DATA=@INSTALL_DATA@ ++INSTALL_PROGRAM=${BSD_INSTALL_PROGRAM} ++INSTALL_MAN=${BSD_INSTALL_MAN} ++INSTALL_SCRIPT=${BSD_INSTALL_SCRIPT} ++INSTALL_DATA=${BSD_INSTALL_DATA} PERL=@PERL@ SENDMAIL=@SENDMAIL@ TOUCH=@TOUCH@ -@@ -88,14 +88,6 @@ + LDFLAGS=-L. @LDFLAGS@ + ++GCC=@GCC@ ++host=@host@ ++ + TARGETS=skey skeyinit skeyinfo skeyaudit + LIBOBJS=skeylogin.o skeysubr.o put.o errx.o md4c.o md5c.o rmd160.o rmd160hl.o sha1.o sha1hl.o flock.o strlcpy.o login_cap.o + SKEYOBJS=skey.o +@@ -49,6 +52,13 @@ + + all: ${TARGETS} ${MANPAGES} + ++ifeq (sparc64, $(findstring sparc64, $(host))) ++ifdef GCC ++sha1.o: config.h ++ ${CC} ${CFLAGS:-O%=-O0} -c -o $@ sha1.c ++endif ++endif ++ + ${LIBOBJS}: config.h + + libskey.a: ${LIBOBJS} +@@ -88,14 +98,6 @@ done install: ${TARGETS} diff --git a/security/skey/patches/patch-ab b/security/skey/patches/patch-ab new file mode 100644 index 00000000000..0caabe4e7c3 --- /dev/null +++ b/security/skey/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1 2003/07/23 16:03:57 salo Exp $ + +--- configure.orig Thu May 10 18:10:49 2001 ++++ configure Wed Jul 23 17:06:22 2003 +@@ -2533,6 +2533,8 @@ + s%@MANTYPE@%$MANTYPE%g + s%@mansubdir@%$mansubdir%g + s%@LIBOBJS@%$LIBOBJS%g ++s%@GCC@%$GCC%g ++s%@host@%$host%g + + CEOF + EOF |