diff options
Diffstat (limited to 'pkgtools/digest')
| -rw-r--r-- | pkgtools/digest/Makefile | 8 | ||||
| -rw-r--r-- | pkgtools/digest/files/Makefile | 6 | ||||
| -rw-r--r-- | pkgtools/digest/files/patch-sum | 4 | ||||
| -rw-r--r-- | pkgtools/digest/files/sha1hl.c | 5 | ||||
| -rw-r--r-- | pkgtools/digest/patches/patch-aa | 15 | ||||
| -rw-r--r-- | pkgtools/digest/patches/patch-ab | 12 | ||||
| -rw-r--r-- | pkgtools/digest/scripts/bootstrap-digest | 4 |
7 files changed, 9 insertions, 45 deletions
diff --git a/pkgtools/digest/Makefile b/pkgtools/digest/Makefile index cac5b46b80f..c8ab8800b79 100644 --- a/pkgtools/digest/Makefile +++ b/pkgtools/digest/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/03/10 15:26:15 tron Exp $ +# $NetBSD: Makefile,v 1.7 2001/03/10 15:58:56 tron Exp $ # # When adding new digest algorithms, please use rmd160 as the template, # and bump the VERSION definition. @@ -21,14 +21,11 @@ MANCOMPRESSED_IF_MANZ= YES PLIST_SRC= ${WRKDIR}/PLIST BUILD_DEFS+= MANINSTALL -DIGEST= ${WRKSRC}/bootstrap-digest -DIGEST_ALGORITHM= MD5 MAKE_ENV+= BINDIR=${LOCALBASE}/bin MANDIR=${LOCALBASE}/man MAKE_ENV+= CPPFLAGS="${CPPFLAGS} -DVERSION=${VERSION}" .include "../../mk/bsd.prefs.mk" - post-extract: @for FILE in Makefile digest.c digest.1 \ md5c.c md5.h md5hl.c \ @@ -37,9 +34,6 @@ post-extract: ; do \ ${CP} ${FILESDIR}/$$FILE ${WRKSRC}; \ done - @${SED} -e 's#$${PREFIX}#${PREFIX}#g' ${SCRIPTDIR}/bootstrap-digest \ - >${DIGEST} - @${CHMOD} +x ${DIGEST} pre-install: @${RM} -f ${PLIST_SRC} diff --git a/pkgtools/digest/files/Makefile b/pkgtools/digest/files/Makefile index 9ae431156c0..f602dc4d8ef 100644 --- a/pkgtools/digest/files/Makefile +++ b/pkgtools/digest/files/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/03/06 11:21:04 agc Exp $ +# $NetBSD: Makefile,v 1.2 2001/03/10 15:55:14 tron Exp $ # When adding new digest algorithms, please use rmd160 as the template, # and bump the version definition in the package Makefile @@ -28,6 +28,10 @@ CPPFLAGS+= -DHAVE_SYS_ENDIAN_H_ CPPFLAGS+= -DHAVE_MACHINE_ENDIAN_H_ .endif +.if (${OPSYS} == SunOS) +NOMAN= YES +.else LDSTATIC?= -static +.endif .include <bsd.prog.mk> diff --git a/pkgtools/digest/files/patch-sum b/pkgtools/digest/files/patch-sum deleted file mode 100644 index d6f13d1fc0e..00000000000 --- a/pkgtools/digest/files/patch-sum +++ /dev/null @@ -1,4 +0,0 @@ -$NetBSD: patch-sum,v 1.3 2001/03/10 15:23:55 tron Exp $ - -MD5 (patch-aa) = 7d90e181eaff2e552dcfe0371f109de1 -MD5 (patch-ab) = 6005b2f7ee7f14e6490c1422f066dcba diff --git a/pkgtools/digest/files/sha1hl.c b/pkgtools/digest/files/sha1hl.c index 49fe0295633..401ba524295 100644 --- a/pkgtools/digest/files/sha1hl.c +++ b/pkgtools/digest/files/sha1hl.c @@ -1,4 +1,4 @@ -/* $NetBSD: sha1hl.c,v 1.1.1.1 2001/03/06 11:21:05 agc Exp $ */ +/* $NetBSD: sha1hl.c,v 1.2 2001/03/10 15:55:14 tron Exp $ */ /* sha1hl.c * ---------------------------------------------------------------------------- @@ -12,6 +12,7 @@ /* #include "namespace.h" */ #include <sys/cdefs.h> +#include <sys/fcntl.h> #include <sys/file.h> #include <sys/types.h> #include <sys/uio.h> @@ -24,7 +25,7 @@ #include <unistd.h> #if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: sha1hl.c,v 1.1.1.1 2001/03/06 11:21:05 agc Exp $"); +__RCSID("$NetBSD: sha1hl.c,v 1.2 2001/03/10 15:55:14 tron Exp $"); #endif /* LIBC_SCCS and not lint */ #ifndef _DIAGASSERT diff --git a/pkgtools/digest/patches/patch-aa b/pkgtools/digest/patches/patch-aa deleted file mode 100644 index 2fa84005f73..00000000000 --- a/pkgtools/digest/patches/patch-aa +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2001/03/10 11:18:10 tron Exp $ - ---- Makefile.orig Sat Mar 10 11:53:55 2001 -+++ Makefile Sat Mar 10 12:13:52 2001 -@@ -28,6 +28,10 @@ - CPPFLAGS+= -DHAVE_MACHINE_ENDIAN_H_ - .endif - -+.if (${OPSYS} == SunOS) -+NOMAN= YES -+.else - LDSTATIC?= -static -+.endif - - .include <bsd.prog.mk> diff --git a/pkgtools/digest/patches/patch-ab b/pkgtools/digest/patches/patch-ab deleted file mode 100644 index d08467d5a4d..00000000000 --- a/pkgtools/digest/patches/patch-ab +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2001/03/10 11:18:10 tron Exp $ - ---- sha1hl.c.orig Sat Mar 10 11:53:55 2001 -+++ sha1hl.c Sat Mar 10 11:55:10 2001 -@@ -12,6 +12,7 @@ - /* #include "namespace.h" */ - - #include <sys/cdefs.h> -+#include <sys/fcntl.h> - #include <sys/file.h> - #include <sys/types.h> - #include <sys/uio.h> diff --git a/pkgtools/digest/scripts/bootstrap-digest b/pkgtools/digest/scripts/bootstrap-digest deleted file mode 100644 index e8cf09cce8e..00000000000 --- a/pkgtools/digest/scripts/bootstrap-digest +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -PATH=/bin:/sbin:/usr/bin:${PREFIX}/bsd/bin; export PATH - -exec md5 |