httrack: Update to 3.49.2

httrack/Makefile

@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.28 2013/07/09 14:10:18 noud4 Exp $
 #
 
-DISTNAME=	httrack-3.47.21
+DISTNAME=	httrack-3.49.2
 CATEGORIES=	www
 MASTER_SITES=	http://download.httrack.com/cserv.php3?File= \
 		http://mirror.httrack.com/historical/
@@ -30,5 +30,6 @@ SUBST_SED.path=		-e "s|/usr/share/httrack/|${PREFIX}/share/httrack/|"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"

httrack/PLIST

@@ -4,13 +4,17 @@ bin/httrack
 bin/proxytrack
 bin/webhttrack
 include/httrack/config.h
+include/httrack/htsarrays.h
 include/httrack/htsbasenet.h
 include/httrack/htsbauth.h
 include/httrack/htsconfig.h
 include/httrack/htsdefines.h
 include/httrack/htsglobal.h
 include/httrack/htsmodules.h
+include/httrack/htsnet.h
 include/httrack/htsopt.h
+include/httrack/htssafe.h
+include/httrack/htsstrings.h
 include/httrack/htswrap.h
 include/httrack/httrack-library.h
 lib/httrack/libbaselinks.la
@@ -117,12 +121,12 @@ share/doc/httrack/html/server/option6.html
 share/doc/httrack/html/server/option7.html
 share/doc/httrack/html/server/option8.html
 share/doc/httrack/html/server/option9.html
+share/doc/httrack/html/server/ping.js
 share/doc/httrack/html/server/refresh.html
-share/doc/httrack/html/server/sfx/finished.wav
-share/doc/httrack/html/server/sfx/silent.wav
 share/doc/httrack/html/server/step2.html
 share/doc/httrack/html/server/step3.html
 share/doc/httrack/html/server/step4.html
+share/doc/httrack/html/server/style.css
 share/doc/httrack/html/shelldoc.html
 share/doc/httrack/html/start.html
 share/doc/httrack/html/step.html
@@ -152,6 +156,7 @@ 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/Croatian.txt
 share/httrack/lang/Dansk.txt
 share/httrack/lang/Deutsch.txt
 share/httrack/lang/Eesti.txt
@@ -175,6 +180,7 @@ share/httrack/lang/Slovenian.txt
 share/httrack/lang/Svenska.txt
 share/httrack/lang/Turkish.txt
 share/httrack/lang/Ukrainian.txt
+share/httrack/lang/Uzbek.txt
 share/httrack/libtest/callbacks-example-baselinks.c
 share/httrack/libtest/callbacks-example-changecontent.c
 share/httrack/libtest/callbacks-example-contentfilter.c
@@ -185,8 +191,8 @@ share/httrack/libtest/callbacks-example-filenameiisbug.c
 share/httrack/libtest/callbacks-example-listlinks.c
 share/httrack/libtest/callbacks-example-log.c
 share/httrack/libtest/callbacks-example-simple.c
-share/httrack/libtest/example.c
-share/httrack/libtest/example.h
+share/httrack/libtest/example-main.c
+share/httrack/libtest/example-main.h
 share/httrack/libtest/readme.txt
 share/httrack/templates/index-body.html
 share/httrack/templates/index-footer.html

httrack/distinfo

@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.11 2013/07/09 14:18:12 noud4 Exp $
 
-SHA1 (httrack-3.47.21.tar.gz) = 2ba3da7784bcd67ff98ff09c419cfb700c97ba5b
-RMD160 (httrack-3.47.21.tar.gz) = 50438d75c1b9e52c2ec282f7381d3d00cec319e8
-Size (httrack-3.47.21.tar.gz) = 1777738 bytes
+SHA1 (httrack-3.49.2.tar.gz) = 982550bcb07f0dcbede2ad84f71dfb31bb742ab2
+RMD160 (httrack-3.49.2.tar.gz) = e1ce07330443a0f4db366d1355681319026eae05
+SHA512 (httrack-3.49.2.tar.gz) = 84a13a776b278533f7f0635ebd764387c3399b01c0644d8af9b46fc8112dc3c6e568c17969d4f6c2db32b5474344c39f86cf51957c09eb807ebe305a554ba5c8
+Size (httrack-3.49.2.tar.gz) = 1835116 bytes
 SHA1 (patch-html_Makefile.in) = 6c332ff784b40e50f3de432f5df6e43fcaa37650
-SHA1 (patch-src_webhttrack) = e9b19c122b710f36004432fae8ba810843526c36

httrack/patches/patch-src_webhttrack

@@ -1,20 +0,0 @@
-$NetBSD: patch-src_webhttrack,v 1.2 2013/07/09 14:18:12 noud4 Exp $
-
-difference between ps option on Linux or NetBSD.
-
---- src/webhttrack.orig	2013-07-09 13:19:58.000000000 +0000
-+++ src/webhttrack
-@@ -55,7 +55,12 @@ if ! test -n "${user_name}"; then
- user_name=`id -un`
- fi
- if test -n "${user_name}"; then
--ps -e -U "$user_name" | grep -E "(iceape|mozilla|netscape|firebird|firefox)" | grep -qv "grep -E"
-+if test "`uname -s`" == "NetBSD"; then
-+PSALL="-a"
-+else
-+PSALL="-e"
-+fi
-+ps ${PSALL} -U "$user_name" | grep -E "(iceape|mozilla|netscape|firebird|firefox|xulrunner)" | grep -qv "grep -E"
- else
- false
- fi