From 1e8585c42883754b0628e11acf8547f6b7ac8b21 Mon Sep 17 00:00:00 2001 From: Martin Wilke Date: Tue, 1 May 2007 23:17:21 +0000 Subject: - Update to 3.41.2 PR: 112316 Submitted by: KATO Tsuguru --- www/httrack/Makefile | 14 +- www/httrack/distinfo | 6 +- www/httrack/files/patch-src-htsglobal.h | 13 -- www/httrack/files/patch-src-mmsrip-mms.h | 11 -- www/httrack/files/patch-src-proxy-store.h | 11 -- www/httrack/pkg-plist | 265 ++++++++++++++++-------------- 6 files changed, 150 insertions(+), 170 deletions(-) delete mode 100644 www/httrack/files/patch-src-htsglobal.h delete mode 100644 www/httrack/files/patch-src-mmsrip-mms.h delete mode 100644 www/httrack/files/patch-src-proxy-store.h diff --git a/www/httrack/Makefile b/www/httrack/Makefile index 6fda5978324b..851cd9700eb0 100644 --- a/www/httrack/Makefile +++ b/www/httrack/Makefile @@ -6,22 +6,20 @@ # PORTNAME= httrack -PORTVERSION= 3.40 -PORTREVISION= 2 +PORTVERSION= 3.41.2 CATEGORIES= www MASTER_SITES= http://www.httrack.com/ -DISTNAME= ${PORTNAME}-${PORTVERSION}-${PORTREVISION} +DISTNAME= ${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E} MAINTAINER= ports@FreeBSD.org COMMENT= Easy-to-use offline browser utility and website copier -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}.`expr ${PORTREVISION} + 1` +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}0 -USE_AUTOTOOLS= libtool:15 +USE_GNOME= gnometarget USE_GMAKE= yes -GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -INSTALLS_SHLIB= yes +USE_AUTOTOOLS= libtool:15 +USE_LDCONFIG= yes MAN1= htsserver.1 httrack.1 proxytrack.1 webhttrack.1 diff --git a/www/httrack/distinfo b/www/httrack/distinfo index a6937fe7b4cb..2c69035190f4 100644 --- a/www/httrack/distinfo +++ b/www/httrack/distinfo @@ -1,3 +1,3 @@ -MD5 (httrack-3.40-2.tar.gz) = 0364c56ab1e5289935d4d3482d1b82cb -SHA256 (httrack-3.40-2.tar.gz) = 09a0bd0cbba7880e272136174c8261308868586f3d77479d06180c0c62079832 -SIZE (httrack-3.40-2.tar.gz) = 1626291 +MD5 (httrack-3.41-2.tar.gz) = ddf5401b8fba171e0d9a61c247467f82 +SHA256 (httrack-3.41-2.tar.gz) = 0da2d3402691b91e26d33f8302a87571842809b7b8acfc04667be4d8d1690aba +SIZE (httrack-3.41-2.tar.gz) = 1645360 diff --git a/www/httrack/files/patch-src-htsglobal.h b/www/httrack/files/patch-src-htsglobal.h deleted file mode 100644 index f606ae30ef7c..000000000000 --- a/www/httrack/files/patch-src-htsglobal.h +++ /dev/null @@ -1,13 +0,0 @@ ---- src/htsglobal.h Sat Jun 4 15:09:01 2005 -+++ src/htsglobal.h.orig Thu Oct 13 11:02:26 2005 -@@ -173,10 +173,8 @@ - #else - - #define HTS_WIN 0 --#ifdef __linux - #undef HTS_PLATFORM - #define HTS_PLATFORM 3 --#endif - #endif - - // don't spare memory usage by default diff --git a/www/httrack/files/patch-src-mmsrip-mms.h b/www/httrack/files/patch-src-mmsrip-mms.h deleted file mode 100644 index 44e81023490c..000000000000 --- a/www/httrack/files/patch-src-mmsrip-mms.h +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 - #else - #include diff --git a/www/httrack/files/patch-src-proxy-store.h b/www/httrack/files/patch-src-proxy-store.h deleted file mode 100644 index 572865f59a07..000000000000 --- a/www/httrack/files/patch-src-proxy-store.h +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 -+ - /* Proxy */ - - typedef struct _PT_Index _PT_Index; diff --git a/www/httrack/pkg-plist b/www/httrack/pkg-plist index 67bb03777d44..09b3cfa4deb7 100644 --- a/www/httrack/pkg-plist +++ b/www/httrack/pkg-plist @@ -6,16 +6,20 @@ include/httrack/config.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/htsopt.h -include/httrack/htssystem.h include/httrack/htswrap.h include/httrack/httrack-library.h lib/httrack/libbaselinks.a lib/httrack/libbaselinks.la lib/httrack/libbaselinks.so lib/httrack/libbaselinks.so.1 +lib/httrack/libchangecontent.a +lib/httrack/libchangecontent.la +lib/httrack/libchangecontent.so +lib/httrack/libchangecontent.so.1 lib/httrack/libcontentfilter.a lib/httrack/libcontentfilter.la lib/httrack/libcontentfilter.so @@ -40,127 +44,138 @@ lib/httrack/liblistlinks.a lib/httrack/liblistlinks.la lib/httrack/liblistlinks.so lib/httrack/liblistlinks.so.1 +lib/httrack/liblog.a +lib/httrack/liblog.la +lib/httrack/liblog.so +lib/httrack/liblog.so.1 +lib/httrack/libsimple.a +lib/httrack/libsimple.la +lib/httrack/libsimple.so +lib/httrack/libsimple.so.1 +lib/libhtsjava.a +lib/libhtsjava.la +lib/libhtsjava.so +lib/libhtsjava.so.2 lib/libhttrack.a lib/libhttrack.la lib/libhttrack.so -lib/libhttrack.so.1 +lib/libhttrack.so.2 share/applications/WebHTTrack-Websites.desktop share/applications/WebHTTrack.desktop %%DOCSDIR%%/history.txt -%%DOCSDIR%%/html/abuse.html -%%DOCSDIR%%/html/addurl.html -%%DOCSDIR%%/html/cache.html -%%DOCSDIR%%/html/cmddoc.html -%%DOCSDIR%%/html/contact.html -%%DOCSDIR%%/html/dev.html -%%DOCSDIR%%/html/div/search.sh -%%DOCSDIR%%/html/faq.html -%%DOCSDIR%%/html/fcguide.html -%%DOCSDIR%%/html/filters.html -%%DOCSDIR%%/html/greetings.txt -%%DOCSDIR%%/html/history.txt -%%DOCSDIR%%/html/httrack.man.html -%%DOCSDIR%%/html/images/bg_rings.gif -%%DOCSDIR%%/html/images/header_title_4.gif -%%DOCSDIR%%/html/images/screenshot_01.jpg -%%DOCSDIR%%/html/images/screenshot_01b.jpg -%%DOCSDIR%%/html/img/addurl1.gif -%%DOCSDIR%%/html/img/addurl2.gif -%%DOCSDIR%%/html/img/addurl3.gif -%%DOCSDIR%%/html/img/addurl4.gif -%%DOCSDIR%%/html/img/addurl5.gif -%%DOCSDIR%%/html/img/backblue.gif -%%DOCSDIR%%/html/img/fade.gif -%%DOCSDIR%%/html/img/httrack.gif -%%DOCSDIR%%/html/img/snap1_a.gif -%%DOCSDIR%%/html/img/snap1_b.gif -%%DOCSDIR%%/html/img/snap1_c.gif -%%DOCSDIR%%/html/img/snap2_a.gif -%%DOCSDIR%%/html/img/snap2_b.gif -%%DOCSDIR%%/html/img/snap3_a.gif -%%DOCSDIR%%/html/img/snap4_a.gif -%%DOCSDIR%%/html/img/snap5_a.gif -%%DOCSDIR%%/html/img/snap9.gif -%%DOCSDIR%%/html/img/snap9_a.gif -%%DOCSDIR%%/html/img/snap9_b.gif -%%DOCSDIR%%/html/img/snap9_c.gif -%%DOCSDIR%%/html/img/snap9_d.gif -%%DOCSDIR%%/html/img/snap9_d2.gif -%%DOCSDIR%%/html/img/snap9_d3.gif -%%DOCSDIR%%/html/img/snap9_d4.gif -%%DOCSDIR%%/html/img/snap9_d5.gif -%%DOCSDIR%%/html/img/snap9_d6.gif -%%DOCSDIR%%/html/img/snap9_d7.gif -%%DOCSDIR%%/html/img/snap9_d8.gif -%%DOCSDIR%%/html/img/snap9_e.gif -%%DOCSDIR%%/html/img/snap9_f.gif -%%DOCSDIR%%/html/img/snap9_g.gif -%%DOCSDIR%%/html/img/snap9_g2.gif -%%DOCSDIR%%/html/img/snap9_g3.gif -%%DOCSDIR%%/html/img/snap9_h.gif -%%DOCSDIR%%/html/img/snap9_i.gif -%%DOCSDIR%%/html/img/snap9_j.gif -%%DOCSDIR%%/html/img/snap9_k.gif -%%DOCSDIR%%/html/index.html -%%DOCSDIR%%/html/library.html -%%DOCSDIR%%/html/license.txt -%%DOCSDIR%%/html/options.html -%%DOCSDIR%%/html/overview.html -%%DOCSDIR%%/html/plug.html -%%DOCSDIR%%/html/scripting.html -%%DOCSDIR%%/html/server/about.html -%%DOCSDIR%%/html/server/addurl.html -%%DOCSDIR%%/html/server/error.html -%%DOCSDIR%%/html/server/exit.html -%%DOCSDIR%%/html/server/file.html -%%DOCSDIR%%/html/server/finished.html -%%DOCSDIR%%/html/server/help.html -%%DOCSDIR%%/html/server/images/bg_rings.gif -%%DOCSDIR%%/html/server/images/fade.gif -%%DOCSDIR%%/html/server/images/header_title_4.gif -%%DOCSDIR%%/html/server/index.html -%%DOCSDIR%%/html/server/option1.html -%%DOCSDIR%%/html/server/option10.html -%%DOCSDIR%%/html/server/option11.html -%%DOCSDIR%%/html/server/option2.html -%%DOCSDIR%%/html/server/option2b.html -%%DOCSDIR%%/html/server/option3.html -%%DOCSDIR%%/html/server/option4.html -%%DOCSDIR%%/html/server/option5.html -%%DOCSDIR%%/html/server/option6.html -%%DOCSDIR%%/html/server/option7.html -%%DOCSDIR%%/html/server/option8.html -%%DOCSDIR%%/html/server/option9.html -%%DOCSDIR%%/html/server/refresh.html -%%DOCSDIR%%/html/server/sfx/finished.wav -%%DOCSDIR%%/html/server/step2.html -%%DOCSDIR%%/html/server/step3.html -%%DOCSDIR%%/html/server/step4.html -%%DOCSDIR%%/html/shelldoc.html -%%DOCSDIR%%/html/start.html -%%DOCSDIR%%/html/step.html -%%DOCSDIR%%/html/step1.html -%%DOCSDIR%%/html/step2.html -%%DOCSDIR%%/html/step3.html -%%DOCSDIR%%/html/step4.html -%%DOCSDIR%%/html/step5.html -%%DOCSDIR%%/html/step9.html -%%DOCSDIR%%/html/step9_opt1.html -%%DOCSDIR%%/html/step9_opt10.html -%%DOCSDIR%%/html/step9_opt11.html -%%DOCSDIR%%/html/step9_opt2.html -%%DOCSDIR%%/html/step9_opt3.html -%%DOCSDIR%%/html/step9_opt4.html -%%DOCSDIR%%/html/step9_opt5.html -%%DOCSDIR%%/html/step9_opt6.html -%%DOCSDIR%%/html/step9_opt7.html -%%DOCSDIR%%/html/step9_opt8.html -%%DOCSDIR%%/html/step9_opt9.html +%%DOCSDIR%%/html %%DOCSDIR%%/httrack-doc.html -%%DATADIR%%/html +%%DATADIR%%/html/abuse.html +%%DATADIR%%/html/addurl.html +%%DATADIR%%/html/cache.html +%%DATADIR%%/html/cmddoc.html +%%DATADIR%%/html/contact.html +%%DATADIR%%/html/dev.html +%%DATADIR%%/html/div/search.sh +%%DATADIR%%/html/faq.html +%%DATADIR%%/html/fcguide.html +%%DATADIR%%/html/filters.html +%%DATADIR%%/html/greetings.txt +%%DATADIR%%/html/history.txt +%%DATADIR%%/html/httrack.man.html +%%DATADIR%%/html/images/bg_rings.gif +%%DATADIR%%/html/images/header_title_4.gif +%%DATADIR%%/html/images/screenshot_01.jpg +%%DATADIR%%/html/images/screenshot_01b.jpg +%%DATADIR%%/html/img/addurl1.gif +%%DATADIR%%/html/img/addurl2.gif +%%DATADIR%%/html/img/addurl3.gif +%%DATADIR%%/html/img/addurl4.gif +%%DATADIR%%/html/img/addurl5.gif +%%DATADIR%%/html/img/backblue.gif +%%DATADIR%%/html/img/fade.gif +%%DATADIR%%/html/img/httrack.gif +%%DATADIR%%/html/img/snap1_a.gif +%%DATADIR%%/html/img/snap1_b.gif +%%DATADIR%%/html/img/snap1_c.gif +%%DATADIR%%/html/img/snap2_a.gif +%%DATADIR%%/html/img/snap2_b.gif +%%DATADIR%%/html/img/snap3_a.gif +%%DATADIR%%/html/img/snap4_a.gif +%%DATADIR%%/html/img/snap5_a.gif +%%DATADIR%%/html/img/snap9.gif +%%DATADIR%%/html/img/snap9_a.gif +%%DATADIR%%/html/img/snap9_b.gif +%%DATADIR%%/html/img/snap9_c.gif +%%DATADIR%%/html/img/snap9_d.gif +%%DATADIR%%/html/img/snap9_d2.gif +%%DATADIR%%/html/img/snap9_d3.gif +%%DATADIR%%/html/img/snap9_d4.gif +%%DATADIR%%/html/img/snap9_d5.gif +%%DATADIR%%/html/img/snap9_d6.gif +%%DATADIR%%/html/img/snap9_d7.gif +%%DATADIR%%/html/img/snap9_d8.gif +%%DATADIR%%/html/img/snap9_e.gif +%%DATADIR%%/html/img/snap9_f.gif +%%DATADIR%%/html/img/snap9_g.gif +%%DATADIR%%/html/img/snap9_g2.gif +%%DATADIR%%/html/img/snap9_g3.gif +%%DATADIR%%/html/img/snap9_h.gif +%%DATADIR%%/html/img/snap9_i.gif +%%DATADIR%%/html/img/snap9_j.gif +%%DATADIR%%/html/img/snap9_k.gif +%%DATADIR%%/html/index.html +%%DATADIR%%/html/library.html +%%DATADIR%%/html/license.txt +%%DATADIR%%/html/options.html +%%DATADIR%%/html/overview.html +%%DATADIR%%/html/plug.html +%%DATADIR%%/html/plug_330.html +%%DATADIR%%/html/scripting.html +%%DATADIR%%/html/server/about.html +%%DATADIR%%/html/server/addurl.html +%%DATADIR%%/html/server/error.html +%%DATADIR%%/html/server/exit.html +%%DATADIR%%/html/server/file.html +%%DATADIR%%/html/server/finished.html +%%DATADIR%%/html/server/help.html +%%DATADIR%%/html/server/images/bg_rings.gif +%%DATADIR%%/html/server/images/fade.gif +%%DATADIR%%/html/server/images/header_title_4.gif +%%DATADIR%%/html/server/index.html +%%DATADIR%%/html/server/option1.html +%%DATADIR%%/html/server/option10.html +%%DATADIR%%/html/server/option11.html +%%DATADIR%%/html/server/option2.html +%%DATADIR%%/html/server/option2b.html +%%DATADIR%%/html/server/option3.html +%%DATADIR%%/html/server/option4.html +%%DATADIR%%/html/server/option5.html +%%DATADIR%%/html/server/option6.html +%%DATADIR%%/html/server/option7.html +%%DATADIR%%/html/server/option8.html +%%DATADIR%%/html/server/option9.html +%%DATADIR%%/html/server/refresh.html +%%DATADIR%%/html/server/sfx/finished.wav +%%DATADIR%%/html/server/step2.html +%%DATADIR%%/html/server/step3.html +%%DATADIR%%/html/server/step4.html +%%DATADIR%%/html/shelldoc.html +%%DATADIR%%/html/start.html +%%DATADIR%%/html/step.html +%%DATADIR%%/html/step1.html +%%DATADIR%%/html/step2.html +%%DATADIR%%/html/step3.html +%%DATADIR%%/html/step4.html +%%DATADIR%%/html/step5.html +%%DATADIR%%/html/step9.html +%%DATADIR%%/html/step9_opt1.html +%%DATADIR%%/html/step9_opt10.html +%%DATADIR%%/html/step9_opt11.html +%%DATADIR%%/html/step9_opt2.html +%%DATADIR%%/html/step9_opt3.html +%%DATADIR%%/html/step9_opt4.html +%%DATADIR%%/html/step9_opt5.html +%%DATADIR%%/html/step9_opt6.html +%%DATADIR%%/html/step9_opt7.html +%%DATADIR%%/html/step9_opt8.html +%%DATADIR%%/html/step9_opt9.html %%DATADIR%%/icons/webhttrack.xpm -%%DATADIR%%/lang.def -%%DATADIR%%/lang.indexes %%DATADIR%%/lang/Bulgarian.txt %%DATADIR%%/lang/Castellano.txt %%DATADIR%%/lang/Cesky.txt @@ -189,18 +204,20 @@ 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-changecontent.c %%DATADIR%%/libtest/callbacks-example-contentfilter.c %%DATADIR%%/libtest/callbacks-example-displayheader.c %%DATADIR%%/libtest/callbacks-example-filename.c %%DATADIR%%/libtest/callbacks-example-filename2.c %%DATADIR%%/libtest/callbacks-example-filenameiisbug.c %%DATADIR%%/libtest/callbacks-example-listlinks.c +%%DATADIR%%/libtest/callbacks-example-log.c +%%DATADIR%%/libtest/callbacks-example-simple.c %%DATADIR%%/libtest/example.c -%%DATADIR%%/libtest/example.dsp -%%DATADIR%%/libtest/example.dsw %%DATADIR%%/libtest/example.h -%%DATADIR%%/libtest/htssystem.h %%DATADIR%%/libtest/readme.txt %%DATADIR%%/templates/index-body.html %%DATADIR%%/templates/index-footer.html @@ -214,14 +231,14 @@ share/pixmaps/httrack.xpm @dirrm %%DATADIR%%/libtest @dirrm %%DATADIR%%/lang @dirrm %%DATADIR%%/icons +@dirrm %%DATADIR%%/html/server/sfx +@dirrm %%DATADIR%%/html/server/images +@dirrm %%DATADIR%%/html/server +@dirrm %%DATADIR%%/html/img +@dirrm %%DATADIR%%/html/images +@dirrm %%DATADIR%%/html/div +@dirrm %%DATADIR%%/html @dirrm %%DATADIR%% -@dirrm %%DOCSDIR%%/html/server/sfx -@dirrm %%DOCSDIR%%/html/server/images -@dirrm %%DOCSDIR%%/html/server -@dirrm %%DOCSDIR%%/html/img -@dirrm %%DOCSDIR%%/html/images -@dirrm %%DOCSDIR%%/html/div -@dirrm %%DOCSDIR%%/html @dirrm %%DOCSDIR%% @dirrm lib/httrack @dirrm include/httrack -- cgit v1.2.3