5 files changed, 35 insertions, 12 deletions

diff --git a/www/httrack/Makefile b/www/httrack/Makefile
index 73b32141a3fd..6d338a8f7e7e 100644
--- a/www/httrack/Makefile
+++ b/www/httrack/Makefile
@@ -6,24 +6,23 @@
 #
 
 PORTNAME=	httrack
-PORTVERSION=	3.33.16
-PORTREVISION=	1
+PORTVERSION=	3.40
+PORTREVISION=	2
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	miwi
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}
+MASTER_SITES=	http://www.httrack.com/
+DISTNAME=	${PORTNAME}-${PORTVERSION}-${PORTREVISION}
 
 MAINTAINER=	andrew.nau.ua@gmail.com
 COMMENT=	Easy-to-use offline browser utility and website copier
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}.`expr ${PORTREVISION} + 1`
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 
-MAN1=		htsserver.1 httrack.1 webhttrack.1
+MAN1=		htsserver.1 httrack.1 proxytrack.1 webhttrack.1
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|>&6,|>\&6|g ; \
diff --git a/www/httrack/distinfo b/www/httrack/distinfo
index 8d4c8b6de6d0..a6937fe7b4cb 100644
--- a/www/httrack/distinfo
+++ b/www/httrack/distinfo
@@ -1,3 +1,3 @@
-MD5 (httrack-3.33.tar.gz) = cd21a49afb9630a49d042936ccff3c0b
-SHA256 (httrack-3.33.tar.gz) = b5dc7121672a4c46aaa082bd79aa5adaea458c28627f358ebfd7ea8bf91c28f7
-SIZE (httrack-3.33.tar.gz) = 1432715
+MD5 (httrack-3.40-2.tar.gz) = 0364c56ab1e5289935d4d3482d1b82cb
+SHA256 (httrack-3.40-2.tar.gz) = 09a0bd0cbba7880e272136174c8261308868586f3d77479d06180c0c62079832
+SIZE (httrack-3.40-2.tar.gz) = 1626291
diff --git a/www/httrack/files/patch-src-mmsrip-mms.h b/www/httrack/files/patch-src-mmsrip-mms.h
new file mode 100644
index 000000000000..44e81023490c
--- /dev/null
+++ b/www/httrack/files/patch-src-mmsrip-mms.h
@@ -0,0 +1,11 @@
+--- src/mmsrip/mms.h.orig	Mon Jan 23 20:30:43 2006
++++ src/mmsrip/mms.h	Sat Jul 29 14:35:04 2006
+@@ -46,7 +46,7 @@
+ #endif
+ typedef unsigned long long int uint64_t;
+ #else
+-#if defined(SOLARIS) || defined(sun)
++#if defined(SOLARIS) || defined(sun) || defined (__FreeBSD__)
+ #include <inttypes.h>
+ #else
+ #include <stdint.h>
diff --git a/www/httrack/files/patch-src-proxy-store.h b/www/httrack/files/patch-src-proxy-store.h
new file mode 100644
index 000000000000..572865f59a07
--- /dev/null
+++ b/www/httrack/files/patch-src-proxy-store.h
@@ -0,0 +1,11 @@
+--- src/proxy/store.h.orig	Sat Jul 29 00:15:48 2006
++++ src/proxy/store.h	Sat Jul 29 00:19:03 2006
+@@ -28,6 +28,8 @@
+ #ifndef WEBHTTRACK_PROXYTRACK_STORE
+ #define WEBHTTRACK_PROXYTRACK_STORE
+
++#include <pthread.h>
++
+ /* Proxy */
+
+ typedef struct _PT_Index _PT_Index;
diff --git a/www/httrack/pkg-plist b/www/httrack/pkg-plist
index 8a91eb8e3aa1..67bb03777d44 100644
--- a/www/httrack/pkg-plist
+++ b/www/httrack/pkg-plist
@@ -1,5 +1,6 @@
 bin/htsserver
 bin/httrack
+bin/proxytrack
 bin/webhttrack
 include/httrack/config.h
 include/httrack/htsbasenet.h
@@ -158,6 +159,8 @@ share/applications/WebHTTrack.desktop
 %%DOCSDIR%%/httrack-doc.html
 %%DATADIR%%/html
 %%DATADIR%%/icons/webhttrack.xpm
+%%DATADIR%%/lang.def
+%%DATADIR%%/lang.indexes
 %%DATADIR%%/lang/Bulgarian.txt
 %%DATADIR%%/lang/Castellano.txt
 %%DATADIR%%/lang/Cesky.txt
@@ -167,6 +170,7 @@ share/applications/WebHTTrack.desktop
 %%DATADIR%%/lang/Deutsch.txt
 %%DATADIR%%/lang/Eesti.txt
 %%DATADIR%%/lang/English.txt
+%%DATADIR%%/lang/Finnish.txt
 %%DATADIR%%/lang/Francais.txt
 %%DATADIR%%/lang/Greek.txt
 %%DATADIR%%/lang/Italiano.txt
@@ -185,8 +189,6 @@ share/applications/WebHTTrack.desktop
 %%DATADIR%%/lang/Svenska.txt
 %%DATADIR%%/lang/Turkish.txt
 %%DATADIR%%/lang/Ukrainian.txt
-%%DATADIR%%/lang.def
-%%DATADIR%%/lang.indexes
 %%DATADIR%%/libtest/callbacks-example-baselinks.c
 %%DATADIR%%/libtest/callbacks-example-contentfilter.c
 %%DATADIR%%/libtest/callbacks-example-displayheader.c