3 files changed, 48 insertions, 46 deletions

diff --git a/net-p2p/dclib/Makefile b/net-p2p/dclib/Makefile
index b2d7d5df7ada..ed150acc3f9f 100644
--- a/net-p2p/dclib/Makefile
+++ b/net-p2p/dclib/Makefile
@@ -7,44 +7,28 @@
 #
 
 PORTNAME=	dclib
-PORTVERSION=	0.1.11
+PORTVERSION=	0.2.18
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES=	http://download.berlios.de/dcgui/ \
 		http://ftp.kde.com/Networking_Internet/File_Sharing/Direct_Connect_4_Linux/ \
-		http://download.berlios.de/dcgui/ \
-		ftp://ftp.kde.com/Networking_Internet/File_Sharing/Direct_Connect_4_Linux/ \
-		http://dc.ketelhot.de/files/dcgui/unstable/source/
-MASTER_SITE_SUBDIR=	dc-gui
-DISTNAME=	dclib-0.1beta11
+		ftp://ftp.kde.com/Networking_Internet/File_Sharing/Direct_Connect_4_Linux/
 
-MAINTAINER=	e96sv@yahoo.se
+MAINTAINER=	brueffer@phoenix-systems.de
 COMMENT=	Direct connect interface library for dcgui
-FORBIDDEN=	"security bug--see <URL:http://dc.ketelhot.de/news.php>"
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		xml2.5:${PORTSDIR}/textproc/libxml2
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-xml-prefix=${LOCALBASE}
-INSTALLS_SHLIB= yes
+USE_REINPLACE=	yes
+INSTALLS_SHLIB=	yes
+USE_LIBTOOL=	yes
 
-post-patch:
-# fix libxml2 test
-# and, do not add optimizations because it might break some ARCHs, e.g.,
-# alpha
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
-	@${REINPLACE_CMD} -e 's@xmlversion.h@libxml/xmlversion.h@; \
-		s@-O2@@; \
-		s@%%LOCALBASE%%@${LOCALBASE}@g' \
+post-patch:
+	@${REINPLACE_CMD} -e 's/-O2//g; s/-pedantic //g' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-	@${REINPLACE_CMD} -e "s@Lu@llu@g" \
-		${WRKSRC}/dclib/cstring.cpp \
-		${WRKSRC}/dclib/cquerymanager.cpp
-# malloc.h is deprecated in favor of stdlib.h
-	@${FIND} ${WRKSRC} -type f -name "*.cpp" -o -name "*.h" | \
-		${XARGS} -n 10 ${REINPLACE_CMD} 's|malloc\.h|stdlib.h|'
 
 .include <bsd.port.mk>
diff --git a/net-p2p/dclib/distinfo b/net-p2p/dclib/distinfo
index a1846ad28d4e..a3256aa7172d 100644
--- a/net-p2p/dclib/distinfo
+++ b/net-p2p/dclib/distinfo
@@ -1 +1 @@
-MD5 (dclib-0.1beta11.tar.bz2) = 1105c521ca69230e0bcbb2d03ef5cd7f
+MD5 (dclib-0.2.18.tar.bz2) = 8c49b528fc66b8f6aadf6014ce424d33
diff --git a/net-p2p/dclib/pkg-plist b/net-p2p/dclib/pkg-plist
index 2905a79ea365..14193df6c47e 100644
--- a/net-p2p/dclib/pkg-plist
+++ b/net-p2p/dclib/pkg-plist
@@ -1,38 +1,56 @@
-include/dclib/casyncdns.h
-include/dclib/cbase64.h
-include/dclib/cbytearray.h
-include/dclib/cbz.h
-include/dclib/ccallback.h
 include/dclib/cclient.h
+include/dclib/cclientssl.h
 include/dclib/cconfig.h
-include/dclib/cconnection.h
-include/dclib/cdir.h
+include/dclib/cdcproto.h
 include/dclib/cdownloadmanager.h
 include/dclib/cdownloadqueue.h
 include/dclib/cencrypt.h
 include/dclib/cfilemanager.h
-include/dclib/che3.h
 include/dclib/chttp.h
 include/dclib/chubsearch.h
-include/dclib/clist.h
-include/dclib/clisten.h
-include/dclib/cmd4.h
-include/dclib/cmd5.h
 include/dclib/cmessagehandler.h
-include/dclib/cobject.h
+include/dclib/core/casyncdns.h
+include/dclib/core/cbase64.h
+include/dclib/core/cbytearray.h
+include/dclib/core/cbz.h
+include/dclib/core/ccallback.h
+include/dclib/core/cconnection.h
+include/dclib/core/cdir.h
+include/dclib/core/cfile.h
+include/dclib/core/che3.h
+include/dclib/core/clist.h
+include/dclib/core/clisten.h
+include/dclib/core/clogfile.h
+include/dclib/core/cmanager.h
+include/dclib/core/cmd4.h
+include/dclib/core/cmd5.h
+include/dclib/core/cobject.h
+include/dclib/core/cplugin.h
+include/dclib/core/csingleton.h
+include/dclib/core/csocket.h
+include/dclib/core/cssl.h
+include/dclib/core/cstring.h
+include/dclib/core/cstringlist.h
+include/dclib/core/cthread.h
+include/dclib/core/cxml.h
+include/dclib/core/filecopy.h
+include/dclib/core/platform.h
+include/dclib/core/types.h
+include/dclib/cpluginmanager.h
 include/dclib/cquerymanager.h
+include/dclib/csearchindex.h
 include/dclib/cservermanager.h
-include/dclib/csingleton.h
-include/dclib/csocket.h
-include/dclib/cstring.h
-include/dclib/cstringlist.h
-include/dclib/cthread.h
+include/dclib/csharelist.h
 include/dclib/ctransfer.h
-include/dclib/cxml.h
+include/dclib/cutils.h
+include/dclib/dclib.h
 include/dclib/dcobject.h
 include/dclib/dcos.h
 lib/libdc.a
 lib/libdc.la
 lib/libdc.so
 lib/libdc.so.0
+@unexec rmdir %D/share/dcgui/plugin 2>/dev/null || true
+@unexec rmdir %D/share/dcgui 2>/dev/null || true
+@dirrm include/dclib/core
 @dirrm include/dclib