Update to 0.7.1, which also fixes the compilation problem on 5.x.

PR:		ports/71963
Submitted by:	maintainer
Approved by:	portmgr (linimon).

10 files changed, 22 insertions, 66 deletions

diff --git a/ftp/jigdo/Makefile b/ftp/jigdo/Makefile
index f7d18497aa76..06e672cd2d9d 100644
--- a/ftp/jigdo/Makefile
+++ b/ftp/jigdo/Makefile
@@ -6,18 +6,15 @@
 #
 
 PORTNAME=	jigdo
-PORTVERSION=	0.7.0
-PORTREVISION=	1
+PORTVERSION=	0.7.1
 CATEGORIES=	ftp
 MASTER_SITES=	http://atterer.net/jigdo/
 
 MAINTAINER=	bra@fsn.hu
 COMMENT=	A utility used to retrieve very large files over the Internet
 
-BUILD_DEPENDS=	libwww-config:${PORTSDIR}/www/libwww
-RUN_DEPENDS=	${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget
-
-BROKEN=		Does not compile
+BUILD_DEPENDS=	libwww-config:${PORTSDIR}/www/libwww \
+		${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget
 
 MAN1=		jigdo-file.1 jigdo-lite.1 jigdo-mirror.1
 
diff --git a/ftp/jigdo/distinfo b/ftp/jigdo/distinfo
index 97e3e0c2890a..b173cd24bf2c 100644
--- a/ftp/jigdo/distinfo
+++ b/ftp/jigdo/distinfo
@@ -1,2 +1,2 @@
-MD5 (jigdo-0.7.0.tar.bz2) = a1960f7b269c1842d2013eae0abfc3eb
-SIZE (jigdo-0.7.0.tar.bz2) = 530737
+MD5 (jigdo-0.7.1.tar.bz2) = aa9aa42923af90d09b6ff4a878b8d53a
+SIZE (jigdo-0.7.1.tar.bz2) = 599969
diff --git a/ftp/jigdo/files/patch-aa b/ftp/jigdo/files/patch-aa
deleted file mode 100644
index b057cf97e4cc..000000000000
--- a/ftp/jigdo/files/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
---- src.orig/mktemplate.cc
-+++ src/mktemplate.cc
-@@ -1,4 +1,4 @@
--/* $Id: mktemplate.cc,v 1.92 2003/04/27 15:57:21 richard Exp $ -*- C++ -*-
-+/* $Id: mktemplate.cc,v 1.93 2003/05/06 19:12:14 richard Exp $ -*- C++ -*-
-   __   _
-   |_) /|  Copyright (C) 2001-2002 Richard Atterer
-   | \/¯|  <richard at atterer.net>
-@@ -643,7 +643,7 @@
-     Paranoid(*data + len <= bufferLength);
-     rsum->addBack(buf + *data, len);
-     *data += len; off += len; *n -= len;
--    *rsumBack = modAdd(*rsumBack, len, bufferLength);
-+    *rsumBack = modAdd(*rsumBack, implicit_cast<size_t>(len), bufferLength);
-     Paranoid(off == nextEvent || off == nextAlignedOff);
- #   if DEBUG
-     for (unsigned i = 0; i < len; ++i) {
-
diff --git a/ftp/jigdo/pkg-plist b/ftp/jigdo/pkg-plist
index 03eaea63fb8e..c3ac2f2d036a 100644
--- a/ftp/jigdo/pkg-plist
+++ b/ftp/jigdo/pkg-plist
@@ -4,7 +4,6 @@ bin/jigdo-mirror
 %%SUB_GUI%%bin/jigdo
 share/jigdo/debian-mirrors.jigdo
 %%SUB_GUI%%share/jigdo/COPYING
-%%SUB_GUI%%man/man1/jigdo.1
 %%SUB_GUI%%share/jigdo/pixmaps/close.png
 %%SUB_GUI%%share/jigdo/pixmaps/jigdo-logo.png
 %%SUB_GUI%%share/jigdo/pixmaps/pause.png
@@ -13,4 +12,4 @@ share/jigdo/debian-mirrors.jigdo
 %%SUB_GUI%%share/jigdo/pixmaps/start.png
 %%SUB_GUI%%share/jigdo/pixmaps/stop.png
 %%SUB_GUI%%@dirrm share/jigdo/pixmaps
-@dirrm share/jigdo
\ No newline at end of file
+@dirrm share/jigdo
diff --git a/ftp/jigdo/scripts/configure.jigdo b/ftp/jigdo/scripts/configure.jigdo
index 4b5ea3c39fda..43bc6df6319e 100644
--- a/ftp/jigdo/scripts/configure.jigdo
+++ b/ftp/jigdo/scripts/configure.jigdo
@@ -10,7 +10,7 @@ tempfile=`mktemp -t checklist`
 if [ "${BATCH}" = "yes" ]; then
 	set \"DB3\"
 else
-	/usr/bin/dialog --title "Jigsaw Download configuration options" \
+	dialog --title "Jigsaw Download configuration options" \
 	--clear --checklist "\n\
 Please select desired options:" -1 -1 16 \
 GUI		"Graphical User Interface (experimental)" OFF \
@@ -47,19 +47,19 @@ while [ "$1" ]; do
 	case $1 in
 		\"GUI\")
 			echo "CONFIGURE_ARGS+= --with-gui"
-			echo "LIB_DEPENDS+= gtk-x11-2.0.200:\${PORTSDIR}/x11-toolkits/gtk20"
-			echo "MAN+= jigdo.1"
+			echo "LIB_DEPENDS+= gtk-x11-2.0:\${PORTSDIR}/x11-toolkits/gtk20"
+			echo "MAN1+= jigdo.1"
 			SUB_GUI=""
 			;;
 		\"DB3\")
 			echo "CONFIGURE_ARGS+= --with-libdb=-ldb3"
 			echo "CONFIGURE_ENV+= \
 			  CPPFLAGS=\"-I\${LOCALBASE}/include/db3\" \
-			  LIBS=\"-L\${LOCALBASE}/lib\" LDFLAGS=\"-ldb3\""
+			  LIBS=\"-L\${LOCALBASE}/lib\" LDFLAGS+=\"-ldb3\""
 			echo "LIB_DEPENDS= db3:\${PORTSDIR}/databases/db3"
 			;;
 		\"NLS\")
-			echo "CONFIGURE_ARGS+= --enable-nls=/usr/local/include"
+			echo "CONFIGURE_ARGS+= --enable-nls=${LOCALBASE}/include"
 			;;
 		*)
 			echo "Invalid option(s): $*" > /dev/stderr
diff --git a/net-p2p/jigdo/Makefile b/net-p2p/jigdo/Makefile
index f7d18497aa76..06e672cd2d9d 100644
--- a/net-p2p/jigdo/Makefile
+++ b/net-p2p/jigdo/Makefile
@@ -6,18 +6,15 @@
 #
 
 PORTNAME=	jigdo
-PORTVERSION=	0.7.0
-PORTREVISION=	1
+PORTVERSION=	0.7.1
 CATEGORIES=	ftp
 MASTER_SITES=	http://atterer.net/jigdo/
 
 MAINTAINER=	bra@fsn.hu
 COMMENT=	A utility used to retrieve very large files over the Internet
 
-BUILD_DEPENDS=	libwww-config:${PORTSDIR}/www/libwww
-RUN_DEPENDS=	${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget
-
-BROKEN=		Does not compile
+BUILD_DEPENDS=	libwww-config:${PORTSDIR}/www/libwww \
+		${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget
 
 MAN1=		jigdo-file.1 jigdo-lite.1 jigdo-mirror.1
 
diff --git a/net-p2p/jigdo/distinfo b/net-p2p/jigdo/distinfo
index 97e3e0c2890a..b173cd24bf2c 100644
--- a/net-p2p/jigdo/distinfo
+++ b/net-p2p/jigdo/distinfo
@@ -1,2 +1,2 @@
-MD5 (jigdo-0.7.0.tar.bz2) = a1960f7b269c1842d2013eae0abfc3eb
-SIZE (jigdo-0.7.0.tar.bz2) = 530737
+MD5 (jigdo-0.7.1.tar.bz2) = aa9aa42923af90d09b6ff4a878b8d53a
+SIZE (jigdo-0.7.1.tar.bz2) = 599969
diff --git a/net-p2p/jigdo/files/patch-aa b/net-p2p/jigdo/files/patch-aa
deleted file mode 100644
index b057cf97e4cc..000000000000
--- a/net-p2p/jigdo/files/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
---- src.orig/mktemplate.cc
-+++ src/mktemplate.cc
-@@ -1,4 +1,4 @@
--/* $Id: mktemplate.cc,v 1.92 2003/04/27 15:57:21 richard Exp $ -*- C++ -*-
-+/* $Id: mktemplate.cc,v 1.93 2003/05/06 19:12:14 richard Exp $ -*- C++ -*-
-   __   _
-   |_) /|  Copyright (C) 2001-2002 Richard Atterer
-   | \/¯|  <richard at atterer.net>
-@@ -643,7 +643,7 @@
-     Paranoid(*data + len <= bufferLength);
-     rsum->addBack(buf + *data, len);
-     *data += len; off += len; *n -= len;
--    *rsumBack = modAdd(*rsumBack, len, bufferLength);
-+    *rsumBack = modAdd(*rsumBack, implicit_cast<size_t>(len), bufferLength);
-     Paranoid(off == nextEvent || off == nextAlignedOff);
- #   if DEBUG
-     for (unsigned i = 0; i < len; ++i) {
-
diff --git a/net-p2p/jigdo/pkg-plist b/net-p2p/jigdo/pkg-plist
index 03eaea63fb8e..c3ac2f2d036a 100644
--- a/net-p2p/jigdo/pkg-plist
+++ b/net-p2p/jigdo/pkg-plist
@@ -4,7 +4,6 @@ bin/jigdo-mirror
 %%SUB_GUI%%bin/jigdo
 share/jigdo/debian-mirrors.jigdo
 %%SUB_GUI%%share/jigdo/COPYING
-%%SUB_GUI%%man/man1/jigdo.1
 %%SUB_GUI%%share/jigdo/pixmaps/close.png
 %%SUB_GUI%%share/jigdo/pixmaps/jigdo-logo.png
 %%SUB_GUI%%share/jigdo/pixmaps/pause.png
@@ -13,4 +12,4 @@ share/jigdo/debian-mirrors.jigdo
 %%SUB_GUI%%share/jigdo/pixmaps/start.png
 %%SUB_GUI%%share/jigdo/pixmaps/stop.png
 %%SUB_GUI%%@dirrm share/jigdo/pixmaps
-@dirrm share/jigdo
\ No newline at end of file
+@dirrm share/jigdo
diff --git a/net-p2p/jigdo/scripts/configure.jigdo b/net-p2p/jigdo/scripts/configure.jigdo
index 4b5ea3c39fda..43bc6df6319e 100644
--- a/net-p2p/jigdo/scripts/configure.jigdo
+++ b/net-p2p/jigdo/scripts/configure.jigdo
@@ -10,7 +10,7 @@ tempfile=`mktemp -t checklist`
 if [ "${BATCH}" = "yes" ]; then
 	set \"DB3\"
 else
-	/usr/bin/dialog --title "Jigsaw Download configuration options" \
+	dialog --title "Jigsaw Download configuration options" \
 	--clear --checklist "\n\
 Please select desired options:" -1 -1 16 \
 GUI		"Graphical User Interface (experimental)" OFF \
@@ -47,19 +47,19 @@ while [ "$1" ]; do
 	case $1 in
 		\"GUI\")
 			echo "CONFIGURE_ARGS+= --with-gui"
-			echo "LIB_DEPENDS+= gtk-x11-2.0.200:\${PORTSDIR}/x11-toolkits/gtk20"
-			echo "MAN+= jigdo.1"
+			echo "LIB_DEPENDS+= gtk-x11-2.0:\${PORTSDIR}/x11-toolkits/gtk20"
+			echo "MAN1+= jigdo.1"
 			SUB_GUI=""
 			;;
 		\"DB3\")
 			echo "CONFIGURE_ARGS+= --with-libdb=-ldb3"
 			echo "CONFIGURE_ENV+= \
 			  CPPFLAGS=\"-I\${LOCALBASE}/include/db3\" \
-			  LIBS=\"-L\${LOCALBASE}/lib\" LDFLAGS=\"-ldb3\""
+			  LIBS=\"-L\${LOCALBASE}/lib\" LDFLAGS+=\"-ldb3\""
 			echo "LIB_DEPENDS= db3:\${PORTSDIR}/databases/db3"
 			;;
 		\"NLS\")
-			echo "CONFIGURE_ARGS+= --enable-nls=/usr/local/include"
+			echo "CONFIGURE_ARGS+= --enable-nls=${LOCALBASE}/include"
 			;;
 		*)
 			echo "Invalid option(s): $*" > /dev/stderr