Attachment 135321 Details for Bug 180168 – Sockets.diff

[patch] Sockets.diff

Sockets.diff (text/plain; charset=us-ascii), 4.13 KB, created by ml on 2013-08-18 15:43:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ml

Created: 2013-08-18 15:43:18 UTC

Size: 4.13 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 324918)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	Sockets
>-PORTVERSION=	2.3.9.7
>+PORTVERSION=	2.3.9.9
> CATEGORIES=	net
> MASTER_SITES=	http://www.alhem.net/Sockets/ \
> 		http://www.netfence.it/Sockets/
>@@ -12,6 +12,7 @@
> 
> #execinfo is optional and currently not configured (would need to patch source's #ifdef LINUX)
> #LIB_DEPENDS=	execinfo.1:${PORTSDIR}/devel/libexecinfo
>+USE_GNOME=libxml2
> 
> #Not needed without execinfo or xml
> #CFLAGS+=	-I${LOCALBASE}/include
>Index: distinfo
>===================================================================
>--- distinfo	(revision 324918)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (Sockets-2.3.9.7.tar.gz) = dc6411eb53933c0aba639b3ace98b34b674a97aad6b8613f02e5e0aa2af92b24
>-SIZE (Sockets-2.3.9.7.tar.gz) = 203023
>+SHA256 (Sockets-2.3.9.9.tar.gz) = 5b88723fe26836fb42dc9d8c974e801fdb7a404c27511247e560455bef0ebc60
>+SIZE (Sockets-2.3.9.9.tar.gz) = 206119
>Index: files/patch-Makefile
>===================================================================
>--- files/patch-Makefile	(revision 324918)
>+++ files/patch-Makefile	(working copy)
>@@ -1,7 +1,39 @@
>---- /Makefile.orig	2010-06-29 21:16:10.000000000 +0200
>-+++ Makefile	2010-06-29 21:17:45.000000000 +0200
>-@@ -90,9 +90,9 @@
>+--- Makefile.orig	2013-04-10 19:52:39.000000000 +0200
>++++ Makefile	2013-07-04 08:17:52.000000000 +0200
>+@@ -1,11 +1,11 @@
>+ # platforms:
>+-#  linux-x86-32
>++#  freebsd
>+ #  linux-x86-64
>+ #  win32-cygwin
>+ #  solaris9-sparc-64
>+ #  macosx
>+ #  solaris8
>+-PLATFORM =	linux-x86-32
>++PLATFORM =	freebsd
>  
>+ # 'Makefile.version' defines the $(VERSION) of the library, and also
>+ # setup the OBJS variable - stuff to be compiled.
>+@@ -30,7 +30,7 @@
>+ 
>+ # .h files installed to $(DESTDIR)/$(PREFIX)/include/$(NAME)
>+ # static lib .a files installed to $(DESTDIR)/$(PREFIX)/lib
>+-PREFIX =	/usr/local
>++PREFIX=/usr/local
>+ 
>+ # debian
>+ #PREFIX =	/usr
>+@@ -39,7 +39,7 @@
>+ INCLUDE =	-I/usr/include/libxml2
>+ 
>+ # Add for libxml2 if not in above location
>+-#CFLAGS +=	`xml2-config --cflags`
>++CFLAGS +=	`xml2-config --cflags`
>+ 
>+ # CXX, CFLAGS, LIBS, LDFLAGS, LDFLAGSSO
>+ include		Makefile.Defines.$(PLATFORM)
>+@@ -96,9 +96,9 @@
>+ 
>  install:	all 
>  		@mkdir -p $(DESTDIR)/$(PREFIX)/lib
> -		cp $(LIBNAME) $(DESTDIR)/$(PREFIX)/lib
>@@ -12,7 +44,7 @@
>  		@rm -f $(DESTDIR)/$(PREFIX)/include/$(NAME)/SSLSocket.*
>  		@rm -f $(DESTDIR)/$(PREFIX)/include/$(NAME)/HttpsGetSocket.*
>  		@rm -f $(DESTDIR)/$(PREFIX)/include/$(NAME)/HttpsSocket.*
>-@@ -106,12 +106,12 @@
>+@@ -112,12 +112,12 @@
>  		@rm -f $(DESTDIR)/$(PREFIX)/include/$(NAME)/Min*Handler.h
>  		@rm -f $(DESTDIR)/$(PREFIX)/include/$(NAME)/Uid.h
>  		@mkdir -p $(DESTDIR)/$(PREFIX)/bin
>@@ -27,4 +59,4 @@
> +		@${BSD_INSTALL_DATA} pkgconfig/*pc $(DESTDIR)/$(PREFIX)/libdata/pkgconfig
>  		rm -f $(DESTDIR)/$(PREFIX)/lib/lib$(NAME).so
>  		rm -f $(DESTDIR)/$(PREFIX)/lib/lib$(NAME).so.$(MAJOR)
>- 		ln -s $(DESTDIR)/$(PREFIX)/lib/lib$(NAME).so.$(MAJOR).$(MINOR) $(DESTDIR)/$(PREFIX)/lib/lib$(NAME).so
>+ 		ln -s lib$(NAME).so.$(MAJOR).$(MINOR) $(DESTDIR)/$(PREFIX)/lib/lib$(NAME).so
>Index: files/patch-Sockets-config.cpp
>===================================================================
>--- files/patch-Sockets-config.cpp	(revision 324918)
>+++ files/patch-Sockets-config.cpp	(working copy)
>@@ -1,11 +1,12 @@
> --- Sockets-config.cpp.orig	2012-12-29 14:24:51.000000000 +0100
> +++ Sockets-config.cpp	2012-12-29 14:25:16.000000000 +0100
>-@@ -29,7 +29,7 @@
>+@@ -29,8 +29,8 @@
>  
>  // ------------------------------------------------------------------
>  static	bool any_set = false;
> -static	std::map<std::string, std::string> mmap;
> +static	std::map<std::string, std::string> sockets_mmap;
>+ static	bool quiet = false;
>  
>  // ------------------------------------------------------------------
>  void show_info()
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 324918)
>+++ pkg-plist	(working copy)
>@@ -71,6 +71,6 @@
> lib/libSockets.a
> lib/libSockets.so
> lib/libSockets.so.2
>-lib/libSockets.so.2.3.9.7
>+lib/libSockets.so.2.3.9.9
> @dirrm include/Sockets
> @dirrmtry lib/pkgconfig

Actions: View | Diff

Attachments on bug 180168: 135319 | 135320 | 135321