Attachment #107449 for bug #148245




# New ports collection makefile for:   C++ Sockets
# Date created:                Tue Jun 29 16:00:00 UTC 2010
# Whom:                 Andrea Venturoli <ml@netfence.it>
#
# $FreeBSD$
#

PORTNAME=	Sockets
PORTVERSION=	2.3.9.2
CATEGORIES=	net
MASTER_SITES=	http://www.alhem.net/Sockets/ \
		http://www.netfence.it/Sockets/

MAINTAINER=	ml@netfence.it
COMMENT=	A C++ wrapper for BSD-style sockets

#execinfo is optional and currently not configured (would need to patch source's #ifdef LINUX)
#LIB_DEPENDS=	execinfo.1:${PORTSDIR}/devel/libexecinfo

#Not needed without execinfo or xml
#CFLAGS+=	-I${LOCALBASE}/include
#LDFLAGS+=	-L${LOCALBASE}/lib

MAKE_JOBS_SAFE=yes
USE_GMAKE=	yes
USE_OPENSSL=	yes
USE_LDCONFIG=	yes

ALL_TARGET=	all shared
INSTALL_TARGET=	install_shared

post-patch:
# PREFIX safeness
	@${CP} ${PATCHDIR}/Makefile.Defines.freebsd ${WRKSRC}
# CXXFLAGS safeness
	@${REINPLACE_CMD} -E \
		-e 's|linux-x86-32|freebsd|' \
		-e 's|^PREFIX.+$$|PREFIX=${PREFIX}|' \
		-e 's|^INCLUDE.+$$|INCLUDE=-I. -I${OPENSSLINC}|' \
		-e 's|g\+\+|${CXX}|' \
		${BUILD_WRKSRC}/${MAKEFILE}
# fix StdLog.h location
	@${FIND} ${WRKSRC} -type f | \
		${XARGS} -n 5 -x \
		${REINPLACE_CMD} -E \
		-e 's|"StdLog.h"|<StdLog.h>|'

	@${REINPLACE_CMD} -e 's#pthread#(unsigned long)pthread#g' \
		${WRKSRC}/Utility.cpp

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)Sockets/distinfo (-3 / +3 lines)
1	MD5 (Sockets-2.1.4.tar.gz) = b58dbe074eeacf2a885914141c9f73a5	1	MD5 (Sockets-2.3.9.2.tar.gz) = 669c4c093aa446c9c831a142a22571a4
2	SHA256 (Sockets-2.1.4.tar.gz) = a90d4e1a735f315ad3adde70bf64c67a01ff44687be2b32836dfef51504bb630	2	SHA256 (Sockets-2.3.9.2.tar.gz) = 810ab9b6a7316bfa7994c0d5e9bd8c556e9edcb8da35a1778ea11bd16471fba8
3	SIZE (Sockets-2.1.4.tar.gz) = 123138	3	SIZE (Sockets-2.3.9.2.tar.gz) = 191131




CXX?=		g++

CFLAGS +=	-Wall $(INCLUDE) -MD -D_VERSION='"$(VERSION)"'

CFLAGS +=	-O2


CFLAGS +=	-fPIC

OBJS +=		Semaphore.o

LDFLAGSSO =	-shared \
		-Wl,-lssl \
		-Wl,-h$(SONAME)




--- /Makefile.orig	2010-06-29 21:16:10.000000000 +0200
+++ Makefile	2010-06-29 21:17:45.000000000 +0200
@@ -90,9 +90,9 @@
 
 install:	all 
 		@mkdir -p $(DESTDIR)/$(PREFIX)/lib
-		cp $(LIBNAME) $(DESTDIR)/$(PREFIX)/lib
+		@${BSD_INSTALL_DATA} $(LIBNAME) $(DESTDIR)/$(PREFIX)/lib
 		@mkdir -p $(DESTDIR)/$(PREFIX)/include/$(NAME)
-		cp -a *.h $(DESTDIR)/$(PREFIX)/include/$(NAME)
+		@${BSD_INSTALL_DATA} *.h $(DESTDIR)/$(PREFIX)/include/$(NAME)
 		@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 @@
 		@rm -f $(DESTDIR)/$(PREFIX)/include/$(NAME)/Min*Handler.h
 		@rm -f $(DESTDIR)/$(PREFIX)/include/$(NAME)/Uid.h
 		@mkdir -p $(DESTDIR)/$(PREFIX)/bin
-		install $(CONFNAME) $(DESTDIR)/$(PREFIX)/bin
+		@${BSD_INSTALL_PROGRAM} $(CONFNAME) $(DESTDIR)/$(PREFIX)/bin
-		install Sockets-config $(PREFIX)/bin
+		@${BSD_INSTALL_DATA} Sockets-config $(PREFIX)/bin
 
 install_shared:	install shared
 		@mkdir -p $(DESTDIR)/$(PREFIX)/lib/pkgconfig
-		cp $(SHAREDLIBNAME) $(DESTDIR)/$(PREFIX)/lib
-		cp -a pkgconfig/*pc $(DESTDIR)/$(PREFIX)/lib/pkgconfig
+		@${BSD_INSTALL_DATA} $(SHAREDLIBNAME) $(DESTDIR)/$(PREFIX)/lib
+		@${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

Lines 1-10 Link Here

(-)Sockets/pkg-descr (-4 / +5 lines)
1	[ excerpt from developer's web site ]	1	[ excerpt from developer's web site ]
2		2
3	This is a GPL licensed C++ class library wrapping the berkeley	3	This is C++ class library wrapping the berkeley
4	sockets C API, and therefore works on most unixes and also win32.	4	sockets C API, and therefore works on most unixes and also win32.
5	Features include, but are not limited to, SSL support, IPv6 support,	5	Features include, but are not limited to, SSL support, IPv6 support,
6	tcp and udp sockets, encrypted tcp, http protocol, highly customizable	6	tcp and udp sockets, encrypted tcp, http protocol, highly customizable
7	error handling. Testing has been done on Linux and Windows 2000,	7	error handling.
8	and to some part on Solaris and Mac OS X.	8	The source code is released under the terms of the GNU GPL, but is
		9	also available under an alternative license.
9		10
10	WWW: http://www.alhem.net/Sockets/index.html	11	WWW: http://www.alhem.net/Sockets/

Lines 1-37 Link Here

(-)Sockets/pkg-plist (-10 / +26 lines)
1	bin/Sockets-config	1	bin/Sockets-config
		2	include/Sockets/Ajp13Socket.h
		3	include/Sockets/AjpBaseSocket.h
2	include/Sockets/Base64.h	4	include/Sockets/Base64.h
3	include/Sockets/CTcpSocket.h
4	include/Sockets/CircularBuffer.h
5	include/Sockets/Debug.h	5	include/Sockets/Debug.h
6	include/Sockets/Event.h	6	include/Sockets/Event.h
7	include/Sockets/EventHandler.h	7	include/Sockets/EventHandler.h
8	include/Sockets/EventTime.h	8	include/Sockets/EventTime.h
		9	include/Sockets/Exception.h
9	include/Sockets/File.h	10	include/Sockets/File.h
		11	include/Sockets/FileStream.h
10	include/Sockets/HTTPSocket.h	12	include/Sockets/HTTPSocket.h
		13	include/Sockets/HttpBaseSocket.h
11	include/Sockets/HttpClientSocket.h	14	include/Sockets/HttpClientSocket.h
12	include/Sockets/HttpDebugSocket.h	15	include/Sockets/HttpDebugSocket.h
13	include/Sockets/HttpGetSocket.h	16	include/Sockets/HttpGetSocket.h
14	include/Sockets/HttpPostSocket.h	17	include/Sockets/HttpPostSocket.h
15	include/Sockets/HttpPutSocket.h	18	include/Sockets/HttpPutSocket.h
		19	include/Sockets/HttpRequest.h
		20	include/Sockets/HttpResponse.h
		21	include/Sockets/HttpTransaction.h
16	include/Sockets/HttpdCookies.h	22	include/Sockets/HttpdCookies.h
17	include/Sockets/HttpdForm.h	23	include/Sockets/HttpdForm.h
18	include/Sockets/HttpdSocket.h	24	include/Sockets/HttpdSocket.h
19	include/Sockets/ICrypt.h	25	include/Sockets/IBase.h
20	include/Sockets/IEventHandler.h	26	include/Sockets/IEventHandler.h
21	include/Sockets/IEventOwner.h	27	include/Sockets/IEventOwner.h
22	include/Sockets/IFile.h	28	include/Sockets/IFile.h
		29	include/Sockets/IFileUpload.h
		30	include/Sockets/IHttpServer.h
		31	include/Sockets/IMutex.h
23	include/Sockets/ISocketHandler.h	32	include/Sockets/ISocketHandler.h
		33	include/Sockets/IStream.h
24	include/Sockets/Ipv4Address.h	34	include/Sockets/Ipv4Address.h
25	include/Sockets/Ipv6Address.h	35	include/Sockets/Ipv6Address.h
26	include/Sockets/ListenSocket.h	36	include/Sockets/ListenSocket.h
27	include/Sockets/Lock.h	37	include/Sockets/Lock.h
28	include/Sockets/MemFile.h	38	include/Sockets/MemFile.h
29	include/Sockets/MinderSocket.h
30	include/Sockets/MinderHandler.h
31	include/Sockets/MinionSocket.h
32	include/Sockets/Mutex.h	39	include/Sockets/Mutex.h
33	include/Sockets/NullCrypt.h
34	include/Sockets/RandomNumber.h
35	include/Sockets/Parse.h	40	include/Sockets/Parse.h
36	include/Sockets/ResolvServer.h	41	include/Sockets/ResolvServer.h
37	include/Sockets/ResolvSocket.h	42	include/Sockets/ResolvSocket.h
Lines 42-56 Link Here
42	include/Sockets/Socket.h	47	include/Sockets/Socket.h
43	include/Sockets/SocketAddress.h	48	include/Sockets/SocketAddress.h
44	include/Sockets/SocketHandler.h	49	include/Sockets/SocketHandler.h
		50	include/Sockets/SocketHandlerEp.h
		51	include/Sockets/SocketStream.h
45	include/Sockets/StdLog.h	52	include/Sockets/StdLog.h
46	include/Sockets/StdoutLog.h	53	include/Sockets/StdoutLog.h
		54	include/Sockets/StreamSocket.h
		55	include/Sockets/StreamWriter.h
47	include/Sockets/TcpSocket.h	56	include/Sockets/TcpSocket.h
48	include/Sockets/Thread.h	57	include/Sockets/Thread.h
49	include/Sockets/UdpSocket.h	58	include/Sockets/UdpSocket.h
50	include/Sockets/Uid.h
51	include/Sockets/Utility.h	59	include/Sockets/Utility.h
		60	include/Sockets/XmlDocument.h
		61	include/Sockets/XmlException.h
		62	include/Sockets/XmlNode.h
		63	include/Sockets/ajp13.h
52	include/Sockets/socket_include.h	64	include/Sockets/socket_include.h
53	include/Sockets/sockets-config.h	65	include/Sockets/sockets-config.h
		66	libdata/pkgconfig/libSockets.pc
		67	libdata/pkgconfig/libsockets2.pc
54	lib/libSockets.a	68	lib/libSockets.a
55	lib/libSocketsEx.a	69	lib/libSockets.so
		70	lib/libSockets.so.2
		71	lib/libSockets.so.2.3.9.2
56	@dirrm include/Sockets	72	@dirrm include/Sockets

Return to bug 148245

Lines 1-44 Link Here

(-)Sockets/Makefile (-25 / +21 lines)
1	# New ports collection makefile for: C++ Sockets	1	# New ports collection makefile for: C++ Sockets
2	# Date created: Sat Jan 15 16:17:20 UTC 2005	2	# Date created: Tue Jun 29 16:00:00 UTC 2010
3	# Whom: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>	3	# Whom: Andrea Venturoli <ml@netfence.it>
4	#	4	#
5	# $FreeBSD: ports/net/Sockets/Makefile,v 1.9 2010/01/13 01:53:00 wen Exp $	5	# $FreeBSD$
6	#	6	#
7		7
8	PORTNAME= Sockets	8	PORTNAME= Sockets
9	PORTVERSION= 2.1.4	9	PORTVERSION= 2.3.9.2
10	CATEGORIES= net ipv6	10	CATEGORIES= net
11	MASTER_SITES= http://www.alhem.net/Sockets/	11	MASTER_SITES= http://www.alhem.net/Sockets/ \
		12	http://www.netfence.it/Sockets/
12		13
13	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= ml@netfence.it
14	COMMENT= A C++ wrapper for BSD-style sockets	15	COMMENT= A C++ wrapper for BSD-style sockets
15		16
16	LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo	17	#execinfo is optional and currently not configured (would need to patch source's #ifdef LINUX)
		18	#LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo
17		19
18	CFLAGS+= -I${LOCALBASE}/include	20	#Not needed without execinfo or xml
19	LDFLAGS+= -L${LOCALBASE}/lib	21	#CFLAGS+= -I${LOCALBASE}/include
20	CONFIGURE_ARGS+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"	22	#LDFLAGS+= -L${LOCALBASE}/lib
		23
		24	MAKE_JOBS_SAFE=yes
21	USE_GMAKE= yes	25	USE_GMAKE= yes
22	USE_OPENSSL= yes	26	USE_OPENSSL= yes
23	WITH_OPENSSL_BASE= yes	27	USE_LDCONFIG= yes
		28
		29	ALL_TARGET= all shared
		30	INSTALL_TARGET= install_shared
24		31
25	post-patch:	32	post-patch:
26	# PREFIX safeness	33	# PREFIX safeness
27	# CXX safeness	34	@${CP} ${PATCHDIR}/Makefile.Defines.freebsd ${WRKSRC}
28	# CXXFLAGS safeness
29	@${REINPLACE_CMD} -E \	35	@${REINPLACE_CMD} -E \
30	-e 's\|-O2\|\|' \	36	-e 's\|linux-x86-32\|freebsd\|' \
31	-e 's\|^PREFIX.+$$\|PREFIX=${PREFIX}\|' \	37	-e 's\|^PREFIX.+$$\|PREFIX=${PREFIX}\|' \
32	-e 's\|^INCLUDE.+$$\|INCLUDE=-I. -I${OPENSSLINC}\|' \
33	-e 's\|g\+\+\|${CXX}\|' \
34	${BUILD_WRKSRC}/${MAKEFILE}	38	${BUILD_WRKSRC}/${MAKEFILE}
35	# fix StdLog.h location
36	@${FIND} ${WRKSRC} -type f \| \
37	${XARGS} -n 5 -x \
38	${REINPLACE_CMD} -E \
39	-e 's\|"StdLog.h"\|<StdLog.h>\|'
40
41	@${REINPLACE_CMD} -e 's#pthread#(unsigned long)pthread#g' \
42	${WRKSRC}/Utility.cpp
43		39
44	.include <bsd.port.mk>	40	.include <bsd.port.mk>

Line 0 Link Here

(-)Sockets/files/Makefile.Defines.freebsd (+14 lines)
	1	CXX?= g++
	2
	3	CFLAGS += -Wall $(INCLUDE) -MD -D_VERSION='"$(VERSION)"'
	4
	5	CFLAGS += -O2
	6
	7
	8	CFLAGS += -fPIC
	9
	10	OBJS += Semaphore.o
	11
	12	LDFLAGSSO = -shared \
	13	-Wl,-lssl \
	14	-Wl,-h$(SONAME)

Lines 1-25 Link Here

(-)Sockets/files/patch-Makefile (-22 / +27 lines)
1	--- Makefile.orig 2010-01-12 15:22:03.000000000 +0800	1	--- /Makefile.orig 2010-06-29 21:16:10.000000000 +0200
2	+++ Makefile 2010-01-12 15:24:19.000000000 +0800	2	+++ Makefile 2010-06-29 21:17:45.000000000 +0200
3	@@ -70,18 +70,17 @@	3	@@ -90,9 +90,9 @@
4		4
5	install: all	5	install: all
6	@mkdir -p $(PREFIX)/lib	6	@mkdir -p $(DESTDIR)/$(PREFIX)/lib
7	- cp libSockets.a $(PREFIX)/lib	7	- cp $(LIBNAME) $(DESTDIR)/$(PREFIX)/lib
8	- cp libSocketsEx.a $(PREFIX)/lib	8	+ @${BSD_INSTALL_DATA} $(LIBNAME) $(DESTDIR)/$(PREFIX)/lib
9	+ @${BSD_INSTALL_DATA} libSockets.a $(PREFIX)/lib	9	@mkdir -p $(DESTDIR)/$(PREFIX)/include/$(NAME)
10	+ @${BSD_INSTALL_DATA} libSocketsEx.a $(PREFIX)/lib	10	- cp -a *.h $(DESTDIR)/$(PREFIX)/include/$(NAME)
11	@mkdir -p $(PREFIX)/include/Sockets	11	+ @${BSD_INSTALL_DATA} *.h $(DESTDIR)/$(PREFIX)/include/$(NAME)
12	- cp -a *.h $(PREFIX)/include/Sockets	12	@rm -f $(DESTDIR)/$(PREFIX)/include/$(NAME)/SSLSocket.*
13	+ @${BSD_INSTALL_DATA} *.h $(PREFIX)/include/Sockets	13	@rm -f $(DESTDIR)/$(PREFIX)/include/$(NAME)/HttpsGetSocket.*
14	@rm -f $(PREFIX)/include/Sockets/SSLSocket.*	14	@rm -f $(DESTDIR)/$(PREFIX)/include/$(NAME)/HttpsSocket.*
15	@rm -f $(PREFIX)/include/Sockets/HttpsGetSocket.*	15	@@ -106,12 +106,12 @@
16	@rm -f $(PREFIX)/include/Sockets/HttpsSocket.*	16	@rm -f $(DESTDIR)/$(PREFIX)/include/$(NAME)/Min*Handler.h
17	@rm -f $(PREFIX)/include/Sockets/EventSocket.*	17	@rm -f $(DESTDIR)/$(PREFIX)/include/$(NAME)/Uid.h
18	@rm -f $(PREFIX)/include/Sockets/PoolSocket.*	18	@mkdir -p $(DESTDIR)/$(PREFIX)/bin
19	@rm -f $(PREFIX)/include/Sockets/SocketThread.*	19	- install $(CONFNAME) $(DESTDIR)/$(PREFIX)/bin
20	- @mkdir -p $(PREFIX)/bin	20	+ @${BSD_INSTALL_PROGRAM} $(CONFNAME) $(DESTDIR)/$(PREFIX)/bin
21	- install Sockets-config $(PREFIX)/bin
22	+ @${BSD_INSTALL_DATA} Sockets-config $(PREFIX)/bin
23		21
24	# no binary files, zip will translate lf to cr lf	22	install_shared: install shared
25	FILES = .h .cpp Makefile Makefile.* Project/.ds \	23	@mkdir -p $(DESTDIR)/$(PREFIX)/lib/pkgconfig
		24	- cp $(SHAREDLIBNAME) $(DESTDIR)/$(PREFIX)/lib
		25	- cp -a pkgconfig/*pc $(DESTDIR)/$(PREFIX)/lib/pkgconfig
		26	+ @${BSD_INSTALL_DATA} $(SHAREDLIBNAME) $(DESTDIR)/$(PREFIX)/lib
		27	+ @${BSD_INSTALL_DATA} pkgconfig/*pc $(DESTDIR)/$(PREFIX)/libdata/pkgconfig
		28	rm -f $(DESTDIR)/$(PREFIX)/lib/lib$(NAME).so
		29	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