6 files changed, 15 insertions, 62 deletions

diff --git a/net-p2p/jigdo/Makefile b/net-p2p/jigdo/Makefile
index b34d63b19ed0..61540cc2e0ef 100644
--- a/net-p2p/jigdo/Makefile
+++ b/net-p2p/jigdo/Makefile
@@ -6,20 +6,19 @@
 #
 
 PORTNAME=	jigdo
-PORTVERSION=	0.6.8
+PORTVERSION=	0.7.0
 CATEGORIES=	ftp
 MASTER_SITES=	http://home.in.tum.de/~atterer/jigdo/
 
 MAINTAINER=	bra@fsn.hu
-COMMENT=	An utility used to retrieve very large files over the Internet
+COMMENT=	A utility used to retrieve very large files over the Internet
 
-#BUILD_DEPENDS=	libwww-config:${PORTSDIR}/www/libwww
+BUILD_DEPENDS=	libwww-config:${PORTSDIR}/www/libwww
 RUN_DEPENDS=	${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget
 
 MAN1=		jigdo-file.1 jigdo-lite.1 jigdo-mirror.1
 
 USE_BZIP2=	yes
-#USE_REINPLACE=	yes
 USE_SUBMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-libdb --disable-nls --without-gui
@@ -36,19 +35,8 @@ pre-fetch:
 .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
 .endif
 
-#post-patch:
-#	@${REINPLACE_CMD} -e "s/gtk-config/${GTK_CONFIG}/g" ${WRKSRC}/configure
-
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
-.if ${OSVERSION} >= 500041
-EXTRA_PATCHES=	${FILESDIR}/extra-glibc-getopt.h
-.endif
-
 post-install:
 	@${STRIP_CMD} ${PREFIX}/bin/jigdo-file
 
diff --git a/net-p2p/jigdo/distinfo b/net-p2p/jigdo/distinfo
index a2aac1271e61..cbe0a9a3817a 100644
--- a/net-p2p/jigdo/distinfo
+++ b/net-p2p/jigdo/distinfo
@@ -1 +1 @@
-MD5 (jigdo-0.6.8.tar.bz2) = 9f9614fa7e01be98e79445f07179c675
+MD5 (jigdo-0.7.0.tar.bz2) = a1960f7b269c1842d2013eae0abfc3eb
\ No newline at end of file
diff --git a/net-p2p/jigdo/files/extra-glibc-getopt.h b/net-p2p/jigdo/files/extra-glibc-getopt.h
deleted file mode 100644
index 300584ba0825..000000000000
--- a/net-p2p/jigdo/files/extra-glibc-getopt.h
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/glibc-getopt.h.orig	Fri Dec  6 08:24:36 2002
-+++ src/glibc-getopt.h	Fri Dec  6 08:29:58 2002
-@@ -37,12 +37,11 @@
- #  define ELIDE_CODE
- # endif
- #endif
-+#define ELIDE_CODE
- #ifndef ELIDE_CODE
- #  define opterr my_opterr
- #  define optind my_optind
- #  define optopt my_optopt
--#endif
--
- 
- #ifdef  __cplusplus
- extern "C" {
-@@ -186,5 +185,6 @@
- 
- /* Make sure we later can get all the definitions and declarations.  */
- #undef __need_getopt
-+#endif /* ELIDE_CODE */
- 
- #endif /* getopt.h */
diff --git a/net-p2p/jigdo/files/patch-scan.cc b/net-p2p/jigdo/files/patch-scan.cc
deleted file mode 100644
index 2c1d4443f2e7..000000000000
--- a/net-p2p/jigdo/files/patch-scan.cc
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/scan.cc.orig	Fri Sep 20 03:21:08 2002
-+++ src/scan.cc	Fri Sep 20 03:21:36 2002
-@@ -174,8 +174,8 @@
-   }
- }
- #else
--JigdoCache::JigdoCache(const string&, size_t, size_t bufLen = 128*1024,
--                       ProgressReporter& pr = noReport)
-+JigdoCache::JigdoCache(const string&, size_t, size_t bufLen,
-+                       ProgressReporter& pr)
-   : blockLength(0), md5BlockLength(0), files(), nrOfFiles(0),
-     locationPaths(), readAmount(bufLen), buffer(), reporter(pr) { }
- #endif
diff --git a/net-p2p/jigdo/pkg-plist b/net-p2p/jigdo/pkg-plist
index e2899580e2dc..03eaea63fb8e 100644
--- a/net-p2p/jigdo/pkg-plist
+++ b/net-p2p/jigdo/pkg-plist
@@ -3,14 +3,14 @@ bin/jigdo-lite
 bin/jigdo-mirror
 %%SUB_GUI%%bin/jigdo
 share/jigdo/debian-mirrors.jigdo
-@dirrm share/jigdo
-%%SUB_GUI%%share/jigdo/pixmaps/button-cross.xpm
-%%SUB_GUI%%share/jigdo/pixmaps/button-pause.xpm
-%%SUB_GUI%%share/jigdo/pixmaps/button-play.xpm
-%%SUB_GUI%%share/jigdo/pixmaps/jigdo-logo.xpm
-%%SUB_GUI%%share/jigdo/pixmaps/new.xpm
-%%SUB_GUI%%share/jigdo/pixmaps/preferences.xpm
-%%SUB_GUI%%share/jigdo/pixmaps/progress051.xpm
-%%SUB_GUI%%share/jigdo/pixmaps/quit.xpm
 %%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
+%%SUB_GUI%%share/jigdo/pixmaps/progress-green.png
+%%SUB_GUI%%share/jigdo/pixmaps/restart.png
+%%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
diff --git a/net-p2p/jigdo/scripts/configure.jigdo b/net-p2p/jigdo/scripts/configure.jigdo
index c198af9e58f1..4b5ea3c39fda 100644
--- a/net-p2p/jigdo/scripts/configure.jigdo
+++ b/net-p2p/jigdo/scripts/configure.jigdo
@@ -47,7 +47,8 @@ while [ "$1" ]; do
 	case $1 in
 		\"GUI\")
 			echo "CONFIGURE_ARGS+= --with-gui"
-			echo "BUILD_DEPENDS+= gtk12-config:\${PORTSDIR}/x11-toolkits/gtk12"
+			echo "LIB_DEPENDS+= gtk-x11-2.0.200:\${PORTSDIR}/x11-toolkits/gtk20"
+			echo "MAN+= jigdo.1"
 			SUB_GUI=""
 			;;
 		\"DB3\")