Attachment #135319 for bug #180168

Lines 2-8 Link Here

(-)Makefile (-1 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= Sockets	4	PORTNAME= Sockets
5	PORTVERSION= 2.3.9.7	5	PORTVERSION= 2.3.9.9
6	CATEGORIES= net	6	CATEGORIES= net
7	MASTER_SITES= http://www.alhem.net/Sockets/ \	7	MASTER_SITES= http://www.alhem.net/Sockets/ \
8	http://www.netfence.it/Sockets/	8	http://www.netfence.it/Sockets/
Lines 12-17 Link Here
12		12
13	#execinfo is optional and currently not configured (would need to patch source's #ifdef LINUX)	13	#execinfo is optional and currently not configured (would need to patch source's #ifdef LINUX)
14	#LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo	14	#LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo
		15	BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/libxml-2.0.pc:${PORTSDIR}/textproc/libxml2
15		16
16	#Not needed without execinfo or xml	17	#Not needed without execinfo or xml
17	#CFLAGS+= -I${LOCALBASE}/include	18	#CFLAGS+= -I${LOCALBASE}/include

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (Sockets-2.3.9.7.tar.gz) = dc6411eb53933c0aba639b3ace98b34b674a97aad6b8613f02e5e0aa2af92b24	1	SHA256 (Sockets-2.3.9.9.tar.gz) = 5b88723fe26836fb42dc9d8c974e801fdb7a404c27511247e560455bef0ebc60
2	SIZE (Sockets-2.3.9.7.tar.gz) = 203023	2	SIZE (Sockets-2.3.9.9.tar.gz) = 206119




--- Makefile.orig	2013-04-10 19:52:39.000000000 +0200
+++ Makefile	2013-07-01 13:48:08.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

 		@rm -f $(DESTDIR)/$(PREFIX)/include/$(NAME)/SSLSocket.*
 		@rm -f $(DESTDIR)/$(PREFIX)/include/$(NAME)/HttpsGetSocket.*
 		@rm -f $(DESTDIR)/$(PREFIX)/include/$(NAME)/HttpsSocket.*
@@ -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

-		install -m 0644 $(SHAREDLIBNAME) $(DESTDIR)/$(PREFIX)/lib
-		install -m 0644  pkgconfig/*pc $(DESTDIR)/$(PREFIX)/lib/pkgconfig
+		@${BSD_INSTALL_DATA} $(SHAREDLIBNAME) $(DESTDIR)/$(PREFIX)/lib
+		@${BSD_INSTALL_DATA} pkgconfig/*pc $(DESTDIR)/$(PREFIX)/lib/pkgconfig
 		rm -f $(DESTDIR)/$(PREFIX)/lib/lib$(NAME).so
 		rm -f $(DESTDIR)/$(PREFIX)/lib/lib$(NAME).so.$(MAJOR)
 		ln -s lib$(NAME).so.$(MAJOR).$(MINOR) $(DESTDIR)/$(PREFIX)/lib/lib$(NAME).so

Lines 1-11 Link Here

(-)files/patch-Sockets-config.cpp (-1 / +2 lines)
1	--- Sockets-config.cpp.orig 2012-12-29 14:24:51.000000000 +0100	1	--- Sockets-config.cpp.orig 2012-12-29 14:24:51.000000000 +0100
2	+++ Sockets-config.cpp 2012-12-29 14:25:16.000000000 +0100	2	+++ Sockets-config.cpp 2012-12-29 14:25:16.000000000 +0100
3	@@ -29,7 +29,7 @@	3	@@ -29,8 +29,8 @@
4		4
5	// ------------------------------------------------------------------	5	// ------------------------------------------------------------------
6	static bool any_set = false;	6	static bool any_set = false;
7	-static std::map<std::string, std::string> mmap;	7	-static std::map<std::string, std::string> mmap;
8	+static std::map<std::string, std::string> sockets_mmap;	8	+static std::map<std::string, std::string> sockets_mmap;
		9	static bool quiet = false;
9		10
10	// ------------------------------------------------------------------	11	// ------------------------------------------------------------------
11	void show_info()	12	void show_info()

Return to bug 180168

Lines 1-7 Link Here

(-)files/patch-Makefile (-6 / +38 lines)
1	--- /Makefile.orig 2010-06-29 21:16:10.000000000 +0200	1	--- Makefile.orig 2013-04-10 19:52:39.000000000 +0200
2	+++ Makefile 2010-06-29 21:17:45.000000000 +0200	2	+++ Makefile 2013-07-01 13:48:08.000000000 +0200
3	@@ -90,9 +90,9 @@	3	@@ -1,11 +1,11 @@
		4	# platforms:
		5	-# linux-x86-32
		6	+# freebsd
		7	# linux-x86-64
		8	# win32-cygwin
		9	# solaris9-sparc-64
		10	# macosx
		11	# solaris8
		12	-PLATFORM = linux-x86-32
		13	+PLATFORM = freebsd
4		14
		15	# 'Makefile.version' defines the $(VERSION) of the library, and also
		16	# setup the OBJS variable - stuff to be compiled.
		17	@@ -30,7 +30,7 @@
		18
		19	# .h files installed to $(DESTDIR)/$(PREFIX)/include/$(NAME)
		20	# static lib .a files installed to $(DESTDIR)/$(PREFIX)/lib
		21	-PREFIX = /usr/local
		22	+PREFIX=/usr/local
		23
		24	# debian
		25	#PREFIX = /usr
		26	@@ -39,7 +39,7 @@
		27	INCLUDE = -I/usr/include/libxml2
		28
		29	# Add for libxml2 if not in above location
		30	-#CFLAGS += `xml2-config --cflags`
		31	+CFLAGS += `xml2-config --cflags`
		32
		33	# CXX, CFLAGS, LIBS, LDFLAGS, LDFLAGSSO
		34	include Makefile.Defines.$(PLATFORM)
		35	@@ -96,9 +96,9 @@
		36
5	install: all	37	install: all
6	@mkdir -p $(DESTDIR)/$(PREFIX)/lib	38	@mkdir -p $(DESTDIR)/$(PREFIX)/lib
7	- cp $(LIBNAME) $(DESTDIR)/$(PREFIX)/lib	39	- cp $(LIBNAME) $(DESTDIR)/$(PREFIX)/lib
Lines 12-18 Link Here
12	@rm -f $(DESTDIR)/$(PREFIX)/include/$(NAME)/SSLSocket.*	44	@rm -f $(DESTDIR)/$(PREFIX)/include/$(NAME)/SSLSocket.*
13	@rm -f $(DESTDIR)/$(PREFIX)/include/$(NAME)/HttpsGetSocket.*	45	@rm -f $(DESTDIR)/$(PREFIX)/include/$(NAME)/HttpsGetSocket.*
14	@rm -f $(DESTDIR)/$(PREFIX)/include/$(NAME)/HttpsSocket.*	46	@rm -f $(DESTDIR)/$(PREFIX)/include/$(NAME)/HttpsSocket.*
15	@@ -106,12 +106,12 @@	47	@@ -112,12 +112,12 @@
16	@rm -f $(DESTDIR)/$(PREFIX)/include/$(NAME)/Min*Handler.h	48	@rm -f $(DESTDIR)/$(PREFIX)/include/$(NAME)/Min*Handler.h
17	@rm -f $(DESTDIR)/$(PREFIX)/include/$(NAME)/Uid.h	49	@rm -f $(DESTDIR)/$(PREFIX)/include/$(NAME)/Uid.h
18	@mkdir -p $(DESTDIR)/$(PREFIX)/bin	50	@mkdir -p $(DESTDIR)/$(PREFIX)/bin
Lines 24-30 Link Here
24	- install -m 0644 $(SHAREDLIBNAME) $(DESTDIR)/$(PREFIX)/lib	56	- install -m 0644 $(SHAREDLIBNAME) $(DESTDIR)/$(PREFIX)/lib
25	- install -m 0644 pkgconfig/*pc $(DESTDIR)/$(PREFIX)/lib/pkgconfig	57	- install -m 0644 pkgconfig/*pc $(DESTDIR)/$(PREFIX)/lib/pkgconfig
26	+ @${BSD_INSTALL_DATA} $(SHAREDLIBNAME) $(DESTDIR)/$(PREFIX)/lib	58	+ @${BSD_INSTALL_DATA} $(SHAREDLIBNAME) $(DESTDIR)/$(PREFIX)/lib
27	+ @${BSD_INSTALL_DATA} pkgconfig/*pc $(DESTDIR)/$(PREFIX)/libdata/pkgconfig	59	+ @${BSD_INSTALL_DATA} pkgconfig/*pc $(DESTDIR)/$(PREFIX)/lib/pkgconfig
28	rm -f $(DESTDIR)/$(PREFIX)/lib/lib$(NAME).so	60	rm -f $(DESTDIR)/$(PREFIX)/lib/lib$(NAME).so
29	rm -f $(DESTDIR)/$(PREFIX)/lib/lib$(NAME).so.$(MAJOR)	61	rm -f $(DESTDIR)/$(PREFIX)/lib/lib$(NAME).so.$(MAJOR)
30	ln -s $(DESTDIR)/$(PREFIX)/lib/lib$(NAME).so.$(MAJOR).$(MINOR) $(DESTDIR)/$(PREFIX)/lib/lib$(NAME).so	62	ln -s lib$(NAME).so.$(MAJOR).$(MINOR) $(DESTDIR)/$(PREFIX)/lib/lib$(NAME).so