Update to 0.5.13.

8 files changed, 48 insertions, 54 deletions

diff --git a/devel/ORBit/Makefile b/devel/ORBit/Makefile
index 5d84c2e72967..36871137f91c 100644
--- a/devel/ORBit/Makefile
+++ b/devel/ORBit/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ORBit
-PORTVERSION=	0.5.12
+PORTVERSION=	0.5.13
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/ORBit
diff --git a/devel/ORBit/distinfo b/devel/ORBit/distinfo
index b7151a2ad88e..d346af3d33c5 100644
--- a/devel/ORBit/distinfo
+++ b/devel/ORBit/distinfo
@@ -1 +1 @@
-MD5 (ORBit-0.5.12.tar.gz) = ab66859c937a940da6bad2c84161c6aa
+MD5 (ORBit-0.5.13.tar.gz) = 89b16a12e565798945b49e9f41d1db5d
diff --git a/devel/ORBit/files/patch-ae b/devel/ORBit/files/patch-ae
index 7e43d15302c9..205f906c7e30 100644
--- a/devel/ORBit/files/patch-ae
+++ b/devel/ORBit/files/patch-ae
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- configure	2001/10/27 12:43:19	1.1
-+++ configure	2001/10/27 12:43:58
-@@ -5747,9 +5747,9 @@
+--- configure.orig	Mon Jan  7 11:09:58 2002
++++ configure	Fri Jan 11 11:51:55 2002
+@@ -2151,9 +2151,9 @@
    rm -f conf.glibtest
  
  
@@ -15,12 +15,12 @@ $FreeBSD$
  
  
  for ac_prog in 'bison -y' byacc
-@@ -7273,57 +7273,47 @@
+@@ -3757,37 +3757,30 @@
  fi
  
  
 +echo $ac_n "checking how many vectors writev is capable to handle""... $ac_c" 1>&6
-+echo "configure:7278: checking how many vectors writev is capable to handle" >&5
++echo "configure:3761: checking how many vectors writev is capable to handle" >&5
  if test "$cross_compiling" = yes; then
 -  cat >> confdefs.h <<\EOF
 -#define HAVE_LIMITED_WRITEV 1
@@ -29,18 +29,16 @@ $FreeBSD$
 +  MAXIOV=16
  else
    cat > conftest.$ac_ext <<EOF
--#line 7284 "configure"
-+#line 7283 "configure"
+ #line 3768 "configure"
  #include "confdefs.h"
  
 -#include <fcntl.h>
 +#include <sys/types.h>
  #include <sys/uio.h>
 -#define NIOVECS 50
--int main(int argc, char *argv[])
 +#include <fcntl.h>
 +#include <stdio.h>
-+int main()
+ int main(int argc, char *argv[])
  {
 -	char dumbuf[20] = "\n";
 -	struct iovec iovecs[NIOVECS];
@@ -56,25 +54,22 @@ $FreeBSD$
 -		return(1);
 -
 -	if(writev(fd, iovecs, NIOVECS) < 0)
--		return 1;
--
 +	FILE *f;
 +	int fd, i;
 +	static struct iovec iovecs[4097];
 +	if ((f = fopen("conftestval", "w")) == NULL || \
 +	    (fd = open("/dev/null", O_WRONLY)) < 0)
-+		exit(1);
+ 		return 1;
+-
 +	for (i = 1; i < 4098 && writev(fd, iovecs, i) >= 0; i++);
 +	fprintf(f, "%d\n", i - 1);
 +	fclose(f);
  	close(fd);
--	return 0;
-+	exit(0);
+ 	return 0;
  }
- 
+@@ -3795,19 +3788,16 @@
  EOF
--if { (eval echo configure:7313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:7306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ if { (eval echo configure:3797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
 -  :
 +  MAXIOV=`cat conftestval`
@@ -95,7 +90,7 @@ $FreeBSD$
  
  
  #######################
-@@ -8260,7 +8250,7 @@
+@@ -4740,7 +4730,7 @@
  s%@LIB_WRAP@%$LIB_WRAP%g
  s%@HAVE_HOSTS_ACCESS_TRUE@%$HAVE_HOSTS_ACCESS_TRUE%g
  s%@HAVE_HOSTS_ACCESS_FALSE@%$HAVE_HOSTS_ACCESS_FALSE%g
@@ -104,7 +99,7 @@ $FreeBSD$
  s%@subdirs@%$subdirs%g
  s%@pkglibdir@%$pkglibdir%g
  
-@@ -8584,10 +8574,6 @@
+@@ -5064,10 +5054,6 @@
        *) # Relative path.
          ac_sub_cache_file="$ac_dots$cache_file" ;;
        esac
diff --git a/devel/ORBit/pkg-plist b/devel/ORBit/pkg-plist
index 54f1b173b491..ddcc8e9caf84 100644
--- a/devel/ORBit/pkg-plist
+++ b/devel/ORBit/pkg-plist
@@ -22,14 +22,8 @@ include/orbit-1.0/IIOP/IIOP.h
 include/orbit-1.0/IIOP/giop-msg-buffer.h
 include/orbit-1.0/IIOP/iiop-encoders.h
 include/orbit-1.0/IIOP/iiop-endian.h
-include/orbit-1.0/ORBitservices/CosEventChannel.idl
-include/orbit-1.0/ORBitservices/CosEventComm.idl
 include/orbit-1.0/ORBitservices/CosNaming.h
-include/orbit-1.0/ORBitservices/CosNaming.idl
 include/orbit-1.0/ORBitservices/CosNaming_impl.h
-include/orbit-1.0/ORBitservices/CosTypedEventChannel.idl
-include/orbit-1.0/ORBitservices/CosTypedEventComm.idl
-include/orbit-1.0/ORBitservices/LName.pidl
 include/orbit-1.0/ORBitutil/basic_types.h
 include/orbit-1.0/ORBitutil/compat.h
 include/orbit-1.0/ORBitutil/orbit-os-config.h
@@ -103,6 +97,14 @@ libdata/pkgconfig/ORBit.pc
 libdata/pkgconfig/libIDL.pc
 share/aclocal/ORBit.m4
 share/aclocal/libIDL.m4
+share/idl/orbit-1.0/CosEventChannel.idl
+share/idl/orbit-1.0/CosEventComm.idl
+share/idl/orbit-1.0/CosNaming.idl
+share/idl/orbit-1.0/CosTypedEventChannel.idl
+share/idl/orbit-1.0/CosTypedEventComm.idl
+share/idl/orbit-1.0/LName.pidl
+@dirrm share/idl/orbit-1.0
+@dirrm share/idl
 @dirrm include/orbit-1.0/orb
 @dirrm include/orbit-1.0/ORBitutil
 @dirrm include/orbit-1.0/ORBitservices
diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
index 5d84c2e72967..36871137f91c 100644
--- a/devel/ORBit2/Makefile
+++ b/devel/ORBit2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ORBit
-PORTVERSION=	0.5.12
+PORTVERSION=	0.5.13
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/ORBit
diff --git a/devel/ORBit2/distinfo b/devel/ORBit2/distinfo
index b7151a2ad88e..d346af3d33c5 100644
--- a/devel/ORBit2/distinfo
+++ b/devel/ORBit2/distinfo
@@ -1 +1 @@
-MD5 (ORBit-0.5.12.tar.gz) = ab66859c937a940da6bad2c84161c6aa
+MD5 (ORBit-0.5.13.tar.gz) = 89b16a12e565798945b49e9f41d1db5d
diff --git a/devel/ORBit2/files/patch-ae b/devel/ORBit2/files/patch-ae
index 7e43d15302c9..205f906c7e30 100644
--- a/devel/ORBit2/files/patch-ae
+++ b/devel/ORBit2/files/patch-ae
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- configure	2001/10/27 12:43:19	1.1
-+++ configure	2001/10/27 12:43:58
-@@ -5747,9 +5747,9 @@
+--- configure.orig	Mon Jan  7 11:09:58 2002
++++ configure	Fri Jan 11 11:51:55 2002
+@@ -2151,9 +2151,9 @@
    rm -f conf.glibtest
  
  
@@ -15,12 +15,12 @@ $FreeBSD$
  
  
  for ac_prog in 'bison -y' byacc
-@@ -7273,57 +7273,47 @@
+@@ -3757,37 +3757,30 @@
  fi
  
  
 +echo $ac_n "checking how many vectors writev is capable to handle""... $ac_c" 1>&6
-+echo "configure:7278: checking how many vectors writev is capable to handle" >&5
++echo "configure:3761: checking how many vectors writev is capable to handle" >&5
  if test "$cross_compiling" = yes; then
 -  cat >> confdefs.h <<\EOF
 -#define HAVE_LIMITED_WRITEV 1
@@ -29,18 +29,16 @@ $FreeBSD$
 +  MAXIOV=16
  else
    cat > conftest.$ac_ext <<EOF
--#line 7284 "configure"
-+#line 7283 "configure"
+ #line 3768 "configure"
  #include "confdefs.h"
  
 -#include <fcntl.h>
 +#include <sys/types.h>
  #include <sys/uio.h>
 -#define NIOVECS 50
--int main(int argc, char *argv[])
 +#include <fcntl.h>
 +#include <stdio.h>
-+int main()
+ int main(int argc, char *argv[])
  {
 -	char dumbuf[20] = "\n";
 -	struct iovec iovecs[NIOVECS];
@@ -56,25 +54,22 @@ $FreeBSD$
 -		return(1);
 -
 -	if(writev(fd, iovecs, NIOVECS) < 0)
--		return 1;
--
 +	FILE *f;
 +	int fd, i;
 +	static struct iovec iovecs[4097];
 +	if ((f = fopen("conftestval", "w")) == NULL || \
 +	    (fd = open("/dev/null", O_WRONLY)) < 0)
-+		exit(1);
+ 		return 1;
+-
 +	for (i = 1; i < 4098 && writev(fd, iovecs, i) >= 0; i++);
 +	fprintf(f, "%d\n", i - 1);
 +	fclose(f);
  	close(fd);
--	return 0;
-+	exit(0);
+ 	return 0;
  }
- 
+@@ -3795,19 +3788,16 @@
  EOF
--if { (eval echo configure:7313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:7306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ if { (eval echo configure:3797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
 -  :
 +  MAXIOV=`cat conftestval`
@@ -95,7 +90,7 @@ $FreeBSD$
  
  
  #######################
-@@ -8260,7 +8250,7 @@
+@@ -4740,7 +4730,7 @@
  s%@LIB_WRAP@%$LIB_WRAP%g
  s%@HAVE_HOSTS_ACCESS_TRUE@%$HAVE_HOSTS_ACCESS_TRUE%g
  s%@HAVE_HOSTS_ACCESS_FALSE@%$HAVE_HOSTS_ACCESS_FALSE%g
@@ -104,7 +99,7 @@ $FreeBSD$
  s%@subdirs@%$subdirs%g
  s%@pkglibdir@%$pkglibdir%g
  
-@@ -8584,10 +8574,6 @@
+@@ -5064,10 +5054,6 @@
        *) # Relative path.
          ac_sub_cache_file="$ac_dots$cache_file" ;;
        esac
diff --git a/devel/ORBit2/pkg-plist b/devel/ORBit2/pkg-plist
index 54f1b173b491..ddcc8e9caf84 100644
--- a/devel/ORBit2/pkg-plist
+++ b/devel/ORBit2/pkg-plist
@@ -22,14 +22,8 @@ include/orbit-1.0/IIOP/IIOP.h
 include/orbit-1.0/IIOP/giop-msg-buffer.h
 include/orbit-1.0/IIOP/iiop-encoders.h
 include/orbit-1.0/IIOP/iiop-endian.h
-include/orbit-1.0/ORBitservices/CosEventChannel.idl
-include/orbit-1.0/ORBitservices/CosEventComm.idl
 include/orbit-1.0/ORBitservices/CosNaming.h
-include/orbit-1.0/ORBitservices/CosNaming.idl
 include/orbit-1.0/ORBitservices/CosNaming_impl.h
-include/orbit-1.0/ORBitservices/CosTypedEventChannel.idl
-include/orbit-1.0/ORBitservices/CosTypedEventComm.idl
-include/orbit-1.0/ORBitservices/LName.pidl
 include/orbit-1.0/ORBitutil/basic_types.h
 include/orbit-1.0/ORBitutil/compat.h
 include/orbit-1.0/ORBitutil/orbit-os-config.h
@@ -103,6 +97,14 @@ libdata/pkgconfig/ORBit.pc
 libdata/pkgconfig/libIDL.pc
 share/aclocal/ORBit.m4
 share/aclocal/libIDL.m4
+share/idl/orbit-1.0/CosEventChannel.idl
+share/idl/orbit-1.0/CosEventComm.idl
+share/idl/orbit-1.0/CosNaming.idl
+share/idl/orbit-1.0/CosTypedEventChannel.idl
+share/idl/orbit-1.0/CosTypedEventComm.idl
+share/idl/orbit-1.0/LName.pidl
+@dirrm share/idl/orbit-1.0
+@dirrm share/idl
 @dirrm include/orbit-1.0/orb
 @dirrm include/orbit-1.0/ORBitutil
 @dirrm include/orbit-1.0/ORBitservices