Attachment 246100 Details for Bug 274839 – [PATCH 3/3] ftp/lftp: Lint with portclippy(1) and portfmt(1)

[patch] [PATCH 3/3] ftp/lftp: Lint with portclippy(1) and portfmt(1)

0003-ftp-lftp-Lint-with-portclippy-1-and-portfmt-1.patch (text/plain), 3.45 KB, created by Älven on 2023-11-04 09:37:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Älven

Created: 2023-11-04 09:37:18 UTC

Size: 3.45 KB

patch

obsolete

>From 98adaa3b10375bf3095dd7b406d22d3d520cdd0e Mon Sep 17 00:00:00 2001
>From: Andrey Korobkov <alster@vinterdalen.se>
>Date: Sat, 4 Nov 2023 13:17:51 +0400
>Subject: [PATCH 3/3] ftp/lftp: Lint with portclippy(1) and portfmt(1)
>
>PR: 274839
>---
> ftp/lftp/Makefile | 57 ++++++++++++++++++++++++-----------------------
> 1 file changed, 29 insertions(+), 28 deletions(-)
>
>diff --git a/ftp/lftp/Makefile b/ftp/lftp/Makefile
>index af267d02d0f6..053427cc8cd3 100644
>--- a/ftp/lftp/Makefile
>+++ b/ftp/lftp/Makefile
>@@ -1,17 +1,17 @@
> PORTNAME=	lftp
> PORTVERSION=	4.9.2
> CATEGORIES=	ftp
>-MASTER_SITES=	http://lftp.tech/ftp/ \
>-		http://lftp.tech/ftp/old/ \
>-		http://lftp.cybermirror.org/ \
>-		http://lftp.cybermirror.org/old/ \
>+MASTER_SITES=	ftp://ftp.cs.tu-berlin.de/pub/net/ftp/lftp/ \
> 		http://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/ \
> 		http://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/old/ \
> 		http://ftp.tuwien.ac.at/infosys/browsers/ftp/lftp/ \
>-		ftp://ftp.cs.tu-berlin.de/pub/net/ftp/lftp/
>+		http://lftp.cybermirror.org/ \
>+		http://lftp.cybermirror.org/old/ \
>+		http://lftp.tech/ftp/ \
>+		http://lftp.tech/ftp/old/
> 
> MAINTAINER=	martymac@FreeBSD.org
>-COMMENT=	Shell-like command line FTP client
>+COMMENT=	Shell-like command-line FTP client
> WWW=		https://lftp.tech/
> 
> LICENSE=	GPLv3
>@@ -20,31 +20,30 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> LIB_DEPENDS=	libexpat.so:textproc/expat2 \
> 		libidn2.so:dns/libidn2
> 
>-USES=		compiler:c++11-lang charsetfix cpe desktop-file-utils \
>-		iconv libtool localbase readline shebangfix
>-GNU_CONFIGURE=	yes
>+USES=		charsetfix compiler:c++11-lang cpe desktop-file-utils iconv \
>+		libtool localbase readline shebangfix
> CPE_VENDOR=	lftp_project
> 
>-PORTDOCS=	AUTHORS BUGS ChangeLog FAQ FEATURES INSTALL \
>-		MIRRORS NEWS README README.debug-levels README.modules \
>-		THANKS TODO
>+SHEBANG_FILES=	src/convert-mozilla-cookies src/verify-file src/xdg-move
>+
>+GNU_CONFIGURE=	yes
> 
>-SHEBANG_FILES=	src/verify-file \
>-		src/convert-mozilla-cookies \
>-		src/xdg-move
>+PORTDOCS=	AUTHORS BUGS ChangeLog FAQ FEATURES INSTALL MIRRORS NEWS README \
>+		README.debug-levels README.modules THANKS TODO
> 
>-OPTIONS_DEFINE=	DOCS NLS
>-OPTIONS_RADIO=	SSL
>-OPTIONS_RADIO_SSL=	OPENSSL GNUTLS
>+OPTIONS_DEFINE=		DOCS NLS
> OPTIONS_DEFAULT=	OPENSSL
>-OPTIONS_SUB=	yes
>-NLS_USES=	gettext
>+OPTIONS_RADIO=		SSL
>+OPTIONS_RADIO_SSL=	GNUTLS OPENSSL
>+OPTIONS_SUB=		yes
>+
>+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
>+GNUTLS_USES=		pkgconfig
>+GNUTLS_CONFIGURE_WITH=	gnutls
>+NLS_USES=		gettext
> NLS_CONFIGURE_ENABLE=	nls
>+OPENSSL_USES=		ssl
> OPENSSL_CONFIGURE_WITH=	openssl
>-OPENSSL_USES=	ssl
>-GNUTLS_CONFIGURE_WITH=	gnutls
>-GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
>-GNUTLS_USES=	pkgconfig
> 
> post-install:
> 	${MV} ${STAGEDIR}${PREFIX}/etc/lftp.conf \
>@@ -52,22 +51,24 @@ post-install:
> 
> post-install-DOCS-on:
> 	${MKDIR} ${STAGEDIR}${DOCSDIR}
>-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
>+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} \
>+		${STAGEDIR}${DOCSDIR}
> 
> .include <bsd.port.pre.mk>
> 
> # Only link to libthr if necessary
> .if ${PORT_OPTIONS:MGNUTLS}
>-NEED_PTHREAD=	yes
>+NEED_PTHREAD=		yes
> .else
> .if exists(${OPENSSLLIB}/libssl.so)
>-NEED_PTHREAD_CMDS=	ldd ${OPENSSLLIB}/libssl.so | ${GREP} -w 'libthr\.so' || ${ECHO_CMD}
>+NEED_PTHREAD_CMDS=	${ECHO_CMD} ${GREP} ${OPENSSLLIB}/libssl.so \
>+			'libthr\.so' -w ldd | ||
> .else
> NEED_PTHREAD=	# empty
> .endif
> .endif
> .if !empty(NEED_PTHREAD)
>-LDFLAGS+=	-pthread
>+LDFLAGS+=		-pthread
> .endif
> 
> .include <bsd.port.post.mk>
>-- 
>2.42.1
>

Flags:

alster: maintainer-approval? (martymac)

Actions: View | Diff

Attachments on bug 274839: 246033 | 246034 | 246100 | 246217