[72523] trunk/dports/net

Tue Oct 19 11:20:40 PDT 2010

Revision: 72523
          http://trac.macports.org/changeset/72523
Author:   afb at macports.org
Date:     2010-10-19 11:20:37 -0700 (Tue, 19 Oct 2010)
Log Message:
-----------
port upgrade from 6.2.0 (2007) to 7.3.0 (2010)

Modified Paths:
--------------
    trunk/dports/net/fetch/Portfile
    trunk/dports/net/libfetch/Portfile
    trunk/dports/net/libfetch/files/patch-Makefile

Added Paths:
-----------
    trunk/dports/net/libfetch/files/patch-http.c

Modified: trunk/dports/net/fetch/Portfile
===================================================================

--- trunk/dports/net/fetch/Portfile	2010-10-19 18:01:05 UTC (rev 72522)
+++ trunk/dports/net/fetch/Portfile	2010-10-19 18:20:37 UTC (rev 72523)
@@ -3,9 +3,9 @@
 PortSystem 1.0
 
 name		fetch
-version		6.2.0-RELEASE
+version		7.3.0-RELEASE
 categories	net
-maintainers	nomaintainer
+maintainers	afb
 description	FreeBSD file fetching utility
 long_description	Fetch provides a command-line interface to the fetch(3) library. \
 	Its purpose is to retrieve the file(s) pointed to by the URL(s) on the command line.
@@ -13,12 +13,12 @@
 use_bzip2	yes
 homepage	http://www.freebsd.org/
 master_sites	macports
-checksums	md5 41f930ab95e10e6d204bf8ac380db7bd
+checksums	md5 adfd092d7cd45c9797105e433662591f
 worksrcdir	${name}
 use_configure	no
-depends_lib	lib:libfetch.4:libfetch
+depends_lib	lib:libfetch.5:libfetch lib:ssl:openssl
 build.type	bsd
-build.args	CFLAGS+=-I${prefix}/include LDFLAGS+=-L${prefix}/lib
+build.args	CFLAGS+=-I${prefix}/include LDFLAGS+=-L${prefix}/lib -DMK_OPENSSL
 
 destroot	{
 		xinstall -m 755 ${workpath}/${worksrcdir}/fetch ${destroot}${prefix}/bin

Modified: trunk/dports/net/libfetch/Portfile
===================================================================
--- trunk/dports/net/libfetch/Portfile	2010-10-19 18:01:05 UTC (rev 72522)
+++ trunk/dports/net/libfetch/Portfile	2010-10-19 18:20:37 UTC (rev 72523)
@@ -3,10 +3,9 @@
 PortSystem 1.0
 
 name		libfetch
-version		6.2.0-RELEASE
-revision	1
+version		7.3.0-RELEASE
 categories	net
-maintainers	nomaintainer
+maintainers	afb
 description	FreeBSD file fetching library
 long_description	These functions implement a high-level library for retrieving and \
 			uploading files using Uniform Resource Locators (URLs).
@@ -14,18 +13,26 @@
 use_bzip2	yes
 homepage	http://www.freebsd.org/
 master_sites	macports
-checksums	md5 0d0b59e7c13b7bce67bcdd13e1fde7d5
+checksums	md5 34431a8480734c42a822701c36772b97
 build.type	bsd
+build.args	-DMK_INET6_SUPPORT -DMK_OPENSSL
 worksrcdir	${name}
 use_configure	no
-set libver	4
+set libver	5
 destroot	{
 		xinstall -m 644 -c ${worksrcpath}/fetch.h ${destroot}${prefix}/include
 		xinstall -m 644 -c ${worksrcpath}/fetch.3 ${destroot}${prefix}/share/man/man3 }
 
+depends_lib	lib:ssl:openssl
+patchfiles	patch-common.c patch-http.c
+
 platform darwin {
-	patchfiles	patch-Makefile patch-common.h patch-common.c
-	build.env	LDADD="-Wl,-install_name,${prefix}/lib/libfetch.${libver}.dylib"
+	patchfiles-append	patch-Makefile patch-common.h
+	post-build {
+		# need to add libdir, do it afterwards instead of messing with make
+		system "install_name_tool -id ${prefix}/lib/libfetch.${libver}.dylib \
+			${worksrcpath}/libfetch.${libver}.dylib"
+	}
 	pre-destroot {
 		xinstall -m 644 -c ${worksrcpath}/libfetch.${libver}.dylib \
 			${destroot}${prefix}/lib

Modified: trunk/dports/net/libfetch/files/patch-Makefile
===================================================================
--- trunk/dports/net/libfetch/files/patch-Makefile	2010-10-19 18:01:05 UTC (rev 72522)
+++ trunk/dports/net/libfetch/files/patch-Makefile	2010-10-19 18:20:37 UTC (rev 72523)
@@ -1,24 +1,25 @@
---- Makefile.orig	2007-09-08 22:24:45.000000000 +0200
-+++ Makefile	2007-09-08 22:29:04.000000000 +0200
-@@ -1,8 +1,8 @@
- # $FreeBSD: src/lib/libfetch/Makefile,v 1.44.2.1 2005/07/22 17:29:05 kensmith Exp $
+--- Makefile.orig	2010-02-10 01:26:20.000000000 +0100
++++ Makefile	2010-10-14 09:47:47.000000000 +0200
+@@ -4,7 +4,8 @@
+ .include <bsd.own.mk>
  
  LIB=		fetch
 -CFLAGS+=	-I.
--CFLAGS+=	-DINET6
 +CFLAGS+=	-no-cpp-precomp -fno-common -I.
-+CFLAGS+=	-DINET6 -D__FBSDID=__RCSID -D__unused=__attribute__\(\(__unused__\)\)
++CFLAGS+=	-D__FBSDID=__RCSID -D__unused=__attribute__\(\(__unused__\)\)
  SRCS=		fetch.c common.c ftp.c http.c file.c \
  		ftperr.h httperr.h
  INCS=		fetch.h
-@@ -11,8 +11,8 @@
- 
- .if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
- CFLAGS+=	-DWITH_SSL
--DPADD=		${LIBSSL} ${LIBCRYPTO}
--LDADD=		-lssl -lcrypto
-+DPADD+=		${LIBSSL} ${LIBCRYPTO}
-+LDADD+=		-lssl -lcrypto
+@@ -15,9 +16,9 @@
  .endif
  
- CSTD?=		c99
+ .if ${MK_OPENSSL} != "no"
+-CFLAGS+=	-DWITH_SSL
+-DPADD=		${LIBSSL} ${LIBCRYPTO} ${LIBMD}
+-LDADD=		-lssl -lcrypto -lmd
++CFLAGS+=	-DWITH_SSL -DWITH_SSL_MD5
++DPADD=		${LIBSSL} ${LIBCRYPTO}
++LDADD=		-lssl -lcrypto
+ .else
+ DPADD=		${LIBMD}
+ LDADD=		-lmd

Added: trunk/dports/net/libfetch/files/patch-http.c
===================================================================
--- trunk/dports/net/libfetch/files/patch-http.c	                        (rev 0)
+++ trunk/dports/net/libfetch/files/patch-http.c	2010-10-19 18:20:37 UTC (rev 72523)
@@ -0,0 +1,17 @@
+--- http.c.orig	2010-02-10 01:26:20.000000000 +0100
++++ http.c	2010-10-14 09:37:39.000000000 +0200
+@@ -76,7 +76,14 @@
+ #include <string.h>
+ #include <time.h>
+ #include <unistd.h>
++#ifndef WITH_SSL_MD5
+ #include <md5.h>
++#else
++#include <openssl/md5.h>
++#define MD5Init(c) MD5_Init(c)
++#define MD5Update(c,data,len) MD5_Update(c,data,(unsigned)len)
++#define MD5Final(d,c) MD5_Final((unsigned char *)d,c)
++#endif
+ 
+ #include <netinet/in.h>
+ #include <netinet/tcp.h>


Property changes on: trunk/dports/net/libfetch/files/patch-http.c
___________________________________________________________________
Added: svn:eol-style
   + native
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101019/a4cfff07/attachment.html>
