3 files changed, 37 insertions, 36 deletions

diff --git a/net-p2p/jigdo/Makefile b/net-p2p/jigdo/Makefile
index c8d2934acac4..8bc61352667a 100644
--- a/net-p2p/jigdo/Makefile
+++ b/net-p2p/jigdo/Makefile
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	jigdo
-PORTVERSION=	0.7.1
+PORTVERSION=	0.7.3
 CATEGORIES=	net-p2p
 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 \
-		${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget
+BUILD_DEPENDS=	${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget
 
 MAN1=		jigdo-file.1 jigdo-lite.1 jigdo-mirror.1
 
@@ -22,11 +21,12 @@ USE_BZIP2=	yes
 USE_SUBMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ENV+=	"CPPFLAGS=-I${LOCALBASE}/include -I${LOCALBASE}/include/db3" \
-		LIBS=-L${LOCALBASE}/lib
+WITH_BDB_VER?=	43
+
+CONFIGURE_ENV+=	"CPPFLAGS=-I${LOCALBASE}/include"
 
 OPTIONS=	GUI "Build the gtk2 gui" off \
-		DB3 "Build with BDB3 support" on \
+		BDB "Build with Berkeley DB support (for jigdo-file cache)" on \
 		NLS "Native Language Support" on
 
 .include <bsd.port.pre.mk>
@@ -37,29 +37,31 @@ NOT_FOR_ARCHS+=	alpha
 
 .if defined(WITH_GUI)
 CONFIGURE_ARGS+=	--with-gui
-LIB_DEPENDS+=	gtk-x11-2.0:${PORTSDIR}/x11-toolkits/gtk20
-MAN1+=	jigdo.1
-PLIST_SUB+=	SUB_GUI=""
+LIB_DEPENDS+=	gtk-x11-2.0:${PORTSDIR}/x11-toolkits/gtk20 \
+		curl:${PORTSDIR}/ftp/curl
+MAN1+=		jigdo.1
+PLIST_SUB+=	GUI=""
 .else
-CONFIGURE_ARGS+=	--without-gui
-PLIST_SUB+=	SUB_GUI="@comment "
+CONFIGURE_ARGS+=--without-gui
+PLIST_SUB+=	GUI="@comment "
 .endif
 
-.if defined(WITH_DB3)
-CONFIGURE_ARGS+=	--with-libdb=-ldb3
-#CONFIGURE_ENV+=	LDFLAGS=-ldb3
-USE_BDB=	3
+.if !defined(WITHOUT_BDB)
+CONFIGURE_ENV+=	CPPFLAGS=-I${BDB_INCLUDE_DIR} \
+		LIBS=-L${BDB_LIB_DIR}
+CONFIGURE_ARGS+=--with-libdb=-l${BDB_LIB_CXX_NAME}
+USE_BDB=	${WITH_BDB_VER}
 .else
-CONFIGURE_ARGS+=	--without-libdb
+CONFIGURE_ARGS+=--without-libdb
 .endif
 
-.if defined(WITH_NLS)
+.if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
-CONFIGURE_ARGS+=	--enable-nls
+CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment"
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
 .endif
 
 post-install:
diff --git a/net-p2p/jigdo/distinfo b/net-p2p/jigdo/distinfo
index 747a8d47a83f..8fa5f0639699 100644
--- a/net-p2p/jigdo/distinfo
+++ b/net-p2p/jigdo/distinfo
@@ -1,3 +1,3 @@
-MD5 (jigdo-0.7.1.tar.bz2) = aa9aa42923af90d09b6ff4a878b8d53a
-SHA256 (jigdo-0.7.1.tar.bz2) = f8d0f86e85cf7ce2e01d1cf3e98d3e2eb656a3691f78550925e925a9d1f99851
-SIZE (jigdo-0.7.1.tar.bz2) = 599969
+MD5 (jigdo-0.7.3.tar.bz2) = bbc1d9ac750bb34e0748f0b57157cc72
+SHA256 (jigdo-0.7.3.tar.bz2) = 875c069abad67ce67d032a9479228acdb37c8162236c0e768369505f264827f0
+SIZE (jigdo-0.7.3.tar.bz2) = 644670
diff --git a/net-p2p/jigdo/pkg-plist b/net-p2p/jigdo/pkg-plist
index b14758fde992..a58530c27dec 100644
--- a/net-p2p/jigdo/pkg-plist
+++ b/net-p2p/jigdo/pkg-plist
@@ -1,16 +1,15 @@
 bin/jigdo-file
 bin/jigdo-lite
 bin/jigdo-mirror
-%%SUB_GUI%%bin/jigdo
-%%DATADIR%%/debian-mirrors.jigdo
-%%SUB_GUI%%%%DATADIR%%/COPYING
-%%SUB_GUI%%%%DATADIR%%/pixmaps/close.png
-%%SUB_GUI%%%%DATADIR%%/pixmaps/jigdo-logo.png
-%%SUB_GUI%%%%DATADIR%%/pixmaps/pause.png
-%%SUB_GUI%%%%DATADIR%%/pixmaps/progress-green.png
-%%SUB_GUI%%%%DATADIR%%/pixmaps/restart.png
-%%SUB_GUI%%%%DATADIR%%/pixmaps/start.png
-%%SUB_GUI%%%%DATADIR%%/pixmaps/stop.png
-%%SUB_GUI%%@dirrm %%DATADIR%%/pixmaps
-%%NLS%%share/locale/de/LC_MESSAGES/jigdo.mo
-@dirrm %%DATADIR%%
+share/jigdo/debian-mirrors.jigdo
+%%GUI%%bin/jigdo
+%%GUI%%share/jigdo/COPYING
+%%GUI%%share/jigdo/pixmaps/close.png
+%%GUI%%share/jigdo/pixmaps/jigdo-logo.png
+%%GUI%%share/jigdo/pixmaps/pause.png
+%%GUI%%share/jigdo/pixmaps/progress-green.png
+%%GUI%%share/jigdo/pixmaps/restart.png
+%%GUI%%share/jigdo/pixmaps/start.png
+%%GUI%%share/jigdo/pixmaps/stop.png
+%%GUI%%@dirrm share/jigdo/pixmaps
+@dirrm share/jigdo