Date: Fri, 1 Dec 2000 19:31:11 -0800 (PST) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/23222: Update port: ftp/pavuk to 0.9.26 Message-ID: <200012020331.eB23VB006023@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 23222
>Category: ports
>Synopsis: Update port: ftp/pavuk to 0.9.26
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Dec 01 19:40:01 PST 2000
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 4.2-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 0.9pl26
New file:
files/patch-af
Remove file:
files/patch-ab files/patch-ac files/patch-ad
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/ftp/pavuk/Makefile ftp/pavuk/Makefile
--- /usr/ports/ftp/pavuk/Makefile Fri Sep 22 23:17:21 2000
+++ ftp/pavuk/Makefile Fri Dec 1 02:10:57 2000
@@ -5,56 +5,55 @@
# $FreeBSD: ports/ftp/pavuk/Makefile,v 1.19 2000/09/22 01:58:53 kris Exp $
#
-PORTNAME= pavuk
-PORTVERSION= 0.9.18
-CATEGORIES= ftp www
-MASTER_SITES= ${MASTER_SITE_SUNSITE} \
- ftp://ftp.idata.sk/pub/unix/www/ \
- ftp://ftp.phacka.sk/pub/pavuk/ \
- http://www.idata.sk/~ondrej/sw/
-MASTER_SITE_SUBDIR= X11/gtkbuffet/apps/pavuk
-DISTNAME= ${PORTNAME}-0.9pl18
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= ports@FreeBSD.org
-
-USE_AUTOCONF= yes
-
-.if defined(WIITHOUT_X11)
-CONFIGURE_ARGS= --disable-gtk
+PORTNAME= pavuk
+PORTVERSION= 0.9.26
+CATEGORIES= ftp www
+MASTER_SITES= ${MASTER_SITE_SUNSITE} \
+ http://www.idata.sk/~ondrej/sw/
+MASTER_SITE_SUBDIR= apps/www/mirroring
+DISTNAME= ${PORTNAME}-0.9pl26
+EXTRACT_SUFX= .tgz
+
+MAINTAINER= ports@FreeBSD.org
+
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+
+WANT_GTK= yes
+USE_AUTOMAKE= yes
+AUTOMAKE_ARGS= --include-deps
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS= --with-locale-dir=${LOCALBASE}/share/locale \
+ --disable-debug --disable-gnome --enable-threads
+
+MAN1= pavuk.1
+
+.include <bsd.port.pre.mk>
+
+.if defined(HAVE_GTK)
+USE_GTK= yes
+CONFIGURE_ARGS+= --with-gtk-config="${GTK_CONFIG:T}"
.else
-CONFIGURE_ARGS= --with-xpm-includes=${X11BASE}/include --disable-gtk
-USE_XPM= yes
+CONFIGURE_ARGS+= --disable-gtk
.endif
-USE_GMAKE= yes
-
.if defined(WITH_SSL)
-USE_OPENSSL= YES
+USE_OPENSSL= yes
.else
CONFIGURE_ARGS+= --disable-ssl
.endif
-MAN1= pavuk.1
+pre-configure:
+ @cd ${WRKSRC} && aclocal
-do-install:
- @ ${INSTALL_PROGRAM} ${WRKSRC}/src/pavuk ${PREFIX}/bin
- @ ${INSTALL_MAN} ${WRKSRC}/man/pavuk.1 ${PREFIX}/man/man1
- @ ${INSTALL_DATA} ${WRKSRC}/pavukrc.sample ${PREFIX}/etc
- @ ${INSTALL_DATA} ${WRKSRC}/pavuk_authinfo.sample ${PREFIX}/etc
- @ ${MKDIR} ${PREFIX}/share/locale/cs/LC_MESSAGES
- @ ${MKDIR} ${PREFIX}/share/locale/de/LC_MESSAGES
- @ ${MKDIR} ${PREFIX}/share/locale/sk/LC_MESSAGES
- @ ${INSTALL_DATA} ${WRKSRC}/po/cs.mo ${PREFIX}/share/locale/cs/LC_MESSAGES/pavuk.mo
- @ ${INSTALL_DATA} ${WRKSRC}/po/de.mo ${PREFIX}/share/locale/de/LC_MESSAGES/pavuk.mo
- @ ${INSTALL_DATA} ${WRKSRC}/po/sk.mo ${PREFIX}/share/locale/sk/LC_MESSAGES/pavuk.mo
- @ ${MKDIR} ${PREFIX}/share/icons
- @ ${INSTALL_DATA} ${WRKSRC}/icons/*.xpm ${PREFIX}/share/icons
+post-install:
+ ${INSTALL_DATA} ${WRKSRC}/pavuk_authinfo.sample ${PREFIX}/etc
+ ${INSTALL_DATA} ${WRKSRC}/pavukrc.sample ${PREFIX}/etc
.if !defined(NOPORTDOCS)
- @ ${MKDIR} ${PREFIX}/share/doc/pavuk
-.for file in AUTHORS BUGS ChangeLog FAQ README THANK_TO TODO
- @ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/pavuk
+ @${MKDIR} ${PREFIX}/share/doc/pavuk
+.for file in AUTHORS BUGS CREDITS ChangeLog FAQ MAILINGLIST NEWS README
+ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/pavuk
.endfor
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -urN /usr/ports/ftp/pavuk/distinfo ftp/pavuk/distinfo
--- /usr/ports/ftp/pavuk/distinfo Thu Aug 5 13:03:42 1999
+++ ftp/pavuk/distinfo Wed Nov 29 04:20:45 2000
@@ -1 +1 @@
-MD5 (pavuk-0.9pl18.tgz) = a7d192948e7f9637f0005489c4f24249
+MD5 (pavuk-0.9pl26.tgz) = cb211efa0219aaf43b9186fa0572681a
diff -urN /usr/ports/ftp/pavuk/files/patch-ab ftp/pavuk/files/patch-ab
--- /usr/ports/ftp/pavuk/files/patch-ab Thu Aug 5 13:03:43 1999
+++ ftp/pavuk/files/patch-ab Thu Jan 1 09:00:00 1970
@@ -1,26 +0,0 @@
---- src/net.c.orig Fri Jul 23 03:50:48 1999
-+++ src/net.c Wed Aug 4 20:32:42 1999
-@@ -106,9 +106,9 @@
- {
- return -1;
- }
--
-+#ifndef __FreeBSD__
- fcntl(sock , F_SETFL , O_NONBLOCK);
--
-+#endif
- rv = connect(sock, (struct sockaddr*)&addr, sizeof(addr));
- if (rv && (errno != EINPROGRESS) && (errno != EISCONN))
- {
-@@ -296,9 +296,9 @@
- int rv;
-
- p = sizeof(caller);
--
-+#ifdef __FreeBSD__
- fcntl(sock , F_SETFL , O_NONBLOCK);
--
-+#endif
- rsock = accept(sock, (struct sockaddr*)&caller, &p);
- if ((rsock < 0) && (errno != EWOULDBLOCK))
- {
diff -urN /usr/ports/ftp/pavuk/files/patch-ac ftp/pavuk/files/patch-ac
--- /usr/ports/ftp/pavuk/files/patch-ac Thu Aug 5 18:10:13 1999
+++ ftp/pavuk/files/patch-ac Thu Jan 1 09:00:00 1970
@@ -1,12 +0,0 @@
---- src/doc.c.orig Thu Aug 5 02:09:04 1999
-+++ src/doc.c Thu Aug 5 02:09:25 1999
-@@ -18,7 +18,8 @@
- #include <sys/file.h>
- #endif
- #ifdef HAVE_FSTATFS
--#include <sys/vfs.h>
-+#include <sys/param.h>
-+#include <sys/mount.h>
- #endif
- #include <sys/time.h>
- #include <time.h>
diff -urN /usr/ports/ftp/pavuk/files/patch-ad ftp/pavuk/files/patch-ad
--- /usr/ports/ftp/pavuk/files/patch-ad Tue Feb 15 16:25:53 2000
+++ ftp/pavuk/files/patch-ad Thu Jan 1 09:00:00 1970
@@ -1,11 +0,0 @@
---- Makefile.in.orig Sun Feb 13 23:12:20 2000
-+++ Makefile.in Sun Feb 13 23:13:13 2000
-@@ -109,7 +109,7 @@
- config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- $(SHELL) ./config.status --recheck
- $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-- cd $(srcdir) && $(AUTOCONF)
-+ cd $(srcdir) && $(CONFIGURE_ENV) $(AUTOCONF)
-
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
diff -urN /usr/ports/ftp/pavuk/files/patch-ae ftp/pavuk/files/patch-ae
--- /usr/ports/ftp/pavuk/files/patch-ae Tue Feb 15 16:25:53 2000
+++ ftp/pavuk/files/patch-ae Thu Nov 30 00:56:50 2000
@@ -1,18 +1,41 @@
---- configure.in.orig Sun Jul 25 15:18:07 1999
-+++ configure.in Thu Feb 10 16:30:46 2000
-@@ -197,14 +197,14 @@
- fi
-
- if eval "test x$WITH_SSL = xyes"; then
+--- configure.in.orig Thu Aug 31 08:37:36 2000
++++ configure.in Thu Nov 30 00:56:41 2000
+@@ -233,15 +233,15 @@
+ CFLAGS="$CFLAGS -I$WITH_SSL_PFX/include"
+ LDFLAGS="$LDFLAGS -L$WITH_SSL_PFX/lib"
+ fi
- AC_CHECK_LIB(ssl, SSLv23_client_method, SSL_LIBS="-lssl", ,"-lcrypto")
+ AC_CHECK_LIB(ssl, SSLv23_client_method, SSL_LIBS="-lssl", ,-lcrypto $EXTRA_SSL_LIBS)
if test -n "$SSL_LIBS"; then
+- AC_CHECK_LIB(ssl, TLSv1_client_method, TLS1=yes, TLS1=no, "-lcrypto")
++ AC_CHECK_LIB(ssl, TLSv1_client_method, TLS1=yes, TLS1=no, "-lcrypto $EXTRA_SLL_LIBS")
AC_CHECK_HEADER(ssl.h, SSLEAY=yes, SSLEAY=no)
AC_CHECK_HEADER(openssl/ssl.h, OPENSSL=yes, OPENSSL=no)
if eval "test x$SSLEAY = xno -a x$OPENSSL = xno"; then
- AC_WARN("SSLeay headers not found --\> use --disable-ssl option or set --with-ssl-includes to apropriate location")
+ AC_MSG_WARN("SSLeay or OpenSSL headers not found --\> use --disable-ssl option or set --with-ssl-includes to apropriate location")
fi
- AC_CHECK_LIB(crypto, SSLeay, SSL_LIBS="$SSL_LIBS -lcrypto", SSL_LIBS='')
+ AC_CHECK_LIB(crypto, SSLeay, SSL_LIBS="$SSL_LIBS -lcrypto $EXTRA_SSL_LIBS", SSL_LIBS='', $EXTRA_SSL_LIBS)
fi
fi
+
+@@ -250,7 +250,7 @@
+ echo 'void f(){}' > conftest.c
+ if test -z "`${CC-cc} -pthread -c conftest.c 2>&1`"; then
+ ac_ccpthread_opt=yes
+- x_cflags="$x_cflags -pthread -DHAVE_MT"
++ x_cflags="$x_cflags -D_THREAD_SAFE -DHAVE_MT"
+ x_libs="-pthread $x_libs"
+ HAVE_MT="yes"
+ else
+@@ -297,8 +297,8 @@
+
+ dnl Test for gtk
+ if eval "test x$WITH_GTK = xyes"; then
+- AC_CHECK_PROG(GTK_CONFIG, $WITH_GTK_CONFIG, "yes", "no")
+- if eval "test x$GTK_CONFIG = xyes"; then
++ AC_CHECK_PROG(GTK_CONFIG_SCRIPT, $WITH_GTK_CONFIG, "yes", "no")
++ if eval "test x$GTK_CONFIG_SCRIPT = xyes"; then
+ AC_MSG_RESULT("checking for gtk configuration using gtk-config script ...")
+ if eval "test x$HAVE_MT = xyes"; then
+ GTK_LIBS=`$WITH_GTK_CONFIG --libs gtk gthread`
diff -urN /usr/ports/ftp/pavuk/files/patch-af ftp/pavuk/files/patch-af
--- /usr/ports/ftp/pavuk/files/patch-af Thu Jan 1 09:00:00 1970
+++ ftp/pavuk/files/patch-af Wed Nov 29 05:23:02 2000
@@ -0,0 +1,8 @@
+--- icons/Makefile.am.orig Thu Mar 2 07:03:32 2000
++++ icons/Makefile.am Wed Nov 29 05:22:50 2000
+@@ -1,4 +1,4 @@
+-iconsdir = $(datadir)/icons
++iconsdir = $(pkgdatadir)/icons
+
+ icons_DATA = pavuk_16x16.xpm pavuk_32x32.xpm pavuk_64x64.xpm \
+ pavuk_as_icon.xpm pavuk_prg_icon.xpm
diff -urN /usr/ports/ftp/pavuk/pkg-plist ftp/pavuk/pkg-plist
--- /usr/ports/ftp/pavuk/pkg-plist Fri Jul 14 21:35:13 2000
+++ ftp/pavuk/pkg-plist Thu Nov 30 00:45:30 2000
@@ -1,20 +1,25 @@
bin/pavuk
-etc/pavukrc.sample
etc/pavuk_authinfo.sample
+etc/pavukrc.sample
share/doc/pavuk/AUTHORS
share/doc/pavuk/BUGS
+share/doc/pavuk/CREDITS
share/doc/pavuk/ChangeLog
share/doc/pavuk/FAQ
+share/doc/pavuk/MAILINGLIST
+share/doc/pavuk/NEWS
share/doc/pavuk/README
-share/doc/pavuk/THANK_TO
-share/doc/pavuk/TODO
-share/icons/pavuk_16x16.xpm
-share/icons/pavuk_32x32.xpm
-share/icons/pavuk_64x64.xpm
-share/icons/pavuk_as_icon.xpm
-share/icons/pavuk_prg_icon.xpm
+share/pavuk/icons/pavuk_16x16.xpm
+share/pavuk/icons/pavuk_32x32.xpm
+share/pavuk/icons/pavuk_64x64.xpm
+share/pavuk/icons/pavuk_as_icon.xpm
+share/pavuk/icons/pavuk_prg_icon.xpm
share/locale/cs/LC_MESSAGES/pavuk.mo
share/locale/de/LC_MESSAGES/pavuk.mo
+share/locale/es/LC_MESSAGES/pavuk.mo
+share/locale/fr/LC_MESSAGES/pavuk.mo
+share/locale/it/LC_MESSAGES/pavuk.mo
share/locale/sk/LC_MESSAGES/pavuk.mo
+@dirrm share/pavuk/icons
+@dirrm share/pavuk
@dirrm share/doc/pavuk
-@unexec rmdir %D/share/icons > /dev/null 2>&1 || true
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200012020331.eB23VB006023>