Upgrade to 3.10.

5 files changed, 42 insertions, 12 deletions

diff --git a/www/httrack/Makefile b/www/httrack/Makefile
index 312b5e419377..0ca7a253fdd6 100644
--- a/www/httrack/Makefile
+++ b/www/httrack/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	httrack
-PORTVERSION=	3.05
+PORTVERSION=	3.10
 CATEGORIES=	www
 MASTER_SITES=	http://www.httrack.com/
 
@@ -16,8 +16,12 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/src
 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	PREFIX=${PREFIX} BINPATH=${PREFIX}/bin
+INSTALLS_SHLIB=	yes
 .if defined(NOPORTDOCS)
 INSTALL_TARGET=	bininstall
 .endif
 
+post-install:
+	${LN} -sf libhttrack.so.1 ${PREFIX}/lib/libhttrack.so
+
 .include <bsd.port.mk>
diff --git a/www/httrack/distinfo b/www/httrack/distinfo
index a07ab9ce2c0c..dc40a93ac976 100644
--- a/www/httrack/distinfo
+++ b/www/httrack/distinfo
@@ -1 +1 @@
-MD5 (httrack-3.05.tar.gz) = d1f7da0e66a41ef53bd4cf1f93fe0eb2
+MD5 (httrack-3.10.tar.gz) = 69faaa7a68ac5406d8840b6d45b056a3
diff --git a/www/httrack/files/patch-aa b/www/httrack/files/patch-aa
index 89df93d3fa44..fe94ebaa0444 100644
--- a/www/httrack/files/patch-aa
+++ b/www/httrack/files/patch-aa
@@ -1,16 +1,16 @@
---- configure.orig	Wed May  9 21:02:23 2001
-+++ configure	Sun Jun 17 10:37:56 2001
-@@ -247,11 +247,11 @@
+--- 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/'"
  fi
  if test "$THREADS" = 1; then
--	SEDEXEC="$SEDEXEC | sed -e \"s/__CFLAGS__/$OTYPE $WTYPE -D_REENTRANT/g\""
+-	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'"
  else
  	SEDEXEC="$SEDEXEC | sed -e 's/__DEFINEPTH__/HTS_DO_NOT_USE_PTHREAD/'"
--	SEDEXEC="$SEDEXEC | sed -e \"s/__CFLAGS__/$OTYPE $WTYPE/g\""
+-	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'"
  fi
- if test "$SOLSOCK" = 1; then
+ if test "$ZLIB" = 1; then
diff --git a/www/httrack/files/patch-ab b/www/httrack/files/patch-ab
index 27a07a8996cd..eb78ef60fc93 100644
--- a/www/httrack/files/patch-ab
+++ b/www/httrack/files/patch-ab
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Thu May 17 08:26:28 2001
-+++ Makefile.in	Sun Jun 17 10:52:24 2001
+--- Makefile.in.orig	Sun Oct 21 16:12:26 2001
++++ Makefile.in	Fri Dec 21 17:58:09 2001
 @@ -22,7 +22,6 @@
  ### Makefile commands
  SHELL     = /bin/sh
@@ -7,8 +7,25 @@
 -CC        = gcc 
  CFLAGS    = __CFLAGS__
  # threads
- LFLAGS    = __LFLAGS__ __LFLAGS2__
-@@ -344,13 +343,13 @@
+ LFLAGS    = __LFLAGS__ __LFLAGS2__ __LFLAGS3__
+@@ -48,7 +47,7 @@
+ MAINBIN = httrack.c
+ 
+ BOUTPUT     = httrack
+-BOUTPUTSO   = libhttrack.so
++BOUTPUTSO   = libhttrack.so.1
+ DOCS      = ../HelpHtml ../httrack ../httrack-doc.html ../COPYING ../INSTALL ../README ../*.txt
+ HTSSYSTEM = htssystem.h
+ BINPATH   = __BINPATH__
+@@ -341,6 +340,7 @@
+ 
+ build_binso : $(SOBINARIES)
+ 	$(CC) $(CFLAGS) -shared -Wl,-soname,libhttrack.so.1 -o $(BOUTPUTSO) $(SOBINARIES) -lc $(LFLAGS)
++	/bin/ln -sf $(BOUTPUTSO) libhttrack.so
+ 	$(CC) -L. -lhttrack $(MAINBIN) -o $(BOUTPUT)
+ 	chmod +x $(BOUTPUT)
+ 
+@@ -371,13 +371,13 @@
  
  # Install docs
  docinstall :
diff --git a/www/httrack/pkg-plist b/www/httrack/pkg-plist
index 4a4ed90a00dc..8ee2bb90e90a 100644
--- a/www/httrack/pkg-plist
+++ b/www/httrack/pkg-plist
@@ -1,4 +1,6 @@
 bin/httrack
+lib/libhttrack.so
+lib/libhttrack.so.1
 %%PORTDOCS%%share/doc/httrack/COPYING
 %%PORTDOCS%%share/doc/httrack/HelpHtml/abuse.html
 %%PORTDOCS%%share/doc/httrack/HelpHtml/addurl.html
@@ -76,8 +78,15 @@ bin/httrack
 %%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%%@dirrm share/doc/httrack/HelpHtml/div
 %%PORTDOCS%%@dirrm share/doc/httrack/HelpHtml
+%%PORTDOCS%%@dirrm share/doc/httrack/httrack
 %%PORTDOCS%%@dirrm share/doc/httrack