4 files changed, 31 insertions, 32 deletions

diff --git a/devel/libdap/Makefile b/devel/libdap/Makefile
index ae6f4022e9ba..182596980473 100644
--- a/devel/libdap/Makefile
+++ b/devel/libdap/Makefile
@@ -6,26 +6,27 @@
 #
 
 PORTNAME=	libdap
-PORTVERSION=	3.10.0
+PORTVERSION=	3.10.2
 CATEGORIES=	devel
-MASTER_SITES=	http://www.opendap.org/pub/source/
+MASTER_SITES=	http://www.opendap.org/pub/source/ \
+		http://sunpoet.net/distfiles/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@sunpoet.net
 COMMENT=	SDK which contains an implementation of DAP 2.0 and 3.1
 
 LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
-		xml2.5:${PORTSDIR}/textproc/libxml2 \
-		uuid:${PORTSDIR}/misc/e2fsprogs-libuuid
+		uuid:${PORTSDIR}/misc/e2fsprogs-libuuid \
+		xml2.5:${PORTSDIR}/textproc/libxml2
 
-CFLAGS=		-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CFLAGS=		-I${LOCALBASE}/include -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CONFIGURE_ARGS+=--with-zlib=/usr
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+USE_GNOME=	gnomehack
 USE_LDCONFIG=	yes
 
 post-patch:
-	@${REINPLACE_CMD} -e \
-	's#$(libdir)/pkgconfig#$(libdir)/libdata/pkgconfig#g' \
-	${WRKSRC}/Makefile.in
+	# do not alter ${PREFIX}/lib/charset.alias
+	@${REINPLACE_CMD} -e '/^install-exec-am: / s|install-exec-local||' ${WRKSRC}/gl/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/devel/libdap/distinfo b/devel/libdap/distinfo
index daa3a27a18d5..d71dd5870587 100644
--- a/devel/libdap/distinfo
+++ b/devel/libdap/distinfo
@@ -1,3 +1,3 @@
-MD5 (libdap-3.10.0.tar.gz) = 8a5361f127e2665f675e9868e7635614
-SHA256 (libdap-3.10.0.tar.gz) = b27d85fc551db07c54564442a7385618fa7fbf28d851f6130088923d13948603
-SIZE (libdap-3.10.0.tar.gz) = 1516612
+MD5 (libdap-3.10.2.tar.gz) = 4367f3266f20479a68d9fdaeaa001af8
+SHA256 (libdap-3.10.2.tar.gz) = 47cd4a91997843b408f5e4632953b8a624d5f35da71dea7929ac019091c61cc9
+SIZE (libdap-3.10.2.tar.gz) = 1391987
diff --git a/devel/libdap/pkg-descr b/devel/libdap/pkg-descr
index 3892a6801563..c48cdd0a7d02 100644
--- a/devel/libdap/pkg-descr
+++ b/devel/libdap/pkg-descr
@@ -2,4 +2,4 @@ libdap is A C++ SDK which contains an implementation of DAP 2.0 and 3.1,
 Client- and Server-side support classes and a prototype implementation
 of the AIS.
 
-WWW: http://opendap.org/download/libdap++.html
+WWW:	http://opendap.org/download/libdap++.html
diff --git a/devel/libdap/pkg-plist b/devel/libdap/pkg-plist
index 22e64c8c733b..682195fa3025 100644
--- a/devel/libdap/pkg-plist
+++ b/devel/libdap/pkg-plist
@@ -1,18 +1,7 @@
+@comment $FreeBSD$
 bin/dap-config
 bin/dap-config-pkgconfig
 bin/getdap
-lib/libdap.a
-lib/libdap.la
-lib/libdap.so
-lib/libdap.so.11
-lib/libdapclient.a
-lib/libdapclient.la
-lib/libdapclient.so
-lib/libdapclient.so.4
-lib/libdapserver.a
-lib/libdapserver.la
-lib/libdapserver.so
-lib/libdapserver.so.8
 include/libdap/AlarmHandler.h
 include/libdap/Ancillary.h
 include/libdap/Array.h
@@ -85,7 +74,6 @@ include/libdap/debug.h
 include/libdap/dods-datatypes.h
 include/libdap/dods-limits.h
 include/libdap/escaping.h
-include/libdap/fdiostream.h
 include/libdap/expr.h
 include/libdap/gse_parser.h
 include/libdap/mime_util.h
@@ -93,10 +81,20 @@ include/libdap/parser.h
 include/libdap/util.h
 include/libdap/util_mit.h
 include/libdap/xdr-datatypes.h
-lib/libdata/pkgconfig/libdap.pc
-lib/libdata/pkgconfig/libdapclient.pc
-lib/libdata/pkgconfig/libdapserver.pc
+lib/libdap.a
+lib/libdap.la
+lib/libdap.so
+lib/libdap.so.12
+lib/libdapclient.a
+lib/libdapclient.la
+lib/libdapclient.so
+lib/libdapclient.so.4
+lib/libdapserver.a
+lib/libdapserver.la
+lib/libdapserver.so
+lib/libdapserver.so.8
+libdata/pkgconfig/libdap.pc
+libdata/pkgconfig/libdapclient.pc
+libdata/pkgconfig/libdapserver.pc
 share/aclocal/libdap.m4
 @dirrm include/libdap
-@dirrm lib/libdata/pkgconfig
-@dirrm lib/libdata