Upgrade to 3.20RC6E (3.20.b.6)

PR:		ports/40405

5 files changed, 49 insertions, 42 deletions

diff --git a/www/httrack/Makefile b/www/httrack/Makefile
index 040717160c4a..a86cb224a59a 100644
--- a/www/httrack/Makefile
+++ b/www/httrack/Makefile
@@ -6,16 +6,17 @@
 #
 
 PORTNAME=	httrack
-PORTVERSION=	3.16.2
+PORTVERSION=	3.20.b.6
 CATEGORIES=	www
 MASTER_SITES=	http://www.httrack.com/
-DISTNAME=	httrack-3.16-2
+DISTNAME=	httrack-3.20RC6E
 
 MAINTAINER=	dirk@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/httrack-3.16/src
+WRKSRC=		${WRKDIR}/httrack-3.20/src
 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--nouseftime
 CONFIGURE_ENV=	PREFIX=${PREFIX} BINPATH=${PREFIX}/bin
 INSTALLS_SHLIB=	yes
 .if defined(NOPORTDOCS)
diff --git a/www/httrack/distinfo b/www/httrack/distinfo
index 86a562299430..c5596adddb2a 100644
--- a/www/httrack/distinfo
+++ b/www/httrack/distinfo
@@ -1 +1 @@
-MD5 (httrack-3.16-2.tar.gz) = fa6d7f8aec1faf2b18168edb81abf43c
+MD5 (httrack-3.20RC6E.tar.gz) = ee199d51eb1dc9f60ebc7e73cd6b9896
diff --git a/www/httrack/files/patch-aa b/www/httrack/files/patch-aa
index fe94ebaa0444..07185e28a236 100644
--- a/www/httrack/files/patch-aa
+++ b/www/httrack/files/patch-aa
@@ -1,16 +1,17 @@
---- configure.orig	Sun Dec 16 21:16:05 2001
-+++ configure	Fri Dec 21 17:25:40 2001
-@@ -365,11 +365,11 @@
-     SEDEXEC="$SEDEXEC | sed -e 's/__DEFINEINA__/HTS_DO_NOT_REDEFINE_in_addr_t/'"
+--- configure.orig	Sun May 26 09:11:27 2002
++++ configure	Sat Aug  3 17:37:49 2002
+@@ -443,12 +443,12 @@
  fi
  if test "$THREADS" = 1; then
--	SEDEXEC="$SEDEXEC | sed -e \"s/__CFLAGS__/$SOTYPE $OTYPE $WTYPE -D_REENTRANT/g\""
-+	SEDEXEC="$SEDEXEC | sed -e \"s/__CFLAGS__/$CFLAGS -D_REENTRANT/g\""
- 	SEDEXEC="$SEDEXEC | sed -e 's/__LFLAGS__/-lpthread/g'"
+ THTYPE="-D_REENTRANT"
+-LPTHTYPE="-lpthread"
++LPTHTYPE="-pthread"
  else
- 	SEDEXEC="$SEDEXEC | sed -e 's/__DEFINEPTH__/HTS_DO_NOT_USE_PTHREAD/'"
--	SEDEXEC="$SEDEXEC | sed -e \"s/__CFLAGS__/$SOTYPE $OTYPE $WTYPE/g\""
-+	SEDEXEC="$SEDEXEC | sed -e \"s/__CFLAGS__/$CFLAGS/g\""
- 	SEDEXEC="$SEDEXEC | sed -e 's/__LFLAGS__//g'"
+ THTYPE=
+ LPTHTYPE=
  fi
- if test "$ZLIB" = 1; then
+-SEDEXEC="$SEDEXEC | sed -e \"s/__CFLAGS__/$SOTYPE $OTYPE $WTYPE $IPTYPE $THTYPE/g\""
++SEDEXEC="$SEDEXEC | sed -e \"s/__CFLAGS__/$CFLAGS $SOTYPE $IPTYPE $THTYPE/g\""
+ SEDEXEC="$SEDEXEC | sed -e \"s/__LFLAGS__/$LPTHTYPE $SSTYPE $LIPTYPE/g\""
+ if test ! "$THREADS" = 1; then
+ 	SEDEXEC="$SEDEXEC | sed -e 's/__DEFINEPTH__/HTS_DO_NOT_USE_PTHREAD/'"
diff --git a/www/httrack/files/patch-ab b/www/httrack/files/patch-ab
index 9dec3a74b33c..2acec06f6b24 100644
--- a/www/httrack/files/patch-ab
+++ b/www/httrack/files/patch-ab
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Sun Oct 21 16:12:26 2001
-+++ Makefile.in	Fri Dec 21 18:15:25 2001
+--- Makefile.in.orig	Thu Jul 11 07:15:47 2002
++++ Makefile.in	Sat Aug  3 17:53:46 2002
 @@ -22,7 +22,6 @@
  ### Makefile commands
  SHELL     = /bin/sh
@@ -8,32 +8,32 @@
  CFLAGS    = __CFLAGS__
  # threads
  LFLAGS    = __LFLAGS__ __LFLAGS2__ __LFLAGS3__
-@@ -48,7 +47,7 @@
+@@ -50,7 +49,7 @@
  MAINBIN = httrack.c
  
  BOUTPUT     = httrack
 -BOUTPUTSO   = libhttrack.so
 +BOUTPUTSO   = libhttrack.so.1
- DOCS      = ../HelpHtml ../httrack ../httrack-doc.html ../COPYING ../INSTALL ../README ../*.txt
+ DOCS      = ../HelpHtml ../templates ../httrack-doc.html ../COPYING ../INSTALL ../README ../*.txt
  HTSSYSTEM = htssystem.h
  BINPATH   = __BINPATH__
-@@ -341,6 +340,7 @@
+@@ -346,7 +345,8 @@
+ 	chmod a+rx $(BOUTPUT)
  
  build_binso : $(SOBINARIES)
- 	$(CC) $(CFLAGS) -shared -Wl,-soname,libhttrack.so.1 -o $(BOUTPUTSO) $(SOBINARIES) -lc $(LFLAGS)
+-	$(CC) $(CFLAGS) -shared -Wl,-x,-soname,$(BOUTPUTSO) -o $(BOUTPUTSO) $(SOBINARIES) -lc $(LFLAGS)
++	$(CC) $(CFLAGS) -shared -Wl,-x,-soname,$(BOUTPUTSO) -o $(BOUTPUTSO) $(SOBINARIES) $(LFLAGS)
 +	/bin/ln -sf $(BOUTPUTSO) libhttrack.so
  	$(CC) -L. -lhttrack $(MAINBIN) -o $(BOUTPUT)
- 	chmod +x $(BOUTPUT)
+ 	chmod a+rx $(BOUTPUT)
  
-@@ -371,13 +371,13 @@
+@@ -377,12 +377,12 @@
  
  # Install docs
  docinstall :
--	mkdir -p "$(PREFIX)/doc/httrack"
--	chmod 755 "$(PREFIX)/doc/httrack"
+-	mkdir -p "$(PREFIX)/doc/httrack" && chmod a+rx "$(PREFIX)/doc/httrack"
 -	cp -fR $(DOCS) "$(PREFIX)/doc/httrack/"
-+	mkdir -p "$(PREFIX)/share/doc/httrack"
-+	chmod 755 "$(PREFIX)/share/doc/httrack"
++	mkdir -p "$(PREFIX)/share/doc/httrack" && chmod a+rx "$(PREFIX)/share/doc/httrack"
 +	cp -fR $(DOCS) "$(PREFIX)/share/doc/httrack/"
  
  # Uninstall docs
@@ -43,11 +43,12 @@
  
  # Install binaries and conf files
  bininstall :
-@@ -392,7 +392,6 @@
- 	@echo "Copying $(BOUTPUTSO) to $(LIBPATH)/.."
- 	chmod 755 $(BOUTPUTSO)
+@@ -399,7 +399,7 @@
+ 	test ! -d  "$(LIBPATH)" && (mkdir -p "$(LIBPATH)" && chmod a+rx "$(LIBPATH)") || true
  	cp -f $(BOUTPUTSO) $(LIBPATH)/
--	ldconfig
+ 	chmod a+rx $(LIBPATH)/$(BOUTPUTSO)
+-	ln -sf "$(BOUTPUTSO)" "$(PREFIX)/lib/$(BOUTPUTSO).1"
++	ln -sf "$(BOUTPUTSO)" "$(PREFIX)/lib/libhttrack.so"
+ 
  
  # Uninstall binaries
- binremove :
diff --git a/www/httrack/pkg-plist b/www/httrack/pkg-plist
index d5bfd51822f3..393c7b9e1d55 100644
--- a/www/httrack/pkg-plist
+++ b/www/httrack/pkg-plist
@@ -12,6 +12,10 @@ lib/libhttrack.so.1
 %%PORTDOCS%%share/doc/httrack/HelpHtml/faq.html
 %%PORTDOCS%%share/doc/httrack/HelpHtml/fcguide.html
 %%PORTDOCS%%share/doc/httrack/HelpHtml/filters.html
+%%PORTDOCS%%share/doc/httrack/HelpHtml/httrack.css
+%%PORTDOCS%%share/doc/httrack/HelpHtml/images/bg_rings.gif
+%%PORTDOCS%%share/doc/httrack/HelpHtml/images/header_title_4.gif
+%%PORTDOCS%%share/doc/httrack/HelpHtml/images/screenshot_01.jpg
 %%PORTDOCS%%share/doc/httrack/HelpHtml/img/addurl1.gif
 %%PORTDOCS%%share/doc/httrack/HelpHtml/img/addurl2.gif
 %%PORTDOCS%%share/doc/httrack/HelpHtml/img/addurl3.gif
@@ -79,15 +83,15 @@ lib/libhttrack.so.1
 %%PORTDOCS%%share/doc/httrack/greetings.txt
 %%PORTDOCS%%share/doc/httrack/history.txt
 %%PORTDOCS%%share/doc/httrack/httrack-doc.html
-%%PORTDOCS%%share/doc/httrack/httrack/index-body.html
-%%PORTDOCS%%share/doc/httrack/httrack/index-footer.html
-%%PORTDOCS%%share/doc/httrack/httrack/index-header.html
-%%PORTDOCS%%share/doc/httrack/httrack/topindex-body.html
-%%PORTDOCS%%share/doc/httrack/httrack/topindex-footer.html
-%%PORTDOCS%%share/doc/httrack/httrack/topindex-header.html
 %%PORTDOCS%%share/doc/httrack/license.txt
-%%PORTDOCS%%@dirrm share/doc/httrack/HelpHtml/img
+%%PORTDOCS%%share/doc/httrack/templates/index-body.html
+%%PORTDOCS%%share/doc/httrack/templates/index-footer.html
+%%PORTDOCS%%share/doc/httrack/templates/index-header.html
+%%PORTDOCS%%share/doc/httrack/templates/topindex-body.html
+%%PORTDOCS%%share/doc/httrack/templates/topindex-footer.html
+%%PORTDOCS%%share/doc/httrack/templates/topindex-header.html
 %%PORTDOCS%%@dirrm share/doc/httrack/HelpHtml/div
+%%PORTDOCS%%@dirrm share/doc/httrack/HelpHtml/images
+%%PORTDOCS%%@dirrm share/doc/httrack/HelpHtml/img
 %%PORTDOCS%%@dirrm share/doc/httrack/HelpHtml
-%%PORTDOCS%%@dirrm share/doc/httrack/httrack
-%%PORTDOCS%%@dirrm share/doc/httrack
+%%PORTDOCS%%@dirrm share/doc/httrack/templates