Attachment 99766 Details for Bug 138937 – file.diff

[patch] file.diff

file.diff (text/plain), 3.26 KB, created by Ganael LAPLANCHE on 2009-09-18 13:30:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ganael LAPLANCHE

Created: 2009-09-18 13:30:01 UTC

Size: 3.26 KB

patch

obsolete

>diff -aurN lftp.orig/Makefile lftp/Makefile
>--- lftp.orig/Makefile	2009-09-17 08:05:16.445085618 +0000
>+++ lftp/Makefile	2009-09-18 08:32:37.776575234 +0000
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	lftp
>-PORTVERSION=	3.7.15
>-PORTREVISION=	1
>+PORTVERSION=	4.0.0
> CATEGORIES=	ftp ipv6
> MASTER_SITES=	ftp://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/ \
> 		ftp://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/old/ \
>@@ -36,8 +35,8 @@
> 		MIRRORS NEWS README README.debug-levels README.modules \
> 		THANKS TODO
> 
>-OPTIONS=	GNUTLS "With GnutTLS support" off \
>-		OPENSSL "With OpenSSL support" on \
>+OPTIONS=	OPENSSL "With OpenSSL support" on \
>+		GNUTLS "With GnutTLS support" off \
> 		NLS "With i18n support" on
> 
> .include <bsd.port.pre.mk>
>@@ -47,13 +46,6 @@
> RUN_DEPENDS+=	${LOCALBASE}/lib/libreadline.so.6:${PORTSDIR}/devel/readline
> .endif
> 
>-.if defined(WITH_GNUTLS)
>-LIB_DEPENDS+=	gnutls:${PORTSDIR}/security/gnutls
>-CONFIGURE_ARGS+=	--with-gnutls
>-.else
>-CONFIGURE_ARGS+=	--without-gnutls
>-.endif
>-
> .if !defined(WITHOUT_OPENSSL)
> .include "${PORTSDIR}/Mk/bsd.openssl.mk"
> CONFIGURE_ARGS+=	--with-openssl
>@@ -61,6 +53,13 @@
> CONFIGURE_ARGS+=	--without-openssl
> .endif
> 
>+.if defined(WITH_GNUTLS)
>+LIB_DEPENDS+=	gnutls:${PORTSDIR}/security/gnutls
>+CONFIGURE_ARGS+=	--with-gnutls
>+.else
>+CONFIGURE_ARGS+=	--without-gnutls
>+.endif
>+
> .if !defined(WITHOUT_NLS)
> USE_GETTEXT=	yes
> CONFIGURE_ARGS+=	--enable-nls
>@@ -72,6 +71,14 @@
> 
> MAN1=		lftp.1 lftpget.1
> 
>+pre-configure:
>+.if !defined(WITHOUT_OPENSSL) && defined(WITH_GNUTLS)
>+	@${ECHO_MSG} "========"
>+	@${ECHO_MSG} "WARNING: both OPENSSL and GNUTLS have been selected, OPENSSL will be used"
>+	@${ECHO_MSG} "========"
>+.endif
>+
>+
> post-install:
> 	@${INSTALL_DATA} ${WRKSRC}/lftp.conf ${PREFIX}/etc/lftp.conf.sample
> 	@if [ ! -f ${PREFIX}/etc/lftp.conf ]; then \
>diff -aurN lftp.orig/distinfo lftp/distinfo
>--- lftp.orig/distinfo	2009-09-17 08:05:16.456083664 +0000
>+++ lftp/distinfo	2009-09-16 11:43:00.136233235 +0000
>@@ -1,3 +1,3 @@
>-MD5 (lftp-3.7.15.tar.bz2) = bb2e116d2fcf3544805efd4b6463316e
>-SHA256 (lftp-3.7.15.tar.bz2) = c4cd5ee5fb17b1cceb7b2cf655b1cfc8f6aead69e2623d5d7ee6f3975d0e8769
>-SIZE (lftp-3.7.15.tar.bz2) = 1499838
>+MD5 (lftp-4.0.0.tar.bz2) = 3d06d2869d6715460756aedd50650352
>+SHA256 (lftp-4.0.0.tar.bz2) = 6604eedf075ff056f4ee59f1f71a76b3a52b2bd1353b7a9b788cb4e335c1c422
>+SIZE (lftp-4.0.0.tar.bz2) = 1580362
>diff -aurN lftp.orig/files/patch-src-Torrent.cc lftp/files/patch-src-Torrent.cc
>--- lftp.orig/files/patch-src-Torrent.cc	1970-01-01 00:00:00.000000000 +0000
>+++ lftp/files/patch-src-Torrent.cc	2009-09-16 18:02:58.568354637 +0000
>@@ -0,0 +1,10 @@
>+--- src/Torrent.cc.orig	2009-09-16 18:02:13.808225067 +0000
>++++ src/Torrent.cc	2009-09-16 18:02:27.236576994 +0000
>+@@ -24,6 +24,7 @@
>+ #include <stdlib.h>
>+ #include <assert.h>
>+ #include <sys/socket.h>
>++#include <sys/stat.h>
>+ #include <netinet/in.h>
>+ #include <arpa/inet.h>
>+ #include <unistd.h>
>diff -aurN lftp.orig/pkg-plist lftp/pkg-plist
>--- lftp.orig/pkg-plist	2009-09-17 08:05:16.440084424 +0000
>+++ lftp/pkg-plist	2009-09-16 18:17:38.076299641 +0000
>@@ -10,6 +10,7 @@
> %%DATADIR%%/import-netscape
> %%DATADIR%%/verify-file
> @dirrm %%DATADIR%%
>+%%NLS%%share/locale/cs/LC_MESSAGES/lftp.mo
> %%NLS%%share/locale/de/LC_MESSAGES/lftp.mo
> %%NLS%%share/locale/es/LC_MESSAGES/lftp.mo
> %%NLS%%share/locale/fr/LC_MESSAGES/lftp.mo

Actions: View | Diff

Attachments on bug 138937: 99766