Fixed the build on IRIX 6.5.

5 files changed, 44 insertions, 8 deletions

diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index f775ba9156a..6a1b0644e4c 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2006/08/09 17:58:09 salo Exp $
+# $NetBSD: Makefile,v 1.63 2007/02/20 10:17:14 rillig Exp $
 
 DISTNAME=	heimdal-0.7.2
 PKGREVISION=	3
@@ -43,6 +43,10 @@ CONFIGURE_ENV+=		COMPILE_ET=no
 
 .include "../../mk/bsd.prefs.mk"
 
+.if defined(ABI)
+CONFIGURE_ARGS+=	--with-mips-abi=${ABI}
+.endif
+
 # Heimdal's configure script expects to find the readline.h header as
 # <readline.h>.
 #
@@ -92,6 +96,12 @@ HEIMDAL_TRANSFORM=	s/^ftp/k&/
 PLIST_SUBST+=		KRB5_PREFIX=${KRB5_PREFIX:Q}
 CONFIGURE_ARGS+=	--program-transform-name=${HEIMDAL_TRANSFORM:Q}
 
+.if ${OPSYS} == "IRIX"
+PLIST_SUBST+=		IF_IRIX=""
+.else
+PLIST_SUBST+=		IF_IRIX="@comment "
+.endif
+
 OWN_DIRS_PERMS=		${HEIMDAL_STATEDIR} ${ROOT_USER} ${ROOT_GROUP} 0700
 SPECIAL_PERMS=		${PREFIX}/bin/${KRB5_PREFIX}su ${SETUID_ROOT_PERMS}
 RCD_SCRIPTS=		kadmind kcm kdc kpasswdd
diff --git a/security/heimdal/PLIST b/security/heimdal/PLIST
index 04f533fdc8a..d74b4b9f5be 100644
--- a/security/heimdal/PLIST
+++ b/security/heimdal/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2006/07/05 04:39:14 jlam Exp $
+@comment $NetBSD: PLIST,v 1.12 2007/02/20 10:17:14 rillig Exp $
 bin/${KRB5_PREFIX}login
 bin/${KRB5_PREFIX}rcp
 bin/${KRB5_PREFIX}rsh
@@ -63,6 +63,7 @@ include/krb5/sl.h
 include/krb5/ss/ss.h
 include/krb5/xdbm.h
 info/heimdal.info
+${IF_IRIX}lib/afskauthlib.so
 lib/libasn1.la
 lib/libcom_err.la
 lib/libeditline.la
diff --git a/security/heimdal/distinfo b/security/heimdal/distinfo
index 1b6df19420f..ab8cdc18a57 100644
--- a/security/heimdal/distinfo
+++ b/security/heimdal/distinfo
@@ -1,13 +1,14 @@
-$NetBSD: distinfo,v 1.21 2006/08/09 17:58:09 salo Exp $
+$NetBSD: distinfo,v 1.22 2007/02/20 10:17:14 rillig Exp $
 
 SHA1 (heimdal-0.7.2.tar.gz) = a902e6ad7c31d940b588dc0235b348936f0d719d
 RMD160 (heimdal-0.7.2.tar.gz) = 0f028a9d5a6a66e8efc0397e4d8c8adc2183b409
 Size (heimdal-0.7.2.tar.gz) = 4525734 bytes
 SHA1 (patch-ac) = 313c0a1f91e4f9546ae906f981adae0d499dd9cf
-SHA1 (patch-ad) = a7cfc038e76f8c3da38f8eb0ee48a7f8c7a9c7df
+SHA1 (patch-ad) = fe6a0f6de436182d4960058911142786c945aa89
 SHA1 (patch-al) = 6035ef920b1a005902ae021b307fc4c3efc77449
 SHA1 (patch-am) = 538c0c3bb8806bdd3691d490ea4ceafc7acc0ca7
 SHA1 (patch-an) = 2f414a50520a345f3c875220d2b001516933fbac
 SHA1 (patch-ao) = 7401ad7a47ed8541663193f71bd52feafeeeb045
 SHA1 (patch-ap) = 4c28d64ecf1c55d7eb02d0be1cf3efeff81339c6
 SHA1 (patch-aq) = 3ac32c49d5880813998b5bfe8c474fbb87218cba
+SHA1 (patch-ar) = d00a5786098607f81700ea147eb8acdd882bd27c
diff --git a/security/heimdal/patches/patch-ad b/security/heimdal/patches/patch-ad
index 60848f26193..4d5f341607d 100644
--- a/security/heimdal/patches/patch-ad
+++ b/security/heimdal/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.7 2005/10/26 15:12:45 jlam Exp $
+$NetBSD: patch-ad,v 1.8 2007/02/20 10:17:14 rillig Exp $
 
---- configure.orig	2005-09-09 08:14:45.000000000 -0400
-+++ configure
-@@ -3182,9 +3182,6 @@ fi
+--- configure.orig	Mon Feb  6 08:29:16 2006
++++ configure	Mon Feb 19 18:06:05 2007
+@@ -3182,9 +3182,6 @@
  
  
  
@@ -12,3 +12,11 @@ $NetBSD: patch-ad,v 1.7 2005/10/26 15:12:45 jlam Exp $
  # Make sure we can run config.sub.
  $ac_config_sub sun4 >/dev/null 2>&1 ||
    { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
+@@ -4199,7 +4196,6 @@
+ esac
+ 
+ CC="$CC $abi"
+-libdir="$libdir$abilibdirext"
+ 
+ 
+ echo "$as_me:$LINENO: checking for __attribute__" >&5
diff --git a/security/heimdal/patches/patch-ar b/security/heimdal/patches/patch-ar
new file mode 100644
index 00000000000..835804e9e59
--- /dev/null
+++ b/security/heimdal/patches/patch-ar
@@ -0,0 +1,16 @@
+$NetBSD: patch-ar,v 1.1 2007/02/20 10:17:14 rillig Exp $
+
+Why should anyone want to install the libtool wrapper for a library, but
+not the library itself?
+
+--- lib/auth/afskauthlib/Makefile.in.orig	Mon Feb  6 08:31:49 2006
++++ lib/auth/afskauthlib/Makefile.in	Tue Feb 20 04:20:05 2007
+@@ -347,7 +347,7 @@
+ @KRB5_TRUE@LIB_tsasl = $(top_builddir)/lib/tsasl/libtsasl.la
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
+ foodir = $(libdir)
+-foo_DATA = afskauthlib.so
++foo_DATA = .libs/afskauthlib.so
+ SRCS = verify.c
+ OBJS = verify.o
+ CLEANFILES = $(foo_DATA) $(OBJS) so_locations