5 files changed, 28 insertions, 67 deletions
diff --git a/ftp/pavuk/Makefile b/ftp/pavuk/Makefile
index 5edbabb..1c14ada 100644
--- a/ftp/pavuk/Makefile
+++ b/ftp/pavuk/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	pavuk
-PORTVERSION=	0.9.27
+PORTVERSION=	0.9.28
 CATEGORIES=	ftp www
 MASTER_SITES=	${MASTER_SITE_SUNSITE} \
 		http://www.idata.sk/~ondrej/sw/
 MASTER_SITE_SUBDIR=	apps/www/mirroring
-DISTNAME=	${PORTNAME}-0.9pl27
+DISTNAME=	${PORTNAME}-0.9pl28
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
@@ -19,8 +19,8 @@ MAINTAINER=	ports@FreeBSD.org
 LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
 
 WANT_GTK=	yes
-USE_AUTOMAKE=	yes
-AUTOMAKE_ARGS=	--include-deps
+USE_OPENSSL=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS= --with-locale-dir=${LOCALBASE}/share/locale \
@@ -37,22 +37,20 @@ CONFIGURE_ARGS+=	--with-gtk-config="${GTK_CONFIG}"
 CONFIGURE_ARGS+=	--disable-gtk
 .endif
 
-.if defined(WITH_SSL)
-USE_OPENSSL=	yes
-.else
-CONFIGURE_ARGS+=	--disable-ssl
-.endif
-
-pre-configure:
-	@cd ${WRKSRC} && aclocal
+pre-patch:
+	@${PERL} -pi -e 's|-pthread -DHAVE_MT|${PTHREAD_CFLAGS} -DHAVE_MT|g ; \
+		 s|-pthread|${PTHREAD_LIBS}|g ; \
+		 s|-lpthreads|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
+	@find  ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+		's|\$$\(datadir\)/icons|\$$\(pkgdatadir\)/icons|g'
 
 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
+	@${MKDIR} ${DOCSDIR}
 .for file in AUTHORS BUGS CREDITS ChangeLog FAQ MAILINGLIST NEWS README
-	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/pavuk
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/ftp/pavuk/distinfo b/ftp/pavuk/distinfo
index 776faec..30663d9 100644
--- a/ftp/pavuk/distinfo
+++ b/ftp/pavuk/distinfo
@@ -1 +1 @@
-MD5 (pavuk-0.9pl27.tgz) = 3e1f02993dca7b7faafe0e370aeed8ff
+MD5 (pavuk-0.9pl28.tgz) = d0f7b77bd11322add1f7d52d62afbf78
diff --git a/ftp/pavuk/files/patch-ae b/ftp/pavuk/files/patch-ae
deleted file mode 100644
index eab94f2..0000000
--- a/ftp/pavuk/files/patch-ae
+++ /dev/null
@@ -1,30 +0,0 @@
---- configure.in.orig	Thu Dec 14 06:47:13 2000
-+++ configure.in	Fri Dec 15 23:12:19 2000
-@@ -244,15 +244,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_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
- 
-@@ -269,7 +269,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
diff --git a/ftp/pavuk/files/patch-af b/ftp/pavuk/files/patch-af
deleted file mode 100644
index ef93ceb7..0000000
--- a/ftp/pavuk/files/patch-af
+++ /dev/null
@@ -1,8 +0,0 @@
---- 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 7483fa5..d48417b 100644
--- a/ftp/pavuk/pkg-plist
+++ b/ftp/pavuk/pkg-plist
@@ -1,25 +1,26 @@
 bin/pavuk
 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/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
+%%PORTDOCS%%share/doc/pavuk/AUTHORS
+%%PORTDOCS%%share/doc/pavuk/BUGS
+%%PORTDOCS%%share/doc/pavuk/CREDITS
+%%PORTDOCS%%share/doc/pavuk/ChangeLog
+%%PORTDOCS%%share/doc/pavuk/FAQ
+%%PORTDOCS%%share/doc/pavuk/MAILINGLIST
+%%PORTDOCS%%share/doc/pavuk/NEWS
+%%PORTDOCS%%share/doc/pavuk/README
 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/ja/LC_MESSAGES/pavuk.mo
 share/locale/sk/LC_MESSAGES/pavuk.mo
+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
 @dirrm share/pavuk/icons
 @dirrm share/pavuk
-@dirrm share/doc/pavuk
+%%PORTDOCS%%@dirrm share/doc/pavuk