Attachment 7866 Details for Bug 16806 – file.diff

[patch] file.diff

file.diff (text/plain), 13.81 KB, created by okazaki on 2000-02-18 14:30:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: okazaki

Created: 2000-02-18 14:30:01 UTC

Size: 13.81 KB

patch

obsolete

>diff -urN /usr/ports/devel/omniORB/Makefile omniORB/Makefile
>--- /usr/ports/devel/omniORB/Makefile	Fri Feb 18 04:51:20 2000
>+++ omniORB/Makefile	Fri Feb 18 20:44:37 2000
>@@ -18,27 +18,44 @@
> 
> WRKSRC=		${WRKDIR}/${DISTNAME}/src
> 
>+USE_NEWGCC=	YES
> USE_GMAKE=	YES
> MAKEFILE=	GNUmakefile
> ALL_TARGET=	export
>+MAKE_ENV=	CDEBUGFLAGS="${CFLAGS}" CXXDEBUGFLAGS="${CXXFLAGS}" \
>+		MKDIRHIER="${WRKSRC}/../bin/scripts/omkdirhier"
>+ONLY_FOR_ARCHS=	i386
>+CONFIG_TARGET=	x86_freebsd_3.2
>+
>+post-patch:
>+	@${SETENV} LANG=C ${PERL} -pi -e 's/__PLATFORM__/${CONFIG_TARGET}/;' \
>+		${WRKSRC}/../config/config.mk
>+	@${SETENV} LANG=C ${PERL} -pi -e 's/^(MKDIRHIER[^=]*)=/$$1?=/;' \
>+		${WRKSRC}/../mk/unix.mk
> 
> do-install:
>-	(cd ${WRKSRC}/../bin/x86_freebsd_3.2; find . |cpio -pdum ${PREFIX}/bin)
>-	(cd ${WRKSRC}/../lib/x86_freebsd_3.2; find . |cpio -pdum ${PREFIX}/lib)
>-	${INSTALL_MAN} ${WRKSRC}/../man/man1/* ${PREFIX}/man/man1
>+	cd ${WRKSRC}/../bin && \
>+		${INSTALL_PROGRAM} ${CONFIG_TARGET}/* ${PREFIX}/bin
>+	cd ${WRKSRC}/../lib/${CONFIG_TARGET} && \
>+		find . |cpio -pdum -R ${BINOWN}:${BINGRP} ${PREFIX}/lib
>+.for m in ${MAN1}
>+	${INSTALL_MAN} ${WRKSRC}/../man/man1/${m} ${PREFIX}/man/man1
>+.endfor
> 	${MKDIR} ${PREFIX}/include/omniORB2
> 	${MKDIR} ${PREFIX}/include/omnithread
> 	${INSTALL_DATA} ${WRKSRC}/../include/omnithread.h ${PREFIX}/include
>-	${INSTALL_DATA} ${WRKSRC}/../include/omnithread/* ${PREFIX}/include/omnithread
>-	${INSTALL_DATA} ${WRKSRC}/../include/omniORB2/* ${PREFIX}/include/omniORB2
>+	cd ${WRKSRC}/../include && \
>+		${INSTALL_DATA} omnithread/* ${PREFIX}/include/omnithread; \
>+		${INSTALL_DATA} omniORB2/* ${PREFIX}/include/omniORB2
>+	@ cd ${.CURDIR}
> .if !defined(NOPORTDOCS)
> 	${MKDIR} ${PREFIX}/share/doc/omniORB
> 	${INSTALL_DATA} ${WRKSRC}/../README.unix ${PREFIX}/share/doc/omniORB
> 	${INSTALL_DATA} ${WRKSRC}/../README.FreeBSD ${PREFIX}/share/doc/omniORB
> 	${INSTALL_DATA} ${WRKSRC}/../ReleaseNote_omniORB_280 ${PREFIX}/share/doc/omniORB
>-	(cd ${WRKSRC}/../doc; find . |cpio -pdum ${PREFIX}/share/doc/omniORB)
>+	cd ${WRKSRC}/../doc && \
>+		find . |cpio -pdum -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/omniORB
> .endif
> 	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
> 
> .include <bsd.port.mk>
>-
>diff -urN /usr/ports/devel/omniORB/patches/patch-aa omniORB/patches/patch-aa
>--- /usr/ports/devel/omniORB/patches/patch-aa	Wed Jan 12 15:45:22 2000
>+++ omniORB/patches/patch-aa	Fri Feb 18 06:30:24 2000
>@@ -5,7 +5,7 @@
>  #platform = x86_sco5
>  #platform = x86_uw7
> -#platform = i386_freebsd_3.2
>-+platform = x86_freebsd_3.2
>++platform = __PLATFORM__
>  
>  # On Win32 platforms, uncomment the following line to build all the binaries
>  # with debugging information. Useful if you want to debug the binaries under
>diff -urN /usr/ports/devel/omniORB/patches/patch-ab omniORB/patches/patch-ab
>--- /usr/ports/devel/omniORB/patches/patch-ab	Wed Jan 12 15:45:22 2000
>+++ omniORB/patches/patch-ab	Fri Feb 18 06:09:12 2000
>@@ -1,24 +1,29 @@
>---- ../mk/platforms/x86_freebsd_3.2.mk.orig	Thu Sep 16 10:00:18 1999
>-+++ ../mk/platforms/x86_freebsd_3.2.mk	Tue Sep 28 11:36:52 1999
>-@@ -20,7 +20,7 @@
>+--- ../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++
>++CXX ?= g++
>  CXXMAKEDEPEND = $(TOP)/$(BINDIR)/omkdepend -D__cplusplus -D__GNUG__ -D__GNUC__
>- CXXDEBUGFLAGS = -O2
>+-CXXDEBUGFLAGS = -O2
>++CXXDEBUGFLAGS ?= -O2
>  
>-@@ -31,7 +31,7 @@
>+ 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
>++CC          ?= gcc
>  CMAKEDEPEND  = $(TOP)/$(BINDIR)/omkdepend -D__GNUC__
>- CDEBUGFLAGS  = -O2
>+-CDEBUGFLAGS  = -O2
>++CDEBUGFLAGS  ?= -O2
>  
>-@@ -40,7 +40,7 @@
>+ CLINK        = $(CC)
>+ CLINKOPTIONS = $(CDEBUGFLAGS) $(COPTIONS)
>  
>  INSTALL = install -c
>  
>diff -urN /usr/ports/devel/omniORB/patches/patch-ac omniORB/patches/patch-ac
>--- /usr/ports/devel/omniORB/patches/patch-ac	Wed Jan 12 04:30:29 2000
>+++ omniORB/patches/patch-ac	Sat Feb  5 23:19:46 2000
>@@ -1,72 +1,22 @@
>-*** lib/omniORB2/orbcore/gatekeepers/alone/gatekeeper.cc.orig	Mon Jan 10 13:43:45 2000
>---- lib/omniORB2/orbcore/gatekeepers/alone/gatekeeper.cc	Mon Jan 10 13:44:32 2000
>-***************
>-*** 112,118 ****
>-  
>-    if ( getpeername ( handle, 
>-  		     (struct sockaddr*) (void *) & clientAddr, 
>-! 		     & clientAddrSize ) ) {
>-      LOGMESSAGE(1,"","Failed to authenticate peer name: access denied.");
>-      return 0 ;
>-    }
>---- 112,118 ----
>-  
>-    if ( getpeername ( handle, 
>-  		     (struct sockaddr*) (void *) & clientAddr, 
>-! 		     (socklen_t *)& clientAddrSize ) ) {
>-      LOGMESSAGE(1,"","Failed to authenticate peer name: access denied.");
>-      return 0 ;
>-    }
>-*** lib/omniORB2/orbcore/tcpSocketMTfactory.cc.orig	Wed Sep 22 16:22:50 1999
>---- lib/omniORB2/orbcore/tcpSocketMTfactory.cc	Mon Jan 10 15:41:52 2000
>-***************
>-*** 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/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;
>diff -urN /usr/ports/devel/omniORB/patches/patch-ad omniORB/patches/patch-ad
>--- /usr/ports/devel/omniORB/patches/patch-ad	Thu Jan  1 09:00:00 1970
>+++ omniORB/patches/patch-ad	Sat Feb  5 23:16:23 2000
>@@ -0,0 +1,40 @@
>+--- 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;
>diff -urN /usr/ports/devel/omniORB/patches/patch-ae omniORB/patches/patch-ae
>--- /usr/ports/devel/omniORB/patches/patch-ae	Thu Jan  1 09:00:00 1970
>+++ omniORB/patches/patch-ae	Mon Feb 14 06:43:53 2000
>@@ -0,0 +1,25 @@
>+--- 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); \
>+          )
>diff -urN /usr/ports/devel/omniORB/patches/patch-af omniORB/patches/patch-af
>--- /usr/ports/devel/omniORB/patches/patch-af	Thu Jan  1 09:00:00 1970
>+++ omniORB/patches/patch-af	Mon Feb 14 06:51:27 2000
>@@ -0,0 +1,20 @@
>+--- 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); \
>+          )
>diff -urN /usr/ports/devel/omniORB/patches/patch-ag omniORB/patches/patch-ag
>--- /usr/ports/devel/omniORB/patches/patch-ag	Thu Jan  1 09:00:00 1970
>+++ omniORB/patches/patch-ag	Mon Feb 14 07:02:06 2000
>@@ -0,0 +1,20 @@
>+--- 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); \
>+          )
>diff -urN /usr/ports/devel/omniORB/patches/patch-ah omniORB/patches/patch-ah
>--- /usr/ports/devel/omniORB/patches/patch-ah	Thu Jan  1 09:00:00 1970
>+++ omniORB/patches/patch-ah	Mon Feb 14 06:32:56 2000
>@@ -0,0 +1,20 @@
>+--- 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); \
>+          )
>diff -urN /usr/ports/devel/omniORB/patches/patch-ai omniORB/patches/patch-ai
>--- /usr/ports/devel/omniORB/patches/patch-ai	Thu Jan  1 09:00:00 1970
>+++ omniORB/patches/patch-ai	Mon Feb 14 07:04:22 2000
>@@ -0,0 +1,20 @@
>+--- 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); \
>+          )
>diff -urN /usr/ports/devel/omniORB/pkg/PLIST omniORB/pkg/PLIST
>--- /usr/ports/devel/omniORB/pkg/PLIST	Fri Feb 18 04:51:28 2000
>+++ omniORB/pkg/PLIST	Fri Feb 18 20:34:12 2000
>@@ -52,6 +52,8 @@
> lib/libtcpwrapGK.a
> lib/libtcpwrapGK.so
> lib/libtcpwrapGK.so.1.0
>+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
>+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
> share/doc/omniORB/README.unix
> share/doc/omniORB/README.FreeBSD
> share/doc/omniORB/ReleaseNote_omniORB_280
>@@ -175,5 +177,3 @@
> @dirrm share/doc/omniORB/utilities
> @dirrm share/doc/omniORB/tex
> @dirrm share/doc/omniORB
>-@exec /sbin/ldconfig -m %D/lib
>-@unexec /sbin/ldconfig -R

Actions: View | Diff

Attachments on bug 16806: 7866