Import of pkgsrc-2013Q2

databases/db46/DESCR

@@ -0,0 +1,23 @@
+Berkeley DB is an embeddable database system that supports keyed access to
+data. The software is distributed in source code form, and developers can
+compile and link the source code into a single library for inclusion
+directly in their applications.
+
+Developers may choose to store data in any of several different storage
+structures to satisfy the requirements of a particular application. In
+database terminology, these storage structures and the code that operates on
+them are called access methods. The library includes support for the
+following access methods:
+
+   * B+tree: Stores keys in sorted order, using either a programmer-supplied
+     ordering function or a default function that does lexicographical
+     ordering of keys. Applications may perform equality or range searches.
+   * Hashing: Stores records in a hash table for fast searches based on
+     strict equality. Extended Linear Hashing modifies the hash function
+     used by the table as new records are inserted, in order to keep buckets
+     underfull in the steady state.
+   * Fixed and Variable-Length Records: Stores fixed- or variable-length
+     records in sequential order. Record numbers may be immutable or
+     mutable, i.e., permitting new records to be inserted between existing
+     records or requiring that new records be added only at the end of the
+     database.

databases/db46/Makefile

@@ -0,0 +1,58 @@
+# $NetBSD: Makefile,v 1.5 2012/12/13 00:33:19 gdt Exp $
+
+DISTNAME=	db-4.6.21
+PKGNAME=	${DISTNAME:S/db/db46/}
+CATEGORIES=	databases
+MASTER_SITES=	http://download.oracle.com/berkeley-db/ \
+		http://download-uk.oracle.com/berkeley-db/
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://www.oracle.com/database/berkeley-db/db/index.html
+COMMENT=	Berkeley DB version 4 from Oracle
+LICENSE=	sleepycat-license # minus ASM stanza
+
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_LANGUAGES=		c c++
+USE_LIBTOOL=		yes
+USE_TOOLS+=		pax rpcgen
+GNU_CONFIGURE=		yes
+CONFIGURE_DIRS=		build_unix
+CONFIGURE_SCRIPT=	../dist/configure
+
+CONFIGURE_ARGS+=	--enable-cxx
+CONFIGURE_ARGS+=	--enable-rpc
+CONFIGURE_ARGS+=	--enable-compat185
+CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/db46
+CONFIGURE_ARGS+=	--program-transform-name=s,db_,db46_,
+
+# Along with a hack in patch-ab, this forces shlib detection via
+# the pkgsrc-supplied libtool only.
+CONFIGURE_ENV+=		LIBTOOL_PROG=${LIBTOOL:Q}\ ${LIBTOOL_FLAGS:Q}
+
+OPSYSVARS+=		LIBSO_LIBS
+LIBSO_LIBS.Interix+=	-lrpclib
+LIBS.Interix+=		-lrpclib # needed for in-tree programs, too
+LIBSO_LIBS.SunOS+=	-lnsl -lrt
+CONFIGURE_ENV+=		LIBSO_LIBS=${LIBSO_LIBS:Q}
+
+# DB4 only want pthreads because it's really after POSIX 1003.1
+# inter-process mutexes.  In this case, we only care to use the native
+# threads.  We also only care if we're using a non-GCC compiler since
+# we have code to use GCC assembly for mutexes instead of 1003.1
+# mutexes.
+#
+.include "../../mk/compiler.mk"
+.if !empty(PKGSRC_COMPILER:Mgcc)
+CONFIGURE_ENV+=		ac_cv_lib_pthread_main=no
+.else
+PTHREAD_OPTS+=		native
+.  include "../../mk/pthread.buildlink3.mk"
+.endif
+
+INSTALLATION_DIRS=	include/db46 lib share/doc/db46
+
+post-install:
+	chown -R ${DOCOWN}:${DOCGRP} ${DESTDIR}${PREFIX}/share/doc/db46
+
+.include "../../mk/bsd.pkg.mk"

databases/db46/buildlink3.mk

@@ -0,0 +1,27 @@
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:05 joerg Exp $
+
+BUILDLINK_TREE+=	db46
+
+.if !defined(DB46_BUILDLINK3_MK)
+DB46_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.db46+=	db46>=4.6.21
+BUILDLINK_PKGSRCDIR.db46?=	../../databases/db46
+BUILDLINK_INCDIRS.db46?=		include/db46
+BUILDLINK_LDADD.db46=		-ldb46
+BUILDLINK_TRANSFORM+=		l:db-4:db46 l:db46:db46
+
+.  include "../../mk/bsd.fast.prefs.mk"
+.  if defined(USE_DB185) && !empty(USE_DB185:M[yY][eE][sS])
+BUILDLINK_LIBS.db46=		${BUILDLINK_LDADD.db46}
+BUILDLINK_TRANSFORM+=		l:db:db46
+.  endif
+
+.  include "../../mk/compiler.mk"
+.  if empty(PKGSRC_COMPILER:Mgcc)
+PTHREAD_OPTS+=	native
+.    include "../../mk/pthread.buildlink3.mk"
+.  endif
+.endif # DB46_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-db46

databases/db46/distinfo

@@ -0,0 +1,8 @@
+$NetBSD: distinfo,v 1.2 2009/07/12 10:34:19 hasso Exp $
+
+SHA1 (db-4.6.21.tar.gz) = 5be3beb82e42a78ff671a3f5a4c30e5652972119
+RMD160 (db-4.6.21.tar.gz) = ccf9a4b85cc0464b2f3c2f2da29d99328fd4978e
+Size (db-4.6.21.tar.gz) = 11881885 bytes
+SHA1 (patch-aa) = e4626d9ec00e8f3fae6e334447739febb9ad1be5
+SHA1 (patch-ab) = 01ae6c671317d5b013ab154ae5a230391b3246f4
+SHA1 (patch-ac) = 72930ded2e676e810242df60f94703f37a8be853

databases/db46/hacks.mk

@@ -0,0 +1,25 @@
+# $NetBSD: hacks.mk,v 1.1 2008/09/09 22:23:32 tron Exp $
+
+### [Sun Mar 14 19:32:40 UTC 2004 : jlam]
+### GCC 3.3.x and older versions have an optimization bug on powerpc that's
+### tickled by the db4 source code, so remove optimization flags in that
+### case. This fixes PR pkg/30647 by Ian Spray.
+###
+.if ${MACHINE_ARCH} == "powerpc"
+.  include "../../mk/compiler.mk"
+.  if !empty(CC_VERSION:Mgcc*)
+.    if !defined(_GCC_IS_TOO_OLD)
+_GCC_IS_TOO_OLD!=	\
+	if ${PKG_ADMIN} pmatch 'gcc<3.4' ${CC_VERSION}; then		\
+		${ECHO} "yes";						\
+	else								\
+		${ECHO} "no";						\
+	fi
+MAKEFLAGS+=	_GCC_IS_TOO_OLD=${_GCC_IS_TOO_OLD:Q}
+.    endif
+.    if !empty(_GCC_IS_TOO_OLD:M[yY][eE][sS])
+PKG_HACKS+=		powerpc-codegen
+BUILDLINK_TRANSFORM+=	rm:-O[0-9]*
+.    endif
+.  endif
+.endif

databases/db46/patches/patch-aa

@@ -0,0 +1,103 @@
+$NetBSD: patch-aa,v 1.1 2008/09/09 22:23:33 tron Exp $
+
+--- dist/Makefile.in.orig	2007-07-05 19:35:02.000000000 +0100
++++ dist/Makefile.in	2008-09-09 22:33:08.000000000 +0100
+@@ -11,7 +11,7 @@
+ bindir=	@bindir@
+ includedir=@includedir@
+ libdir=	@libdir@
+-docdir=	$(prefix)/docs
++docdir=	$(prefix)/share/doc/db46
+ 
+ dmode=	755
+ emode=	555
+@@ -41,7 +41,7 @@
+ LIBTOOL=	@LIBTOOL@
+ 
+ POSTLINK=	@POSTLINK@
+-SOLINK=		@MAKEFILE_SOLINK@
++SOLINK=		@MAKEFILE_SOLINK@ -version-info @DB_VERSION_MINOR@:@DB_VERSION_PATCH@
+ SOFLAGS=	@SOFLAGS@
+ LIBMAJOR=	@DB_VERSION_MAJOR@
+ LIBVERSION=	@DB_VERSION_MAJOR@.@DB_VERSION_MINOR@
+@@ -60,7 +60,7 @@
+ TEST_LIBS=	@TEST_LIBS@
+ LIBCSO_LIBS=	@LIBCSO_LIBS@ @LIBSO_LIBS@
+ 
+-libdb_base=	libdb
++libdb_base=	libdb46
+ libdb=		$(libdb_base).a
+ libdb_version=	$(libdb_base)-$(LIBVERSION).a
+ libso=		$(libdb_base)-$(LIBVERSION)@SOSUFFIX@
+@@ -79,7 +79,7 @@
+ XSOLINK=	@MAKEFILE_XSOLINK@ @CXXFLAGS@
+ LIBXSO_LIBS=	@LIBXSO_LIBS@ @LIBSO_LIBS@
+ 
+-libcxx_base=	libdb_cxx
++libcxx_base=	libdb46_cxx
+ libcxx=		$(libcxx_base).a
+ libcxx_version=	$(libcxx_base)-$(LIBVERSION).a
+ libxso=		$(libcxx_base)-$(LIBVERSION)@SOSUFFIX@
+@@ -105,9 +105,9 @@
+ JAVA_EXDIR=	$(srcdir)/examples_java/src
+ JAVA_SLEEPYCAT=	$(srcdir)/java/src/com/sleepycat
+ 
+-libj_jarfile=	db.jar
++libj_jarfile=	db4.jar
+ libj_exjarfile=	dbexamples.jar
+-libjso_base=	libdb_java
++libjso_base=	libdb46_java
+ libjso=		$(libjso_base)-$(LIBVERSION)@JMODSUFFIX@
+ libjso_static=	$(libjso_base)-$(LIBVERSION).a
+ libjso_target=	$(libjso_base)-$(LIBVERSION).la
+@@ -122,7 +122,7 @@
+ ##################################################
+ TCL_INCLUDE_SPEC=	@TCL_INCLUDE_SPEC@
+ LIBTSO_LIBS=	@LIBTSO_LIBS@ @LIBSO_LIBS@
+-libtso_base=	libdb_tcl
++libtso_base=	libdb46_tcl
+ libtso=		$(libtso_base)-$(LIBVERSION)@MODSUFFIX@
+ libtso_static=	$(libtso_base)-$(LIBVERSION).a
+ libtso_target=	$(libtso_base)-$(LIBVERSION).la
+@@ -738,8 +738,7 @@
+ 	    ($(MKDIR) -p $(DESTDIR)$(includedir) && \
+ 	    $(CHMOD) $(dmode) $(DESTDIR)$(includedir))
+ 	@cd $(DESTDIR)$(includedir) && $(RM) -f $(INCDOT)
+-	@$(CP) -p $(INCDOT) $(DESTDIR)$(includedir)
+-	@cd $(DESTDIR)$(includedir) && $(CHMOD) $(fmode) $(INCDOT)
++	${BSD_INSTALL_DATA} $(INCDOT) $(DESTDIR)$(includedir)
+ 
+ uninstall_include:
+ 	@cd $(DESTDIR)$(includedir) && $(RM) -f $(INCDOT)
+@@ -750,7 +749,7 @@
+ 	    ($(MKDIR) -p $(DESTDIR)$(libdir) && \
+ 	    $(CHMOD) $(dmode) $(DESTDIR)$(libdir))
+ 	@cd $(DESTDIR)$(libdir) && $(RM) -f $(LIB_INSTALL_FILE_LIST)
+-	@$(INSTALLER) @INSTALL_LIBS@ $(DESTDIR)$(libdir)
++	@libtool --mode=install ${BSD_INSTALL_LIB} @INSTALL_LIBS@ $(DESTDIR)$(libdir)
+ 	@(cd $(DESTDIR)$(libdir) && \
+ 	    test -f $(libso) && $(LN) -s $(libso) $(libso_default); \
+ 	    test -f $(libso) && $(LN) -s $(libso) $(libso_major); \
+@@ -774,11 +773,8 @@
+ 	    ($(MKDIR) -p $(DESTDIR)$(bindir) && \
+ 	    $(CHMOD) $(dmode) $(DESTDIR)$(bindir))
+ 	@for i in $(UTIL_PROGS); do \
+-		test -f $$i.exe && i=$$i.exe || i=$$i; \
+-		$(RM) -f $(DESTDIR)$(bindir)/$$i; \
+-		$(INSTALLER) $$i $(DESTDIR)$(bindir)/$$i; \
+-		$(STRIP) $(DESTDIR)$(bindir)/$$i; \
+-		$(CHMOD) $(emode) $(DESTDIR)$(bindir)/$$i; \
++		target="${DESTDIR}${bindir}/`echo $$i | sed '${transform}'`"; \
++		libtool --mode=install ${BSD_INSTALL_PROGRAM} $$i $$target; \
+ 	done
+ 
+ uninstall_utilities:
+@@ -795,7 +791,7 @@
+ 	    ($(MKDIR) -p $(DESTDIR)$(docdir) && \
+ 	    $(CHMOD) $(dmode) $(DESTDIR)$(docdir))
+ 	@cd $(DESTDIR)$(docdir) && $(RM) -rf $(DOCLIST)
+-	@cd $(srcdir)/docs && $(CP) -pr $(DOCLIST) $(DESTDIR)$(docdir)/
++	@cd $(srcdir)/docs && pax -rwpp $(DOCLIST) $(DESTDIR)$(docdir)/
+ 
+ uninstall_docs:
+ 	@cd $(DESTDIR)$(docdir) && $(RM) -rf $(DOCLIST)

databases/db46/patches/patch-ab

@@ -0,0 +1,78 @@
+$NetBSD: patch-ab,v 1.2 2009/07/12 10:34:19 hasso Exp $
+
+--- dist/configure.orig	2007-09-27 18:32:04 +0300
++++ dist/configure	2009-07-11 22:40:41 +0300
+@@ -3735,7 +3735,7 @@ bsdi3*)	CC=${CC-"shlicc2"}
+ 	LIBSO_LIBS="$LIBSO_LIBS -lipc";;
+ cygwin*)
+ 	CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE -D_REENTRANT";;
+-freebsd*)
++freebsd*|dragonfly*)
+ 	CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"
+ 	LDFLAGS="$LDFLAGS -pthread";;
+ gnu*|k*bsd*-gnu|linux*)
+@@ -5938,6 +5938,7 @@ db_cv_gxx_except=no;
+ if test "$GXX" = "yes"; then
+ 	GXX_VERSION=`${MAKEFILE_CXX} --version`
+ 	case ${GXX_VERSION} in
++	egcs*)	CXXFLAGS="-fexceptions $CXXFLAGS";;
+ 	1.*|2.[01234567].*|*-1.*|*-2.[01234567].*)
+ 		db_cv_gxx_except=yes;;
+ 	esac
+@@ -5954,7 +5955,7 @@ fi
+ # we're using.
+ case "$host_os" in
+ sysv5UnixWare*|sysv5OpenUNIX8*)
+-	if test "$GCC" == "yes"; then
++	if test "$GCC" = "yes"; then
+ 		CPPFLAGS="$CPPFLAGS -pthread"
+ 		LDFLAGS="$LDFLAGS -pthread"
+ 	else
+@@ -21078,7 +21079,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
+ 
+ 
+ SOFLAGS="-rpath \$(libdir)"
+-LIBTOOL_PROG="${SHELL} ./libtool"
+ 
+ # Set SOSUFFIX and friends
+ 
+@@ -21170,7 +21170,7 @@ echo "${ECHO_T}$JMODSUFFIX" >&6; }
+ INSTALLER="\$(LIBTOOL) --mode=install cp -p"
+ 
+ MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}"
+-MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -avoid-version"
++MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}"
+ MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}"
+ MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}"
+ MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version"
+@@ -21937,7 +21937,7 @@ if test "$_JTOPDIR" != "/usr"; then
+ 	case "$host_os" in
+ 	aix*)		_JNI_INC_SUBDIRS="aix";;
+ 	bsdi*)		_JNI_INC_SUBDIRS="bsdos";;
+-	freebsd*)	_JNI_INC_SUBDIRS="freebsd";;
++	freebsd*|dragonfly*)	_JNI_INC_SUBDIRS="freebsd";;
+ 	hp*)		_JNI_INC_SUBDIRS="hp-ux";;
+ 	linux*)		_JNI_INC_SUBDIRS="linux genunix";;
+ 	osf*)		_JNI_INC_SUBDIRS="alpha";;
+@@ -28547,10 +28547,12 @@ typedef FILE ac__type_new_;
+ int
+ main ()
+ {
++#ifndef __DragonFly__
+ if ((ac__type_new_ *) 0)
+   return 0;
+ if (sizeof (ac__type_new_))
+   return 0;
++#endif
+   ;
+   return 0;
+ }
+@@ -29859,7 +29861,7 @@ rm -f core conftest.err conftest.$ac_obj
+ 	# If the user specified we use POSIX pthreads mutexes, and we fail to
+ 	# find the full interface, try and configure for just intra-process
+ 	# support.
+-	if test "$db_cv_mutex" = no -o "$db_cv_mutex" = posix_only; then
++	if test "$ac_cv_lib_pthread_main" = yes -a "$db_cv_mutex" = no -o "$db_cv_mutex" = posix_only; then
+ 		LIBS="$LIBS -lpthread"
+ 
+ if test "$cross_compiling" = yes; then

databases/db46/patches/patch-ac

@@ -0,0 +1,103 @@
+$NetBSD: patch-ac,v 1.1 2008/09/09 22:23:33 tron Exp $
+
+--- hmac/sha1.c.orig	2008-01-09 19:15:23.000000000 +0100
++++ hmac/sha1.c
+@@ -98,6 +98,64 @@ A million repetitions of "a"
+ #define	R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30);
+ #define	R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30);
+ 
++typedef union {
++    unsigned char c[64];
++    u_int32_t l[16];
++} CHAR64LONG16;
++
++#ifdef __sparc_v9__
++void do_R01(u_int32_t *a, u_int32_t *b, u_int32_t *c, u_int32_t *d, u_int32_t *e, CHAR64LONG16 *, int is_bigendian);
++void do_R2(u_int32_t *a, u_int32_t *b, u_int32_t *c, u_int32_t *d, u_int32_t *e, CHAR64LONG16 *, int is_bigendian);
++void do_R3(u_int32_t *a, u_int32_t *b, u_int32_t *c, u_int32_t *d, u_int32_t *e, CHAR64LONG16 *, int is_bigendian);
++void do_R4(u_int32_t *a, u_int32_t *b, u_int32_t *c, u_int32_t *d, u_int32_t *e, CHAR64LONG16 *, int is_bigendian);
++
++#define nR0(v,w,x,y,z,i) R0(*v,*w,*x,*y,*z,i)
++#define nR1(v,w,x,y,z,i) R1(*v,*w,*x,*y,*z,i)
++#define nR2(v,w,x,y,z,i) R2(*v,*w,*x,*y,*z,i)
++#define nR3(v,w,x,y,z,i) R3(*v,*w,*x,*y,*z,i)
++#define nR4(v,w,x,y,z,i) R4(*v,*w,*x,*y,*z,i)
++
++void
++do_R01(u_int32_t *a, u_int32_t *b, u_int32_t *c, u_int32_t *d, u_int32_t *e, CHAR64LONG16 *block, int is_bigendian)
++{
++    nR0(a,b,c,d,e, 0); nR0(e,a,b,c,d, 1); nR0(d,e,a,b,c, 2); nR0(c,d,e,a,b, 3);
++    nR0(b,c,d,e,a, 4); nR0(a,b,c,d,e, 5); nR0(e,a,b,c,d, 6); nR0(d,e,a,b,c, 7);
++    nR0(c,d,e,a,b, 8); nR0(b,c,d,e,a, 9); nR0(a,b,c,d,e,10); nR0(e,a,b,c,d,11);
++    nR0(d,e,a,b,c,12); nR0(c,d,e,a,b,13); nR0(b,c,d,e,a,14); nR0(a,b,c,d,e,15);
++    nR1(e,a,b,c,d,16); nR1(d,e,a,b,c,17); nR1(c,d,e,a,b,18); nR1(b,c,d,e,a,19);
++}
++
++void
++do_R2(u_int32_t *a, u_int32_t *b, u_int32_t *c, u_int32_t *d, u_int32_t *e, CHAR64LONG16 *block, int is_bigendian)
++{
++    nR2(a,b,c,d,e,20); nR2(e,a,b,c,d,21); nR2(d,e,a,b,c,22); nR2(c,d,e,a,b,23);
++    nR2(b,c,d,e,a,24); nR2(a,b,c,d,e,25); nR2(e,a,b,c,d,26); nR2(d,e,a,b,c,27);
++    nR2(c,d,e,a,b,28); nR2(b,c,d,e,a,29); nR2(a,b,c,d,e,30); nR2(e,a,b,c,d,31);
++    nR2(d,e,a,b,c,32); nR2(c,d,e,a,b,33); nR2(b,c,d,e,a,34); nR2(a,b,c,d,e,35);
++    nR2(e,a,b,c,d,36); nR2(d,e,a,b,c,37); nR2(c,d,e,a,b,38); nR2(b,c,d,e,a,39);
++}
++
++void
++do_R3(u_int32_t *a, u_int32_t *b, u_int32_t *c, u_int32_t *d, u_int32_t *e, CHAR64LONG16 *block, int is_bigendian)
++{
++    nR3(a,b,c,d,e,40); nR3(e,a,b,c,d,41); nR3(d,e,a,b,c,42); nR3(c,d,e,a,b,43);
++    nR3(b,c,d,e,a,44); nR3(a,b,c,d,e,45); nR3(e,a,b,c,d,46); nR3(d,e,a,b,c,47);
++    nR3(c,d,e,a,b,48); nR3(b,c,d,e,a,49); nR3(a,b,c,d,e,50); nR3(e,a,b,c,d,51);
++    nR3(d,e,a,b,c,52); nR3(c,d,e,a,b,53); nR3(b,c,d,e,a,54); nR3(a,b,c,d,e,55);
++    nR3(e,a,b,c,d,56); nR3(d,e,a,b,c,57); nR3(c,d,e,a,b,58); nR3(b,c,d,e,a,59);
++}
++
++void
++do_R4(u_int32_t *a, u_int32_t *b, u_int32_t *c, u_int32_t *d, u_int32_t *e, CHAR64LONG16 *block, int is_bigendian)
++{
++    nR4(a,b,c,d,e,60); nR4(e,a,b,c,d,61); nR4(d,e,a,b,c,62); nR4(c,d,e,a,b,63);
++    nR4(b,c,d,e,a,64); nR4(a,b,c,d,e,65); nR4(e,a,b,c,d,66); nR4(d,e,a,b,c,67);
++    nR4(c,d,e,a,b,68); nR4(b,c,d,e,a,69); nR4(a,b,c,d,e,70); nR4(e,a,b,c,d,71);
++    nR4(d,e,a,b,c,72); nR4(c,d,e,a,b,73); nR4(b,c,d,e,a,74); nR4(a,b,c,d,e,75);
++    nR4(e,a,b,c,d,76); nR4(d,e,a,b,c,77); nR4(c,d,e,a,b,78); nR4(b,c,d,e,a,79);
++}
++#endif
++
+ #ifdef VERBOSE  /* SAK */
+ static void __db_SHAPrintContext __P((SHA1_CTX *, char *));
+ static void
+@@ -129,10 +187,6 @@ __db_SHA1Transform(state, buffer)
+ 	unsigned char *buffer;
+ {
+ u_int32_t a, b, c, d, e;
+-typedef union {
+-    unsigned char c[64];
+-    u_int32_t l[16];
+-} CHAR64LONG16;
+ CHAR64LONG16* block;
+     int is_bigendian;
+ #ifdef SHA1HANDSOFF
+@@ -151,6 +205,13 @@ CHAR64LONG16* block;
+     c = state[2];
+     d = state[3];
+     e = state[4];
++
++#ifdef __sparc_v9__
++    do_R01(&a, &b, &c, &d, &e, block, is_bigendian);
++    do_R2(&a, &b, &c, &d, &e, block, is_bigendian);
++    do_R3(&a, &b, &c, &d, &e, block, is_bigendian);
++    do_R4(&a, &b, &c, &d, &e, block, is_bigendian);
++#else
+     /* 4 rounds of 20 operations each. Loop unrolled. */
+     R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3);
+     R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7);
+@@ -172,6 +233,8 @@ CHAR64LONG16* block;
+     R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71);
+     R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75);
+     R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79);
++#endif
++
+     /* Add the working vars back into context.state[] */
+     state[0] += a;
+     state[1] += b;