Attachment #148223 for bug #194269




# $FreeBSD: head/devel/gsoap/Makefile 367307 2014-09-04 19:26:24Z antoine $

PORTNAME=	gsoap
PORTVERSION=	2.8.18
PORTREVISION=	3
CATEGORIES=	devel
MASTER_SITES=	SF/${PORTNAME}2/gSOAP
DISTNAME=	${PORTNAME}_${PORTVERSION}

MAINTAINER=	5u623l20@gmail.com
COMMENT=	Generator Tools for Coding SOAP/XML Web Services in C and C++

LICENSE=	GPLv2

OPTIONS_RADIO=	SSL
OPTIONS_RADIO_SSL=	GNUTLS OPENSSL
OPTIONS_DEFAULT=	OPENSSL
GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls \
	   		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
			libgpg-error.so:${PORTSDIR}/security/libgpg-error
GNUTLS_CONFIGURE_ON=	--enable-gnutls
GNUTLS_LDFLAGS=		-L${LOCALBASE}/lib
OPENSSL_CONFIGURE_ENABLE=	ssl

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MGNUTLS}
LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls \
   		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
		libgpg-error.so:${PORTSDIR}/security/libgpg-error
CONFIGURE_ARGS=	--enable-gnutls
LDFLAGS+=	-L${LOCALBASE}/lib
.elif ${PORT_OPTIONS:MOPENSSL}
CONFIGURE_ARGS=	--enable-ssl
.else
CONFIGURE_ARGS=	--disable-ssl
.endif

post-patch:
	${REINPLACE_CMD} -e 's| sys/timeb.h | |' \
	    -e 's|-DSOAPCPP_IMPORT_PATH=|-DSOAPCPP2_IMPORT_PATH=|' \

Lines 1-2 Link Here

(-)./distinfo (-2 / +2 lines)
1	SHA256 (gsoap_2.8.17.zip) = 30a53785708c842694227753badda17010cac64efd43f7a4f2b0e8de3de68f28	1	SHA256 (gsoap_2.8.18.zip) = 764281a67020b7b7b982ddf8e7fdffae27f7a3e61af9ab4ec8a4705a67ba7ced
2	SIZE (gsoap_2.8.17.zip) = 20695905	2	SIZE (gsoap_2.8.18.zip) = 20596233

Lines 1-11 Link Here

(-)./files/patch-gsoap__wsdl__Makefile.in (-11 lines)
1	--- gsoap/wsdl/Makefile.in 2013-12-18 14:58:38.000000000 -0500
2	+++ gsoap/wsdl/Makefile.in 2014-01-16 14:35:52.000000000 -0500
3	@@ -204,7 +204,7 @@
4	BUILT_SOURCES = $(SOAP_CPP_SRC)
5	wsdl2h_CFLAGS = $(C_DEBUG_FLAGS) $(WSDL2H_EXTRA_FLAGS)
6	wsdl2h_CXXFLAGS = $(C_DEBUG_FLAGS) $(WSDL2H_EXTRA_FLAGS)
7	-wsdl2h_CPPFLAGS = $(AM_CPPFLAGS) $(SOAPCPP2_NONAMESPACES) -D$(platform)
8	+wsdl2h_CPPFLAGS = $(AM_CPPFLAGS) $(SOAPCPP2_NONAMESPACES) $(WSDL2H_IMPORTPATH) -D$(platform)
9	wsdl2h_SOURCES = wsdl2h.cpp wsdl.cpp schema.cpp types.cpp service.cpp soap.cpp mime.cpp wsp.cpp $(SOAP_CPP_SRC)
10	wsdl2h_LDADD = $(SOAP_CPP_LIB) $(WSDL2H_EXTRA_LIBS)
11	CLEANFILES = ~ C.cpp H.h Stub.h *.nsmap

Line 0 Link Here

(-)./files/patch-gsoap_wsdl_Makefile.in (+11 lines)
	1	--- gsoap/wsdl/Makefile.in.orig 2014-10-09 00:09:14.631256099 +0600
	2	+++ gsoap/wsdl/Makefile.in 2014-10-09 00:09:33.119255143 +0600
	3	@@ -303,7 +303,7 @@
	4	BUILT_SOURCES = $(SOAP_CPP_SRC)
	5	wsdl2h_CFLAGS = $(C_DEBUG_FLAGS) $(WSDL2H_EXTRA_FLAGS)
	6	wsdl2h_CXXFLAGS = $(C_DEBUG_FLAGS) $(WSDL2H_EXTRA_FLAGS) $(WSDL2H_IMPORTPATH)
	7	-wsdl2h_CPPFLAGS = $(AM_CPPFLAGS) $(SOAPCPP2_NONAMESPACES) -D$(platform)
	8	+wsdl2h_CPPFLAGS = $(AM_CPPFLAGS) $(SOAPCPP2_NONAMESPACES) $(WSDL2H_IMPORTPATH) -D$(platform)
	9	wsdl2h_SOURCES = wsdl2h.cpp wsdl.cpp schema.cpp types.cpp service.cpp soap.cpp mime.cpp wsp.cpp bpel.cpp $(SOAP_CPP_SRC)
	10	wsdl2h_LDADD = $(SOAP_CPP_LIB) $(WSDL2H_EXTRA_LIBS)
	11	CLEANFILES = ~ C.cpp H.h Stub.h *.nsmap

Lines 15-20 Link Here

(-)./pkg-plist (-7 / +27 lines)
15	libdata/pkgconfig/gsoapck.pc	15	libdata/pkgconfig/gsoapck.pc
16	libdata/pkgconfig/gsoapssl++.pc	16	libdata/pkgconfig/gsoapssl++.pc
17	libdata/pkgconfig/gsoapssl.pc	17	libdata/pkgconfig/gsoapssl.pc
		18	%%DATADIR%%/WS/LEGAL.txt
18	%%DATADIR%%/WS/README.txt	19	%%DATADIR%%/WS/README.txt
19	%%DATADIR%%/WS/WS-Addressing.xsd	20	%%DATADIR%%/WS/WS-Addressing.xsd
20	%%DATADIR%%/WS/WS-Addressing03.xsd	21	%%DATADIR%%/WS/WS-Addressing03.xsd
Lines 37-42 Link Here
37	%%DATADIR%%/WS/enumeration.xsd	38	%%DATADIR%%/WS/enumeration.xsd
38	%%DATADIR%%/WS/reference-1.1.xsd	39	%%DATADIR%%/WS/reference-1.1.xsd
39	%%DATADIR%%/WS/typemap.dat	40	%%DATADIR%%/WS/typemap.dat
		41	%%DATADIR%%/WS/ws-bpel_abstract_common_base.xsd
		42	%%DATADIR%%/WS/ws-bpel_executable.xsd
		43	%%DATADIR%%/WS/ws-bpel_plnktype.xsd
		44	%%DATADIR%%/WS/ws-bpel_serviceref.xsd
		45	%%DATADIR%%/WS/ws-bpel_varprop.xsd
40	%%DATADIR%%/WS/ws-reliability-1.1.xsd	46	%%DATADIR%%/WS/ws-reliability-1.1.xsd
41	%%DATADIR%%/WS/wsse.xsd	47	%%DATADIR%%/WS/wsse.xsd
42	%%DATADIR%%/WS/wsu.xsd	48	%%DATADIR%%/WS/wsu.xsd
Lines 50-55 Link Here
50	%%DATADIR%%/custom/struct_timeval.h	56	%%DATADIR%%/custom/struct_timeval.h
51	%%DATADIR%%/custom/struct_tm.c	57	%%DATADIR%%/custom/struct_tm.c
52	%%DATADIR%%/custom/struct_tm.h	58	%%DATADIR%%/custom/struct_tm.h
		59	%%DATADIR%%/custom/wsrmdemo-duration.o
		60	%%DATADIR%%/custom/wsrmdemo_ssl-duration.o
		61	%%DATADIR%%/custom/wsrmdemo_udp-duration.o
53	%%DATADIR%%/extras/README.txt	62	%%DATADIR%%/extras/README.txt
54	%%DATADIR%%/extras/ckdb.c	63	%%DATADIR%%/extras/ckdb.c
55	%%DATADIR%%/extras/ckdb.h	64	%%DATADIR%%/extras/ckdb.h
Lines 66-71 Link Here
66	%%DATADIR%%/import/dom.h	75	%%DATADIR%%/import/dom.h
67	%%DATADIR%%/import/ds.h	76	%%DATADIR%%/import/ds.h
68	%%DATADIR%%/import/ds2.h	77	%%DATADIR%%/import/ds2.h
		78	%%DATADIR%%/import/plnk.h
69	%%DATADIR%%/import/ref.h	79	%%DATADIR%%/import/ref.h
70	%%DATADIR%%/import/ser.h	80	%%DATADIR%%/import/ser.h
71	%%DATADIR%%/import/soap12.h	81	%%DATADIR%%/import/soap12.h
Lines 75-80 Link Here
75	%%DATADIR%%/import/stllist.h	85	%%DATADIR%%/import/stllist.h
76	%%DATADIR%%/import/stlset.h	86	%%DATADIR%%/import/stlset.h
77	%%DATADIR%%/import/stlvector.h	87	%%DATADIR%%/import/stlvector.h
		88	%%DATADIR%%/import/vprop.h
78	%%DATADIR%%/import/wsa.h	89	%%DATADIR%%/import/wsa.h
79	%%DATADIR%%/import/wsa3.h	90	%%DATADIR%%/import/wsa3.h
80	%%DATADIR%%/import/wsa4.h	91	%%DATADIR%%/import/wsa4.h
Lines 119-124 Link Here
119	%%DATADIR%%/plugin/httpform.h	130	%%DATADIR%%/plugin/httpform.h
120	%%DATADIR%%/plugin/httpget.c	131	%%DATADIR%%/plugin/httpget.c
121	%%DATADIR%%/plugin/httpget.h	132	%%DATADIR%%/plugin/httpget.h
		133	%%DATADIR%%/plugin/httpget.o
122	%%DATADIR%%/plugin/httpgettest.c	134	%%DATADIR%%/plugin/httpgettest.c
123	%%DATADIR%%/plugin/httpgettest.h	135	%%DATADIR%%/plugin/httpgettest.h
124	%%DATADIR%%/plugin/httpmd5.c	136	%%DATADIR%%/plugin/httpmd5.c
Lines 127-132 Link Here
127	%%DATADIR%%/plugin/httpmd5test.h	139	%%DATADIR%%/plugin/httpmd5test.h
128	%%DATADIR%%/plugin/httppost.c	140	%%DATADIR%%/plugin/httppost.c
129	%%DATADIR%%/plugin/httppost.h	141	%%DATADIR%%/plugin/httppost.h
		142	%%DATADIR%%/plugin/httppost.o
130	%%DATADIR%%/plugin/httpposttest.c	143	%%DATADIR%%/plugin/httpposttest.c
131	%%DATADIR%%/plugin/httpposttest.h	144	%%DATADIR%%/plugin/httpposttest.h
132	%%DATADIR%%/plugin/logging.c	145	%%DATADIR%%/plugin/logging.c
Lines 141-163 Link Here
141	%%DATADIR%%/plugin/plugin.h	154	%%DATADIR%%/plugin/plugin.h
142	%%DATADIR%%/plugin/smdevp.c	155	%%DATADIR%%/plugin/smdevp.c
143	%%DATADIR%%/plugin/smdevp.h	156	%%DATADIR%%/plugin/smdevp.h
		157	%%DATADIR%%/plugin/sslserver-threads.o
144	%%DATADIR%%/plugin/threads.c	158	%%DATADIR%%/plugin/threads.c
145	%%DATADIR%%/plugin/threads.h	159	%%DATADIR%%/plugin/threads.h
146	%%DATADIR%%/plugin/wsaapi.c	160	%%DATADIR%%/plugin/wsaapi.c
147	%%DATADIR%%/plugin/wsaapi.h	161	%%DATADIR%%/plugin/wsaapi.h
		162	%%DATADIR%%/plugin/wsademo-wsaapi.o
148	%%DATADIR%%/plugin/wsddapi.c	163	%%DATADIR%%/plugin/wsddapi.c
149	%%DATADIR%%/plugin/wsddapi.h	164	%%DATADIR%%/plugin/wsddapi.h
150	%%DATADIR%%/plugin/wsrmapi.c	165	%%DATADIR%%/plugin/wsrmapi.c
151	%%DATADIR%%/plugin/wsrmapi.h	166	%%DATADIR%%/plugin/wsrmapi.h
		167	%%DATADIR%%/plugin/wsrmdemo-threads.o
		168	%%DATADIR%%/plugin/wsrmdemo-wsaapi.o
		169	%%DATADIR%%/plugin/wsrmdemo-wsrmapi.o
		170	%%DATADIR%%/plugin/wsrmdemo_ssl-threads.o
		171	%%DATADIR%%/plugin/wsrmdemo_ssl-wsaapi.o
		172	%%DATADIR%%/plugin/wsrmdemo_ssl-wsrmapi.o
		173	%%DATADIR%%/plugin/wsrmdemo_udp-threads.o
		174	%%DATADIR%%/plugin/wsrmdemo_udp-wsaapi.o
		175	%%DATADIR%%/plugin/wsrmdemo_udp-wsrmapi.o
152	%%DATADIR%%/plugin/wsse2api.c	176	%%DATADIR%%/plugin/wsse2api.c
153	%%DATADIR%%/plugin/wsse2api.h	177	%%DATADIR%%/plugin/wsse2api.h
154	%%DATADIR%%/plugin/wsseapi.c	178	%%DATADIR%%/plugin/wsseapi.c
155	%%DATADIR%%/plugin/wsseapi.cpp	179	%%DATADIR%%/plugin/wsseapi.cpp
156	%%DATADIR%%/plugin/wsseapi.h	180	%%DATADIR%%/plugin/wsseapi.h
157	@dirrm lib/gsoap	181	%%DATADIR%%/plugin/wssedemo-mecevp.o
158	@dirrm %%DATADIR%%/plugin	182	%%DATADIR%%/plugin/wssedemo-smdevp.o
159	@dirrm %%DATADIR%%/import	183	%%DATADIR%%/plugin/wssedemo-wsseapi.o
160	@dirrm %%DATADIR%%/extras
161	@dirrm %%DATADIR%%/custom
162	@dirrm %%DATADIR%%/WS
163	@dirrm %%DATADIR%%

Return to bug 194269

Lines 2-14 Link Here

(-)./Makefile (-15 / +8 lines)
2	# $FreeBSD: head/devel/gsoap/Makefile 367307 2014-09-04 19:26:24Z antoine $	2	# $FreeBSD: head/devel/gsoap/Makefile 367307 2014-09-04 19:26:24Z antoine $
3		3
4	PORTNAME= gsoap	4	PORTNAME= gsoap
5	PORTVERSION= 2.8.17	5	PORTVERSION= 2.8.18
6	PORTREVISION= 3
7	CATEGORIES= devel	6	CATEGORIES= devel
8	MASTER_SITES= SF/${PORTNAME}2/gSOAP	7	MASTER_SITES= SF/${PORTNAME}2/gSOAP
9	DISTNAME= ${PORTNAME}_${PORTVERSION}	8	DISTNAME= ${PORTNAME}_${PORTVERSION}
10		9
11	MAINTAINER= ports@FreeBSD.org	10	MAINTAINER= 5u623l20@gmail.com
12	COMMENT= Generator Tools for Coding SOAP/XML Web Services in C and C++	11	COMMENT= Generator Tools for Coding SOAP/XML Web Services in C and C++
13		12
14	LICENSE= GPLv2	13	LICENSE= GPLv2
Lines 22-42 Link Here
22	OPTIONS_RADIO= SSL	21	OPTIONS_RADIO= SSL
23	OPTIONS_RADIO_SSL= GNUTLS OPENSSL	22	OPTIONS_RADIO_SSL= GNUTLS OPENSSL
24	OPTIONS_DEFAULT= OPENSSL	23	OPTIONS_DEFAULT= OPENSSL
		24	GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \
		25	libgcrypt.so:${PORTSDIR}/security/libgcrypt \
		26	libgpg-error.so:${PORTSDIR}/security/libgpg-error
		27	GNUTLS_CONFIGURE_ON= --enable-gnutls
		28	GNUTLS_LDFLAGS= -L${LOCALBASE}/lib
		29	OPENSSL_CONFIGURE_ENABLE= ssl
25		30
26	.include <bsd.port.options.mk>	31	.include <bsd.port.options.mk>
27		32
28	.if ${PORT_OPTIONS:MGNUTLS}
29	LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \
30	libgcrypt.so:${PORTSDIR}/security/libgcrypt \
31	libgpg-error.so:${PORTSDIR}/security/libgpg-error
32	CONFIGURE_ARGS= --enable-gnutls
33	LDFLAGS+= -L${LOCALBASE}/lib
34	.elif ${PORT_OPTIONS:MOPENSSL}
35	CONFIGURE_ARGS= --enable-ssl
36	.else
37	CONFIGURE_ARGS= --disable-ssl
38	.endif
39
40	post-patch:	33	post-patch:
41	${REINPLACE_CMD} -e 's\| sys/timeb.h \| \|' \	34	${REINPLACE_CMD} -e 's\| sys/timeb.h \| \|' \
42	-e 's\|-DSOAPCPP_IMPORT_PATH=\|-DSOAPCPP2_IMPORT_PATH=\|' \	35	-e 's\|-DSOAPCPP_IMPORT_PATH=\|-DSOAPCPP2_IMPORT_PATH=\|' \