[109613] trunk/dports/net/httrack

[cal at macports.org]

Revision: 109613
          https://trac.macports.org/changeset/109613
Author:   cal at macports.org
Date:     2013-08-18 09:59:52 -0700 (Sun, 18 Aug 2013)
Log Message:
-----------
httrack: update to 3.47.23, closes #40172, maintainer

Modified Paths:
--------------
    trunk/dports/net/httrack/Portfile
    trunk/dports/net/httrack/files/patch-src-htsweb.c.diff
    trunk/dports/net/httrack/files/patch-src-webhttrack.diff

Modified: trunk/dports/net/httrack/Portfile
===================================================================
--- trunk/dports/net/httrack/Portfile	2013-08-18 16:33:11 UTC (rev 109612)
+++ trunk/dports/net/httrack/Portfile	2013-08-18 16:59:52 UTC (rev 109613)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                httrack
-version             3.45.3
+version             3.47.23
 categories          net
 platforms           darwin
 maintainers         ross-williams.net:ross
@@ -18,10 +18,12 @@
 homepage            http://www.httrack.com/
 master_sites        http://mirror.httrack.com/
 
-checksums           rmd160  4a6c3fb3df765f62b111f001ebfb8acdcc0782f1 \
-                    sha256  8b5e8267f485b237fcf23f6c3939ef8a6eab10356eab7310dcf8234eacb2db8b
+checksums           rmd160  ac3b76f84db3f934de0ce7de1e2393ab47746d61 \
+                    sha256  b5fc4c7da7ab98d689f17709b3a42e59909bcb7c5174b99c1fb28441d7f578dd
 
-depends_lib         port:zlib
+depends_lib         port:zlib \
+                    port:openssl \
+                    port:libiconv
 
 patchfiles          patch-src-htsweb.c.diff \
                     patch-src-webhttrack.diff

Modified: trunk/dports/net/httrack/files/patch-src-htsweb.c.diff
===================================================================
--- trunk/dports/net/httrack/files/patch-src-htsweb.c.diff	2013-08-18 16:33:11 UTC (rev 109612)
+++ trunk/dports/net/httrack/files/patch-src-htsweb.c.diff	2013-08-18 16:59:52 UTC (rev 109613)
@@ -1,9 +1,9 @@
---- src/htsweb.c.orig	2012-01-29 09:25:58.000000000 -0600
-+++ src/htsweb.c	2012-01-30 09:59:50.000000000 -0600
+--- src/htsweb.c.orig	2013-08-18 12:25:48.000000000 -0400
++++ src/htsweb.c	2013-08-18 12:26:05.000000000 -0400
 @@ -123,7 +123,7 @@
-   if (argc < 2 || (argc % 2) != 0) {
-     fprintf(stderr, "** Warning: use the webhttrack frontend if available\n");
-     fprintf(stderr, "usage: %s [--port <port>] <path-to-html-root-dir> [key value [key value]..]\n", argv[0]);
+     fprintf(stderr,
+             "usage: %s [--port <port>] <path-to-html-root-dir> [key value [key value]..]\n",
+             argv[0]);
 -    fprintf(stderr, "example: %s /usr/share/httrack/\n", argv[0]);
 +    fprintf(stderr, "example: %s @PREFIX@/share/httrack/\n", argv[0]);
      return 1;

Modified: trunk/dports/net/httrack/files/patch-src-webhttrack.diff
===================================================================
--- trunk/dports/net/httrack/files/patch-src-webhttrack.diff	2013-08-18 16:33:11 UTC (rev 109612)
+++ trunk/dports/net/httrack/files/patch-src-webhttrack.diff	2013-08-18 16:59:52 UTC (rev 109613)
@@ -1,24 +1,14 @@
---- src/webhttrack.orig	2012-01-28 02:38:23.000000000 -0600
-+++ src/webhttrack	2012-01-30 10:00:51.000000000 -0600
-@@ -16,9 +16,9 @@
- # the browser to exit
+--- src/webhttrack.orig	2013-06-28 13:45:59.000000000 -0400
++++ src/webhttrack	2013-08-18 12:31:40.000000000 -0400
+@@ -17,9 +17,9 @@
  BROWSEREXE="/usr/bin/open -W"
  fi
--SRCHPATH="/usr/local/bin /usr/share/bin /usr/bin /usr/lib/httrack /usr/local/lib/httrack /usr/local/share/httrack /opt/local/bin /sw/bin ${HOME}/usr/bin ${HOME}/bin"
+ BINWD=`dirname "$0"`
+-SRCHPATH="$BINWD /usr/local/bin /usr/share/bin /usr/bin /usr/lib/httrack /usr/local/lib/httrack /usr/local/share/httrack /opt/local/bin /sw/bin ${HOME}/usr/bin ${HOME}/bin"
 +SRCHPATH="@PREFIX@/bin"
  SRCHPATH="$SRCHPATH "`echo $PATH | tr ":" " "`
--SRCHDISTPATH="/usr/share /usr/local /usr /local /usr/local/share ${HOME}/usr ${HOME}/usr/share /opt/local/share /sw ${HOME}/usr/local ${HOME}/usr/share"
+-SRCHDISTPATH="$BINWD/../share $BINWD/.. /usr/share /usr/local /usr /local /usr/local/share ${HOME}/usr ${HOME}/usr/share /opt/local/share /sw ${HOME}/usr/local ${HOME}/usr/share"
 +SRCHDISTPATH="@PREFIX@/share"
  
  ###
  # And now some famous cuisine
-@@ -161,8 +161,7 @@
- fi
- 
- # Create a temporary filename
--TMPSRVFILE="/tmp/.webhttrack.$$.`head -c16 /dev/random | md5sum | cut -f1 -d' '`"
-->${TMPSRVFILE} || ! log "cound not create the temporary file ${TMPSRVFILE}" || exit 1
-+TMPSRVFILE="$(mktemp ${TMPDIR:-/tmp}/.webhttrack.XXXXXXXX)" || ! log "cound not create the temporary file ${TMPSRVFILE}" || exit 1
- # Launch htsserver binary and setup the server
- (${BINPATH}/htsserver "${DISTPATH}/" path "${HOME}/websites" lang "${LANGN}" $@; echo SRVURL=error) > ${TMPSRVFILE}&
- # Find the generated SRVURL
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130818/40ad6682/attachment-0001.html>