From 31eaf476dc810936ea076a33c75f42a84e8ff6e0 Mon Sep 17 00:00:00 2001
From: Florent Thoumie <flz@FreeBSD.org>
Date: Fri, 25 Nov 2005 17:12:46 +0000
Subject: - Fix compilation issue on 4.x. - Remove .la libtool file.

PR:		ports/89537
Submitted by:	maintainer
---
 ftp/prozilla/Makefile                          |  4 ++--
 ftp/prozilla/files/patch-libprozilla_ltmain.sh | 15 +++++++++++++++
 ftp/prozilla/files/patch-ltmain.sh             | 16 ----------------
 ftp/prozilla/files/patch-src_interface.c       | 18 ++++++++++++++++++
 ftp/prozilla/pkg-plist                         |  1 -
 5 files changed, 35 insertions(+), 19 deletions(-)
 create mode 100644 ftp/prozilla/files/patch-libprozilla_ltmain.sh
 delete mode 100644 ftp/prozilla/files/patch-ltmain.sh
 create mode 100644 ftp/prozilla/files/patch-src_interface.c

diff --git a/ftp/prozilla/Makefile b/ftp/prozilla/Makefile
index ff5393b8f814..e6ac32791dd3 100644
--- a/ftp/prozilla/Makefile
+++ b/ftp/prozilla/Makefile
@@ -16,16 +16,16 @@ COMMENT=	ProZilla is a fast download accelerator
 USE_BZIP2=	yes
 USE_GETOPT_LONG=yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
 USE_REINPLACE=	yes
 
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=		proz.1
 
 post-patch:
-	${REINPLACE_CMD} -e 's|CPPFLAGS =|CPPFLAGS = @CPPFLAGS@|' \
+	@${REINPLACE_CMD} -e 's|CPPFLAGS =|CPPFLAGS = @CPPFLAGS@|' \
 		${WRKSRC}/libprozilla/src/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/ftp/prozilla/files/patch-libprozilla_ltmain.sh b/ftp/prozilla/files/patch-libprozilla_ltmain.sh
new file mode 100644
index 000000000000..d78d6635cc96
--- /dev/null
+++ b/ftp/prozilla/files/patch-libprozilla_ltmain.sh
@@ -0,0 +1,15 @@
+--- libprozilla/ltmain.sh.orig	Fri Jan 28 12:29:23 2005
++++ libprozilla/ltmain.sh	Fri Nov 25 13:05:58 2005
+@@ -5620,10 +5620,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/ftp/prozilla/files/patch-ltmain.sh b/ftp/prozilla/files/patch-ltmain.sh
deleted file mode 100644
index 7f883792c4f8..000000000000
--- a/ftp/prozilla/files/patch-ltmain.sh
+++ /dev/null
@@ -1,16 +0,0 @@
---- ltmain.sh.orig	Wed Nov  2 13:02:43 2005
-+++ ltmain.sh	Thu Nov 10 16:33:44 2005
-@@ -5771,11 +5771,13 @@
- 	  IFS="$save_ifs"
- 	fi
- 
-+	if /usr/bin/false; then
- 	# Install the pseudo-library for information purposes.
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/ftp/prozilla/files/patch-src_interface.c b/ftp/prozilla/files/patch-src_interface.c
new file mode 100644
index 000000000000..c0961404d420
--- /dev/null
+++ b/ftp/prozilla/files/patch-src_interface.c
@@ -0,0 +1,18 @@
+--- src/interface.c.orig	Thu Nov  3 23:18:15 2005
++++ src/interface.c	Fri Nov 25 12:54:48 2005
+@@ -281,6 +281,7 @@
+   char buf[1000];
+   int i = 0;
+   int line = 1;
++  int secs_left;
+   
+   //  erase();
+     refresh();
+@@ -338,7 +339,6 @@
+ 	   current_dl_speed , proz_download_get_average_speed(download) / 1024);
+     mvprintw(line++,1, buf);
+     clrtoeol();
+-    int secs_left;
+ 
+     if ((secs_left = proz_download_get_est_time_left(download)) != -1)
+     {
diff --git a/ftp/prozilla/pkg-plist b/ftp/prozilla/pkg-plist
index 893b3e27e31a..2bb7ee08f8f8 100644
--- a/ftp/prozilla/pkg-plist
+++ b/ftp/prozilla/pkg-plist
@@ -3,7 +3,6 @@ include/common.h
 include/netrc.h
 include/prozilla.h
 lib/libprozilla.a
-lib/libprozilla.la
 share/locale/fr/LC_MESSAGES/proz.mo
 share/locale/it/LC_MESSAGES/.mo
 share/locale/it/LC_MESSAGES/proz.mo
-- 
cgit v1.2.3