From 87e5f8daec1fd4f1d1533d2785d9af20e4ac2b0f Mon Sep 17 00:00:00 2001 From: Kevin Lo Date: Sat, 2 Dec 2000 15:49:56 +0000 Subject: Update to version 0.9.26 PR: 23222 Submitted by: Ports Fury --- ftp/pavuk/Makefile | 81 ++++++++++++++++++++++++------------------------ ftp/pavuk/distinfo | 2 +- ftp/pavuk/files/patch-ab | 26 ---------------- ftp/pavuk/files/patch-ac | 12 ------- ftp/pavuk/files/patch-ad | 11 ------- ftp/pavuk/files/patch-ae | 37 +++++++++++++++++----- ftp/pavuk/files/patch-af | 8 +++++ ftp/pavuk/pkg-plist | 23 ++++++++------ 8 files changed, 93 insertions(+), 107 deletions(-) delete mode 100644 ftp/pavuk/files/patch-ab delete mode 100644 ftp/pavuk/files/patch-ac delete mode 100644 ftp/pavuk/files/patch-ad create mode 100644 ftp/pavuk/files/patch-af (limited to 'ftp/pavuk') diff --git a/ftp/pavuk/Makefile b/ftp/pavuk/Makefile index 708b555ffb9f..86660d4d5bd0 100644 --- a/ftp/pavuk/Makefile +++ b/ftp/pavuk/Makefile @@ -5,56 +5,55 @@ # $FreeBSD$ # -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 + +.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 - -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 +pre-configure: + @cd ${WRKSRC} && aclocal + +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 +.include diff --git a/ftp/pavuk/distinfo b/ftp/pavuk/distinfo index 78c98ddde62e..e12dbd336710 100644 --- a/ftp/pavuk/distinfo +++ b/ftp/pavuk/distinfo @@ -1 +1 @@ -MD5 (pavuk-0.9pl18.tgz) = a7d192948e7f9637f0005489c4f24249 +MD5 (pavuk-0.9pl26.tgz) = cb211efa0219aaf43b9186fa0572681a diff --git a/ftp/pavuk/files/patch-ab b/ftp/pavuk/files/patch-ab deleted file mode 100644 index 573e520b98fa..000000000000 --- a/ftp/pavuk/files/patch-ab +++ /dev/null @@ -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 --git a/ftp/pavuk/files/patch-ac b/ftp/pavuk/files/patch-ac deleted file mode 100644 index 61ba400015cb..000000000000 --- a/ftp/pavuk/files/patch-ac +++ /dev/null @@ -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 - #endif - #ifdef HAVE_FSTATFS --#include -+#include -+#include - #endif - #include - #include diff --git a/ftp/pavuk/files/patch-ad b/ftp/pavuk/files/patch-ad deleted file mode 100644 index d425e9cc9b19..000000000000 --- a/ftp/pavuk/files/patch-ad +++ /dev/null @@ -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 --git a/ftp/pavuk/files/patch-ae b/ftp/pavuk/files/patch-ae index f1f89a6c4c59..60087db9603a 100644 --- a/ftp/pavuk/files/patch-ae +++ b/ftp/pavuk/files/patch-ae @@ -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 --git a/ftp/pavuk/files/patch-af b/ftp/pavuk/files/patch-af new file mode 100644 index 000000000000..ef93ceb79834 --- /dev/null +++ b/ftp/pavuk/files/patch-af @@ -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 --git a/ftp/pavuk/pkg-plist b/ftp/pavuk/pkg-plist index 5cb0c31350cf..7483fa507bca 100644 --- a/ftp/pavuk/pkg-plist +++ b/ftp/pavuk/pkg-plist @@ -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 -- cgit v1.2.3