Date: Thu, 16 Jan 2014 23:35:44 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r339999 - in head/devel/gsoap: . files Message-ID: <201401162335.s0GNZi9k058232@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Thu Jan 16 23:35:43 2014 New Revision: 339999 URL: http://svnweb.freebsd.org/changeset/ports/339999 QAT: https://qat.redports.org/buildarchive/r339999/ Log: Remove unnecessary CPPFLAGS and fix the import paths properly. It seems there was an upstream bug introduced in 2.7.11 (via Red Hat), which broke the default values. In r295977, we added a hack to override these two definitions but it was actually incomplete and incorrect, e. g., the import path for wsdl2h was still not properly set. Now we fix the root cause of these longstanding problems correctly. Added: head/devel/gsoap/files/ head/devel/gsoap/files/patch-gsoap__wsdl__Makefile.in (contents, props changed) Modified: head/devel/gsoap/Makefile Modified: head/devel/gsoap/Makefile ============================================================================== --- head/devel/gsoap/Makefile Thu Jan 16 23:34:36 2014 (r339998) +++ head/devel/gsoap/Makefile Thu Jan 16 23:35:43 2014 (r339999) @@ -14,8 +14,6 @@ COMMENT= Generator Tools for Coding SOAP LICENSE= GPLv2 CONFIGURE_ENV= LEX=flex YACC=yacc -CPPFLAGS+= -DWSDL_TYPEMAP_FILE=\\\"${DATADIR}/WS/typemap.dat\\\" \ - -DSOAPCPP2_IMPORT_PATH=\\\"${DATADIR}/import\\\" GNU_CONFIGURE= yes MAKE_JOBS_UNSAFE= yes USES= pathfix @@ -40,7 +38,10 @@ CONFIGURE_ARGS= --disable-ssl .endif post-patch: - ${REINPLACE_CMD} -e 's| sys/timeb.h | |' ${WRKSRC}/${CONFIGURE_SCRIPT} + ${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} post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/gsoap Added: head/devel/gsoap/files/patch-gsoap__wsdl__Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gsoap/files/patch-gsoap__wsdl__Makefile.in Thu Jan 16 23:35:43 2014 (r339999) @@ -0,0 +1,11 @@ +--- 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401162335.s0GNZi9k058232>