7 files changed, 24 insertions, 57 deletions

diff --git a/devel/gsoap/Makefile b/devel/gsoap/Makefile
index da68b5287745..60e483e38493 100644
--- a/devel/gsoap/Makefile
+++ b/devel/gsoap/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gsoap
-PORTVERSION=	2.7.9l
+PORTVERSION=	2.7.10
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gsoap2
@@ -16,7 +16,7 @@ MAINTAINER=	sem@FreeBSD.org
 COMMENT=	Generator Tools for Coding SOAP/XML Web Services in C and C++
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+USE_GNOME=	gnomehack gnometarget
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-2.7
 
@@ -24,12 +24,6 @@ ONLY_FOR_ARCHS=	i386 amd64
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 700000
-CONST=
-.else
-CONST=	const
-.endif
-
 .if ${OSVERSION} < 600000
 IGNORE=	does not compile: needs gethostbyname_r()
 .endif
@@ -38,12 +32,9 @@ IGNORE=	does not compile: needs gethostbyname_r()
 CFLAGS+=	-fPIC
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's/> FD_SETSIZE/>= (int)FD_SETSIZE/g' ${WRKSRC}/soapcpp2/stdsoap2.c
-	@${REINPLACE_CMD} -e 's/> FD_SETSIZE/>= (int)FD_SETSIZE/g' ${WRKSRC}/soapcpp2/stdsoap2.cpp
-	@${REINPLACE_CMD} -e 's/%%CONST%%/${CONST}/' ${WRKSRC}/soapcpp2/stdsoap2.cpp
-
-pre-build:
-	@${RM} ${WRKDIR}/gsoap-2.7/soapcpp2/stdsoap2_cpp.cpp
+post-install:
+	@${MKDIR} ${PREFIX}/lib/gsoap
+	@${CP} ${WRKSRC}/gsoap/stdsoap2.c ${PREFIX}/lib/gsoap
+	@${LN} ${PREFIX}/lib/gsoap/stdsoap2.c ${PREFIX}/lib/gsoap/stdsoap2.cpp
 
 .include <bsd.port.post.mk>
diff --git a/devel/gsoap/distinfo b/devel/gsoap/distinfo
index 4ee7e11eeff7..917c1f963543 100644
--- a/devel/gsoap/distinfo
+++ b/devel/gsoap/distinfo
@@ -1,3 +1,3 @@
-MD5 (gsoap_2.7.9l.tar.gz) = 9bd21c4f8fe4ffa9ee6cd5f05ea3b65a
-SHA256 (gsoap_2.7.9l.tar.gz) = b866cd1c73212bb82c202e12a2bac4ff6907a22d99d1a5bead7df8e8718b8552
-SIZE (gsoap_2.7.9l.tar.gz) = 4787311
+MD5 (gsoap_2.7.10.tar.gz) = 31ac50314900d87c43f8f008c8de712f
+SHA256 (gsoap_2.7.10.tar.gz) = 5286f1cd9bac68a1630f52f802b217fd523e0278d05fbc2b99edd5c5a7ce73b6
+SIZE (gsoap_2.7.10.tar.gz) = 6967239
diff --git a/devel/gsoap/files/patch-Makefile.in b/devel/gsoap/files/patch-Makefile.in
deleted file mode 100644
index 7ccc110024b3..000000000000
--- a/devel/gsoap/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Fri Sep 16 16:45:51 2005
-+++ Makefile.in	Fri Oct 21 17:03:44 2005
-@@ -106,7 +106,7 @@
- 
- AUTOMAKE_OPTIONS = foreign 1.4
- 
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = @prefix@/libdata/pkgconfig
- pkgconfig_DATA = gsoap.pc gsoap++.pc gsoapck.pc gsoapck++.pc  gsoapssl.pc gsoapssl++.pc
- 
- EXTRA_DIST = gsoap.pc.in gsoap++.pc.in gsoapck.pc.in gsoapck++.pc.in gsoapssl.pc.in gsoapssl++.pc.in
diff --git a/devel/gsoap/files/patch-gsoap-stdsoap2.h b/devel/gsoap/files/patch-gsoap-stdsoap2.h
new file mode 100644
index 000000000000..1c8920a2c8c1
--- /dev/null
+++ b/devel/gsoap/files/patch-gsoap-stdsoap2.h
@@ -0,0 +1,12 @@
+--- gsoap/stdsoap2.h.orig	2008-01-27 22:02:36.000000000 +0100
++++ gsoap/stdsoap2.h	2008-07-04 12:35:55.000000000 +0200
+@@ -292,9 +292,6 @@
+ #  define HAVE_STRRCHR
+ #  define HAVE_STRTOD
+ #  define HAVE_SSCANF
+-#  define HAVE_STRTOD_L
+-#  define HAVE_SSCANF_L
+-#  define HAVE_SPRINTF_L
+ #  define HAVE_STRTOL
+ #  define HAVE_STRTOUL
+ #  define HAVE_STRTOLL
diff --git a/devel/gsoap/files/patch-soapcpp2-stdsoap2.c b/devel/gsoap/files/patch-soapcpp2-stdsoap2.c
deleted file mode 100644
index a9eac4382496..000000000000
--- a/devel/gsoap/files/patch-soapcpp2-stdsoap2.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- soapcpp2/stdsoap2.c.orig	Tue Dec 19 11:28:08 2006
-+++ soapcpp2/stdsoap2.c	Tue Dec 19 11:36:34 2006
-@@ -3335,7 +3335,11 @@
-     soap->errnum = h_errno;
-   }
- #elif defined(HAVE_GETHOSTBYNAME_R)
-+#if defined(__FreeBSD__)
-+  gethostbyname_r(addr, &hostent, soap->buf, SOAP_BUFLEN, &host, &soap->errnum);
-+#else
-   host = gethostbyname_r(addr, &hostent, soap->buf, SOAP_BUFLEN, &soap->errnum);
-+#endif
- #elif defined(VXWORKS)
-   /* If the DNS resolver library resolvLib has been configured in the vxWorks
-    * image, a query for the host IP address is sent to the DNS server, if the
diff --git a/devel/gsoap/files/patch-soapcpp2-stdsoap2.cpp b/devel/gsoap/files/patch-soapcpp2-stdsoap2.cpp
deleted file mode 100644
index 63761a5624e1..000000000000
--- a/devel/gsoap/files/patch-soapcpp2-stdsoap2.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- soapcpp2/stdsoap2.cpp.orig	Tue Dec 19 11:28:05 2006
-+++ soapcpp2/stdsoap2.cpp	Tue Dec 19 11:37:15 2006
-@@ -3335,7 +3335,11 @@
-     soap->errnum = h_errno;
-   }
- #elif defined(HAVE_GETHOSTBYNAME_R)
-+#if defined(__FreeBSD__)
-+  gethostbyname_r(addr, &hostent, soap->buf, SOAP_BUFLEN, &host, &soap->errnum);
-+#else
-   host = gethostbyname_r(addr, &hostent, soap->buf, SOAP_BUFLEN, &soap->errnum);
-+#endif
- #elif defined(VXWORKS)
-   /* If the DNS resolver library resolvLib has been configured in the vxWorks
-    * image, a query for the host IP address is sent to the DNS server, if the
diff --git a/devel/gsoap/pkg-plist b/devel/gsoap/pkg-plist
index f11be5abfdb6..5851b332c882 100644
--- a/devel/gsoap/pkg-plist
+++ b/devel/gsoap/pkg-plist
@@ -7,9 +7,12 @@ lib/libgsoapck++.a
 lib/libgsoapck.a
 lib/libgsoapssl++.a
 lib/libgsoapssl.a
+lib/gsoap/stdsoap2.c
+lib/gsoap/stdsoap2.cpp
 libdata/pkgconfig/gsoap++.pc
 libdata/pkgconfig/gsoap.pc
 libdata/pkgconfig/gsoapck++.pc
 libdata/pkgconfig/gsoapck.pc
 libdata/pkgconfig/gsoapssl++.pc
 libdata/pkgconfig/gsoapssl.pc
+@dirrm lib/gsoap