- Update to version 3.31

PR:		ports/64219
Submitted by:	Ports Fury

4 files changed, 42 insertions, 22 deletions

diff --git a/www/httrack/Makefile b/www/httrack/Makefile
index bbc4b0ebefa1..e52da4b031e4 100644
--- a/www/httrack/Makefile
+++ b/www/httrack/Makefile
@@ -6,22 +6,26 @@
 #
 
 PORTNAME=	httrack
-PORTVERSION=	3.30
+PORTVERSION=	3.31
 CATEGORIES=	www
-MASTER_SITES=	http://httrack.free.fr/mirror/
+MASTER_SITES=	http://httrack.free.fr/mirror/ \
+		http://www.httrack.com/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Easy-to-use offline browser utility and website copier
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}.01
-USE_GMAKE=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}-3.30.01
+
+USE_GNOME=	gnometarget
 USE_REINPLACE=	yes
-USE_LIBTOOL=	yes
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
 MAN1=		htsserver.1 httrack.1 webhttrack.1
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|>&6,|>\&6|g; s|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|>&6,|>\&6|g ; \
+		 s|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/www/httrack/distinfo b/www/httrack/distinfo
index f84430d33e97..00e2d359280d 100644
--- a/www/httrack/distinfo
+++ b/www/httrack/distinfo
@@ -1,2 +1,2 @@
-MD5 (httrack-3.30.tar.gz) = 85114a9189f960c05d19d701f97a4c1a
-SIZE (httrack-3.30.tar.gz) = 1358225
+MD5 (httrack-3.31.tar.gz) = 85114a9189f960c05d19d701f97a4c1a
+SIZE (httrack-3.31.tar.gz) = 1358225
diff --git a/www/httrack/files/patch-ltmain.sh b/www/httrack/files/patch-ltmain.sh
new file mode 100644
index 000000000000..09e79425b74c
--- /dev/null
+++ b/www/httrack/files/patch-ltmain.sh
@@ -0,0 +1,15 @@
+--- ltmain.sh.orig	Sat Oct 11 16:14:42 2003
++++ ltmain.sh	Sat Mar 13 21:56:33 2004
+@@ -4318,10 +4318,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/www/httrack/pkg-plist b/www/httrack/pkg-plist
index 4eaf7ea5aa44..ea7a7957856b 100644
--- a/www/httrack/pkg-plist
+++ b/www/httrack/pkg-plist
@@ -12,11 +12,10 @@ include/httrack/htssystem.h
 include/httrack/htswrap.h
 include/httrack/httrack-library.h
 lib/libhttrack.a
-lib/libhttrack.la
 lib/libhttrack.so
 lib/libhttrack.so.1
-share/applications/WebHTTrack.desktop
 share/applications/WebHTTrack-Websites.desktop
+share/applications/WebHTTrack.desktop
 share/doc/httrack/history.txt
 share/doc/httrack/html/abuse.html
 share/doc/httrack/html/addurl.html
@@ -32,8 +31,8 @@ share/doc/httrack/html/history.txt
 share/doc/httrack/html/httrack.man.html
 share/doc/httrack/html/images/bg_rings.gif
 share/doc/httrack/html/images/header_title_4.gif
-share/doc/httrack/html/images/screenshot_01b.jpg
 share/doc/httrack/html/images/screenshot_01.jpg
+share/doc/httrack/html/images/screenshot_01b.jpg
 share/doc/httrack/html/img/addurl1.gif
 share/doc/httrack/html/img/addurl2.gif
 share/doc/httrack/html/img/addurl3.gif
@@ -54,6 +53,7 @@ share/doc/httrack/html/img/snap9.gif
 share/doc/httrack/html/img/snap9_a.gif
 share/doc/httrack/html/img/snap9_b.gif
 share/doc/httrack/html/img/snap9_c.gif
+share/doc/httrack/html/img/snap9_d.gif
 share/doc/httrack/html/img/snap9_d2.gif
 share/doc/httrack/html/img/snap9_d3.gif
 share/doc/httrack/html/img/snap9_d4.gif
@@ -61,12 +61,11 @@ share/doc/httrack/html/img/snap9_d5.gif
 share/doc/httrack/html/img/snap9_d6.gif
 share/doc/httrack/html/img/snap9_d7.gif
 share/doc/httrack/html/img/snap9_d8.gif
-share/doc/httrack/html/img/snap9_d.gif
 share/doc/httrack/html/img/snap9_e.gif
 share/doc/httrack/html/img/snap9_f.gif
+share/doc/httrack/html/img/snap9_g.gif
 share/doc/httrack/html/img/snap9_g2.gif
 share/doc/httrack/html/img/snap9_g3.gif
-share/doc/httrack/html/img/snap9_g.gif
 share/doc/httrack/html/img/snap9_h.gif
 share/doc/httrack/html/img/snap9_i.gif
 share/doc/httrack/html/img/snap9_j.gif
@@ -89,11 +88,11 @@ share/doc/httrack/html/server/images/bg_rings.gif
 share/doc/httrack/html/server/images/fade.gif
 share/doc/httrack/html/server/images/header_title_4.gif
 share/doc/httrack/html/server/index.html
+share/doc/httrack/html/server/option1.html
 share/doc/httrack/html/server/option10.html
 share/doc/httrack/html/server/option11.html
-share/doc/httrack/html/server/option1.html
-share/doc/httrack/html/server/option2b.html
 share/doc/httrack/html/server/option2.html
+share/doc/httrack/html/server/option2b.html
 share/doc/httrack/html/server/option3.html
 share/doc/httrack/html/server/option4.html
 share/doc/httrack/html/server/option5.html
@@ -107,15 +106,16 @@ share/doc/httrack/html/server/step3.html
 share/doc/httrack/html/server/step4.html
 share/doc/httrack/html/shelldoc.html
 share/doc/httrack/html/start.html
+share/doc/httrack/html/step.html
 share/doc/httrack/html/step1.html
 share/doc/httrack/html/step2.html
 share/doc/httrack/html/step3.html
 share/doc/httrack/html/step4.html
 share/doc/httrack/html/step5.html
 share/doc/httrack/html/step9.html
+share/doc/httrack/html/step9_opt1.html
 share/doc/httrack/html/step9_opt10.html
 share/doc/httrack/html/step9_opt11.html
-share/doc/httrack/html/step9_opt1.html
 share/doc/httrack/html/step9_opt2.html
 share/doc/httrack/html/step9_opt3.html
 share/doc/httrack/html/step9_opt4.html
@@ -124,21 +124,18 @@ share/doc/httrack/html/step9_opt6.html
 share/doc/httrack/html/step9_opt7.html
 share/doc/httrack/html/step9_opt8.html
 share/doc/httrack/html/step9_opt9.html
-share/doc/httrack/html/step.html
 share/doc/httrack/httrack-doc.html
 share/httrack/icons/webhttrack.xpm
-share/httrack/lang.def
-share/httrack/lang.indexes
 share/httrack/lang/Castellano.txt
 share/httrack/lang/Cesky.txt
+share/httrack/lang/Chinese-BIG5.txt
+share/httrack/lang/Chinese-Simplified.txt
 share/httrack/lang/Dansk.txt
 share/httrack/lang/Deutsch.txt
 share/httrack/lang/Eesti.txt
 share/httrack/lang/English.txt
 share/httrack/lang/Francais.txt
 share/httrack/lang/Greek.txt
-share/httrack/lang/Chinese-BIG5.txt
-share/httrack/lang/Chinese-Simplified.txt
 share/httrack/lang/Italiano.txt
 share/httrack/lang/Japanese.txt
 share/httrack/lang/Macedonian.txt
@@ -146,8 +143,8 @@ share/httrack/lang/Magyar.txt
 share/httrack/lang/Nederlands.txt
 share/httrack/lang/Norsk.txt
 share/httrack/lang/Polski.txt
-share/httrack/lang/Portugues.txt
 share/httrack/lang/Portugues-Brasil.txt
+share/httrack/lang/Portugues.txt
 share/httrack/lang/Romanian.txt
 share/httrack/lang/Russian.txt
 share/httrack/lang/Slovak.txt
@@ -155,6 +152,8 @@ share/httrack/lang/Slovenian.txt
 share/httrack/lang/Svenska.txt
 share/httrack/lang/Turkish.txt
 share/httrack/lang/Ukrainian.txt
+share/httrack/lang.def
+share/httrack/lang.indexes
 share/httrack/libtest/callbacks-example.c
 share/httrack/libtest/example.c
 share/httrack/libtest/example.dsp
@@ -182,3 +181,5 @@ share/pixmaps/httrack.xpm
 @dirrm share/doc/httrack/html
 @dirrm share/doc/httrack
 @dirrm include/httrack
+@unexec rmdir %D/share/pixmaps 2>/dev/null || true
+@unexec rmdir %D/share/applications 2>/dev/null || true