diff options
20 files changed, 150 insertions, 700 deletions
diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile index 3e7c5be83e75..6b2926eabf13 100644 --- a/devel/ORBit2/Makefile +++ b/devel/ORBit2/Makefile @@ -1,23 +1,27 @@ -# New ports collection makefile for: orbit +# New ports collection makefile for: orbit2 # Date Created: 16 Aug 1998 # Whom: Chia-liang Kao <clkao@CirX.ORG> # # $FreeBSD$ # -PORTNAME= ORBit -PORTVERSION= 0.5.13 -PORTREVISION= 2 +PORTNAME= ORBit2 +PORTVERSION= 2.3.103 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= stable/sources/ORBit +MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-alpha2 +DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig -LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext \ + IDL-2.0:${PORTSDIR}/devel/libIDL \ + popt.0:${PORTSDIR}/devel/popt \ + linc.1:${PORTSDIR}/net/linc RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig +USE_BZIP2= yes USE_GMAKE= yes USE_GLIB= yes INSTALLS_SHLIB= yes @@ -25,25 +29,13 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-indent CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" - -post-patch: - @${TOUCH} ${WRKSRC}/configure +CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} post-install: - @${ECHO_CMD} "ORBIIOPIPv4=0" > ${PREFIX}/etc/orbitrc.default - @${ECHO_CMD} "ORBIIOPIPv6=0" >> ${PREFIX}/etc/orbitrc.default - @if [ ! -f ${PREFIX}/etc/orbitrc ]; then \ - ${CP} -p ${PREFIX}/etc/orbitrc.default ${PREFIX}/etc/orbitrc ; \ - fi -.for dir in IIOP ORBitservices ORBitutil orb orbit-idl2.h - @if [ -L ${PREFIX}/include/${dir} ]; then \ - ${RM} -f ${PREFIX}/include/${dir}; \ - fi - @${LN} -sf ${PREFIX}/include/orbit-1.0/${dir} ${PREFIX}/include/${dir} -.endfor - @if [ -L ${PREFIX}/include/libIDL ]; then \ - ${RM} -f ${PREFIX}/include/libIDL; \ + @${ECHO_CMD} "ORBIIOPIPv4=0" > ${PREFIX}/etc/orbit2rc.default + @${ECHO_CMD} "ORBIIOPIPv6=0" >> ${PREFIX}/etc/orbit2rc.default + @if [ ! -f ${PREFIX}/etc/orbit2rc ]; then \ + ${CP} -p ${PREFIX}/etc/orbitrc.default ${PREFIX}/etc/orbit2rc ; \ fi - @${LN} -sf ${PREFIX}/include/libIDL-1.0/libIDL ${PREFIX}/include/libIDL .include <bsd.port.mk> diff --git a/devel/ORBit2/distinfo b/devel/ORBit2/distinfo index d346af3d33c5..b87655062a7e 100644 --- a/devel/ORBit2/distinfo +++ b/devel/ORBit2/distinfo @@ -1 +1 @@ -MD5 (ORBit-0.5.13.tar.gz) = 89b16a12e565798945b49e9f41d1db5d +MD5 (gnome2/ORBit2-2.3.103.tar.bz2) = 624f67690735c7d186bb432b526e30f8 diff --git a/devel/ORBit2/files/patch-ab b/devel/ORBit2/files/patch-ab index 97ca1f138dc9..6b72dbaeed3c 100644 --- a/devel/ORBit2/files/patch-ab +++ b/devel/ORBit2/files/patch-ab @@ -1,21 +1,36 @@ ---- Makefile.in.orig Sun May 13 02:20:09 2001 -+++ Makefile.in Mon May 21 22:32:11 2001 -@@ -37,3 +37,3 @@ + +$FreeBSD$ + +--- Makefile.in.orig Mon Jan 28 19:56:23 2002 ++++ Makefile.in Wed Feb 13 10:48:08 2002 +@@ -35,7 +35,7 @@ + DESTDIR = + pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ +pkglibdir = $(prefix)/libdata/pkgconfig pkgincludedir = $(includedir)/@PACKAGE@ -@@ -93,3 +93,2 @@ - YACC = @YACC@ + + top_builddir = . +@@ -93,11 +93,10 @@ + STRIP = @STRIP@ + VERSION = @VERSION@ + WARN_CFLAGS = @WARN_CFLAGS@ -pkglibdir = @pkglibdir@ -@@ -97,3 +96,3 @@ + AUTOMAKE_OPTIONS = 1.3 + +-SUBDIRS = src include test docs ++SUBDIRS = src include docs --SUBDIRS = popt libIDL src test -+SUBDIRS = popt libIDL src + bin_SCRIPTS = orbit2-config -@@ -106,3 +105,3 @@ +@@ -107,7 +106,7 @@ + m4datadir = $(datadir)/aclocal + m4data_DATA = ORBit2.m4 -pkgconfigdir = $(libdir)/pkgconfig +pkgconfigdir = $(pkglibdir) - pkgconfig_DATA = ORBit.pc + pkgconfig_DATA = ORBit-2.0.pc ORBit-CosNaming-2.0.pc + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/devel/ORBit2/files/patch-ac b/devel/ORBit2/files/patch-ac deleted file mode 100644 index 3f1db0c1be83..000000000000 --- a/devel/ORBit2/files/patch-ac +++ /dev/null @@ -1,55 +0,0 @@ ---- src/IIOP/Makefile.in.orig Mon Feb 15 13:00:01 1999 -+++ src/IIOP/Makefile.in Thu Feb 18 22:36:39 1999 -@@ -109,7 +109,7 @@ - - BUILT_SOURCES = $(libwrap_files) - --libIIOP_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -+libIIOP_la_LDFLAGS = -version-info 2:0:0 - - EXTRA_DIST = IIOP-design.txt - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ---- src/ORBitutil/Makefile.in.orig Mon Feb 15 13:00:00 1999 -+++ src/ORBitutil/Makefile.in Thu Feb 18 22:36:39 1999 -@@ -102,7 +102,7 @@ - libORBitutilinclude_HEADERS = basic_types.h thread-safety.h trace.h util.h compat.h - - --libORBitutil_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -+libORBitutil_la_LDFLAGS = -version-info 2:0:0 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../config.h - CONFIG_CLEAN_FILES = ---- src/services/name/Makefile.in.orig Thu Oct 12 11:07:08 2000 -+++ src/services/name/Makefile.in Thu Oct 12 13:11:55 2000 -@@ -109,3 +109,3 @@ - --libORBitCosNaming_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -+libORBitCosNaming_la_LDFLAGS = -version-info 2:0:0 - ---- libIDL/Makefile.in.orig Sun May 13 02:20:15 2001 -+++ libIDL/Makefile.in Mon May 21 22:33:45 2001 -@@ -42,3 +42,3 @@ - pkgdatadir = $(datadir)/@PACKAGE@ --pkglibdir = $(libdir)/@PACKAGE@ -+pkglibdir = $(prefix)/libdata/pkgconfig - pkgincludedir = $(includedir)/@PACKAGE@ -@@ -92,3 +92,3 @@ - MAINT = @MAINT@ --MAKEINFO = @MAKEINFO@ -+MAKEINFO = @MAKEINFO@ --no-split - OBJDUMP = @OBJDUMP@ -@@ -122,3 +122,3 @@ - --libIDL_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) -+libIDL_la_LDFLAGS = -version-info 2:0:0 - -@@ -131,6 +131,6 @@ - --confexecdir = $(libdir) -+confexecdir = $(sysconfdir) - confexec_DATA = libIDLConf.sh - --pkgconfigdir = $(libdir)/pkgconfig -+pkgconfigdir = $(pkglibdir) - pkgconfig_DATA = libIDL.pc diff --git a/devel/ORBit2/files/patch-ad b/devel/ORBit2/files/patch-ad deleted file mode 100644 index 0bb76e615318..000000000000 --- a/devel/ORBit2/files/patch-ad +++ /dev/null @@ -1,30 +0,0 @@ - -$FreeBSD$ - ---- orbit-config.in.orig Wed Sep 19 20:09:00 2001 -+++ orbit-config.in Tue Jan 22 14:27:19 2002 -@@ -28,8 +28,8 @@ - - Known values for TARGET are: - -- client (calls glib-config) -- server (calls glib-config) -+ client (calls @GLIB_CONFIG@) -+ server (calls @GLIB_CONFIG@) - EOF - - exit $1 -@@ -87,10 +87,10 @@ - ;; - - client|server) -- the_libs="$the_libs -L$libdir -lORBit -lIIOP -lORBitutil `glib-config --libs` @LIBS@ -lm" -- the_flags="$the_flags `glib-config --cflags` " -+ the_libs="$the_libs -L$libdir -lORBit -lIIOP -lORBitutil `@GLIB_CONFIG@ --libs` @LIBS@ @LIB_WRAP@ -lm" -+ the_flags="$the_flags `@GLIB_CONFIG@ --cflags` " - test "x$includedir" = "x/usr/include" \ -- || the_flags="$the_flags -I$includedir " -+ || the_flags="$the_flags -I$includedir -I@includedir@" - ;; - - --use-service=*) diff --git a/devel/ORBit2/files/patch-ae b/devel/ORBit2/files/patch-ae deleted file mode 100644 index 205f906c7e30..000000000000 --- a/devel/ORBit2/files/patch-ae +++ /dev/null @@ -1,112 +0,0 @@ - -$FreeBSD$ - ---- 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 - - --GMODULE_CFLAGS=`glib-config --cflags gmodule` -+GMODULE_CFLAGS=`$GLIB_CONFIG --cflags gmodule` - --GMODULE_LIBS=`glib-config --libs gmodule` -+GMODULE_LIBS=`$GLIB_CONFIG --libs gmodule` - - - for ac_prog in 'bison -y' byacc -@@ -3757,37 +3757,30 @@ - fi - - -+echo $ac_n "checking how many vectors writev is capable to handle""... $ac_c" 1>&6 -+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 --EOF -- -+ MAXIOV=16 - else - cat > conftest.$ac_ext <<EOF - #line 3768 "configure" - #include "confdefs.h" - --#include <fcntl.h> -+#include <sys/types.h> - #include <sys/uio.h> --#define NIOVECS 50 -+#include <fcntl.h> -+#include <stdio.h> - int main(int argc, char *argv[]) - { -- char dumbuf[20] = "\n"; -- struct iovec iovecs[NIOVECS]; -- int i,fd; -- -- for(i = 0; i < NIOVECS; i++) { -- iovecs[i].iov_base = dumbuf; -- iovecs[i].iov_len = 1; -- } -- -- fd=open("/dev/null", O_WRONLY); -- if(fd==-1) -- return(1); -- -- if(writev(fd, iovecs, NIOVECS) < 0) -+ FILE *f; -+ int fd, i; -+ static struct iovec iovecs[4097]; -+ if ((f = fopen("conftestval", "w")) == NULL || \ -+ (fd = open("/dev/null", O_WRONLY)) < 0) - 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; - } -@@ -3795,19 +3788,16 @@ - EOF - 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` - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* -- cat >> confdefs.h <<\EOF --#define HAVE_LIMITED_WRITEV 1 --EOF -- -+ MAXIOV=16 - fi - rm -fr conftest* - fi -- -+echo "$ac_t""$MAXIOV" 1>&6 - - - ####################### -@@ -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 --s%@HAVE_LIMITED_WRITEV@%$HAVE_LIMITED_WRITEV%g -+s%@MAXIOV@%$MAXIOV%g - s%@subdirs@%$subdirs%g - s%@pkglibdir@%$pkglibdir%g - -@@ -5064,10 +5054,6 @@ - *) # Relative path. - ac_sub_cache_file="$ac_dots$cache_file" ;; - esac -- case "$ac_given_INSTALL" in -- [/$]*) INSTALL="$ac_given_INSTALL" ;; -- *) INSTALL="$ac_dots$ac_given_INSTALL" ;; -- esac - - echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" - # The eval makes quoting arguments work. diff --git a/devel/ORBit2/files/patch-configure.in b/devel/ORBit2/files/patch-configure.in deleted file mode 100644 index abd947f9dfe7..000000000000 --- a/devel/ORBit2/files/patch-configure.in +++ /dev/null @@ -1,57 +0,0 @@ - -$FreeBSD$ - ---- configure.in 2001/10/27 12:08:05 1.1 -+++ configure.in 2001/10/27 12:33:26 -@@ -241,33 +241,29 @@ - dnl This generates warnings from autoconf... - AC_C_BIGENDIAN - -+AC_MSG_CHECKING(how many vectors writev is capable to handle) - AC_TRY_RUN([ --#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() - { -- char dumbuf[20] = "\n"; -- struct iovec iovecs[NIOVECS]; -- int i,fd; -- -- for(i = 0; i < NIOVECS; i++) { -- iovecs[i].iov_base = dumbuf; -- iovecs[i].iov_len = 1; -- } -- -- fd=open("/dev/null", O_WRONLY); -- if(fd==-1) -- 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); -+ 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); - } --], , AC_DEFINE(HAVE_LIMITED_WRITEV), AC_DEFINE(HAVE_LIMITED_WRITEV)) --AC_SUBST(HAVE_LIMITED_WRITEV) -+], MAXIOV=`cat conftestval`, MAXIOV=16, MAXIOV=16)dnl -+AC_MSG_RESULT($MAXIOV) -+AC_SUBST(MAXIOV) - - ####################### - # type alignment test # diff --git a/devel/ORBit2/files/patch-libIDL::libIDL-config.in b/devel/ORBit2/files/patch-libIDL::libIDL-config.in deleted file mode 100644 index b32fd6a9ec83..000000000000 --- a/devel/ORBit2/files/patch-libIDL::libIDL-config.in +++ /dev/null @@ -1,18 +0,0 @@ - -$FreeBSD$ - ---- libIDL/libIDL-config.in 2001/10/22 11:25:30 1.1 -+++ libIDL/libIDL-config.in 2001/10/22 11:26:00 -@@ -72,10 +72,10 @@ - echo $exec_prefix - fi - if test "$echo_cflags" = "yes"; then -- all_flags="$all_flags $includes $cflags `glib-config --cflags`" -+ all_flags="$all_flags $includes $cflags `@GLIB_CONFIG@ --cflags`" - fi - if test "$echo_libs" = "yes"; then -- all_flags="$all_flags -L@libdir@ -lIDL `glib-config --libs`" -+ all_flags="$all_flags -L@libdir@ -lIDL `@GLIB_CONFIG@ --libs`" - fi - - # Straight out any possible duplicates, but be careful to diff --git a/devel/ORBit2/files/patch-libIDL::ltmain.sh b/devel/ORBit2/files/patch-libIDL::ltmain.sh deleted file mode 100644 index 99556a375dd2..000000000000 --- a/devel/ORBit2/files/patch-libIDL::ltmain.sh +++ /dev/null @@ -1,28 +0,0 @@ - -$FreeBSD$ - ---- libIDL/ltmain.sh Mon Jan 7 11:09:55 2002 -+++ libIDL/ltmain.sh Thu Jan 24 16:32:50 2002 -@@ -1795,6 +1795,9 @@ - *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*) - # these systems don't actually have a c library (as such)! - ;; -+ *-*-freebsd*) -+ # has libc, but it shouldn't be explicitly linked in -+ ;; - *-*-rhapsody*) - # rhapsody is a little odd... - deplibs="$deplibs -framework System" -@@ -3360,10 +3366,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/devel/ORBit2/files/patch-ltmain.sh b/devel/ORBit2/files/patch-ltmain.sh index c6c98237ec0f..91713d2306f8 100644 --- a/devel/ORBit2/files/patch-ltmain.sh +++ b/devel/ORBit2/files/patch-ltmain.sh @@ -1,19 +1,36 @@ $FreeBSD$ ---- ltmain.sh.orig Mon Jan 7 11:09:55 2002 -+++ ltmain.sh Thu Jan 24 16:32:50 2002 -@@ -1795,6 +1795,9 @@ - *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*) - # these systems don't actually have a c library (as such)! - ;; -+ *-*-freebsd*) -+ # has libc, but it shouldn't be explicitly linked in -+ ;; - *-*-rhapsody*) - # rhapsody is a little odd... - deplibs="$deplibs -framework System" -@@ -3360,10 +3366,12 @@ +--- ltmain.sh.orig Wed Jan 23 11:38:40 2002 ++++ ltmain.sh Sun Feb 3 01:44:17 2002 +@@ -1037,8 +1037,16 @@ + continue + ;; + ++ -pthread) ++ compile_command="$compile_command -pthread" ++ finalize_command="$finalize_command -pthread" ++ compiler_flags="$compiler_flags -pthread" ++ continue ++ ;; ++ + -module) + module=yes ++ build_old_libs=no + continue + ;; + +@@ -2412,6 +2420,9 @@ + *-*-netbsd*) + # Don't link with libc until the a.out ld.so is fixed. + ;; ++ *-*-freebsd*) ++ # FreeBSD doesn't need this... ++ ;; + *) + # Add libc to deplibs on all other systems if necessary. + if test "$build_libtool_need_lc" = "yes"; then +@@ -4179,10 +4190,12 @@ fi # Install the pseudo-library for information purposes. diff --git a/devel/ORBit2/files/patch-popt::ltmain.sh b/devel/ORBit2/files/patch-popt::ltmain.sh deleted file mode 100644 index 18f548da39f5..000000000000 --- a/devel/ORBit2/files/patch-popt::ltmain.sh +++ /dev/null @@ -1,28 +0,0 @@ - -$FreeBSD$ - ---- popt/ltmain.sh 2001/08/27 09:51:26 1.1 -+++ popt/ltmain.sh 2001/08/27 09:51:42 -@@ -2408,6 +2408,9 @@ - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then -@@ -4175,10 +4178,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/devel/ORBit2/files/patch-src::IIOP::connection.c b/devel/ORBit2/files/patch-src::IIOP::connection.c deleted file mode 100644 index c817c169b116..000000000000 --- a/devel/ORBit2/files/patch-src::IIOP::connection.c +++ /dev/null @@ -1,65 +0,0 @@ -$NetBSD: patch-ag,v 1.6 2001/05/21 19:59:04 rh Exp $ - ---- src/IIOP/connection.c.orig Sun May 13 09:07:46 2001 -+++ src/IIOP/connection.c -@@ -1,4 +1,7 @@ - #include "config.h" -+#include <sys/types.h> -+#include <sys/param.h> -+#include <stdio.h> - #if defined (__hpux) && ! defined (_XOPEN_SOURCE_EXTENDED) - # define _XOPEN_SOURCE_EXTENDED 1 - # define WE_DEFINED_XOPEN_SOURCE_EXTENDED 1 -@@ -13,7 +16,6 @@ - #include <stdlib.h> - #include <unistd.h> - #include <errno.h> --#include <sys/types.h> - #include <fcntl.h> - #include <sys/socket.h> - #include <sys/un.h> -@@ -32,7 +34,7 @@ - #include <signal.h> - #include <syslog.h> - --#if defined(HAVE_TCPD_H) && defined(HAVE_HOSTS_ACCESS) -+#if defined(HAVE_TCPD_H) - #include <tcpd.h> - #endif - -@@ -80,7 +82,7 @@ - GIOPConnectionList giop_connection_list; - static GSList *iiop_unix_socket_list = NULL; - --#if defined(HAVE_HOSTS_ACCESS) && defined (HAVE_TCPD_H) -+#if defined (HAVE_TCPD_H) - static const char *argv0_val = NULL; - #endif - -@@ -104,7 +106,7 @@ - struct sigaction mypipe; - g_assert(sizeof(GIOPMessageHeader) == 12); - --#if defined(HAVE_HOSTS_ACCESS) && defined (HAVE_TCPD_H) -+#if defined (HAVE_TCPD_H) - argv0_val = g_strdup(g_basename(argv0)); /* For TCP wrappers */ - #endif - -@@ -1007,7 +1009,7 @@ - */ - int allow_severity = LOG_INFO, deny_severity = LOG_NOTICE; - --#if defined(HAVE_HOSTS_ACCESS) && defined(HAVE_TCPD_H) -+#if defined(HAVE_TCPD_H) - DEFINE_LOCK(tcp_wrappers_usage); - - #endif -@@ -1033,7 +1035,7 @@ - - newfd = accept(GIOP_CONNECTION_GET_FD(connection), &sock, &n); - --#if defined(HAVE_HOSTS_ACCESS) && defined(HAVE_TCPD_H) -+#if defined(HAVE_TCPD_H) - /* tcp wrappers access checking */ - switch(IIOP_CONNECTION(connection)->icnxtype) { - case IIOP_IPV4: diff --git a/devel/ORBit2/files/patch-src::IIOP::giop-msg-buffer.c b/devel/ORBit2/files/patch-src::IIOP::giop-msg-buffer.c deleted file mode 100644 index d6184df8952a..000000000000 --- a/devel/ORBit2/files/patch-src::IIOP::giop-msg-buffer.c +++ /dev/null @@ -1,34 +0,0 @@ - -$FreeBSD$ - ---- src/IIOP/giop-msg-buffer.c.orig Wed Oct 3 09:51:21 2001 -+++ src/IIOP/giop-msg-buffer.c Sat Oct 27 15:52:11 2001 -@@ -34,10 +34,6 @@ - #include "IIOP.h" - #include "IIOP-private.h" - --#ifdef HAVE_LIMITED_WRITEV --#define writev g_writev --#endif -- - /* type defs */ - - #ifdef __GNUC__ -@@ -197,7 +193,7 @@ - sum); - } - #endif -- res = writev(fd, curvec, nvecs); -+ res = g_writev(fd, curvec, nvecs); - - sum = (GIOP_MESSAGE_BUFFER(send_buffer)->message_header.message_size + sizeof(GIOPMessageHeader)); - if(res < sum) { -@@ -227,7 +223,7 @@ - - fcntl(fd, F_SETFL, fcntl(fd, F_GETFL, 0) & ~O_NONBLOCK); - -- t = writev(fd, curvec, nvecs); -+ t = g_writev(fd, curvec, nvecs); - - fcntl(fd, F_SETFL, fcntl(fd, F_GETFL, 0) | O_NONBLOCK); - diff --git a/devel/ORBit2/files/patch-src::ORBitutil::compat.c b/devel/ORBit2/files/patch-src::ORBitutil::compat.c deleted file mode 100644 index e907c22b66b9..000000000000 --- a/devel/ORBit2/files/patch-src::ORBitutil::compat.c +++ /dev/null @@ -1,47 +0,0 @@ - -$FreeBSD$ - ---- src/ORBitutil/compat.c.orig Wed Sep 9 07:08:14 1998 -+++ src/ORBitutil/compat.c Mon Oct 29 18:50:04 2001 -@@ -1,18 +1,34 @@ -+#include <errno.h> -+#include <fcntl.h> -+ - #include "config.h" - #include "util.h" - --#define MAX_IOVS 16 -- - int g_writev(int fd, const struct iovec * vector, size_t count) - { -- int retval = 0; -+ int fdflags, retval, wcur; -+ int sum = 0; - -- while(count > MAX_IOVS) { -- retval += writev(fd, vector, MAX_IOVS); -- vector += MAX_IOVS; count -= MAX_IOVS; -+ fdflags = fcntl(fd, F_GETFL); -+ /* Get rid of the O_NONBLOCK - we don't need it here */ -+ fcntl(fd, F_SETFL, fdflags & ~O_NONBLOCK); -+ for (wcur = MAXIOV; wcur == MAXIOV && count != 0; count -= MAXIOV) { -+ if (wcur > count) -+ wcur = count; -+ do { -+ retval = writev(fd, vector, wcur); -+ } while (retval <= 0 && (errno == EAGAIN || errno == EINTR)); -+ if (retval < 0) { -+ sum = retval; -+ break; -+ } -+ vector += wcur; -+ sum += retval; - } - -- return writev(fd, vector, count) + retval; -+ /* Restore flags */ -+ fcntl(fd, F_SETFD, fdflags); -+ return sum; - } - - #ifndef HAVE_INET_ATON diff --git a/devel/ORBit2/files/patch-src::ORBitutil::orbit-os-config.h.in b/devel/ORBit2/files/patch-src::ORBitutil::orbit-os-config.h.in deleted file mode 100644 index 35697338049f..000000000000 --- a/devel/ORBit2/files/patch-src::ORBitutil::orbit-os-config.h.in +++ /dev/null @@ -1,12 +0,0 @@ - -$FreeBSD$ - ---- src/ORBitutil/orbit-os-config.h.in 2001/10/27 12:25:39 1.1 -+++ src/ORBitutil/orbit-os-config.h.in 2001/10/27 12:26:13 -@@ -2,5 +2,6 @@ - #define OS_CONFIG_H 1 - - #define ORBIT_HAVE_ALLOCA_H @ORBIT_HAVE_ALLOCA_H@ -+#define MAXIOV @MAXIOV@ - - #endif diff --git a/devel/ORBit2/files/patch-src::daemons::interface_repository::Makefile.in b/devel/ORBit2/files/patch-src::daemons::interface_repository::Makefile.in deleted file mode 100644 index 2ec5230f1504..000000000000 --- a/devel/ORBit2/files/patch-src::daemons::interface_repository::Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-al,v 1.5 2000/10/17 23:48:01 jlam Exp $ - ---- src/daemons/interface_repository/Makefile.in.orig Thu Oct 12 12:07:12 2000 -+++ src/daemons/interface_repository/Makefile.in -@@ -102,7 +102,7 @@ - - - orbit_ird_LDFLAGS = -static --orbit_ird_LDADD = $(top_builddir)/src/orb/libORBit.la $(top_builddir)/src/IIOP/libIIOP.la $(top_builddir)/src/ORBitutil/libORBitutil.la @GLIB_LIBS@ -lm -+orbit_ird_LDADD = $(top_builddir)/src/orb/libORBit.la $(top_builddir)/src/IIOP/libIIOP.la $(top_builddir)/src/ORBitutil/libORBitutil.la @GLIB_LIBS@ -lm @LIB_WRAP@ - - - orbit_ird_SOURCES = interface_repository-skels.c interface_repository-impl.c diff --git a/devel/ORBit2/files/patch-src::orb::Makefile.in b/devel/ORBit2/files/patch-src::orb::Makefile.in deleted file mode 100644 index 03b978704fbd..000000000000 --- a/devel/ORBit2/files/patch-src::orb::Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- src/orb/Makefile.in.orig Wed Oct 3 10:21:01 2001 -+++ src/orb/Makefile.in Wed Oct 3 14:43:17 2001 -@@ -115,7 +115,7 @@ - IDL = $(top_builddir)/src/orbit-idl-compiler/orbit-idl - IRIDL = $(top_srcdir)/src/daemons/interface_repository/interface_repository.idl - --libORBit_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -+libORBit_la_LDFLAGS = -version-info 2:0:0 - libORBit_la_LIBADD = $(GLIB_LIBS) -lm - - BUILT_SOURCES = orbit.h interface_repository.h interface_repository-common.c interface_repository-stubs.c diff --git a/devel/ORBit2/files/patch-src::services::event::Makefile.in b/devel/ORBit2/files/patch-src::services::event::Makefile.in deleted file mode 100644 index c29eee588ca7..000000000000 --- a/devel/ORBit2/files/patch-src::services::event::Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-am,v 1.3 2000/10/17 23:48:01 jlam Exp $ - ---- src/services/event/Makefile.in.orig Thu Oct 12 12:07:09 2000 -+++ src/services/event/Makefile.in -@@ -115,7 +115,7 @@ - DEPS = $(top_builddir)/src/orb/libORBit.la $(top_builddir)/src/ORBitutil/libORBitutil.la $(top_builddir)/src/IIOP/libIIOP.la - - --LDADDS = $(top_builddir)/src/orb/libORBit.la $(top_builddir)/src/IIOP/libIIOP.la $(top_builddir)/src/ORBitutil/libORBitutil.la @GLIB_LIBS@ -lm -+LDADDS = $(top_builddir)/src/orb/libORBit.la $(top_builddir)/src/IIOP/libIIOP.la $(top_builddir)/src/ORBitutil/libORBitutil.la @GLIB_LIBS@ -lm @LIB_WRAP@ - - - event_consumer_SOURCES = event-consumer.c CosEventComm-skels.c CosEventChannel-common.c CosEventChannel-stubs.c diff --git a/devel/ORBit2/files/patch-src::services::name::Makefile.in b/devel/ORBit2/files/patch-src::services::name::Makefile.in deleted file mode 100644 index 2a2a3ff5169f..000000000000 --- a/devel/ORBit2/files/patch-src::services::name::Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.8 2000/10/17 23:48:01 jlam Exp $ - ---- src/services/name/Makefile.in.orig Thu Oct 12 12:07:08 2000 -+++ src/services/name/Makefile.in -@@ -123,7 +123,7 @@ - DEPS = $(top_builddir)/src/orb/libORBit.la $(top_builddir)/src/ORBitutil/libORBitutil.la $(top_builddir)/src/IIOP/libIIOP.la libORBitCosNaming.la - - --LDADDS = $(top_builddir)/src/orb/libORBit.la $(top_builddir)/src/IIOP/libIIOP.la $(top_builddir)/src/ORBitutil/libORBitutil.la libORBitCosNaming.la @GLIB_LIBS@ -lm -+LDADDS = $(top_builddir)/src/orb/libORBit.la $(top_builddir)/src/IIOP/libIIOP.la $(top_builddir)/src/ORBitutil/libORBitutil.la libORBitCosNaming.la @GLIB_LIBS@ -lm @LIB_WRAP@ - - - #name-client.c boot.c orbit-name-server.c new-name-server.c: CosNaming.h diff --git a/devel/ORBit2/pkg-plist b/devel/ORBit2/pkg-plist index ddcc8e9caf84..67fdc870a500 100644 --- a/devel/ORBit2/pkg-plist +++ b/devel/ORBit2/pkg-plist @@ -1,114 +1,79 @@ -bin/libIDL-config -bin/name-client -bin/old-name-server -bin/orbit-config -bin/orbit-event-server -bin/orbit-idl -bin/orbit-ird -bin/orbit-name-server -etc/libIDLConf.sh -@unexec if cmp -s %D/etc/orbitrc.default %D/etc/orbitrc; then rm -f %D/etc/orbitrc; fi -etc/orbitrc.default -@exec if [ ! -f %D/etc/orbitrc ] ; then cp -p %D/%F %B/orbitrc; fi -include/IIOP -include/ORBitservices -include/ORBitutil -include/libIDL -include/libIDL-1.0/libIDL/IDL.h -include/orb -include/orbit-1.0/IIOP/IIOP-config.h -include/orbit-1.0/IIOP/IIOP-types.h -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/CosNaming.h -include/orbit-1.0/ORBitservices/CosNaming_impl.h -include/orbit-1.0/ORBitutil/basic_types.h -include/orbit-1.0/ORBitutil/compat.h -include/orbit-1.0/ORBitutil/orbit-os-config.h -include/orbit-1.0/ORBitutil/os-feature-alloca.h -include/orbit-1.0/ORBitutil/os-specifics.h -include/orbit-1.0/ORBitutil/thread-safety.h -include/orbit-1.0/ORBitutil/trace.h -include/orbit-1.0/ORBitutil/util.h -include/orbit-1.0/orb/allocator-defs.h -include/orbit-1.0/orb/allocators.h -include/orbit-1.0/orb/cdr.h -include/orbit-1.0/orb/corba_any.h -include/orbit-1.0/orb/corba_any_proto.h -include/orbit-1.0/orb/corba_any_type.h -include/orbit-1.0/orb/corba_basic_sequences_type.h -include/orbit-1.0/orb/corba_context.h -include/orbit-1.0/orb/corba_env.h -include/orbit-1.0/orb/corba_env_type.h -include/orbit-1.0/orb/corba_object.h -include/orbit-1.0/orb/corba_object_type.h -include/orbit-1.0/orb/corba_orb.h -include/orbit-1.0/orb/corba_orb_type.h -include/orbit-1.0/orb/corba_portableserver.h -include/orbit-1.0/orb/corba_portableserver_type.h -include/orbit-1.0/orb/corba_sequences.h -include/orbit-1.0/orb/corba_sequences_type.h -include/orbit-1.0/orb/corba_typecode.h -include/orbit-1.0/orb/corba_typecode_type.h -include/orbit-1.0/orb/dii.h -include/orbit-1.0/orb/dynany.h -include/orbit-1.0/orb/env.h -include/orbit-1.0/orb/interface_repository.h -include/orbit-1.0/orb/iop.h -include/orbit-1.0/orb/ir.h -include/orbit-1.0/orb/options.h -include/orbit-1.0/orb/orb.h -include/orbit-1.0/orb/orbit.h -include/orbit-1.0/orb/orbit_config.h -include/orbit-1.0/orb/orbit_object.h -include/orbit-1.0/orb/orbit_object_type.h -include/orbit-1.0/orb/orbit_poa.h -include/orbit-1.0/orb/orbit_poa_type.h -include/orbit-1.0/orb/orbit_typecode.h -include/orbit-1.0/orb/orbit_types.h -include/orbit-1.0/orb/poa.h -include/orbit-1.0/orb/sequences.h -include/orbit-1.0/orb/typecode.h -include/orbit-1.0/orbit-idl2.h -include/orbit-idl2.h -@unexec install-info --delete %D/info/libIDL.info %D/info/dir -info/libIDL.info -@exec install-info %D/info/libIDL.info %D/info/dir -lib/libIDL.a -lib/libIDL.so -lib/libIDL.so.2 -lib/libIIOP.a -lib/libIIOP.so -lib/libIIOP.so.2 -lib/libORBit.a -lib/libORBit.so -lib/libORBit.so.2 -lib/libORBitCosNaming.a -lib/libORBitCosNaming.so -lib/libORBitCosNaming.so.2 -lib/libORBitutil.a -lib/libORBitutil.so -lib/libORBitutil.so.2 -lib/libname-server.a -lib/liborbit-c-backend.a -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 -@dirrm include/orbit-1.0/IIOP -@dirrm include/orbit-1.0 -@dirrm include/libIDL-1.0/libIDL -@dirrm include/libIDL-1.0 +bin/name-client-2 +bin/orbit-idl-2 +bin/orbit-name-server-2 +bin/orbit2-config +@unexec if cmp -s %D/etc/orbit2rc.default %D/etc/orbit2rc; then rm -f %D/etc/orbit2rc; fi +etc/orbit2rc.default +@exec if [ ! -f %D/etc/orbit2rc ] ; then cp -p %D/%F %B/orbit2rc; fi +include/orbit-2.0/ORBitservices/CosNaming.h +include/orbit-2.0/ORBitservices/CosNaming_impl.h +include/orbit-2.0/orbit/GIOP/giop-basics.h +include/orbit-2.0/orbit/GIOP/giop-connection.h +include/orbit-2.0/orbit/GIOP/giop-endian.h +include/orbit-2.0/orbit/GIOP/giop-recv-buffer.h +include/orbit-2.0/orbit/GIOP/giop-send-buffer.h +include/orbit-2.0/orbit/GIOP/giop-server.h +include/orbit-2.0/orbit/GIOP/giop-types.h +include/orbit-2.0/orbit/GIOP/giop.h +include/orbit-2.0/orbit/dynamic/dynamic-defs.h +include/orbit-2.0/orbit/dynamic/dynamic.h +include/orbit-2.0/orbit/orb-core/allocators.h +include/orbit-2.0/orbit/orb-core/corba-any-type.h +include/orbit-2.0/orbit/orb-core/corba-any.h +include/orbit-2.0/orbit/orb-core/corba-context-type.h +include/orbit-2.0/orbit/orb-core/corba-context.h +include/orbit-2.0/orbit/orb-core/corba-defs.h +include/orbit-2.0/orbit/orb-core/corba-environment-type.h +include/orbit-2.0/orbit/orb-core/corba-environment.h +include/orbit-2.0/orbit/orb-core/corba-nvlist.h +include/orbit-2.0/orbit/orb-core/corba-object-type.h +include/orbit-2.0/orbit/orb-core/corba-object.h +include/orbit-2.0/orbit/orb-core/corba-orb-type.h +include/orbit-2.0/orbit/orb-core/corba-orb.h +include/orbit-2.0/orbit/orb-core/corba-pobj.h +include/orbit-2.0/orbit/orb-core/corba-policy-type.h +include/orbit-2.0/orbit/orb-core/corba-string.h +include/orbit-2.0/orbit/orb-core/corba-typecode-type.h +include/orbit-2.0/orbit/orb-core/corba-typecode.h +include/orbit-2.0/orbit/orb-core/iop-defs.h +include/orbit-2.0/orbit/orb-core/orb-core-types.h +include/orbit-2.0/orbit/orb-core/orb-core.h +include/orbit-2.0/orbit/orb-core/orb-types.h +include/orbit-2.0/orbit/orb-core/orbit-interface.h +include/orbit-2.0/orbit/orb-core/orbit-object.h +include/orbit-2.0/orbit/orb-core/orbit-small.h +include/orbit-2.0/orbit/orbit-config.h +include/orbit-2.0/orbit/orbit-types.h +include/orbit-2.0/orbit/orbit.h +include/orbit-2.0/orbit/poa/orbit-adaptor.h +include/orbit-2.0/orbit/poa/poa-basics.h +include/orbit-2.0/orbit/poa/poa-defs.h +include/orbit-2.0/orbit/poa/poa-policy.h +include/orbit-2.0/orbit/poa/poa-types.h +include/orbit-2.0/orbit/poa/poa.h +include/orbit-2.0/orbit/poa/portableserver-current-type.h +include/orbit-2.0/orbit/poa/portableserver-poa-type.h +include/orbit-2.0/orbit/util/basic_types.h +include/orbit-2.0/orbit/util/orbit-genrand.h +include/orbit-2.0/orbit/util/orbit-util.h +lib/libORBit-2.a +lib/libORBit-2.so +lib/libORBit-2.so.0 +lib/libORBitCosNaming-2.a +lib/libORBitCosNaming-2.so +lib/libORBitCosNaming-2.so.0 +lib/libname-server-2.a +libdata/pkgconfig/ORBit-2.0.pc +libdata/pkgconfig/ORBit-CosNaming-2.0.pc +share/aclocal/ORBit2.m4 +share/idl/orbit-2.0/CosNaming.idl +@dirrm share/idl/orbit-2.0 +@unexec /bin/rmdir %D/share/idl 2>/dev/null || /usr/bin/true +@dirrm include/orbit-2.0/orbit/util +@dirrm include/orbit-2.0/orbit/poa +@dirrm include/orbit-2.0/orbit/orb-core +@dirrm include/orbit-2.0/orbit/dynamic +@dirrm include/orbit-2.0/orbit/GIOP +@dirrm include/orbit-2.0/orbit +@dirrm include/orbit-2.0/ORBitservices +@dirrm include/orbit-2.0 |