Changes 0.5.17:

* Bug fixes

6 files changed, 38 insertions, 64 deletions

diff --git a/net/ORBit/Makefile b/net/ORBit/Makefile
index 2ace4984515..3981c0c6a0b 100644
--- a/net/ORBit/Makefile
+++ b/net/ORBit/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.109 2004/12/04 23:09:06 jlam Exp $
-#
+# $NetBSD: Makefile,v 1.110 2005/01/13 09:58:57 adam Exp $
 
-DISTNAME=		ORBit-0.${ORBIT_MAJOR}.${ORBIT_MINOR}
-PKGREVISION=		7
-CATEGORIES=		net
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/ORBit/0.${ORBIT_MAJOR}/}
+DISTNAME=	ORBit-0.${ORBIT_MAJOR}.${ORBIT_MINOR}
+CATEGORIES=	net
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/ORBit/0.${ORBIT_MAJOR}/}
+EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=		tech-pkg@NetBSD.org
-HOMEPAGE=		http://www.gnome.org/
-COMMENT=		High-performance CORBA ORB with support for the C language
+MAINTAINER=	tech-pkg@NetBSD.org
+HOMEPAGE=	http://www.gnome.org/
+COMMENT=	High-performance CORBA ORB with support for the C language
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
@@ -33,7 +32,7 @@ PKGCONFIG_OVERRIDE+=	libIDL/libIDL.pc.in
 
 # for DISTNAME, PKGNAME
 ORBIT_MAJOR=		5
-ORBIT_MINOR=		15
+ORBIT_MINOR=		17
 
 INFO_FILES=		libIDL.info
 
diff --git a/net/ORBit/distinfo b/net/ORBit/distinfo
index cde8aadae4a..e6c5570a214 100644
--- a/net/ORBit/distinfo
+++ b/net/ORBit/distinfo
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.21 2004/11/12 06:39:20 jlam Exp $
+$NetBSD: distinfo,v 1.22 2005/01/13 09:58:57 adam Exp $
 
-SHA1 (ORBit-0.5.15.tar.gz) = 1571976662311060175008d225de05e9bc2eb038
-Size (ORBit-0.5.15.tar.gz) = 1335272 bytes
-SHA1 (patch-aa) = ef745d3d279d57dbdf6380053b6b4a7e63322671
+SHA1 (ORBit-0.5.17.tar.bz2) = c8b2daef43b028d65d0ab82f0a88558942be6217
+Size (ORBit-0.5.17.tar.bz2) = 1065003 bytes
 SHA1 (patch-ab) = c2b7cc5f83230035c214600bff59d4dfefd92422
-SHA1 (patch-ac) = 49bc73c9e6d9b369ca9f44630be75539252e3df7
+SHA1 (patch-ac) = b46d9dc6fcb3ca598aa986c25a25053fa3e1410a
 SHA1 (patch-ad) = d4f61e2fef4b862606473ced8f0b27ea3b7f22b3
 SHA1 (patch-ae) = 95cc6f46fa2cfcd34af2e546f3d4a8d55194e5eb
-SHA1 (patch-af) = 53be67746a3488a899e887de416d940f884f80d7
+SHA1 (patch-af) = 88b7f08410322b4408d2209762f77cb43758a4ff
 SHA1 (patch-ag) = 875e83a597ab39d57abcfd9259d8ec15707ea45c
 SHA1 (patch-ai) = 06e1cb2bc9f4f5460cdde71526417cdaa38ff310
 SHA1 (patch-ak) = d569014320dbea40ccdb9e369e07c984ee7bd9de
@@ -15,4 +14,4 @@ SHA1 (patch-al) = 74fcc40377e85e29a35d60b465f51ef50e7df8fd
 SHA1 (patch-am) = f52369447d04a382d6e93a6bddaf3962a3ab6677
 SHA1 (patch-an) = fa9bb500ddcd0ec8e64b5ff1edbe0f02f5cb0f39
 SHA1 (patch-ao) = b80bf3da551bacccd23a7a27677be8e985e6b543
-SHA1 (patch-ap) = 7efe438cc392d14c19a1453487a988a585def4ae
+SHA1 (patch-ap) = 46d1dc2c930090d88e6745025cd0cfefc55c7405
diff --git a/net/ORBit/patches/patch-aa b/net/ORBit/patches/patch-aa
deleted file mode 100644
index 1f5e33bd333..00000000000
--- a/net/ORBit/patches/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-aa,v 1.11 2002/04/25 12:17:05 agc Exp $
-
---- popt/configure.orig	Wed Mar 20 15:45:04 2002
-+++ popt/configure
-@@ -7298,18 +7298,6 @@
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:7301: checking for GNU xgettext" >&5
--echo $ECHO_N "checking for GNU xgettext... $ECHO_C" >&6
--xgettext --version 2>&1 | grep 'GNU gettext' >/dev/null 2>&1 || { { echo "$as_me:7303: error:
--*** GNU gettext is required. The latest version
--*** is always available from ftp://ftp.gnu.org/gnu/gettext/." >&5
--echo "$as_me: error:
--*** GNU gettext is required. The latest version
--*** is always available from ftp://ftp.gnu.org/gnu/gettext/." >&2;}
--   { (exit 1); exit 1; }; }
--echo "$as_me:7310: result: yes" >&5
--echo "${ECHO_T}yes" >&6
--
- for ac_func in strerror mtrace
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
diff --git a/net/ORBit/patches/patch-ac b/net/ORBit/patches/patch-ac
index c2faabfa601..691b949e454 100644
--- a/net/ORBit/patches/patch-ac
+++ b/net/ORBit/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.13 2003/12/16 11:22:31 sketch Exp $
+$NetBSD: patch-ac,v 1.14 2005/01/13 09:58:57 adam Exp $
 
---- configure.orig	2002-03-20 14:45:48.000000000 +0000
-+++ configure	2003-12-15 17:52:22.568422320 +0000
-@@ -7715,7 +7715,7 @@
+--- configure.orig	2002-06-06 11:27:24.000000000 +0000
++++ configure
+@@ -7922,7 +7922,7 @@ EOF
  fi
  done
  
@@ -10,16 +10,16 @@ $NetBSD: patch-ac,v 1.13 2003/12/16 11:22:31 sketch Exp $
 +for ac_header in alloca.h stddef.h wchar.h wcstr.h wctype.h machine/types.h tcpd.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- echo "$as_me:7721: checking for $ac_header" >&5
-@@ -8628,6 +8628,7 @@
+ echo "$as_me:7928: checking for $ac_header" >&5
+@@ -8835,6 +8835,7 @@ rm -f conftest.$ac_objext conftest.$ac_e
  
- echo "$as_me:8629: checking \"whether to use TCP wrappers\"" >&5
+ echo "$as_me:8836: checking \"whether to use TCP wrappers\"" >&5
  echo $ECHO_N "checking \"whether to use TCP wrappers\"... $ECHO_C" >&6
 +if test -z "$LIBWRAP_PATH" && test -z "$LIB_WRAP"; then
  LIBWRAP_PATH=""
  LIB_WRAP=""
  for I in $LDFLAGS $LIBS -L/usr/lib; do
-@@ -8639,6 +8640,10 @@
+@@ -8846,6 +8847,10 @@ for I in $LDFLAGS $LIBS -L/usr/lib; do
  		LIB_WRAP=-lwrap
  		echo "Found $THEFILE/libwrap.so" 1>&5
  		break
@@ -30,11 +30,11 @@ $NetBSD: patch-ac,v 1.13 2003/12/16 11:22:31 sketch Exp $
  	else
  		echo "From $I, checking in dir $THEFILE for libwrap.a" 1>&5
  		if test -f $THEFILE/libwrap.a; then
-@@ -8649,6 +8654,7 @@
+@@ -8856,6 +8861,7 @@ for I in $LDFLAGS $LIBS -L/usr/lib; do
  	fi
  	esac
  done
 +fi
  if test -n "$LIBWRAP_PATH" || test -n "$LIB_WRAP"; then
- 	echo "$as_me:8653: result: yes" >&5
+ 	echo "$as_me:8860: result: yes" >&5
  echo "${ECHO_T}yes" >&6
diff --git a/net/ORBit/patches/patch-af b/net/ORBit/patches/patch-af
index 32bb9281550..453fef733b0 100644
--- a/net/ORBit/patches/patch-af
+++ b/net/ORBit/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.9 2004/11/12 06:39:20 jlam Exp $
+$NetBSD: patch-af,v 1.10 2005/01/13 09:58:57 adam Exp $
 
---- src/IIOP/Makefile.in.orig	Mon Jan  7 18:23:54 2002
-+++ src/IIOP/Makefile.in	Thu Apr  4 12:30:24 2002
-@@ -399,8 +399,11 @@
+--- src/IIOP/Makefile.in.orig	2002-06-06 11:34:50.000000000 +0000
++++ src/IIOP/Makefile.in
+@@ -409,8 +409,11 @@ $(libwrap_files): make_libwrap_files
  
  make_libwrap_files: $(LIBWRAP_PATH)
  	ar x $(LIBWRAP_PATH)
diff --git a/net/ORBit/patches/patch-ap b/net/ORBit/patches/patch-ap
index 7f47a7e0884..5373fec1335 100644
--- a/net/ORBit/patches/patch-ap
+++ b/net/ORBit/patches/patch-ap
@@ -1,14 +1,13 @@
-$NetBSD: patch-ap,v 1.1 2003/12/16 11:22:31 sketch Exp $
+$NetBSD: patch-ap,v 1.2 2005/01/13 09:58:57 adam Exp $
 
---- config.h.in.orig	2002-03-20 14:14:02.000000000 +0000
-+++ config.h.in	2003-12-15 17:58:49.132485462 +0000
-@@ -33,6 +33,9 @@
- #undef HAVE_HOSTS_ACCESS
- #undef HAVE_TCPD_H
+--- config.h.in.orig	2002-06-06 11:25:14.000000000 +0000
++++ config.h.in
+@@ -35,7 +35,7 @@
  
-+/* Define if you have the <alloca.h> header file. */
-+#undef HAVE_ALLOCA_H
-+
- #ifdef HAVE_ALLOCA_H
+ #undef ORBIT_HAVE_ALLOCA_H
+ 
+-#ifdef ORBIT_HAVE_ALLOCA_H
++#if ORBIT_HAVE_ALLOCA_H
  #include <alloca.h>
  #endif
+