Index: net/pavuk/Makefile =================================================================== RCS file: /cvs/ports/net/pavuk/Makefile,v retrieving revision 1.12 diff -u -p -r1.12 Makefile --- net/pavuk/Makefile 15 Sep 2007 22:36:57 -0000 1.12 +++ net/pavuk/Makefile 9 Jan 2008 17:16:06 -0000 @@ -2,25 +2,20 @@ COMMENT= tool to mirror contents of HTTP and FTP servers -DISTNAME= pavuk-0.9pl28 -PKGNAME= ${DISTNAME}p1 +DISTNAME= pavuk-0.9.35 CATEGORIES= net -EXTRACT_SUFX= .tgz - -MASTER_SITES= http://www.pavuk.org/sw/ \ - http://www.idata.sk/~ondrej/sw/ \ - http://www.doc.cs.univ-paris8.fr/mirrors/pavuk/sw/ HOMEPAGE= http://www.pavuk.org/ -MAINTAINER= Federico Schwindt - # GPL PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= c crypto ssl z + +WANTLIB= c crypto ssl z + +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pavuk/} FLAVORS= no_x11 FLAVOR?= @@ -28,28 +23,30 @@ FLAVOR?= MODULES= devel/gettext CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= --disable-debug --disable-tree \ - --disable-gnome --with-regex=posix \ - --disable-socks +CONFIGURE_ARGS+= --disable-debug --disable-socks --disable-gnome \ + --disable-tree --disable-js --with-regex=posix CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" .if !${FLAVOR:L:Mno_x11} USE_X11= Yes -LIB_DEPENDS+= gtk.>=1.2,gdk.>=1.2::x11/gtk+ -WANTLIB+= X11 Xext Xi Xmu glib gmodule m +LIB_DEPENDS+= gtk-x11-2.0,gdk-x11-2.0,gdk_pixbuf-2.0::x11/gtk+2 +WANTLIB+= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \ + Xi Xinerama Xmu Xrandr Xrender atk-1.0 cairo expat \ + fontconfig freetype glib-2.0 glitz gmodule-2.0 gobject-2.0 \ + m pango-1.0 pangocairo-1.0 pangoft2-1.0 png .else CONFIGURE_ARGS+= --disable-gtk .endif -DOCS= COPYING FAQ README jsbind.txt wget-pavuk.HOWTO -SAMPLES= pavukrc.sample +NO_REGRESS= Yes post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pavuk ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/pavuk - cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/pavuk - cd ${WRKSRC} && ${INSTALL_DATA} ${SAMPLES} \ + cd ${WRKSRC} && ${INSTALL_DATA} COPYING README wget-pavuk.HOWTO \ + ${PREFIX}/share/doc/pavuk + cd ${WRKSRC} && ${INSTALL_DATA} *.sample \ ${PREFIX}/share/examples/pavuk .include Index: net/pavuk/distinfo =================================================================== RCS file: /cvs/ports/net/pavuk/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- net/pavuk/distinfo 5 Apr 2007 16:20:14 -0000 1.3 +++ net/pavuk/distinfo 9 Jan 2008 17:16:06 -0000 @@ -1,5 +1,5 @@ -MD5 (pavuk-0.9pl28.tgz) = 0Pe3e9ETIq3R99UtYq+/eA== -RMD160 (pavuk-0.9pl28.tgz) = 8SMOiGIEDShkOi53B9F2Z6bWjE8= -SHA1 (pavuk-0.9pl28.tgz) = I2cMADyiD3fNhuM3N6gcm30kfMU= -SHA256 (pavuk-0.9pl28.tgz) = f75qMkY0xJ9/urjUDFjaruLLFFwPqMezKcAU7cbxF48= -SIZE (pavuk-0.9pl28.tgz) = 968336 +MD5 (pavuk-0.9.35.tar.gz) = DYiKQclvhMRfKzJbSDJZAQ== +RMD160 (pavuk-0.9.35.tar.gz) = zgMFukO68u7LFTaDaOMzvxgadzM= +SHA1 (pavuk-0.9.35.tar.gz) = GKJUPKf4PHIucLr3oW5N5ibU93s= +SHA256 (pavuk-0.9.35.tar.gz) = +cZOURgiyWpnFPoL8zbBsIZHZxBMkG5Dk6sP30J4FfY= +SIZE (pavuk-0.9.35.tar.gz) = 871928 Index: net/pavuk/pkg/DESCR =================================================================== RCS file: /cvs/ports/net/pavuk/pkg/DESCR,v retrieving revision 1.4 diff -u -p -r1.4 DESCR --- net/pavuk/pkg/DESCR 15 Dec 2003 21:55:08 -0000 1.4 +++ net/pavuk/pkg/DESCR 9 Jan 2008 17:16:06 -0000 @@ -3,4 +3,4 @@ It transfers documents from HTTP, FTP, G over SSL) servers. Flavors: - no_x11 - disable GTK+ based GUI. + no_x11 - disable GTK+2 based GUI. Index: net/pavuk/pkg/PLIST =================================================================== RCS file: /cvs/ports/net/pavuk/pkg/PLIST,v retrieving revision 1.4 diff -u -p -r1.4 PLIST --- net/pavuk/pkg/PLIST 15 Sep 2004 18:17:44 -0000 1.4 +++ net/pavuk/pkg/PLIST 9 Jan 2008 17:16:06 -0000 @@ -1,13 +1,14 @@ @comment $OpenBSD: PLIST,v 1.4 2004/09/15 18:17:44 espie Exp $ bin/pavuk +@comment bin/pavuk.sh +@comment bin/tperf.sh @man man/man1/pavuk.1 share/doc/pavuk/ share/doc/pavuk/COPYING -share/doc/pavuk/FAQ share/doc/pavuk/README -share/doc/pavuk/jsbind.txt share/doc/pavuk/wget-pavuk.HOWTO share/examples/pavuk/ +share/examples/pavuk/pavuk_authinfo.sample share/examples/pavuk/pavukrc.sample share/locale/cs/LC_MESSAGES/pavuk.mo share/locale/de/LC_MESSAGES/pavuk.mo @@ -15,7 +16,9 @@ share/locale/es/LC_MESSAGES/pavuk.mo share/locale/fr/LC_MESSAGES/pavuk.mo share/locale/it/LC_MESSAGES/pavuk.mo share/locale/ja/LC_MESSAGES/pavuk.mo +share/locale/pl/LC_MESSAGES/pavuk.mo share/locale/sk/LC_MESSAGES/pavuk.mo +share/locale/uk/LC_MESSAGES/pavuk.mo share/pavuk/ share/pavuk/icons/ share/pavuk/icons/pavuk_16x16.xpm Index: net/pavuk/patches/patch-configure =================================================================== RCS file: /cvs/ports/net/pavuk/patches/patch-configure,v retrieving revision 1.1 diff -u -p -r1.1 patch-configure --- net/pavuk/patches/patch-configure 12 Aug 2004 21:23:00 -0000 1.1 +++ net/pavuk/patches/patch-configure 9 Jan 2008 17:16:36 -0000 @@ -1,30 +1,30 @@ -$OpenBSD: patch-configure,v 1.1 2004/08/12 21:23:00 naddy Exp $ ---- configure.orig Thu Aug 12 21:43:36 2004 -+++ configure Thu Aug 12 21:44:13 2004 -@@ -3014,7 +3014,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a - echo $ac_n "(cached) $ac_c" 1>&6 +$OpenBSD$ +--- configure.orig Wed Jan 9 11:54:18 2008 ++++ configure Wed Jan 9 11:55:00 2008 +@@ -7406,7 +7406,7 @@ if test "${ac_cv_lib_intl_gettext+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS -LIBS="-lintl $LIBS" +LIBS="-lintl -liconv $LIBS" - cat > conftest.$ac_ext <&6 + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -7478,7 +7478,7 @@ fi + { echo "$as_me:$LINENO: result: $ac_cv_lib_intl_gettext" >&5 + echo "${ECHO_T}$ac_cv_lib_intl_gettext" >&6; } + if test $ac_cv_lib_intl_gettext = yes; then - INTL_LIBS="-lintl";_INTL_LIB="intl" + INTL_LIBS="-lintl -liconv";_INTL_LIB="intl" - else - echo "$ac_t""no" 1>&6 fi -@@ -3056,7 +3056,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a - echo $ac_n "(cached) $ac_c" 1>&6 + + fi +@@ -7497,7 +7497,7 @@ if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS -LIBS="-l$_INTL_LIB $LIBS" +LIBS="-l$_INTL_LIB -liconv $LIBS" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF Index: net/pavuk/patches/patch-icons_Makefile_in =================================================================== RCS file: /cvs/ports/net/pavuk/patches/patch-icons_Makefile_in,v retrieving revision 1.1 diff -u -p -r1.1 patch-icons_Makefile_in --- net/pavuk/patches/patch-icons_Makefile_in 26 Jan 2003 20:50:17 -0000 1.1 +++ net/pavuk/patches/patch-icons_Makefile_in 9 Jan 2008 17:16:36 -0000 @@ -1,12 +1,12 @@ -$OpenBSD: patch-icons_Makefile_in,v 1.1 2003/01/26 20:50:17 fgsch Exp $ ---- icons/Makefile.in.orig Tue Aug 14 04:39:09 2001 -+++ icons/Makefile.in Sun Jan 26 17:26:03 2003 -@@ -84,7 +84,7 @@ WINDRES = @WINDRES@ +$OpenBSD$ +--- icons/Makefile.in.orig Wed Jan 9 11:54:25 2008 ++++ icons/Makefile.in Wed Jan 9 11:54:35 2008 +@@ -178,7 +178,7 @@ sysconfdir = @sysconfdir@ + target_alias = @target_alias@ x_cflags = @x_cflags@ x_libs = @x_libs@ - -iconsdir = $(datadir)/icons +iconsdir = $(datadir)/pavuk/icons - - icons_DATA = pavuk_16x16.xpm pavuk_32x32.xpm pavuk_64x64.xpm pavuk_as_icon.xpm pavuk_prg_icon.xpm + icons_DATA = pavuk_16x16.xpm pavuk_32x32.xpm pavuk_64x64.xpm \ + pavuk_as_icon.xpm pavuk_prg_icon.xpm Index: net/pavuk/patches/patch-src_digest_auth_c =================================================================== RCS file: net/pavuk/patches/patch-src_digest_auth_c diff -N net/pavuk/patches/patch-src_digest_auth_c --- net/pavuk/patches/patch-src_digest_auth_c 19 Jun 2002 21:06:55 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -$OpenBSD: patch-src_digest_auth_c,v 1.1.1.1 2002/06/19 21:06:55 fgsch Exp $ ---- src/digest_auth.c.orig Sat Jun 15 06:40:34 2002 -+++ src/digest_auth.c Sat Jun 15 06:40:44 2002 -@@ -18,6 +18,7 @@ - #include "authinfo.h" - #include "html.h" - #include "abstract.h" -+#include "myssl.h" - - #ifdef USE_SSL - Index: net/pavuk/patches/patch-src_http_c =================================================================== RCS file: net/pavuk/patches/patch-src_http_c diff -N net/pavuk/patches/patch-src_http_c --- net/pavuk/patches/patch-src_http_c 2 Jul 2004 16:02:47 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_http_c,v 1.1 2004/07/02 16:02:47 naddy Exp $ ---- src/http.c.orig Mon Jul 30 00:06:40 2001 -+++ src/http.c Fri Jul 2 17:25:33 2004 -@@ -1111,8 +1111,8 @@ doc *docp; - if (!loc) - return -1; - -- if (sscanf(loc, "http://%[.0-9A-Za-z_-]:%d", proxy, &port) < 1) -- if (sscanf(loc, "%[.0-9A-Za-z_-]:%d", proxy, &port) !=2) -+ if (sscanf(loc, "http://%255[.0-9A-Za-z_-]:%d", proxy, &port) < 1) -+ if (sscanf(loc, "%255[.0-9A-Za-z_-]:%d", proxy, &port) !=2) - return -1; - - _free(docp->http_proxy);