Attachment 52454 Details for Bug 79469 – file.diff

[patch] file.diff

file.diff (text/plain), 7.51 KB, created by tkato432 on 2005-04-02 18:10:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2005-04-02 18:10:12 UTC

Size: 7.51 KB

patch

obsolete

>diff -urN /usr/ports/devel/libassa/Makefile devel/libassa/Makefile
>--- /usr/ports/devel/libassa/Makefile	Sun Mar 27 10:50:17 2005
>+++ devel/libassa/Makefile	Sun Mar 27 10:52:23 2005
>@@ -7,7 +7,7 @@
> #
> 
> PORTNAME=	libassa
>-PORTVERSION=	3.2.0
>+PORTVERSION=	3.3.0
> CATEGORIES=	devel
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	${PORTNAME}
>@@ -15,18 +15,19 @@
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	An C++ networking library and application framework
> 
>-USE_GNOME=	gnomehack
>-GNU_CONFIGURE=	yes
>+USE_GNOME=	gnomehack gnometarget pkgconfig
>+USE_REINPLACE=	yes
>+USE_LIBTOOL_VER=	15
>+CONFIGURE_ARGS=	--disable-html-docs
> INSTALLS_SHLIB=	yes
> 
> .include <bsd.port.pre.mk>
> 
>-.if ${OSVERSION} >= 502126
>-USE_GCC=	3.3
>-.endif
>-
> .if ${ARCH} == "sparc64"
> BROKEN=		"Does not build"
> .endif
>+
>+post-patch:
>+	@${REINPLACE_CMD} -e '/^SUBDIRS/s: doc : :g' ${WRKSRC}/Makefile.in
> 
> .include <bsd.port.post.mk>
>diff -urN /usr/ports/devel/libassa/distinfo devel/libassa/distinfo
>--- /usr/ports/devel/libassa/distinfo	Thu Jan 29 20:21:26 2004
>+++ devel/libassa/distinfo	Tue Mar 22 16:27:18 2005
>@@ -1,2 +1,2 @@
>-MD5 (libassa-3.2.0.tar.gz) = c935e06017ea5958f78271d3e8eec497
>-SIZE (libassa-3.2.0.tar.gz) = 429390
>+MD5 (libassa-3.3.0.tar.gz) = 904fcf589b69463a8af99a29ec24383d
>+SIZE (libassa-3.3.0.tar.gz) = 540733
>diff -urN /usr/ports/devel/libassa/files/patch-assa:Connector.h devel/libassa/files/patch-assa:Connector.h
>--- /usr/ports/devel/libassa/files/patch-assa:Connector.h	Thu Dec 25 17:28:12 2003
>+++ devel/libassa/files/patch-assa:Connector.h	Tue Mar 22 20:13:23 2005
>@@ -1,20 +1,11 @@
>---- assa/Connector.h.orig	Wed Dec 24 17:32:49 2003
>-+++ assa/Connector.h	Wed Dec 24 17:34:16 2003
>-@@ -407,7 +407,7 @@
>+--- assa/Connector.h.orig	Tue Mar  1 20:40:39 2005
>++++ assa/Connector.h	Tue Mar 22 20:13:07 2005
>+@@ -406,7 +406,7 @@
>  	int error;
>  	int ret;
>  	error = ret = errno = 0;
> -	size_t n = sizeof (error);
> +	socklen_t n = sizeof (error);
>  
>- 	/* Always remove IO handler first. */
>- 	m_reactor->removeHandler (this, WRITE_EVENT);	
>-@@ -415,7 +415,7 @@
>- #if defined(linux)
>- 	ret = getsockopt (m_fd, SOL_SOCKET, SO_ERROR, (void*)&error, &n);
>- #else  // Solaris 2.6 
>--	ret = getsockopt (m_fd, SOL_SOCKET, SO_ERROR, (char*)&error, (int*)&n);
>-+	ret = getsockopt (m_fd, SOL_SOCKET, SO_ERROR, (char*)&error, &n);
>- #endif
>- 
>- 	if (ret == 0) {
>+ 	/** Always remove IO handler first. 
>+ 	 */
>diff -urN /usr/ports/devel/libassa/files/patch-assa:GenServer.cpp devel/libassa/files/patch-assa:GenServer.cpp
>--- /usr/ports/devel/libassa/files/patch-assa:GenServer.cpp	Thu Dec 25 17:28:12 2003
>+++ devel/libassa/files/patch-assa:GenServer.cpp	Thu Jan  1 09:00:00 1970
>@@ -1,19 +0,0 @@
>---- assa/GenServer.cpp.orig	Wed Dec 24 16:14:51 2003
>-+++ assa/GenServer.cpp	Wed Dec 24 17:24:09 2003
>-@@ -154,14 +154,14 @@
>- 	
>-     ignore_act.register_action( SIGPIPE );
>-     ignore_act.register_action( SIGCHLD );
>--    ignore_act.register_action( SIGCLD );
>-+//    ignore_act.register_action( SIGCLD );
>-     ignore_act.register_action( SIGALRM );
>- 	
>-     /**
>- 	 * Catch SIGPOLL - sigPOLL handler just does nothing except
>- 	 * of catching signal.
>- 	 */
>--    m_sig_dispatcher.install ( SIGPOLL, &m_sig_poll );
>-+    m_sig_dispatcher.install ( SIGIO, &m_sig_poll );
>- 
>-     /**
>- 	 * SIGINT is generated by the terminal driver when an interrupt
>diff -urN /usr/ports/devel/libassa/files/patch-assa:Handlers.h devel/libassa/files/patch-assa:Handlers.h
>--- /usr/ports/devel/libassa/files/patch-assa:Handlers.h	Thu Dec 25 17:28:12 2003
>+++ devel/libassa/files/patch-assa:Handlers.h	Thu Jan  1 09:00:00 1970
>@@ -1,11 +0,0 @@
>---- assa/Handlers.h.orig	Wed Dec 24 17:02:53 2003
>-+++ assa/Handlers.h	Wed Dec 24 17:22:41 2003
>-@@ -256,7 +256,7 @@
>- 	int handle_signal ( int signum_ ) { 
>- 		trace_with_mask("SIGPOLLHandler::handle_signal", SIGHAND);
>- 			
>--		return (signum_ == SIGPOLL) ? 0 : -1; 
>-+		return (signum_ == SIGIO) ? 0 : -1; 
>- 	}
>- };
>- 
>diff -urN /usr/ports/devel/libassa/files/patch-assa:IniFile.h devel/libassa/files/patch-assa:IniFile.h
>--- /usr/ports/devel/libassa/files/patch-assa:IniFile.h	Thu Jan 29 11:08:34 2004
>+++ devel/libassa/files/patch-assa:IniFile.h	Thu Jan  1 09:00:00 1970
>@@ -1,11 +0,0 @@
>---- assa/IniFile.h.orig	Sat Sep 13 19:01:00 2003
>-+++ assa/IniFile.h	Thu Jan 29 09:05:01 2004
>-@@ -171,7 +171,7 @@
>- 
>- 		/** Return iterator past the last section.
>- 		 */
>--		const_config_iterator sect_end () const { return m_config.end (); }
>-+		config_iterator sect_end () { return m_config.end (); }
>- 
>- 		/** Return number of sections in the cache
>- 		 */
>diff -urN /usr/ports/devel/libassa/files/patch-ltmain.sh devel/libassa/files/patch-ltmain.sh
>--- /usr/ports/devel/libassa/files/patch-ltmain.sh	Thu Dec 25 17:28:12 2003
>+++ devel/libassa/files/patch-ltmain.sh	Thu Jan  1 09:00:00 1970
>@@ -1,15 +0,0 @@
>---- ltmain.sh.orig	Thu Dec 25 16:06:09 2003
>-+++ ltmain.sh	Thu Dec 25 16:06:24 2003
>-@@ -4330,10 +4330,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 -urN /usr/ports/devel/libassa/files/patch-tests:pq_test.cpp devel/libassa/files/patch-tests:pq_test.cpp
>--- /usr/ports/devel/libassa/files/patch-tests:pq_test.cpp	Thu Jan 29 11:08:34 2004
>+++ devel/libassa/files/patch-tests:pq_test.cpp	Thu Jan  1 09:00:00 1970
>@@ -1,13 +0,0 @@
>---- tests/pq_test.cpp.orig	Thu Jan 29 08:39:07 2004
>-+++ tests/pq_test.cpp	Thu Jan 29 08:40:48 2004
>-@@ -23,10 +23,6 @@
>- #include <iostream>
>- using namespace std;
>- 
>--#include <getopt.h>
>--extern char *optarg;
>--extern int optind, opterr, optopt;
>--
>- // ASSA
>- #include "assa/PriorityQueue.h"
>- using namespace ASSA;
>diff -urN /usr/ports/devel/libassa/files/patch-tests:ttcp_assa.cpp devel/libassa/files/patch-tests:ttcp_assa.cpp
>--- /usr/ports/devel/libassa/files/patch-tests:ttcp_assa.cpp	Thu Dec 25 17:28:12 2003
>+++ devel/libassa/files/patch-tests:ttcp_assa.cpp	Tue Mar 22 16:33:56 2005
>@@ -1,5 +1,5 @@
>---- tests/ttcp_assa.cpp.orig	Wed Dec 24 17:39:58 2003
>-+++ tests/ttcp_assa.cpp	Wed Dec 24 17:41:13 2003
>+--- tests/ttcp_assa.cpp.orig	Fri Jan  7 10:46:12 2005
>++++ tests/ttcp_assa.cpp	Tue Mar 22 16:32:30 2005
> @@ -91,7 +91,7 @@
>  IPv4Socket* sock = 0;		// Communication socket
>  
>@@ -9,16 +9,7 @@
>  
>  int domain, fromlen;
>  int fd;				/* fd of network socket */
>-@@ -384,7 +384,7 @@
>- 	}
>- #else
>- 	if (getpeername(fd, (struct sockaddr*) &peer, 
>--			(int*) &peerlen) < 0) {
>-+			&peerlen) < 0) {
>- 	    err("getpeername");
>- 	}
>- #endif /* defined(_POSIX_SOURCE) */
>-@@ -783,7 +783,7 @@
>+@@ -775,7 +775,7 @@
>  Nread( int fd_, void* buf_, int count )
>  {
>      struct sockaddr_in from;
>@@ -27,12 +18,3 @@
>      register int cnt;
>  
>      if( udp )  
>-@@ -795,7 +795,7 @@
>- #else  // _POSIX_SOURCE
>- 	cnt = recvfrom( fd_, (char*) buf_, count, 0, 
>- 			(struct sockaddr*) &from, 
>--			(int*) &len );
>-+			&len );
>- #endif
>- 	numCalls++;
>-     } else {
>diff -urN /usr/ports/devel/libassa/pkg-plist devel/libassa/pkg-plist
>--- /usr/ports/devel/libassa/pkg-plist	Sun Aug 15 15:10:47 2004
>+++ devel/libassa/pkg-plist	Tue Mar 22 16:23:28 2005
>@@ -56,10 +56,9 @@
> include/assa/UNIXAddress.h
> include/assa/UnConUDPSocket.h
> include/assa/xdrIOBuffer.h
>-@dirrm include/assa
> lib/libassa.a
> lib/libassa.so
> lib/libassa.so.3
> libdata/pkgconfig/assa.pc
> share/aclocal/assa.m4
>-@unexec rmdir %D/libdata/pkgconfig 2>/dev/null || true
>+@dirrm include/assa

Actions: View | Diff

Attachments on bug 79469: 52454