Index: head/ftp/jigdo/files/patch-aa =================================================================== --- head/ftp/jigdo/files/patch-aa (revision 118461) +++ head/ftp/jigdo/files/patch-aa (nonexistent) @@ -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 - | \/¯| -@@ -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(len), bufferLength); - Paranoid(off == nextEvent || off == nextAlignedOff); - # if DEBUG - for (unsigned i = 0; i < len; ++i) { - Property changes on: head/ftp/jigdo/files/patch-aa ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/ftp/jigdo/Makefile =================================================================== --- head/ftp/jigdo/Makefile (revision 118461) +++ head/ftp/jigdo/Makefile (revision 118462) @@ -1,53 +1,50 @@ # ports collection makefile for: jigdo # Date created: 23 July 2002 # Whom: Attila Nagy # # $FreeBSD$ # 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 USE_BZIP2= yes USE_SUBMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-libdb --disable-nls --without-gui USE_GMAKE= yes SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ TOUCH="${TOUCH}" \ MKDIR="${MKDIR}" \ .include .if ${OSVERSION} < 500000 NOT_FOR_ARCHS+= alpha .endif pre-fetch: @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.jigdo .if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif post-install: @${STRIP_CMD} ${PREFIX}/bin/jigdo-file post-clean: @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc .include Property changes on: head/ftp/jigdo/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.9 \ No newline at end of property +1.10 \ No newline at end of property Index: head/ftp/jigdo/distinfo =================================================================== --- head/ftp/jigdo/distinfo (revision 118461) +++ head/ftp/jigdo/distinfo (revision 118462) @@ -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 Property changes on: head/ftp/jigdo/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/ftp/jigdo/pkg-plist =================================================================== --- head/ftp/jigdo/pkg-plist (revision 118461) +++ head/ftp/jigdo/pkg-plist (revision 118462) @@ -1,16 +1,15 @@ bin/jigdo-file bin/jigdo-lite 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 %%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 +@dirrm share/jigdo Property changes on: head/ftp/jigdo/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/ftp/jigdo/scripts/configure.jigdo =================================================================== --- head/ftp/jigdo/scripts/configure.jigdo (revision 118461) +++ head/ftp/jigdo/scripts/configure.jigdo (revision 118462) @@ -1,73 +1,73 @@ #!/bin/sh # $FreeBSD$ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit fi 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 \ DB3 "Berkeley DB3 (used for jigdo-file's cache)" ON \ NLS "Native Language Support (no language files yet)" OFF \ 2> $tempfile retval=$? if [ -s $tempfile ]; then set `cat $tempfile` fi rm -f $tempfile case $retval in 0) if [ -z "$*" ]; then echo "Nothing selected" fi ;; 1) echo "Cancel pressed." exit 1 ;; esac fi ${MKDIR} ${WRKDIRPREFIX}${CURDIR} exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc echo "PREFIX= ${PREFIX}" SUB_GUI="@comment " 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 rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 ;; esac shift done echo "PLIST_SUB+= SUB_GUI=\"${SUB_GUI}\"" Property changes on: head/ftp/jigdo/scripts/configure.jigdo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/net-p2p/jigdo/files/patch-aa =================================================================== --- head/net-p2p/jigdo/files/patch-aa (revision 118461) +++ head/net-p2p/jigdo/files/patch-aa (nonexistent) @@ -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 - | \/¯| -@@ -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(len), bufferLength); - Paranoid(off == nextEvent || off == nextAlignedOff); - # if DEBUG - for (unsigned i = 0; i < len; ++i) { - Property changes on: head/net-p2p/jigdo/files/patch-aa ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/net-p2p/jigdo/Makefile =================================================================== --- head/net-p2p/jigdo/Makefile (revision 118461) +++ head/net-p2p/jigdo/Makefile (revision 118462) @@ -1,53 +1,50 @@ # ports collection makefile for: jigdo # Date created: 23 July 2002 # Whom: Attila Nagy # # $FreeBSD$ # 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 USE_BZIP2= yes USE_SUBMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-libdb --disable-nls --without-gui USE_GMAKE= yes SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ TOUCH="${TOUCH}" \ MKDIR="${MKDIR}" \ .include .if ${OSVERSION} < 500000 NOT_FOR_ARCHS+= alpha .endif pre-fetch: @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.jigdo .if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif post-install: @${STRIP_CMD} ${PREFIX}/bin/jigdo-file post-clean: @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc .include Property changes on: head/net-p2p/jigdo/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.9 \ No newline at end of property +1.10 \ No newline at end of property Index: head/net-p2p/jigdo/distinfo =================================================================== --- head/net-p2p/jigdo/distinfo (revision 118461) +++ head/net-p2p/jigdo/distinfo (revision 118462) @@ -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 Property changes on: head/net-p2p/jigdo/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/net-p2p/jigdo/pkg-plist =================================================================== --- head/net-p2p/jigdo/pkg-plist (revision 118461) +++ head/net-p2p/jigdo/pkg-plist (revision 118462) @@ -1,16 +1,15 @@ bin/jigdo-file bin/jigdo-lite 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 %%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 +@dirrm share/jigdo Property changes on: head/net-p2p/jigdo/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/net-p2p/jigdo/scripts/configure.jigdo =================================================================== --- head/net-p2p/jigdo/scripts/configure.jigdo (revision 118461) +++ head/net-p2p/jigdo/scripts/configure.jigdo (revision 118462) @@ -1,73 +1,73 @@ #!/bin/sh # $FreeBSD$ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit fi 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 \ DB3 "Berkeley DB3 (used for jigdo-file's cache)" ON \ NLS "Native Language Support (no language files yet)" OFF \ 2> $tempfile retval=$? if [ -s $tempfile ]; then set `cat $tempfile` fi rm -f $tempfile case $retval in 0) if [ -z "$*" ]; then echo "Nothing selected" fi ;; 1) echo "Cancel pressed." exit 1 ;; esac fi ${MKDIR} ${WRKDIRPREFIX}${CURDIR} exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc echo "PREFIX= ${PREFIX}" SUB_GUI="@comment " 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 rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 ;; esac shift done echo "PLIST_SUB+= SUB_GUI=\"${SUB_GUI}\"" Property changes on: head/net-p2p/jigdo/scripts/configure.jigdo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property