From 0e83088887fb3ee63a2a0d711bce90361092018c Mon Sep 17 00:00:00 2001 From: Sunpoet Po-Chuan Hsieh Date: Sat, 12 Apr 2014 21:47:31 +0000 Subject: [PATCH] - Update to 3.48.1 - Remove outdated PORTSCOUT - Use PORTDATA and PORTDOCS - Simplify Makefile Changes: http://www.httrack.com/page/4/en/index.html https://code.google.com/p/httrack/source/list https://code.google.com/p/httrack/source/browse/trunk/history.txt --- www/httrack/Makefile | 12 +-- www/httrack/distinfo | 4 +- www/httrack/pkg-plist | 231 ------------------------------------------ 3 files changed, 5 insertions(+), 242 deletions(-) diff --git a/www/httrack/Makefile b/www/httrack/Makefile index b0b6694727bb..d4978e8eae41 100644 --- a/www/httrack/Makefile +++ b/www/httrack/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= httrack -PORTVERSION= 3.47.27 +PORTVERSION= 3.48.1 CATEGORIES= www MASTER_SITES= http://download.httrack.com/ \ http://mirror.httrack.com/historical/ \ @@ -16,8 +16,6 @@ LICENSE_COMB= dual OPTIONS_DEFINE= DOCS -PORTSCOUT= skipv:3.47.99 - CONFIGURE_ARGS= --docdir="${DOCSDIR}" CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -25,19 +23,15 @@ USE_AUTOTOOLS= libtool USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} USES= gmake iconv -.include +PORTDATA= * +PORTDOCS= * post-patch: @${REINPLACE_CMD} -e '/DEFAULT_CFLAGS=/ s|-O -g3 ||g' ${WRKSRC}/configure @${REINPLACE_CMD} -e '/ install-data-hook/d' ${WRKSRC}/html/Makefile.in @${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|' ${WRKSRC}/html/server/div/WebHTTrack* -.if ! ${PORT_OPTIONS:MDOCS} - @${REINPLACE_CMD} -e '/^SUBDIRS = / s| html||' ${WRKSRC}/Makefile.in -.endif post-install: -.if ${PORT_OPTIONS:MDOCS} ${INSTALL_DATA} ${WRKSRC}/html/httrack.css ${STAGEDIR}${DOCSDIR}/httrack.css -.endif .include diff --git a/www/httrack/distinfo b/www/httrack/distinfo index 4ab3b390c8b6..a86f251c668b 100644 --- a/www/httrack/distinfo +++ b/www/httrack/distinfo @@ -1,2 +1,2 @@ -SHA256 (httrack-3.47.27.tar.gz) = 7c96bfb63dab9e55efea89d0408e3743115e524c688545b94f9b60dc78d2f9e1 -SIZE (httrack-3.47.27.tar.gz) = 1778104 +SHA256 (httrack-3.48.1.tar.gz) = 065169f40778e533aacf7491d72c8a24b7fd6af9dd767ba9df54c55609d6d416 +SIZE (httrack-3.48.1.tar.gz) = 1788965 diff --git a/www/httrack/pkg-plist b/www/httrack/pkg-plist index 4a14fd77e0db..99a06c8ade0c 100644 --- a/www/httrack/pkg-plist +++ b/www/httrack/pkg-plist @@ -16,46 +16,6 @@ man/man1/htsserver.1.gz man/man1/httrack.1.gz man/man1/proxytrack.1.gz man/man1/webhttrack.1.gz -%%PORTDATA%%lib/httrack/libbaselinks.a -%%PORTDATA%%lib/httrack/libbaselinks.la -%%PORTDATA%%lib/httrack/libbaselinks.so -%%PORTDATA%%lib/httrack/libbaselinks.so.1 -%%PORTDATA%%lib/httrack/libchangecontent.a -%%PORTDATA%%lib/httrack/libchangecontent.la -%%PORTDATA%%lib/httrack/libchangecontent.so -%%PORTDATA%%lib/httrack/libchangecontent.so.1 -%%PORTDATA%%lib/httrack/libcontentfilter.a -%%PORTDATA%%lib/httrack/libcontentfilter.la -%%PORTDATA%%lib/httrack/libcontentfilter.so -%%PORTDATA%%lib/httrack/libcontentfilter.so.1 -%%PORTDATA%%lib/httrack/libdisplayheader.a -%%PORTDATA%%lib/httrack/libdisplayheader.la -%%PORTDATA%%lib/httrack/libdisplayheader.so -%%PORTDATA%%lib/httrack/libdisplayheader.so.1 -%%PORTDATA%%lib/httrack/libfilename.a -%%PORTDATA%%lib/httrack/libfilename.la -%%PORTDATA%%lib/httrack/libfilename.so -%%PORTDATA%%lib/httrack/libfilename.so.1 -%%PORTDATA%%lib/httrack/libfilename2.a -%%PORTDATA%%lib/httrack/libfilename2.la -%%PORTDATA%%lib/httrack/libfilename2.so -%%PORTDATA%%lib/httrack/libfilename2.so.1 -%%PORTDATA%%lib/httrack/libfilenameiisbug.a -%%PORTDATA%%lib/httrack/libfilenameiisbug.la -%%PORTDATA%%lib/httrack/libfilenameiisbug.so -%%PORTDATA%%lib/httrack/libfilenameiisbug.so.1 -%%PORTDATA%%lib/httrack/liblistlinks.a -%%PORTDATA%%lib/httrack/liblistlinks.la -%%PORTDATA%%lib/httrack/liblistlinks.so -%%PORTDATA%%lib/httrack/liblistlinks.so.1 -%%PORTDATA%%lib/httrack/liblog.a -%%PORTDATA%%lib/httrack/liblog.la -%%PORTDATA%%lib/httrack/liblog.so -%%PORTDATA%%lib/httrack/liblog.so.1 -%%PORTDATA%%lib/httrack/libsimple.a -%%PORTDATA%%lib/httrack/libsimple.la -%%PORTDATA%%lib/httrack/libsimple.so -%%PORTDATA%%lib/httrack/libsimple.so.1 lib/libhtsjava.a lib/libhtsjava.la lib/libhtsjava.so @@ -64,195 +24,4 @@ lib/libhttrack.a lib/libhttrack.la lib/libhttrack.so lib/libhttrack.so.2 -%%PORTDOCS%%share/applications/WebHTTrack-Websites.desktop -%%PORTDOCS%%share/applications/WebHTTrack.desktop -%%PORTDOCS%%%%DOCSDIR%%/abuse.html -%%PORTDOCS%%%%DOCSDIR%%/addurl.html -%%PORTDOCS%%%%DOCSDIR%%/cache.html -%%PORTDOCS%%%%DOCSDIR%%/cmddoc.html -%%PORTDOCS%%%%DOCSDIR%%/contact.html -%%PORTDOCS%%%%DOCSDIR%%/dev.html -%%PORTDOCS%%%%DOCSDIR%%/div/search.sh -%%PORTDOCS%%%%DOCSDIR%%/faq.html -%%PORTDOCS%%%%DOCSDIR%%/fcguide.html -%%PORTDOCS%%%%DOCSDIR%%/filters.html -%%PORTDOCS%%%%DOCSDIR%%/greetings.txt -%%PORTDOCS%%%%DOCSDIR%%/history.txt -%%PORTDOCS%%%%DOCSDIR%%/httrack.css -%%PORTDOCS%%%%DOCSDIR%%/httrack.man.html -%%PORTDOCS%%%%DOCSDIR%%/images/bg_rings.gif -%%PORTDOCS%%%%DOCSDIR%%/images/header_title_4.gif -%%PORTDOCS%%%%DOCSDIR%%/images/screenshot_01.jpg -%%PORTDOCS%%%%DOCSDIR%%/images/screenshot_01b.jpg -%%PORTDOCS%%%%DOCSDIR%%/img/addurl1.gif -%%PORTDOCS%%%%DOCSDIR%%/img/addurl2.gif -%%PORTDOCS%%%%DOCSDIR%%/img/addurl3.gif -%%PORTDOCS%%%%DOCSDIR%%/img/addurl4.gif -%%PORTDOCS%%%%DOCSDIR%%/img/addurl5.gif -%%PORTDOCS%%%%DOCSDIR%%/img/backblue.gif -%%PORTDOCS%%%%DOCSDIR%%/img/fade.gif -%%PORTDOCS%%%%DOCSDIR%%/img/httrack.gif -%%PORTDOCS%%%%DOCSDIR%%/img/snap1_a.gif -%%PORTDOCS%%%%DOCSDIR%%/img/snap1_b.gif -%%PORTDOCS%%%%DOCSDIR%%/img/snap1_c.gif -%%PORTDOCS%%%%DOCSDIR%%/img/snap2_a.gif -%%PORTDOCS%%%%DOCSDIR%%/img/snap2_b.gif -%%PORTDOCS%%%%DOCSDIR%%/img/snap3_a.gif -%%PORTDOCS%%%%DOCSDIR%%/img/snap4_a.gif -%%PORTDOCS%%%%DOCSDIR%%/img/snap5_a.gif -%%PORTDOCS%%%%DOCSDIR%%/img/snap9.gif -%%PORTDOCS%%%%DOCSDIR%%/img/snap9_a.gif -%%PORTDOCS%%%%DOCSDIR%%/img/snap9_b.gif -%%PORTDOCS%%%%DOCSDIR%%/img/snap9_c.gif -%%PORTDOCS%%%%DOCSDIR%%/img/snap9_d.gif -%%PORTDOCS%%%%DOCSDIR%%/img/snap9_d2.gif -%%PORTDOCS%%%%DOCSDIR%%/img/snap9_d3.gif -%%PORTDOCS%%%%DOCSDIR%%/img/snap9_d4.gif -%%PORTDOCS%%%%DOCSDIR%%/img/snap9_d5.gif -%%PORTDOCS%%%%DOCSDIR%%/img/snap9_d6.gif -%%PORTDOCS%%%%DOCSDIR%%/img/snap9_d7.gif -%%PORTDOCS%%%%DOCSDIR%%/img/snap9_d8.gif -%%PORTDOCS%%%%DOCSDIR%%/img/snap9_e.gif -%%PORTDOCS%%%%DOCSDIR%%/img/snap9_f.gif -%%PORTDOCS%%%%DOCSDIR%%/img/snap9_g.gif -%%PORTDOCS%%%%DOCSDIR%%/img/snap9_g2.gif -%%PORTDOCS%%%%DOCSDIR%%/img/snap9_g3.gif -%%PORTDOCS%%%%DOCSDIR%%/img/snap9_h.gif -%%PORTDOCS%%%%DOCSDIR%%/img/snap9_i.gif -%%PORTDOCS%%%%DOCSDIR%%/img/snap9_j.gif -%%PORTDOCS%%%%DOCSDIR%%/img/snap9_k.gif -%%PORTDOCS%%%%DOCSDIR%%/index.html -%%PORTDOCS%%%%DOCSDIR%%/library.html -%%PORTDOCS%%%%DOCSDIR%%/license.txt -%%PORTDOCS%%%%DOCSDIR%%/options.html -%%PORTDOCS%%%%DOCSDIR%%/overview.html -%%PORTDOCS%%%%DOCSDIR%%/plug.html -%%PORTDOCS%%%%DOCSDIR%%/plug_330.html -%%PORTDOCS%%%%DOCSDIR%%/scripting.html -%%PORTDOCS%%%%DOCSDIR%%/server/about.html -%%PORTDOCS%%%%DOCSDIR%%/server/addurl.html -%%PORTDOCS%%%%DOCSDIR%%/server/error.html -%%PORTDOCS%%%%DOCSDIR%%/server/exit.html -%%PORTDOCS%%%%DOCSDIR%%/server/file.html -%%PORTDOCS%%%%DOCSDIR%%/server/finished.html -%%PORTDOCS%%%%DOCSDIR%%/server/help.html -%%PORTDOCS%%%%DOCSDIR%%/server/images/bg_rings.gif -%%PORTDOCS%%%%DOCSDIR%%/server/images/fade.gif -%%PORTDOCS%%%%DOCSDIR%%/server/images/header_title_4.gif -%%PORTDOCS%%%%DOCSDIR%%/server/index.html -%%PORTDOCS%%%%DOCSDIR%%/server/option1.html -%%PORTDOCS%%%%DOCSDIR%%/server/option10.html -%%PORTDOCS%%%%DOCSDIR%%/server/option11.html -%%PORTDOCS%%%%DOCSDIR%%/server/option2.html -%%PORTDOCS%%%%DOCSDIR%%/server/option2b.html -%%PORTDOCS%%%%DOCSDIR%%/server/option3.html -%%PORTDOCS%%%%DOCSDIR%%/server/option4.html -%%PORTDOCS%%%%DOCSDIR%%/server/option5.html -%%PORTDOCS%%%%DOCSDIR%%/server/option6.html -%%PORTDOCS%%%%DOCSDIR%%/server/option7.html -%%PORTDOCS%%%%DOCSDIR%%/server/option8.html -%%PORTDOCS%%%%DOCSDIR%%/server/option9.html -%%PORTDOCS%%%%DOCSDIR%%/server/refresh.html -%%PORTDOCS%%%%DOCSDIR%%/server/sfx/finished.wav -%%PORTDOCS%%%%DOCSDIR%%/server/sfx/silent.wav -%%PORTDOCS%%%%DOCSDIR%%/server/step2.html -%%PORTDOCS%%%%DOCSDIR%%/server/step3.html -%%PORTDOCS%%%%DOCSDIR%%/server/step4.html -%%PORTDOCS%%%%DOCSDIR%%/shelldoc.html -%%PORTDOCS%%%%DOCSDIR%%/start.html -%%PORTDOCS%%%%DOCSDIR%%/step.html -%%PORTDOCS%%%%DOCSDIR%%/step1.html -%%PORTDOCS%%%%DOCSDIR%%/step2.html -%%PORTDOCS%%%%DOCSDIR%%/step3.html -%%PORTDOCS%%%%DOCSDIR%%/step4.html -%%PORTDOCS%%%%DOCSDIR%%/step5.html -%%PORTDOCS%%%%DOCSDIR%%/step9.html -%%PORTDOCS%%%%DOCSDIR%%/step9_opt1.html -%%PORTDOCS%%%%DOCSDIR%%/step9_opt10.html -%%PORTDOCS%%%%DOCSDIR%%/step9_opt11.html -%%PORTDOCS%%%%DOCSDIR%%/step9_opt2.html -%%PORTDOCS%%%%DOCSDIR%%/step9_opt3.html -%%PORTDOCS%%%%DOCSDIR%%/step9_opt4.html -%%PORTDOCS%%%%DOCSDIR%%/step9_opt5.html -%%PORTDOCS%%%%DOCSDIR%%/step9_opt6.html -%%PORTDOCS%%%%DOCSDIR%%/step9_opt7.html -%%PORTDOCS%%%%DOCSDIR%%/step9_opt8.html -%%PORTDOCS%%%%DOCSDIR%%/step9_opt9.html -%%PORTDOCS%%%%DOCSDIR%%/httrack-doc.html -%%PORTDATA%%%%DATADIR%%/lang.def -%%PORTDATA%%%%DATADIR%%/lang.indexes -%%PORTDATA%%%%DATADIR%%/lang/Bulgarian.txt -%%PORTDATA%%%%DATADIR%%/lang/Castellano.txt -%%PORTDATA%%%%DATADIR%%/lang/Cesky.txt -%%PORTDATA%%%%DATADIR%%/lang/Chinese-BIG5.txt -%%PORTDATA%%%%DATADIR%%/lang/Chinese-Simplified.txt -%%PORTDATA%%%%DATADIR%%/lang/Dansk.txt -%%PORTDATA%%%%DATADIR%%/lang/Deutsch.txt -%%PORTDATA%%%%DATADIR%%/lang/Eesti.txt -%%PORTDATA%%%%DATADIR%%/lang/English.txt -%%PORTDATA%%%%DATADIR%%/lang/Finnish.txt -%%PORTDATA%%%%DATADIR%%/lang/Francais.txt -%%PORTDATA%%%%DATADIR%%/lang/Greek.txt -%%PORTDATA%%%%DATADIR%%/lang/Italiano.txt -%%PORTDATA%%%%DATADIR%%/lang/Japanese.txt -%%PORTDATA%%%%DATADIR%%/lang/Macedonian.txt -%%PORTDATA%%%%DATADIR%%/lang/Magyar.txt -%%PORTDATA%%%%DATADIR%%/lang/Nederlands.txt -%%PORTDATA%%%%DATADIR%%/lang/Norsk.txt -%%PORTDATA%%%%DATADIR%%/lang/Polski.txt -%%PORTDATA%%%%DATADIR%%/lang/Portugues-Brasil.txt -%%PORTDATA%%%%DATADIR%%/lang/Portugues.txt -%%PORTDATA%%%%DATADIR%%/lang/Romanian.txt -%%PORTDATA%%%%DATADIR%%/lang/Russian.txt -%%PORTDATA%%%%DATADIR%%/lang/Slovak.txt -%%PORTDATA%%%%DATADIR%%/lang/Slovenian.txt -%%PORTDATA%%%%DATADIR%%/lang/Svenska.txt -%%PORTDATA%%%%DATADIR%%/lang/Turkish.txt -%%PORTDATA%%%%DATADIR%%/lang/Ukrainian.txt -%%PORTDATA%%%%DATADIR%%/libtest/callbacks-example-baselinks.c -%%PORTDATA%%%%DATADIR%%/libtest/callbacks-example-changecontent.c -%%PORTDATA%%%%DATADIR%%/libtest/callbacks-example-contentfilter.c -%%PORTDATA%%%%DATADIR%%/libtest/callbacks-example-displayheader.c -%%PORTDATA%%%%DATADIR%%/libtest/callbacks-example-filename.c -%%PORTDATA%%%%DATADIR%%/libtest/callbacks-example-filename2.c -%%PORTDATA%%%%DATADIR%%/libtest/callbacks-example-filenameiisbug.c -%%PORTDATA%%%%DATADIR%%/libtest/callbacks-example-listlinks.c -%%PORTDATA%%%%DATADIR%%/libtest/callbacks-example-log.c -%%PORTDATA%%%%DATADIR%%/libtest/callbacks-example-simple.c -%%PORTDATA%%%%DATADIR%%/libtest/example.c -%%PORTDATA%%%%DATADIR%%/libtest/example.h -%%PORTDATA%%%%DATADIR%%/libtest/readme.txt -%%PORTDATA%%%%DATADIR%%/templates/index-body.html -%%PORTDATA%%%%DATADIR%%/templates/index-footer.html -%%PORTDATA%%%%DATADIR%%/templates/index-header.html -%%PORTDATA%%%%DATADIR%%/templates/topindex-body.html -%%PORTDATA%%%%DATADIR%%/templates/topindex-bodycat.html -%%PORTDATA%%%%DATADIR%%/templates/topindex-footer.html -%%PORTDATA%%%%DATADIR%%/templates/topindex-header.html -%%PORTDOCS%%share/icons/hicolor/16x16/apps/httrack.png -%%PORTDOCS%%share/icons/hicolor/32x32/apps/httrack.png -%%PORTDOCS%%share/icons/hicolor/48x48/apps/httrack.png -%%PORTDOCS%%share/pixmaps/httrack16x16.xpm -%%PORTDOCS%%share/pixmaps/httrack32x32.xpm -%%PORTDOCS%%share/pixmaps/httrack48x48.xpm -%%PORTDOCS%%@dirrmtry share/icons/hicolor/48x48/apps -%%PORTDOCS%%@dirrmtry share/icons/hicolor/48x48 -%%PORTDOCS%%@dirrmtry share/icons/hicolor/32x32/apps -%%PORTDOCS%%@dirrmtry share/icons/hicolor/32x32 -%%PORTDOCS%%@dirrmtry share/icons/hicolor/16x16/apps -%%PORTDOCS%%@dirrmtry share/icons/hicolor/16x16 -%%PORTDOCS%%@dirrmtry share/icons/hicolor -%%PORTDOCS%%@dirrmtry share/icons -%%PORTDATA%%@dirrm %%DATADIR%%/templates -%%PORTDATA%%@dirrm %%DATADIR%%/libtest -%%PORTDATA%%@dirrm %%DATADIR%%/lang -%%PORTDATA%%@dirrm %%DATADIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%%/server/sfx -%%PORTDOCS%%@dirrm %%DOCSDIR%%/server/images -%%PORTDOCS%%@dirrm %%DOCSDIR%%/server -%%PORTDOCS%%@dirrm %%DOCSDIR%%/img -%%PORTDOCS%%@dirrm %%DOCSDIR%%/images -%%PORTDOCS%%@dirrm %%DOCSDIR%%/div -%%PORTDOCS%%@dirrm %%DOCSDIR%% -%%PORTDATA%%@dirrm lib/httrack @dirrm include/httrack