diff --git a/net/tclcurl/Makefile b/net/tclcurl/Makefile
index 6058e6bfebf..3a38eb69871 100644
--- a/net/tclcurl/Makefile
+++ b/net/tclcurl/Makefile
@@ -1,53 +1,41 @@
-# $OpenBSD: Makefile,v 1.18 2010/11/19 22:31:38 espie Exp $
+# $OpenBSD: Makefile,v 1.19 2011/01/05 19:30:26 stu Exp $
 
-COMMENT=		Tcl bindings for Curl
-SHARED_ONLY=		Yes
+SHARED_ONLY =	Yes
 
-DISTNAME=		TclCurl-0.10.5
-REVISION=		4
-CATEGORIES=		net
+COMMENT =	Tcl bindings for Curl
 
-HOMEPAGE=		http://personal.iddeo.es/andresgarci/tclcurl/english/
+DISTNAME =	TclCurl-7.19.6
+SHARED_LIBS =	TclCurl7196 0.0
+CATEGORIES =	net
+HOMEPAGE =	http://personal.iddeo.es/andresgarci/tclcurl/english/
+MAINTAINER =	Stuart Cassoff <stwo@users.sourceforge.net>
 
 # BSD
-PERMIT_PACKAGE_CDROM=	Yes 
-PERMIT_PACKAGE_FTP=	Yes
-PERMIT_DISTFILES_CDROM=	Yes
-PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		crypto idn ssl z curl>=2.2
+PERMIT_PACKAGE_CDROM =	Yes
+PERMIT_PACKAGE_FTP =	Yes
+PERMIT_DISTFILES_CDROM =Yes
+PERMIT_DISTFILES_FTP =	Yes
 
-MASTER_SITES=		${HOMEPAGE}download/tarball/
+WANTLIB =	crypto idn ssl z curl>=2.2
 
-MODULES=		lang/tcl
-MODTCL_VERSION=		8.4
-LIB_DEPENDS=    	net/curl
+MASTER_SITES =	${HOMEPAGE:H:H:=/download/tarball/}
+MODULES =	lang/tcl
+LIB_DEPENDS =	net/curl
+BUILD_DEPENDS =	${MODTCL_BUILD_DEPENDS}
+RUN_DEPENDS =	${MODTCL_RUN_DEPENDS}
 
-BUILD_DEPENDS+=		${MODTCL_BUILD_DEPENDS}
-RUN_DEPENDS+= 		${MODTCL_RUN_DEPENDS}
+FAKE_FLAGS =	PKG_DIR=tclcurl \
+		INSTALL_LIBRARY='${INSTALL_DATA}'
 
-CONFIGURE_STYLE=	gnu dest
-CONFIGURE_ARGS+=	--with-tcl=${MODTCL_LIBDIR} \
-			--with-tclinclude=${MODTCL_INCDIR}
-CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include"
-USE_GROFF =		Yes
+SEPARATE_BUILD =concurrent
+USE_GROFF =	Yes
+CONFIGURE_STYLE=gnu
 
-# broken in this version
-REGRESS_TARGET= 	test
-NO_REGRESS=		Yes
+CONFIGURE_ARGS+=--with-tcl=${MODTCL_LIBDIR} \
+		--libdir=${MODTCL_TCLDIR} \
+		SHLIB_VERSION=${LIBTclCurl7196_VERSION} \
+		CFLAGS="${CFLAGS} -pthread"
 
-MAN_FILES=		tclcurl.n tclcurl_multi.n
+NO_REGRESS =	Yes
 
-do-install:
-	${INSTALL_DATA_DIR} ${WRKINST}/${MODTCL_LIBDIR}/tclcurl0.105
-	${INSTALL_DATA} ${WRKDIST}/libtclcurl0105.so \
-		${WRKINST}/${MODTCL_LIBDIR}/tclcurl0.105
-	${INSTALL_DATA} ${WRKDIST}/generic/tclcurl.tcl \
-		${WRKINST}/${MODTCL_LIBDIR}/tclcurl0.105
-	${INSTALL_MAN_DIR} ${PREFIX}/man/mann
-	${INSTALL_DATA} ${WRKDIST}/pkgIndex.tcl \
-		${WRKINST}/${MODTCL_LIBDIR}/tclcurl0.105
-.for file in ${MAN_FILES}
-	${INSTALL_DATA} ${WRKDIST}/doc/${file} ${PREFIX}/man/mann
-.endfor
-	
 .include <bsd.port.mk>
diff --git a/net/tclcurl/distinfo b/net/tclcurl/distinfo
index 5e295371f41..fa56ef3a2f7 100644
--- a/net/tclcurl/distinfo
+++ b/net/tclcurl/distinfo
@@ -1,5 +1,5 @@
-MD5 (TclCurl-0.10.5.tar.gz) = gU1zWxF8iQaUtqm5yfK1mA==
-RMD160 (TclCurl-0.10.5.tar.gz) = 0084t0qSk2Q6NVPOaclwMausmHw=
-SHA1 (TclCurl-0.10.5.tar.gz) = ecmmxYoRwIRIGdcAnD7LyilwP78=
-SHA256 (TclCurl-0.10.5.tar.gz) = 2tcUNW4Tez+Qk2TEZuv2xLtjr1dkCDIiWEcO9z3ISno=
-SIZE (TclCurl-0.10.5.tar.gz) = 135670
+MD5 (TclCurl-7.19.6.tar.gz) = lh/2JI6AHnh+CQbSbSAwlA==
+RMD160 (TclCurl-7.19.6.tar.gz) = 89V8uKJ7fMny6cyCdm7iy2dPcP8=
+SHA1 (TclCurl-7.19.6.tar.gz) = su5FjbDozsdB5sLm+OmITj94WAc=
+SHA256 (TclCurl-7.19.6.tar.gz) = BoeU7HsWsSuRiSzftl/t2IHeAjQZ+5FBifHT0q+ppfE=
+SIZE (TclCurl-7.19.6.tar.gz) = 227372
diff --git a/net/tclcurl/pkg/DESCR b/net/tclcurl/pkg/DESCR
index be4bd020f64..c24ffd8689d 100644
--- a/net/tclcurl/pkg/DESCR
+++ b/net/tclcurl/pkg/DESCR
@@ -1,3 +1 @@
-TclCurl gives the Tcl programmer a binding to libcurl, allowing you to
-get a URL with FTP, TELNET, LDAP, GOPHER, DICT, FILE, HTTP or HTTPS
-syntax.
+A Tcl extension that provides access to the facilities of libcurl.
diff --git a/net/tclcurl/pkg/PLIST b/net/tclcurl/pkg/PLIST
index 3e509f5c733..ec18220b4f4 100644
--- a/net/tclcurl/pkg/PLIST
+++ b/net/tclcurl/pkg/PLIST
@@ -1,7 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.4 2009/03/16 10:38:09 sthen Exp $
-lib/tcl${MODTCL_VERSION}/tclcurl0.105/
-lib/tcl${MODTCL_VERSION}/tclcurl0.105/libtclcurl0105.so
-lib/tcl${MODTCL_VERSION}/tclcurl0.105/pkgIndex.tcl
-lib/tcl${MODTCL_VERSION}/tclcurl0.105/tclcurl.tcl
+@comment $OpenBSD: PLIST,v 1.5 2011/01/05 19:30:26 stu Exp $
+lib/tcl/tclcurl/
+@lib lib/tcl/tclcurl/libTclCurl7196.so.${LIBTclCurl7196_VERSION}
+lib/tcl/tclcurl/pkgIndex.tcl
+lib/tcl/tclcurl/tclcurl.tcl
 @man man/mann/tclcurl.n
 @man man/mann/tclcurl_multi.n
+@man man/mann/tclcurl_share.n