Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 26 Nov 2001 14:15:58 -0800 (PST)
From:      KATO Tsuguru <tkato@prontomail.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/32306: Update port: ftp/mget 1.3.0.2
Message-ID:  <200111262215.fAQMFwq48868@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         32306
>Category:       ports
>Synopsis:       Update port: ftp/mget 1.3.0.2
>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:   Mon Nov 26 14:20:01 PST 2001
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.4-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 1.3.0.2

Remove file:
files/patch-Makefile
files/patch-mget.c
files/patch-mget.h

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/ftp/mget/Makefile ftp/mget/Makefile
--- /usr/ports/ftp/mget/Makefile	Mon Sep 24 10:37:31 2001
+++ ftp/mget/Makefile	Mon Nov 26 22:07:12 2001
@@ -7,19 +7,24 @@
 #
 
 PORTNAME=	mget
-PORTVERSION=	1.3.0
+PORTVERSION=	1.3.0.2
 CATEGORIES=	ftp
 MASTER_SITES=	http://home.talkcity.com/LaGrangeLn/dbera/
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	gnugetopt:${PORTSDIR}/devel/libgnugetopt
+LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 
-ALL_TARGET=	${PORTNAME}
+CFLAGS+=	-DHAS_HERROR -DHAVE_GETOPT_LONG -DHAVE_INET_NTOP -DHAVE_IPV6 \
+		-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS=	-L${LOCALBASE}/lib -lgnugetopt ${PTHREAD_LIBS}
 
-post-patch:
-	@${PERL} -pi -e "s,-lpthread,${PTHREAD_LIBS},g ; \
-		s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/Makefile
+pre-patch:
+	@find ${WRKSRC} -name '*.[ch]' | xargs ${PERL} -pi -e \
+		's|#include <malloc.h>||g'
+
+do-build:
+	cd ${WRKSRC} && ${CC} ${CFLAGS} -o mget *.c ${LDFLAGS}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mget ${PREFIX}/bin
diff -urN /usr/ports/ftp/mget/distinfo ftp/mget/distinfo
--- /usr/ports/ftp/mget/distinfo	Mon Sep 24 10:37:31 2001
+++ ftp/mget/distinfo	Sat Nov 24 09:14:17 2001
@@ -1 +1 @@
-MD5 (mget-1.3.0.tar.gz) = fb7d29de46181f9939b5b11aa13aa8eb
+MD5 (mget-1.3.0.2.tar.gz) = ec78edddc43172bd00421e2323c35995
diff -urN /usr/ports/ftp/mget/files/patch-Makefile ftp/mget/files/patch-Makefile
--- /usr/ports/ftp/mget/files/patch-Makefile	Mon Sep 24 10:37:32 2001
+++ ftp/mget/files/patch-Makefile	Thu Jan  1 09:00:00 1970
@@ -1,18 +0,0 @@
---- Makefile.orig	Sat Sep 22 00:28:48 2001
-+++ Makefile	Sat Sep 22 00:29:33 2001
-@@ -2,12 +2,13 @@
- CC=gcc
- DEFS=-DHAS_HERROR -DHAVE_IPV6 -DHAVE_GETOPT
- DEBUG=
--CFLAGS=-Wall $(DEFS) $(DEBUG)
-+CFLAGS+=-Wall $(DEFS) $(DEBUG) -I%%LOCALBASE%%/include
- #CFLAGS=-Wall
--LDFLAGS=-lpthread
-+LDFLAGS=-lpthread -L%%LOCALBASE%%/lib -lgnugetopt
- #LDFLAGS=-lpthread -lsocket -lnsl
- 
- mget: mget.o mgetutil.o
-+		${CC} ${LDFLAGS} mget.o mgetutil.o -o mget
- 
- mget.usriv: mget_usriv.o mgetutil.o
- 		$(CC) $(LDFLAGS) mget_usriv.o mgetutil.o -o mget.usriv
diff -urN /usr/ports/ftp/mget/files/patch-mget.c ftp/mget/files/patch-mget.c
--- /usr/ports/ftp/mget/files/patch-mget.c	Mon Sep 24 10:37:32 2001
+++ ftp/mget/files/patch-mget.c	Thu Jan  1 09:00:00 1970
@@ -1,13 +0,0 @@
---- mget.c.orig	Sat Sep 22 00:34:44 2001
-+++ mget.c	Sat Sep 22 00:35:26 2001
-@@ -604,8 +604,10 @@
- 	return segment;
- }
- 
-+/*
- #if !defined(linux) || !defined(HAVE_IPV6)
- char *inet_ntop(int af, INADDR *src, char *dst, size_t cnt){
- 	        return inet_ntoa((INADDR)(*src));
- }
- #endif
-+*/
diff -urN /usr/ports/ftp/mget/files/patch-mget.h ftp/mget/files/patch-mget.h
--- /usr/ports/ftp/mget/files/patch-mget.h	Mon Sep 24 10:37:32 2001
+++ ftp/mget/files/patch-mget.h	Thu Jan  1 09:00:00 1970
@@ -1,14 +0,0 @@
---- mget.h.orig	Sat Sep 22 00:34:48 2001
-+++ mget.h	Sat Sep 22 00:35:03 2001
-@@ -60,9 +60,11 @@
- #define herror(A) printf("%s\n",A)
- #endif
- 
-+/*
- #if !defined(__linux__) || !defined(HAVE_IPV6)
- char *inet_ntop(int , INADDR *, char *, size_t );
- #endif
-+*/
- 
- #ifndef NULL 
- #define NULL 0 //some compilers complained

>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?200111262215.fAQMFwq48868>