Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 22 Sep 2004 11:14:45 +0200
From:      Attila Nagy <bra@fsn.hu>
To:        Thierry Thomas <thierry@FreeBSD.org>
Cc:        freebsd-ports-bugs@FreeBSD.org
Subject:   Re: ports/71963: MAINTAINER-UPDATE: ftp/jigdo
Message-ID:  <41514285.1000401@fsn.hu>
In-Reply-To: <200409212001.i8LK1NaL014160@freefall.freebsd.org>
References:  <200409212001.i8LK1NaL014160@freefall.freebsd.org>

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

Thierry Thomas wrote:
> I'd like to commit this port, but there is a problem
> with portlint:
> FATAL: /usr/ports/ftp/jigdo/pkg-plist [7]: unpacked man file jigdo.1 listed. must be gzipped.
> FATAL: /usr/ports/ftp/jigdo/pkg-plist: the last line has to be terminated by \n.
The attached version should correct that and another problem too, when 
compiling with GUI support.

Thanks for the notice, I only did a portlint which said the port is fine.

-- 
Attila Nagy                                   e-mail: Attila.Nagy@fsn.hu
Free Software Network (FSN.HU)           phone @work: +361 371 3536
ISOs: http://www.fsn.hu/?f=download            cell.: +3630 306 6758

--------------070309080803000406090501
Content-Type: text/plain;
 name="jigdo.patch"
Content-Transfer-Encoding: 8bit
Content-Disposition: inline;
 filename="jigdo.patch"

diff -ruN jigdo/Makefile /tmp/jigdo/Makefile
--- jigdo/Makefile	Sat Sep 18 20:15:26 2004
+++ /tmp/jigdo/Makefile	Wed Sep 22 08:54:15 2004
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	jigdo
-PORTVERSION=	0.7.0
-PORTREVISION=	1
+PORTVERSION=	0.7.1
 CATEGORIES=	ftp
 MASTER_SITES=	http://atterer.net/jigdo/
 
@@ -16,8 +15,6 @@
 
 BUILD_DEPENDS=	libwww-config:${PORTSDIR}/www/libwww
 RUN_DEPENDS=	${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget
-
-BROKEN=		Does not compile
 
 MAN1=		jigdo-file.1 jigdo-lite.1 jigdo-mirror.1
 
diff -ruN jigdo/distinfo /tmp/jigdo/distinfo
--- jigdo/distinfo	Thu Mar 18 21:59:12 2004
+++ /tmp/jigdo/distinfo	Wed Sep 22 08:54:15 2004
@@ -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 -ruN jigdo/files/patch-aa /tmp/jigdo/files/patch-aa
--- jigdo/files/patch-aa	Tue Feb  3 10:32:10 2004
+++ /tmp/jigdo/files/patch-aa	Thu Jan  1 01:00:00 1970
@@ -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 -ruN jigdo/pkg-plist /tmp/jigdo/pkg-plist
--- jigdo/pkg-plist	Thu Jun 19 08:24:16 2003
+++ /tmp/jigdo/pkg-plist	Wed Sep 22 11:09:17 2004
@@ -4,7 +4,6 @@
 %%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 @@
 %%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 -ruN jigdo/scripts/configure.jigdo /tmp/jigdo/scripts/configure.jigdo
--- jigdo/scripts/configure.jigdo	Thu Jun 19 08:24:16 2003
+++ /tmp/jigdo/scripts/configure.jigdo	Wed Sep 22 11:08:22 2004
@@ -10,7 +10,7 @@
 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,8 +47,8 @@
 	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\")
@@ -59,7 +59,7 @@
 			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

--------------070309080803000406090501--



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