Make this package work under Solaris.

4 files changed, 37 insertions, 2 deletions

diff --git a/pkgtools/digest/Makefile b/pkgtools/digest/Makefile
index b2b655900b2..de26c8a80b5 100644
--- a/pkgtools/digest/Makefile
+++ b/pkgtools/digest/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/03/07 23:03:19 kim Exp $
+# $NetBSD: Makefile,v 1.5 2001/03/10 11:18:09 tron Exp $
 #
 # When adding new digest algorithms, please use rmd160 as the template,
 # and bump the VERSION definition.
@@ -24,7 +24,7 @@ BUILD_DEFS+=	MANINSTALL
 MAKE_ENV+=	BINDIR=${LOCALBASE}/bin MANDIR=${LOCALBASE}/man
 MAKE_ENV+=	CPPFLAGS="${CPPFLAGS} -DVERSION=${VERSION}"
 
-do-configure:
+post-extract:
 	@for f in Makefile digest.c digest.1				\
 		md5c.c md5.h md5hl.c					\
 		rmd160.c rmd160.h rmd160hl.c				\
@@ -33,9 +33,12 @@ do-configure:
 		${CP} ${FILESDIR}/$$f ${WRKSRC};			\
 	done
 
+.include "../../mk/bsd.prefs.mk"
+
 pre-install:
 	@${RM} -f ${PLIST_SRC}
 	@${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
+.if (${OPSYS} != SunOS)
 	@for OPT in ${MANINSTALL} broken-solaris-needs-this; do \
 	  case $$OPT in \
 	    catinstall) \
@@ -46,5 +49,6 @@ pre-install:
 		;; \
 	  esac; \
 	done
+.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/pkgtools/digest/files/patch-sum b/pkgtools/digest/files/patch-sum
new file mode 100644
index 00000000000..cd770a716fd
--- /dev/null
+++ b/pkgtools/digest/files/patch-sum
@@ -0,0 +1,4 @@
+$NetBSD: patch-sum,v 1.1 2001/03/10 11:18:10 tron Exp $
+
+SHA1 (patch-aa) = cd2d6441888f36f3e04cad816122e68a641202f7
+SHA1 (patch-ab) = dc843872d63daf67d11849c1d849aa624ed3702e
diff --git a/pkgtools/digest/patches/patch-aa b/pkgtools/digest/patches/patch-aa
new file mode 100644
index 00000000000..2fa84005f73
--- /dev/null
+++ b/pkgtools/digest/patches/patch-aa
@@ -0,0 +1,15 @@
+$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
new file mode 100644
index 00000000000..d08467d5a4d
--- /dev/null
+++ b/pkgtools/digest/patches/patch-ab
@@ -0,0 +1,12 @@
+$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>