Attachment #7866 for bug #16806

View | Details | Raw Unified | Return to bug 16806
Collapse All | Expand All

Lines 18-44 Link Here

(-)omniORB/Makefile (-7 / +24 lines)
18		18
19	WRKSRC= ${WRKDIR}/${DISTNAME}/src	19	WRKSRC= ${WRKDIR}/${DISTNAME}/src
20		20
		21	USE_NEWGCC= YES
21	USE_GMAKE= YES	22	USE_GMAKE= YES
22	MAKEFILE= GNUmakefile	23	MAKEFILE= GNUmakefile
23	ALL_TARGET= export	24	ALL_TARGET= export
		25	MAKE_ENV= CDEBUGFLAGS="${CFLAGS}" CXXDEBUGFLAGS="${CXXFLAGS}" \
		26	MKDIRHIER="${WRKSRC}/../bin/scripts/omkdirhier"
		27	ONLY_FOR_ARCHS= i386
		28	CONFIG_TARGET= x86_freebsd_3.2
		29
		30	post-patch:
		31	@${SETENV} LANG=C ${PERL} -pi -e 's/__PLATFORM__/${CONFIG_TARGET}/;' \
		32	${WRKSRC}/../config/config.mk
		33	@${SETENV} LANG=C ${PERL} -pi -e 's/^(MKDIRHIER[^=]*)=/$$1?=/;' \
		34	${WRKSRC}/../mk/unix.mk
24		35
25	do-install:	36	do-install:
26	(cd ${WRKSRC}/../bin/x86_freebsd_3.2; find . \|cpio -pdum ${PREFIX}/bin)	37	cd ${WRKSRC}/../bin && \
27	(cd ${WRKSRC}/../lib/x86_freebsd_3.2; find . \|cpio -pdum ${PREFIX}/lib)	38	${INSTALL_PROGRAM} ${CONFIG_TARGET}/* ${PREFIX}/bin
28	${INSTALL_MAN} ${WRKSRC}/../man/man1/* ${PREFIX}/man/man1	39	cd ${WRKSRC}/../lib/${CONFIG_TARGET} && \
		40	find . \|cpio -pdum -R ${BINOWN}:${BINGRP} ${PREFIX}/lib
		41	.for m in ${MAN1}
		42	${INSTALL_MAN} ${WRKSRC}/../man/man1/${m} ${PREFIX}/man/man1
		43	.endfor
29	${MKDIR} ${PREFIX}/include/omniORB2	44	${MKDIR} ${PREFIX}/include/omniORB2
30	${MKDIR} ${PREFIX}/include/omnithread	45	${MKDIR} ${PREFIX}/include/omnithread
31	${INSTALL_DATA} ${WRKSRC}/../include/omnithread.h ${PREFIX}/include	46	${INSTALL_DATA} ${WRKSRC}/../include/omnithread.h ${PREFIX}/include
32	${INSTALL_DATA} ${WRKSRC}/../include/omnithread/* ${PREFIX}/include/omnithread	47	cd ${WRKSRC}/../include && \
33	${INSTALL_DATA} ${WRKSRC}/../include/omniORB2/* ${PREFIX}/include/omniORB2	48	${INSTALL_DATA} omnithread/* ${PREFIX}/include/omnithread; \
		49	${INSTALL_DATA} omniORB2/* ${PREFIX}/include/omniORB2
		50	@ cd ${.CURDIR}
34	.if !defined(NOPORTDOCS)	51	.if !defined(NOPORTDOCS)
35	${MKDIR} ${PREFIX}/share/doc/omniORB	52	${MKDIR} ${PREFIX}/share/doc/omniORB
36	${INSTALL_DATA} ${WRKSRC}/../README.unix ${PREFIX}/share/doc/omniORB	53	${INSTALL_DATA} ${WRKSRC}/../README.unix ${PREFIX}/share/doc/omniORB
37	${INSTALL_DATA} ${WRKSRC}/../README.FreeBSD ${PREFIX}/share/doc/omniORB	54	${INSTALL_DATA} ${WRKSRC}/../README.FreeBSD ${PREFIX}/share/doc/omniORB
38	${INSTALL_DATA} ${WRKSRC}/../ReleaseNote_omniORB_280 ${PREFIX}/share/doc/omniORB	55	${INSTALL_DATA} ${WRKSRC}/../ReleaseNote_omniORB_280 ${PREFIX}/share/doc/omniORB
39	(cd ${WRKSRC}/../doc; find . \|cpio -pdum ${PREFIX}/share/doc/omniORB)	56	cd ${WRKSRC}/../doc && \
		57	find . \|cpio -pdum -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/omniORB
40	.endif	58	.endif
41	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib	59	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
42		60
43	.include <bsd.port.mk>	61	.include <bsd.port.mk>
44

Lines 5-11 Link Here

(-)omniORB/patches/patch-aa (-1 / +1 lines)
5	#platform = x86_sco5	5	#platform = x86_sco5
6	#platform = x86_uw7	6	#platform = x86_uw7
7	-#platform = i386_freebsd_3.2	7	-#platform = i386_freebsd_3.2
8	+platform = x86_freebsd_3.2	8	+platform = __PLATFORM__
9		9
10	# On Win32 platforms, uncomment the following line to build all the binaries	10	# On Win32 platforms, uncomment the following line to build all the binaries
11	# with debugging information. Useful if you want to debug the binaries under	11	# with debugging information. Useful if you want to debug the binaries under




--- ../mk/platforms/x86_freebsd_3.2.mk.orig	Thu Sep 16 23:00:18 1999
+++ ../mk/platforms/x86_freebsd_3.2.mk	Fri Feb 18 06:08:33 2000
@@ -20,9 +20,9 @@
 
 CPP = /usr/libexec/cpp
 
-CXX = egcs++
+CXX ?= g++
 CXXMAKEDEPEND = $(TOP)/$(BINDIR)/omkdepend -D__cplusplus -D__GNUG__ -D__GNUC__
-CXXDEBUGFLAGS = -O2
+CXXDEBUGFLAGS ?= -O2
 
 CXXLINK		= $(CXX) -pthread -s
 CXXLINKOPTIONS  = $(CXXDEBUGFLAGS) $(CXXOPTIONS)
@@ -31,16 +31,16 @@
 EgcsMajorVersion = 1
 EgcsMinorVersion = 1        # This is actually a post-1.0 egcs snapshot.
 
-CC           = egcs
+CC          ?= gcc
 CMAKEDEPEND  = $(TOP)/$(BINDIR)/omkdepend -D__GNUC__
-CDEBUGFLAGS  = -O2
+CDEBUGFLAGS  ?= -O2
 
 CLINK        = $(CC)
 CLINKOPTIONS = $(CDEBUGFLAGS) $(COPTIONS)
 
 INSTALL = install -c
 




--- lib/omniORB2/orbcore/gatekeepers/alone/gatekeeper.cc.orig	Thu Sep 23 04:21:42 1999
+++ lib/omniORB2/orbcore/gatekeepers/alone/gatekeeper.cc	Sat Feb  5 23:19:16 2000
@@ -41,6 +41,10 @@
 
 #include <unistd.h>
 
+#if defined(__freebsd__)
+#include <osreldate.h>
+#endif
+
 #endif // __WIN32__
 
 extern "C" void exit(int) ;
@@ -99,7 +103,7 @@
   // ********************************
   // retrieve the client name
   // ********************************
-#if (defined(__GLIBC__) && __GLIBC__ >= 2)
+#if (defined(__GLIBC__) && __GLIBC__ >= 2) || (__FreeBSD_version >= 400013)
     // GNU C library uses socklen_t * instead of int* in getpeername().
     // This is suppose to be compatible with the upcoming POSIX standard.
     socklen_t clientAddrSize;
*** 532,538 ****
  
      l = sizeof(struct sockaddr_in);
      if (getsockname(pd_rendezvous,
! 		    (struct sockaddr *)&myaddr,&l) == RC_SOCKET_ERROR) {
        CLOSESOCKET(pd_rendezvous);
  #ifndef __WIN32__
        throw CORBA::COMM_FAILURE(errno,CORBA::COMPLETED_NO);
--- 532,538 ----
  
      l = sizeof(struct sockaddr_in);
      if (getsockname(pd_rendezvous,
! 		    (struct sockaddr *)&myaddr,(socklen_t *)&l) == RC_SOCKET_ERROR) {
        CLOSESOCKET(pd_rendezvous);
  #ifndef __WIN32__
        throw CORBA::COMM_FAILURE(errno,CORBA::COMPLETED_NO);
***************
*** 1148,1154 ****
  
        PTRACE("Rendezvouser","block on accept()");
  
!       if ((new_sock = ::accept(r->pd_rendezvous,(struct sockaddr *)&raddr,&l)) 
  	                          == RC_INVALID_SOCKET) {
  #ifndef __WIN32__
  	throw CORBA::COMM_FAILURE(errno,CORBA::COMPLETED_NO);
--- 1148,1154 ----
  
        PTRACE("Rendezvouser","block on accept()");
  
!       if ((new_sock = ::accept(r->pd_rendezvous,(struct sockaddr *)&raddr,(socklen_t *)&l)) 
  	                          == RC_INVALID_SOCKET) {
  #ifndef __WIN32__
  	throw CORBA::COMM_FAILURE(errno,CORBA::COMPLETED_NO);
***************
*** 1306,1312 ****
  #endif
  
      l = sizeof(struct sockaddr_in);
!     if ((new_sock = ::accept(r->pd_rendezvous,(struct sockaddr *)&raddr,&l)) 
  	      == RC_INVALID_SOCKET) 
        {
  	die = 1;
--- 1306,1312 ----
  #endif
  
      l = sizeof(struct sockaddr_in);
!     if ((new_sock = ::accept(r->pd_rendezvous,(struct sockaddr *)&raddr,(socklen_t *)&l)) 
  	      == RC_INVALID_SOCKET) 
        {
  	die = 1;




--- lib/omniORB2/orbcore/tcpSocketMTfactory.cc.orig	Thu Sep 23 05:22:50 1999
+++ lib/omniORB2/orbcore/tcpSocketMTfactory.cc	Sat Feb  5 23:15:00 2000
@@ -178,6 +178,10 @@
 #include <arpa/inet.h>
 #include <unistd.h>
 
+#if defined(__freebsd__)
+#include <osreldate.h>
+#endif
+
 #if defined(__sunos__) && defined(__sparc__) && __OSVERSION__ >= 5
 #include <sys/types.h>
 #include <fcntl.h>
@@ -518,7 +522,7 @@
   }
   
   {
-#if (defined(__GLIBC__) && __GLIBC__ >= 2)
+#if (defined(__GLIBC__) && __GLIBC__ >= 2) || (__FreeBSD_version >= 400013)
     // GNU C library uses socklen_t * instead of int* in getsockname().
     // This is suppose to be compatible with the upcoming POSIX standard.
     socklen_t l;
@@ -1134,7 +1138,7 @@
       tcpSocketHandle_t new_sock;
       struct sockaddr_in raddr;
  
-#if (defined(__GLIBC__) && __GLIBC__ >= 2)
+#if (defined(__GLIBC__) && __GLIBC__ >= 2) || (__FreeBSD_version >= 400013)
       // GNU C library uses socklen_t * instead of int* in accept ().
       // This is suppose to be compatible with the upcoming POSIX standard.
       socklen_t l;
@@ -1295,7 +1299,7 @@
 
     tcpSocketHandle_t new_sock;
     struct sockaddr_in raddr;
-#if (defined(__GLIBC__) && __GLIBC__ >= 2)
+#if (defined(__GLIBC__) && __GLIBC__ >= 2) || (__FreeBSD_version >= 400013)
     // GNU C library uses socklen_t * instead of int* in accept ().
     // This is suppose to be compatible with the upcoming POSIX standard.
     socklen_t l;




--- lib/omniORB2/dynamic/sharedlib/dir.mk.orig	Thu Sep 23 04:21:46 1999
+++ lib/omniORB2/dynamic/sharedlib/dir.mk	Mon Feb 14 06:43:15 2000
@@ -657,11 +657,11 @@
 
 libname = libomniORB$(major_version).so
 soname  = $(libname).$(minor_version)
-lib = $(soname).$(mic
+lib = $(soname)
 
 dynlibname = libomniDynamic$(major_version).so
 dynsoname  = $(dynlibname).$(minor_version)
-dynlib = $(dynsoname).$(micro_version)
+dynlib = $(dynsoname)
 
 
 all:: $(dynlib)
@@ -680,8 +680,6 @@
 	@$(ExportLibrary)
 	@(set -x; \
           cd $(EXPORT_TREE)/$(LIBDIR); \
-          $(RM) $(dynsoname); \
-          ln -s $(dynlib) $(dynsoname); \
           $(RM) $(dynlibname); \
           ln -s $(dynsoname) $(dynlibname); \
          )




--- lib/omniORB2/lifecycle/sharedlib/dir.mk.orig	Sat Sep 25 08:38:55 1999
+++ lib/omniORB2/lifecycle/sharedlib/dir.mk	Mon Feb 14 06:50:44 2000
@@ -687,7 +687,7 @@
 
 lclibname = libomniLC.so
 lcsoname  = $(lclibname).$(lc_minor_version)
-lclib = $(lcsoname).$(lc_micro_version)
+lclib = $(lcsoname)
 
 all:: $(lclib)
 
@@ -705,8 +705,6 @@
 	@$(ExportLibrary)
 	@(set -x; \
           cd $(EXPORT_TREE)/$(LIBDIR); \
-          $(RM) $(lcsoname); \
-          ln -s $(lclib) $(lcsoname); \
           $(RM) $(lclibname); \
           ln -s $(lcsoname) $(lclibname); \
          )




--- lib/omniORB2/orbcore/sharedlib/dir.mk.orig	Thu Sep 23 19:38:44 1999
+++ lib/omniORB2/orbcore/sharedlib/dir.mk	Mon Feb 14 07:01:26 2000
@@ -663,7 +663,7 @@
 
 libname = libomniORB$(major_version).so
 soname  = $(libname).$(minor_version)
-lib = $(soname).$(micro_version)
+lib = $(soname)
 
 all:: $(lib)
 
@@ -681,8 +681,6 @@
 	@$(ExportLibrary)
 	@(set -x; \
           cd $(EXPORT_TREE)/$(LIBDIR); \
-          $(RM) $(soname); \
-          ln -s $(lib) $(soname); \
           $(RM) $(libname); \
           ln -s $(soname) $(libname); \
          )




--- lib/omnithread/sharedlib/dir.mk.orig	Thu Sep 23 04:21:50 1999
+++ lib/omnithread/sharedlib/dir.mk	Mon Feb 14 06:31:13 2000
@@ -500,7 +500,7 @@
 
 libname = libomnithread.so
 soname  = $(libname).$(minor_version)
-lib = $(soname).$(micro_version)
+lib = $(soname)
 
 $(lib): $(OBJS)
 	(set -x; \
@@ -518,8 +518,6 @@
 	@$(ExportLibrary)
 	@(set -x; \
           cd $(EXPORT_TREE)/$(LIBDIR); \
-          $(RM) $(soname); \
-          ln -s $(lib) $(soname); \
           $(RM) $(libname); \
           ln -s $(soname) $(libname); \
          )




--- lib/omniORB2/orbcore/gatekeepers/tcpwrapper/sharedlib/dir.mk.orig	Thu Sep 23 04:21:49 1999
+++ lib/omniORB2/orbcore/gatekeepers/tcpwrapper/sharedlib/dir.mk	Mon Feb 14 07:03:42 2000
@@ -294,7 +294,7 @@
 
 libname = libtcpwrapGK.so
 soname  = $(libname).$(minor_version)
-lib = $(soname).$(micro_version)
+lib = $(soname)
 
 $(lib): $(OBJS) $(CXXOBJS)
 	(set -x; \
@@ -312,8 +312,6 @@
 	@$(ExportLibrary)
 	@(set -x; \
           cd $(EXPORT_TREE)/$(LIBDIR); \
-          $(RM) $(soname); \
-          ln -s $(lib) $(soname); \
           $(RM) $(libname); \
           ln -s $(soname) $(libname); \
          )

Lines 52-57 Link Here

(-)omniORB/pkg/PLIST (-2 / +2 lines)
52	lib/libtcpwrapGK.a	52	lib/libtcpwrapGK.a
53	lib/libtcpwrapGK.so	53	lib/libtcpwrapGK.so
54	lib/libtcpwrapGK.so.1.0	54	lib/libtcpwrapGK.so.1.0
		55	@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
		56	@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
55	share/doc/omniORB/README.unix	57	share/doc/omniORB/README.unix
56	share/doc/omniORB/README.FreeBSD	58	share/doc/omniORB/README.FreeBSD
57	share/doc/omniORB/ReleaseNote_omniORB_280	59	share/doc/omniORB/ReleaseNote_omniORB_280
Lines 175-179 Link Here
175	@dirrm share/doc/omniORB/utilities	177	@dirrm share/doc/omniORB/utilities
176	@dirrm share/doc/omniORB/tex	178	@dirrm share/doc/omniORB/tex
177	@dirrm share/doc/omniORB	179	@dirrm share/doc/omniORB
178	@exec /sbin/ldconfig -m %D/lib
179	@unexec /sbin/ldconfig -R

Return to bug 16806

Lines 1-24 Link Here

(-)omniORB/patches/patch-ab (-9 / +14 lines)
1	--- ../mk/platforms/x86_freebsd_3.2.mk.orig Thu Sep 16 10:00:18 1999	1	--- ../mk/platforms/x86_freebsd_3.2.mk.orig Thu Sep 16 23:00:18 1999
2	+++ ../mk/platforms/x86_freebsd_3.2.mk Tue Sep 28 11:36:52 1999	2	+++ ../mk/platforms/x86_freebsd_3.2.mk Fri Feb 18 06:08:33 2000
3	@@ -20,7 +20,7 @@	3	@@ -20,9 +20,9 @@
4		4
5	CPP = /usr/libexec/cpp	5	CPP = /usr/libexec/cpp
6		6
7	-CXX = egcs++	7	-CXX = egcs++
8	+CXX = g++	8	+CXX ?= g++
9	CXXMAKEDEPEND = $(TOP)/$(BINDIR)/omkdepend -D__cplusplus -D__GNUG__ -D__GNUC__	9	CXXMAKEDEPEND = $(TOP)/$(BINDIR)/omkdepend -D__cplusplus -D__GNUG__ -D__GNUC__
10	CXXDEBUGFLAGS = -O2	10	-CXXDEBUGFLAGS = -O2
		11	+CXXDEBUGFLAGS ?= -O2
11		12
12	@@ -31,7 +31,7 @@	13	CXXLINK = $(CXX) -pthread -s
		14	CXXLINKOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS)
		15	@@ -31,16 +31,16 @@
13	EgcsMajorVersion = 1	16	EgcsMajorVersion = 1
14	EgcsMinorVersion = 1 # This is actually a post-1.0 egcs snapshot.	17	EgcsMinorVersion = 1 # This is actually a post-1.0 egcs snapshot.
15		18
16	-CC = egcs	19	-CC = egcs
17	+CC = gcc	20	+CC ?= gcc
18	CMAKEDEPEND = $(TOP)/$(BINDIR)/omkdepend -D__GNUC__	21	CMAKEDEPEND = $(TOP)/$(BINDIR)/omkdepend -D__GNUC__
19	CDEBUGFLAGS = -O2	22	-CDEBUGFLAGS = -O2
		23	+CDEBUGFLAGS ?= -O2
20		24
21	@@ -40,7 +40,7 @@	25	CLINK = $(CC)
		26	CLINKOPTIONS = $(CDEBUGFLAGS) $(COPTIONS)
22		27
23	INSTALL = install -c	28	INSTALL = install -c
24		29

Lines 1-72 Link Here

(-)omniORB/patches/patch-ac (-72 / +22 lines)
1	*** lib/omniORB2/orbcore/gatekeepers/alone/gatekeeper.cc.orig Mon Jan 10 13:43:45 2000	1	--- lib/omniORB2/orbcore/gatekeepers/alone/gatekeeper.cc.orig Thu Sep 23 04:21:42 1999
2	--- lib/omniORB2/orbcore/gatekeepers/alone/gatekeeper.cc Mon Jan 10 13:44:32 2000	2	+++ lib/omniORB2/orbcore/gatekeepers/alone/gatekeeper.cc Sat Feb 5 23:19:16 2000
3	***************	3	@@ -41,6 +41,10 @@
4	* 112,118 **	4
5		5	#include <unistd.h>
6	if ( getpeername ( handle,	6
7	(struct sockaddr) (void ) & clientAddr,	7	+#if defined(__freebsd__)
8	! & clientAddrSize ) ) {	8	+#include <osreldate.h>
9	LOGMESSAGE(1,"","Failed to authenticate peer name: access denied.");	9	+#endif
10	return 0 ;	10	+
11	}	11	#endif // __WIN32__
12	--- 112,118 ----	12
13		13	extern "C" void exit(int) ;
14	if ( getpeername ( handle,	14	@@ -99,7 +103,7 @@
15	(struct sockaddr) (void ) & clientAddr,	15	// ********************************
16	! (socklen_t *)& clientAddrSize ) ) {	16	// retrieve the client name
17	LOGMESSAGE(1,"","Failed to authenticate peer name: access denied.");	17	// ********************************
18	return 0 ;	18	-#if (defined(__GLIBC__) && __GLIBC__ >= 2)
19	}	19	+#if (defined(__GLIBC__) && __GLIBC__ >= 2) \|\| (__FreeBSD_version >= 400013)
20	*** lib/omniORB2/orbcore/tcpSocketMTfactory.cc.orig Wed Sep 22 16:22:50 1999	20	// GNU C library uses socklen_t * instead of int* in getpeername().
21	--- lib/omniORB2/orbcore/tcpSocketMTfactory.cc Mon Jan 10 15:41:52 2000	21	// This is suppose to be compatible with the upcoming POSIX standard.
22	***************	22	socklen_t clientAddrSize;
23	* 532,538 **
24
25	l = sizeof(struct sockaddr_in);
26	if (getsockname(pd_rendezvous,
27	! (struct sockaddr *)&myaddr,&l) == RC_SOCKET_ERROR) {
28	CLOSESOCKET(pd_rendezvous);
29	#ifndef __WIN32__
30	throw CORBA::COMM_FAILURE(errno,CORBA::COMPLETED_NO);
31	--- 532,538 ----
32
33	l = sizeof(struct sockaddr_in);
34	if (getsockname(pd_rendezvous,
35	! (struct sockaddr )&myaddr,(socklen_t )&l) == RC_SOCKET_ERROR) {
36	CLOSESOCKET(pd_rendezvous);
37	#ifndef __WIN32__
38	throw CORBA::COMM_FAILURE(errno,CORBA::COMPLETED_NO);
39	***************
40	* 1148,1154 **
41
42	PTRACE("Rendezvouser","block on accept()");
43
44	! if ((new_sock = ::accept(r->pd_rendezvous,(struct sockaddr *)&raddr,&l))
45	== RC_INVALID_SOCKET) {
46	#ifndef __WIN32__
47	throw CORBA::COMM_FAILURE(errno,CORBA::COMPLETED_NO);
48	--- 1148,1154 ----
49
50	PTRACE("Rendezvouser","block on accept()");
51
52	! if ((new_sock = ::accept(r->pd_rendezvous,(struct sockaddr )&raddr,(socklen_t )&l))
53	== RC_INVALID_SOCKET) {
54	#ifndef __WIN32__
55	throw CORBA::COMM_FAILURE(errno,CORBA::COMPLETED_NO);
56	***************
57	* 1306,1312 **
58	#endif
59
60	l = sizeof(struct sockaddr_in);
61	! if ((new_sock = ::accept(r->pd_rendezvous,(struct sockaddr *)&raddr,&l))
62	== RC_INVALID_SOCKET)
63	{
64	die = 1;
65	--- 1306,1312 ----
66	#endif
67
68	l = sizeof(struct sockaddr_in);
69	! if ((new_sock = ::accept(r->pd_rendezvous,(struct sockaddr )&raddr,(socklen_t )&l))
70	== RC_INVALID_SOCKET)
71	{
72	die = 1;

Line 0 Link Here

(-)omniORB/patches/patch-ad (+40 lines)
	1	--- lib/omniORB2/orbcore/tcpSocketMTfactory.cc.orig Thu Sep 23 05:22:50 1999
	2	+++ lib/omniORB2/orbcore/tcpSocketMTfactory.cc Sat Feb 5 23:15:00 2000
	3	@@ -178,6 +178,10 @@
	4	#include <arpa/inet.h>
	5	#include <unistd.h>
	6
	7	+#if defined(__freebsd__)
	8	+#include <osreldate.h>
	9	+#endif
	10	+
	11	#if defined(__sunos__) && defined(__sparc__) && __OSVERSION__ >= 5
	12	#include <sys/types.h>
	13	#include <fcntl.h>
	14	@@ -518,7 +522,7 @@
	15	}
	16
	17	{
	18	-#if (defined(__GLIBC__) && __GLIBC__ >= 2)
	19	+#if (defined(__GLIBC__) && __GLIBC__ >= 2) \|\| (__FreeBSD_version >= 400013)
	20	// GNU C library uses socklen_t * instead of int* in getsockname().
	21	// This is suppose to be compatible with the upcoming POSIX standard.
	22	socklen_t l;
	23	@@ -1134,7 +1138,7 @@
	24	tcpSocketHandle_t new_sock;
	25	struct sockaddr_in raddr;
	26
	27	-#if (defined(__GLIBC__) && __GLIBC__ >= 2)
	28	+#if (defined(__GLIBC__) && __GLIBC__ >= 2) \|\| (__FreeBSD_version >= 400013)
	29	// GNU C library uses socklen_t * instead of int* in accept ().
	30	// This is suppose to be compatible with the upcoming POSIX standard.
	31	socklen_t l;
	32	@@ -1295,7 +1299,7 @@
	33
	34	tcpSocketHandle_t new_sock;
	35	struct sockaddr_in raddr;
	36	-#if (defined(__GLIBC__) && __GLIBC__ >= 2)
	37	+#if (defined(__GLIBC__) && __GLIBC__ >= 2) \|\| (__FreeBSD_version >= 400013)
	38	// GNU C library uses socklen_t * instead of int* in accept ().
	39	// This is suppose to be compatible with the upcoming POSIX standard.
	40	socklen_t l;

Line 0 Link Here

(-)omniORB/patches/patch-ae (+25 lines)
	1	--- lib/omniORB2/dynamic/sharedlib/dir.mk.orig Thu Sep 23 04:21:46 1999
	2	+++ lib/omniORB2/dynamic/sharedlib/dir.mk Mon Feb 14 06:43:15 2000
	3	@@ -657,11 +657,11 @@
	4
	5	libname = libomniORB$(major_version).so
	6	soname = $(libname).$(minor_version)
	7	-lib = $(soname).$(mic
	8	+lib = $(soname)
	9
	10	dynlibname = libomniDynamic$(major_version).so
	11	dynsoname = $(dynlibname).$(minor_version)
	12	-dynlib = $(dynsoname).$(micro_version)
	13	+dynlib = $(dynsoname)
	14
	15
	16	all:: $(dynlib)
	17	@@ -680,8 +680,6 @@
	18	@$(ExportLibrary)
	19	@(set -x; \
	20	cd $(EXPORT_TREE)/$(LIBDIR); \
	21	- $(RM) $(dynsoname); \
	22	- ln -s $(dynlib) $(dynsoname); \
	23	$(RM) $(dynlibname); \
	24	ln -s $(dynsoname) $(dynlibname); \
	25	)

Line 0 Link Here

(-)omniORB/patches/patch-af (+20 lines)
	1	--- lib/omniORB2/lifecycle/sharedlib/dir.mk.orig Sat Sep 25 08:38:55 1999
	2	+++ lib/omniORB2/lifecycle/sharedlib/dir.mk Mon Feb 14 06:50:44 2000
	3	@@ -687,7 +687,7 @@
	4
	5	lclibname = libomniLC.so
	6	lcsoname = $(lclibname).$(lc_minor_version)
	7	-lclib = $(lcsoname).$(lc_micro_version)
	8	+lclib = $(lcsoname)
	9
	10	all:: $(lclib)
	11
	12	@@ -705,8 +705,6 @@
	13	@$(ExportLibrary)
	14	@(set -x; \
	15	cd $(EXPORT_TREE)/$(LIBDIR); \
	16	- $(RM) $(lcsoname); \
	17	- ln -s $(lclib) $(lcsoname); \
	18	$(RM) $(lclibname); \
	19	ln -s $(lcsoname) $(lclibname); \
	20	)

Line 0 Link Here

(-)omniORB/patches/patch-ag (+20 lines)
	1	--- lib/omniORB2/orbcore/sharedlib/dir.mk.orig Thu Sep 23 19:38:44 1999
	2	+++ lib/omniORB2/orbcore/sharedlib/dir.mk Mon Feb 14 07:01:26 2000
	3	@@ -663,7 +663,7 @@
	4
	5	libname = libomniORB$(major_version).so
	6	soname = $(libname).$(minor_version)
	7	-lib = $(soname).$(micro_version)
	8	+lib = $(soname)
	9
	10	all:: $(lib)
	11
	12	@@ -681,8 +681,6 @@
	13	@$(ExportLibrary)
	14	@(set -x; \
	15	cd $(EXPORT_TREE)/$(LIBDIR); \
	16	- $(RM) $(soname); \
	17	- ln -s $(lib) $(soname); \
	18	$(RM) $(libname); \
	19	ln -s $(soname) $(libname); \
	20	)

Line 0 Link Here

(-)omniORB/patches/patch-ah (+20 lines)
	1	--- lib/omnithread/sharedlib/dir.mk.orig Thu Sep 23 04:21:50 1999
	2	+++ lib/omnithread/sharedlib/dir.mk Mon Feb 14 06:31:13 2000
	3	@@ -500,7 +500,7 @@
	4
	5	libname = libomnithread.so
	6	soname = $(libname).$(minor_version)
	7	-lib = $(soname).$(micro_version)
	8	+lib = $(soname)
	9
	10	$(lib): $(OBJS)
	11	(set -x; \
	12	@@ -518,8 +518,6 @@
	13	@$(ExportLibrary)
	14	@(set -x; \
	15	cd $(EXPORT_TREE)/$(LIBDIR); \
	16	- $(RM) $(soname); \
	17	- ln -s $(lib) $(soname); \
	18	$(RM) $(libname); \
	19	ln -s $(soname) $(libname); \
	20	)

Line 0 Link Here

(-)omniORB/patches/patch-ai (+20 lines)
	1	--- lib/omniORB2/orbcore/gatekeepers/tcpwrapper/sharedlib/dir.mk.orig Thu Sep 23 04:21:49 1999
	2	+++ lib/omniORB2/orbcore/gatekeepers/tcpwrapper/sharedlib/dir.mk Mon Feb 14 07:03:42 2000
	3	@@ -294,7 +294,7 @@
	4
	5	libname = libtcpwrapGK.so
	6	soname = $(libname).$(minor_version)
	7	-lib = $(soname).$(micro_version)
	8	+lib = $(soname)
	9
	10	$(lib): $(OBJS) $(CXXOBJS)
	11	(set -x; \
	12	@@ -312,8 +312,6 @@
	13	@$(ExportLibrary)
	14	@(set -x; \
	15	cd $(EXPORT_TREE)/$(LIBDIR); \
	16	- $(RM) $(soname); \
	17	- ln -s $(lib) $(soname); \
	18	$(RM) $(libname); \
	19	ln -s $(soname) $(libname); \
	20	)