Date: Thu, 10 Nov 2005 19:37:38 -0300 From: "Alejandro Pulver" <alejandro@varnet.biz> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/88815: [MAINTAINER UPDATE] ftp/prozilla: update to version 2.0.1, remove all patches Message-ID: <1131662258.0@phobos.mars.bsd> Resent-Message-ID: <200511102240.jAAMeC17008050@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 88815
>Category: ports
>Synopsis: [MAINTAINER UPDATE] ftp/prozilla: update to version 2.0.1, remove all patches
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Nov 10 22:40:12 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Alejandro Pulver
>Release: FreeBSD 5.4-RELEASE i386
>Organization:
>Environment:
System: FreeBSD 5.4-RELEASE #0: Sat May 21 12:14:47 ART 2005
root@ale.varnet.bsd:/usr/src/sys/i386/compile/ATHLON-ALE
>Description:
Changes:
* Update to version 2.0.1.
* Remove all patches (they were integrated into the release).
* Use bzip2 distfile (asked to the author).
>How-To-Repeat:
>Fix:
--- prozilla.diff begins here ---
diff -urN /usr/ports/ftp/prozilla/Makefile prozilla/Makefile
--- /usr/ports/ftp/prozilla/Makefile Wed Oct 12 06:27:16 2005
+++ prozilla/Makefile Thu Nov 10 18:20:18 2005
@@ -6,32 +6,21 @@
#
PORTNAME= prozilla
-PORTVERSION= 1.3.7.4
+PORTVERSION= 2.0.1
CATEGORIES= ftp
MASTER_SITES= http://prozilla.genesys.ro/downloads/prozilla/tarballs/
MAINTAINER= alejandro@varnet.biz
COMMENT= ProZilla is a fast download accelerator
+USE_BZIP2= yes
USE_GETOPT_LONG=yes
USE_GMAKE= yes
-USE_REINPLACE= yes
-GNU_CONFIGURE= yes
+USE_LIBTOOL_VER=15
-MAN1= proz.1 prozilla.1
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
-.if !defined(NOPORTDOCS)
-PORTDOCS= ANNOUNCE AUTHORS COPYING CREDITS ChangeLog INSTALL FAQ NEWS \
- README TODO
-.endif
-
-post-patch:
- @${REINPLACE_CMD} -e 's|%Ld|%lld|g' ${WRKSRC}/src/*.c ${WRKSRC}/src/*.h
-
-post-install:
-.if !defined(NOPORTDOCS)
- ${MKDIR} ${DOCSDIR}
- (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR})
-.endif
+MAN1= proz.1
.include <bsd.port.mk>
diff -urN /usr/ports/ftp/prozilla/distinfo prozilla/distinfo
--- /usr/ports/ftp/prozilla/distinfo Wed Oct 12 06:27:16 2005
+++ prozilla/distinfo Thu Nov 10 16:30:25 2005
@@ -1,2 +1,3 @@
-MD5 (prozilla-1.3.7.4.tar.gz) = b594b55b1b49a8eca2505173cc1bfc44
-SIZE (prozilla-1.3.7.4.tar.gz) = 222229
+MD5 (prozilla-2.0.1.tar.bz2) = cb9ae30db4445fcb55b93b68cf2b6d4e
+SHA256 (prozilla-2.0.1.tar.bz2) = 941c54260d21627d24db0a8a9d112a701ef66725c22656c6ce8ffd9943911c55
+SIZE (prozilla-2.0.1.tar.bz2) = 873347
diff -urN /usr/ports/ftp/prozilla/files/patch-connect.c prozilla/files/patch-connect.c
--- /usr/ports/ftp/prozilla/files/patch-connect.c Wed Oct 12 06:27:17 2005
+++ prozilla/files/patch-connect.c Wed Dec 31 21:00:00 1969
@@ -1,126 +0,0 @@
---- src/connect.c.orig Sat Feb 26 16:47:17 2005
-+++ src/connect.c Sun Oct 9 13:06:34 2005
-@@ -24,9 +24,11 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <fcntl.h>
- #include <netdb.h>
-+#include <netinet/in_systm.h>
- #include <netinet/in.h>
- #include <netinet/ip.h>
- #include <netdb.h>
-@@ -42,53 +44,52 @@
- #include "runtime.h"
- #include "debug.h"
-
-+static pthread_mutex_t __thread_safe_lock = PTHREAD_MUTEX_INITIALIZER;
-+
- uerr_t connect_to_server(int *sock, char *name, int port, int timeout)
- {
-- unsigned int portnum;
-+ char szPort[10];
- int status;
-- struct sockaddr_in server;
-- struct hostent *hp, hostbuf;
- extern int h_errno;
- /* int opt; */
- int noblock, flags;
-
-- char *tmphstbuf;
-- size_t hstbuflen = 2048;
-- tmphstbuf = kmalloc(hstbuflen);
-+ struct addrinfo hints, *res=NULL;
-+ struct addrinfo *res0=NULL;
-+ int error;
-
- assert(name != NULL);
-
-- portnum = port;
-- memset((void *) &server, 0, sizeof(server));
-+ memset(&hints, 0, sizeof(hints));
-+ memset(szPort, 0, sizeof(szPort));
-+ snprintf(szPort, sizeof(szPort), "%d", port);
-+ hints.ai_family = AF_INET;
-+ hints.ai_socktype = SOCK_STREAM;
-
- message("Resolving %s", name);
-
-- hp=k_gethostname (name,&hostbuf,&tmphstbuf,&hstbuflen);
--
-- if (hp == NULL)
-- {
-- message("Failed to resolve %s", name);
-- return HOSTERR;
-- }
-+ error = getaddrinfo(name, szPort, &hints, &res);
-+ if (error) {
-+ message("Failed to resolve %s", name);
-+ pthread_mutex_unlock(&__thread_safe_lock);
-+ freeaddrinfo(res);
-+ return HOSTERR;
-+ }
-
- message("Resolved %s !", name);
--
-- memcpy((void *) &server.sin_addr, hp->h_addr, hp->h_length);
-- server.sin_family = hp->h_addrtype;
-- server.sin_port = htons(portnum);
-
-- if (tmphstbuf)
-- {
-- free(tmphstbuf);
-- tmphstbuf = NULL;
-- }
-+ res0 = (struct addrinfo *) malloc(sizeof(struct addrinfo));
-+ memcpy(res0, res, sizeof(struct addrinfo));
-+ freeaddrinfo(res);
-+ pthread_mutex_unlock(&__thread_safe_lock);
-
- /*
- * create socket
- */
-- if ((*sock = socket(AF_INET, SOCK_STREAM, 0)) < 1)
-+ if ((*sock = socket(res0->ai_family, res0->ai_socktype, 0)) < 1)
- {
- message("unable to create socket\n");
-+ free(res0);
- return CONSOCKERR;
- }
- /*Experimental */
-@@ -100,8 +101,7 @@
-
- message("Connecting to server.......");
-
--
-- status = connect(*sock, (struct sockaddr *) &server, sizeof(server));
-+ status = connect(*sock, res0->ai_addr, res0->ai_addrlen);
-
- if (status == -1 && noblock != -1 && errno == EINPROGRESS)
- {
-@@ -137,10 +137,13 @@
- {
- close(*sock);
-
-- if (errno == ECONNREFUSED)
-+ if (errno == ECONNREFUSED) {
-+ free(res0);
- return CONREFUSED;
-- else
-+ } else {
-+ free(res0);
- return CONERROR;
-+ }
- } else
- {
- flags = fcntl(*sock, F_GETFL, 0);
-@@ -156,6 +159,7 @@
- * (char *) &opt, (int) sizeof(opt));
- */
- message("Connect OK!");
-+ free(res0);
- return NOCONERROR;
- }
-
diff -urN /usr/ports/ftp/prozilla/files/patch-connection.c prozilla/files/patch-connection.c
--- /usr/ports/ftp/prozilla/files/patch-connection.c Sat Apr 19 18:06:54 2003
+++ prozilla/files/patch-connection.c Wed Dec 31 21:00:00 1969
@@ -1,15 +0,0 @@
---- src/connection.c.ori Sat Jan 25 00:33:14 2003
-+++ src/connection.c Sat Jan 25 00:33:38 2003
-@@ -30,7 +30,12 @@
- #include <assert.h>
- #include <pthread.h>
-
-+#ifdef __FreeBSD__
-+#include <sys/param.h>
-+#include <sys/mount.h>
-+#else
- #include <sys/vfs.h>
-+#endif
-
- #include "connection.h"
- #include "misc.h"
diff -urN /usr/ports/ftp/prozilla/files/patch-ftp-retr.c prozilla/files/patch-ftp-retr.c
--- /usr/ports/ftp/prozilla/files/patch-ftp-retr.c Sat Apr 19 18:06:54 2003
+++ prozilla/files/patch-ftp-retr.c Wed Dec 31 21:00:00 1969
@@ -1,10 +0,0 @@
---- src/ftp-retr.c.ori Sat Jan 25 00:40:45 2003
-+++ src/ftp-retr.c Sat Jan 25 00:40:56 2003
-@@ -32,6 +32,7 @@
- #include <netdb.h>
- #include <sys/socket.h>
- #include <sys/time.h>
-+#include <netinet/in_systm.h>
- #include <netinet/in.h>
- #include <netinet/ip.h>
- #include <netinet/tcp.h>
diff -urN /usr/ports/ftp/prozilla/files/patch-ftpsearch.c prozilla/files/patch-ftpsearch.c
--- /usr/ports/ftp/prozilla/files/patch-ftpsearch.c Sat Apr 19 18:06:54 2003
+++ prozilla/files/patch-ftpsearch.c Wed Dec 31 21:00:00 1969
@@ -1,10 +0,0 @@
---- src/ftpsearch.c.ori Sat Jan 25 00:45:38 2003
-+++ src/ftpsearch.c Sat Jan 25 00:45:48 2003
-@@ -25,6 +25,7 @@
- #include <sys/socket.h>
- #include <fcntl.h>
- #include <netdb.h>
-+#include <netinet/in_systm.h>
- #include <netinet/in.h>
- #include <netinet/ip.h>
- #include <arpa/inet.h>
diff -urN /usr/ports/ftp/prozilla/files/patch-http-retr.c prozilla/files/patch-http-retr.c
--- /usr/ports/ftp/prozilla/files/patch-http-retr.c Sat Apr 19 18:06:54 2003
+++ prozilla/files/patch-http-retr.c Wed Dec 31 21:00:00 1969
@@ -1,10 +0,0 @@
---- src/http-retr.c.ori Sat Jan 25 00:49:21 2003
-+++ src/http-retr.c Sat Jan 25 00:49:34 2003
-@@ -32,6 +32,7 @@
- #include <fcntl.h>
- #include <sys/socket.h>
- #include <sys/time.h>
-+#include <netinet/in_systm.h>
- #include <netinet/in.h>
- #include <netinet/ip.h>
- #include <netinet/tcp.h>
diff -urN /usr/ports/ftp/prozilla/files/patch-ltmain.sh prozilla/files/patch-ltmain.sh
--- /usr/ports/ftp/prozilla/files/patch-ltmain.sh Wed Dec 31 21:00:00 1969
+++ prozilla/files/patch-ltmain.sh Thu Nov 10 16:35:12 2005
@@ -0,0 +1,16 @@
+--- 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 -urN /usr/ports/ftp/prozilla/files/patch-misc.c prozilla/files/patch-misc.c
--- /usr/ports/ftp/prozilla/files/patch-misc.c Sat Apr 19 18:06:54 2003
+++ prozilla/files/patch-misc.c Wed Dec 31 21:00:00 1969
@@ -1,10 +0,0 @@
---- src/misc.c.ori Sat Jan 25 01:38:04 2003
-+++ src/misc.c Sat Jan 25 01:38:40 2003
-@@ -24,7 +24,6 @@
- #include <stdio.h>
- #include <stdarg.h>
- #include <stdlib.h>
--#include <malloc.h>
- #include <string.h>
- #include <ctype.h>
- #include <curses.h>
diff -urN /usr/ports/ftp/prozilla/files/patch-ping.c prozilla/files/patch-ping.c
--- /usr/ports/ftp/prozilla/files/patch-ping.c Sat Apr 19 18:06:54 2003
+++ prozilla/files/patch-ping.c Wed Dec 31 21:00:00 1969
@@ -1,10 +0,0 @@
---- src/ping.c.ori Sat Jan 25 00:53:13 2003
-+++ src/ping.c Sat Jan 25 00:53:28 2003
-@@ -23,6 +23,7 @@
- #include <sys/socket.h>
- #include <fcntl.h>
- #include <netdb.h>
-+#include <netinet/in_systm.h>
- #include <netinet/in.h>
- #include <netinet/ip.h>
- #include <arpa/inet.h>
diff -urN /usr/ports/ftp/prozilla/pkg-plist prozilla/pkg-plist
--- /usr/ports/ftp/prozilla/pkg-plist Wed Oct 12 06:27:16 2005
+++ prozilla/pkg-plist Thu Nov 10 16:27:39 2005
@@ -1,3 +1,15 @@
bin/proz
-@unexec if cmp -s %D/etc/prozilla.conf %D/etc/prozilla.conf-sample; then rm -f %D/etc/prozilla.conf; fi
-etc/prozilla.conf-sample
+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
+share/locale/nl/LC_MESSAGES/.mo
+share/locale/nl/LC_MESSAGES/proz.mo
+share/locale/pt_BR/LC_MESSAGES/.mo
+share/locale/pt_BR/LC_MESSAGES/proz.mo
+share/locale/ro/LC_MESSAGES/.mo
+share/locale/ro/LC_MESSAGES/proz.mo
--- prozilla.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1131662258.0>