Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 05 Jun 2006 22:00:58 +0200
From:      Attila Nagy <bra@fsn.hu>
To:        Pav Lucistnik <pav@FreeBSD.org>
Cc:        freebsd-ports-bugs@FreeBSD.org
Subject:   Re: ports/96433: [update] net-p2p/jigdo
Message-ID:  <44848D7A.1040305@fsn.hu>
In-Reply-To: <200604291107.k3TB7QG4032836@freefall.freebsd.org>
References:  <200604291107.k3TB7QG4032836@freefall.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------010707030801020800090306
Content-Type: text/plain; charset=ISO-8859-2; format=flowed
Content-Transfer-Encoding: 7bit

Hello,

Could you please apply the attached patch?

Upgrades to 0.7.3, and has some changes in how the bdb option is handled.

Sorry for the delay.

Thanks,
-- 
Attila Nagy                                   e-mail: Attila.Nagy@fsn.hu
Free Software Network (FSN.HU)                 phone: +3630 306 6758
http://www.fsn.hu/

--------------010707030801020800090306
Content-Type: text/plain;
 name="jigdo.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="jigdo.diff"

diff -ruN jigdo/Makefile jigdo.new/Makefile
--- jigdo/Makefile	Tue Feb 28 20:43:58 2006
+++ jigdo.new/Makefile	Mon Jun  5 21:36:03 2006
@@ -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_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 @@
 
 .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(WITH_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)
 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 -ruN jigdo/distinfo jigdo.new/distinfo
--- jigdo/distinfo	Sun Jan 22 10:48:54 2006
+++ jigdo.new/distinfo	Mon Jun  5 18:59:50 2006
@@ -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 -ruN jigdo/pkg-plist jigdo.new/pkg-plist
--- jigdo/pkg-plist	Mon Feb 27 13:13:11 2006
+++ jigdo.new/pkg-plist	Mon Jun  5 21:42:23 2006
@@ -1,16 +1,17 @@
 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
+share/nls/POSIX
+share/nls/en_US.US-ASCII
+%%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

--------------010707030801020800090306--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?44848D7A.1040305>