[91989] trunk/dports/net/httrack

[ryandesign at macports.org]

Revision: 91989
          https://trac.macports.org/changeset/91989
Author:   ryandesign at macports.org
Date:     2012-04-14 23:13:59 -0700 (Sat, 14 Apr 2012)
Log Message:
-----------
httrack: update to 3.45.3 (#33062); fix generation of temporary file name in webhttrack, and some path issues (#27361); fix livecheck

Modified Paths:
--------------
    trunk/dports/net/httrack/Portfile

Added Paths:
-----------
    trunk/dports/net/httrack/files/
    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	2012-04-15 05:30:35 UTC (rev 91988)
+++ trunk/dports/net/httrack/Portfile	2012-04-15 06:13:59 UTC (rev 91989)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                httrack
-version             3.44.1
+version             3.45.3
 categories          net
 platforms           darwin
 maintainers         ross-williams.net:ross
@@ -17,11 +17,20 @@
 homepage            http://www.httrack.com/
 master_sites        http://download.httrack.com/
 
-checksums           sha1    5bdbc0b294b25929e52bc932e076c9e349a18fa9 \
-                    rmd160  04644ba0300b92392a255965d1c7191fe4f186fc
+checksums           rmd160  4a6c3fb3df765f62b111f001ebfb8acdcc0782f1 \
+                    sha256  8b5e8267f485b237fcf23f6c3939ef8a6eab10356eab7310dcf8234eacb2db8b
 
 depends_lib         port:zlib
 
+patchfiles          patch-src-htsweb.c.diff \
+                    patch-src-webhttrack.diff
+
+post-patch {
+    reinplace "s|@PREFIX@|${prefix}|g" \
+        ${worksrcpath}/src/htsweb.c \
+        ${worksrcpath}/src/webhttrack
+}
+
 configure.args      --with-zlib=${prefix}
 
 # Makefile fails during parallel builds
@@ -32,3 +41,7 @@
     file delete ${destroot}${prefix}/share/pixmaps/httrack.xpm
     file delete -force ${destroot}${prefix}/share/applications/
 }
+
+livecheck.type      regex
+livecheck.url       [lindex ${master_sites} 0]
+livecheck.regex     ${name}-(\[0-9.\]+)${extract.suffix}

Added: trunk/dports/net/httrack/files/patch-src-htsweb.c.diff
===================================================================
--- trunk/dports/net/httrack/files/patch-src-htsweb.c.diff	                        (rev 0)
+++ trunk/dports/net/httrack/files/patch-src-htsweb.c.diff	2012-04-15 06:13:59 UTC (rev 91989)
@@ -0,0 +1,11 @@
+--- src/htsweb.c.orig	2012-01-29 09:25:58.000000000 -0600
++++ src/htsweb.c	2012-01-30 09:59:50.000000000 -0600
+@@ -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, "example: %s /usr/share/httrack/\n", argv[0]);
++    fprintf(stderr, "example: %s @PREFIX@/share/httrack/\n", argv[0]);
+     return 1;
+   }
+ 

Added: trunk/dports/net/httrack/files/patch-src-webhttrack.diff
===================================================================
--- trunk/dports/net/httrack/files/patch-src-webhttrack.diff	                        (rev 0)
+++ trunk/dports/net/httrack/files/patch-src-webhttrack.diff	2012-04-15 06:13:59 UTC (rev 91989)
@@ -0,0 +1,24 @@
+--- 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
+ 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"
++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="@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/20120414/a612ce4b/attachment.html>