Attachment 147641 Details for Bug 193896 – devel_gsoap.diff

[patch] devel_gsoap.diff

devel_gsoap.diff (text/plain), 7.37 KB, created by tkato432 on 2014-09-24 18:31:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2014-09-24 18:31:06 UTC

Size: 7.37 KB

patch

obsolete

>diff -urN /usr/ports/devel/gsoap/Makefile devel/gsoap/Makefile
>--- /usr/ports/devel/gsoap/Makefile	2014-09-05 19:28:41.000000000 +0900
>+++ devel/gsoap/Makefile	2014-09-25 00:00:00.000000000 +0900
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/devel/gsoap/Makefile 367307 2014-09-04 19:26:24Z antoine $
> 
> PORTNAME=	gsoap
>-PORTVERSION=	2.8.17
>-PORTREVISION=	3
>+PORTVERSION=	2.8.18
> CATEGORIES=	devel
> MASTER_SITES=	SF/${PORTNAME}2/gSOAP
> DISTNAME=	${PORTNAME}_${PORTVERSION}
>@@ -13,40 +12,39 @@
> 
> LICENSE=	GPLv2
> 
>-CONFIGURE_ENV=	LEX=flex YACC=yacc
>+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
>+
>+USES=		pathfix zip
> GNU_CONFIGURE=	yes
>+CONFIGURE_ENV=	LEX="${FLEX:T}" YACC="${YACC:T}"
> MAKE_JOBS_UNSAFE=	yes
>-USES=		pathfix zip
>-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
> 
>-OPTIONS_RADIO=	SSL
>+OPTIONS_RADIO=		SSL
> OPTIONS_RADIO_SSL=	GNUTLS OPENSSL
> OPTIONS_DEFAULT=	OPENSSL
> 
>+GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
>+GNUTLS_CONFIGURE_ENABLE=	gnutls
>+GNUTLS_LDFLAGS=		-L${LOCALBASE}/lib
>+OPENSSL_USE=		openssl=yes
>+
> .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
>+.if !${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MOPENSSL}
>+CONFIGURE_ARGS+=	--disable-ssl
> .endif
> 
> post-patch:
>-	${REINPLACE_CMD} -e 's| sys/timeb.h | |' \
>-	    -e 's|-DSOAPCPP_IMPORT_PATH=|-DSOAPCPP2_IMPORT_PATH=|' \
>-	    -e 's|-DWSDL_IMPORT_PATH=|-DWSDL2H_IMPORT_PATH=|' \
>-	    ${WRKSRC}/${CONFIGURE_SCRIPT}
>+	@${REINPLACE_CMD} -e \
>+		's| sys/timeb.h | | ; \
>+		 s|$-lgnutls$.*$-lz$|\1 \2|' ${WRKSRC}/${CONFIGURE_SCRIPT}
>+	@${REINPLACE_CMD} -e \
>+		'/echo.*RANLIB/,+1d' ${WRKSRC}/gsoap/Makefile.in
> 
> post-install:
> 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/gsoap
>-	@${INSTALL_DATA} ${WRKSRC}/gsoap/stdsoap2.c \
>-	    ${STAGEDIR}${PREFIX}/lib/gsoap
>+	(cd ${WRKSRC}/gsoap && ${INSTALL_DATA} stdsoap2.c \
>+		${STAGEDIR}${PREFIX}/lib/gsoap)
> 	@${LN} -fs stdsoap2.c ${STAGEDIR}${PREFIX}/lib/gsoap/stdsoap2.cpp
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/devel/gsoap/distinfo devel/gsoap/distinfo
>--- /usr/ports/devel/gsoap/distinfo	2014-06-21 17:53:23.000000000 +0900
>+++ devel/gsoap/distinfo	2014-09-25 00:00:00.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (gsoap_2.8.17.zip) = 30a53785708c842694227753badda17010cac64efd43f7a4f2b0e8de3de68f28
>-SIZE (gsoap_2.8.17.zip) = 20695905
>+SHA256 (gsoap_2.8.18.zip) = 764281a67020b7b7b982ddf8e7fdffae27f7a3e61af9ab4ec8a4705a67ba7ced
>+SIZE (gsoap_2.8.18.zip) = 20596233
>diff -urN /usr/ports/devel/gsoap/files/patch-gsoap__wsdl__Makefile.in devel/gsoap/files/patch-gsoap__wsdl__Makefile.in
>--- /usr/ports/devel/gsoap/files/patch-gsoap__wsdl__Makefile.in	2014-06-21 17:53:23.000000000 +0900
>+++ devel/gsoap/files/patch-gsoap__wsdl__Makefile.in	1970-01-01 09:00:00.000000000 +0900
>@@ -1,11 +0,0 @@
>---- gsoap/wsdl/Makefile.in	2013-12-18 14:58:38.000000000 -0500
>-+++ gsoap/wsdl/Makefile.in	2014-01-16 14:35:52.000000000 -0500
>-@@ -204,7 +204,7 @@
>- BUILT_SOURCES = $(SOAP_CPP_SRC)
>- wsdl2h_CFLAGS = $(C_DEBUG_FLAGS) $(WSDL2H_EXTRA_FLAGS)
>- wsdl2h_CXXFLAGS = $(C_DEBUG_FLAGS) $(WSDL2H_EXTRA_FLAGS)
>--wsdl2h_CPPFLAGS = $(AM_CPPFLAGS) $(SOAPCPP2_NONAMESPACES) -D$(platform)
>-+wsdl2h_CPPFLAGS = $(AM_CPPFLAGS) $(SOAPCPP2_NONAMESPACES) $(WSDL2H_IMPORTPATH) -D$(platform)
>- wsdl2h_SOURCES = wsdl2h.cpp wsdl.cpp schema.cpp types.cpp service.cpp soap.cpp mime.cpp wsp.cpp $(SOAP_CPP_SRC)
>- wsdl2h_LDADD = $(SOAP_CPP_LIB) $(WSDL2H_EXTRA_LIBS)
>- CLEANFILES = *~ *C.cpp *H.h *Stub.h *.nsmap
>diff -urN /usr/ports/devel/gsoap/pkg-plist devel/gsoap/pkg-plist
>--- /usr/ports/devel/gsoap/pkg-plist	2014-06-21 17:53:23.000000000 +0900
>+++ devel/gsoap/pkg-plist	2014-09-25 00:00:00.000000000 +0900
>@@ -1,20 +1,21 @@
> bin/soapcpp2
> bin/wsdl2h
> include/stdsoap2.h
>-lib/libgsoap++.a
>+lib/gsoap/stdsoap2.c
>+lib/gsoap/stdsoap2.cpp
> lib/libgsoap.a
>-lib/libgsoapck++.a
>+lib/libgsoap++.a
> lib/libgsoapck.a
>-lib/libgsoapssl++.a
>+lib/libgsoapck++.a
> lib/libgsoapssl.a
>-lib/gsoap/stdsoap2.c
>-lib/gsoap/stdsoap2.cpp
>-libdata/pkgconfig/gsoap++.pc
>+lib/libgsoapssl++.a
> libdata/pkgconfig/gsoap.pc
>-libdata/pkgconfig/gsoapck++.pc
>+libdata/pkgconfig/gsoap++.pc
> libdata/pkgconfig/gsoapck.pc
>-libdata/pkgconfig/gsoapssl++.pc
>+libdata/pkgconfig/gsoapck++.pc
> libdata/pkgconfig/gsoapssl.pc
>+libdata/pkgconfig/gsoapssl++.pc
>+%%DATADIR%%/WS/LEGAL.txt
> %%DATADIR%%/WS/README.txt
> %%DATADIR%%/WS/WS-Addressing.xsd
> %%DATADIR%%/WS/WS-Addressing03.xsd
>@@ -37,6 +38,11 @@
> %%DATADIR%%/WS/enumeration.xsd
> %%DATADIR%%/WS/reference-1.1.xsd
> %%DATADIR%%/WS/typemap.dat
>+%%DATADIR%%/WS/ws-bpel_abstract_common_base.xsd
>+%%DATADIR%%/WS/ws-bpel_executable.xsd
>+%%DATADIR%%/WS/ws-bpel_plnktype.xsd
>+%%DATADIR%%/WS/ws-bpel_serviceref.xsd
>+%%DATADIR%%/WS/ws-bpel_varprop.xsd
> %%DATADIR%%/WS/ws-reliability-1.1.xsd
> %%DATADIR%%/WS/wsse.xsd
> %%DATADIR%%/WS/wsu.xsd
>@@ -50,6 +56,9 @@
> %%DATADIR%%/custom/struct_timeval.h
> %%DATADIR%%/custom/struct_tm.c
> %%DATADIR%%/custom/struct_tm.h
>+%%DATADIR%%/custom/wsrmdemo-duration.o
>+%%DATADIR%%/custom/wsrmdemo_ssl-duration.o
>+%%DATADIR%%/custom/wsrmdemo_udp-duration.o
> %%DATADIR%%/extras/README.txt
> %%DATADIR%%/extras/ckdb.c
> %%DATADIR%%/extras/ckdb.h
>@@ -66,6 +75,7 @@
> %%DATADIR%%/import/dom.h
> %%DATADIR%%/import/ds.h
> %%DATADIR%%/import/ds2.h
>+%%DATADIR%%/import/plnk.h
> %%DATADIR%%/import/ref.h
> %%DATADIR%%/import/ser.h
> %%DATADIR%%/import/soap12.h
>@@ -75,6 +85,7 @@
> %%DATADIR%%/import/stllist.h
> %%DATADIR%%/import/stlset.h
> %%DATADIR%%/import/stlvector.h
>+%%DATADIR%%/import/vprop.h
> %%DATADIR%%/import/wsa.h
> %%DATADIR%%/import/wsa3.h
> %%DATADIR%%/import/wsa4.h
>@@ -119,6 +130,7 @@
> %%DATADIR%%/plugin/httpform.h
> %%DATADIR%%/plugin/httpget.c
> %%DATADIR%%/plugin/httpget.h
>+%%DATADIR%%/plugin/httpget.o
> %%DATADIR%%/plugin/httpgettest.c
> %%DATADIR%%/plugin/httpgettest.h
> %%DATADIR%%/plugin/httpmd5.c
>@@ -127,6 +139,7 @@
> %%DATADIR%%/plugin/httpmd5test.h
> %%DATADIR%%/plugin/httppost.c
> %%DATADIR%%/plugin/httppost.h
>+%%DATADIR%%/plugin/httppost.o
> %%DATADIR%%/plugin/httpposttest.c
> %%DATADIR%%/plugin/httpposttest.h
> %%DATADIR%%/plugin/logging.c
>@@ -141,23 +154,30 @@
> %%DATADIR%%/plugin/plugin.h
> %%DATADIR%%/plugin/smdevp.c
> %%DATADIR%%/plugin/smdevp.h
>+%%DATADIR%%/plugin/sslserver-threads.o
> %%DATADIR%%/plugin/threads.c
> %%DATADIR%%/plugin/threads.h
> %%DATADIR%%/plugin/wsaapi.c
> %%DATADIR%%/plugin/wsaapi.h
>+%%DATADIR%%/plugin/wsademo-wsaapi.o
> %%DATADIR%%/plugin/wsddapi.c
> %%DATADIR%%/plugin/wsddapi.h
> %%DATADIR%%/plugin/wsrmapi.c
> %%DATADIR%%/plugin/wsrmapi.h
>+%%DATADIR%%/plugin/wsrmdemo-threads.o
>+%%DATADIR%%/plugin/wsrmdemo-wsaapi.o
>+%%DATADIR%%/plugin/wsrmdemo-wsrmapi.o
>+%%DATADIR%%/plugin/wsrmdemo_ssl-threads.o
>+%%DATADIR%%/plugin/wsrmdemo_ssl-wsaapi.o
>+%%DATADIR%%/plugin/wsrmdemo_ssl-wsrmapi.o
>+%%DATADIR%%/plugin/wsrmdemo_udp-threads.o
>+%%DATADIR%%/plugin/wsrmdemo_udp-wsaapi.o
>+%%DATADIR%%/plugin/wsrmdemo_udp-wsrmapi.o
> %%DATADIR%%/plugin/wsse2api.c
> %%DATADIR%%/plugin/wsse2api.h
> %%DATADIR%%/plugin/wsseapi.c
> %%DATADIR%%/plugin/wsseapi.cpp
> %%DATADIR%%/plugin/wsseapi.h
>-@dirrm lib/gsoap
>-@dirrm %%DATADIR%%/plugin
>-@dirrm %%DATADIR%%/import
>-@dirrm %%DATADIR%%/extras
>-@dirrm %%DATADIR%%/custom
>-@dirrm %%DATADIR%%/WS
>-@dirrm %%DATADIR%%
>+%%DATADIR%%/plugin/wssedemo-mecevp.o
>+%%DATADIR%%/plugin/wssedemo-smdevp.o
>+%%DATADIR%%/plugin/wssedemo-wsseapi.o

Actions: View | Diff

Attachments on bug 193896: 147641