Attachment #87460 for bug #124069

View | Details | Raw Unified | Return to bug 124069
Collapse All | Expand All




#

PORTNAME=	lftp
PORTVERSION=	3.7.3
CATEGORIES=	ftp ipv6
MASTER_SITES=	ftp://ftp.wiretapped.net/pub/mirrors/lftp/ \
		ftp://ftp.wiretapped.net/pub/mirrors/lftp/old/ \

		http://lftp.cybermirror.org/ \
		http://lftp.cybermirror.org/old/

MAINTAINER=	ganael.laplanche@martymac.com
COMMENT=	Shell-like command line ftp client

LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2

.endif

.if defined(WITH_GNUTLS)
CONFIGURE_ARGS+=	--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
.else
CONFIGURE_ARGS+=	--without-openssl
.endif

.if !defined(WITHOUT_NLS)
USE_GETTEXT=	yes
CONFIGURE_ARGS+=	--enable-nls
PLIST_SUB+=	NLS=""
.else
CONFIGURE_ARGS+=	--disable-nls
PLIST_SUB+=	NLS="@comment "
.endif


Lines 1-3 Link Here

(-)lftp/distinfo (-3 / +3 lines)
1	MD5 (lftp-3.7.1.tar.bz2) = 60bb61fc1a5e96392bbd2dc88b938109	1	MD5 (lftp-3.7.3.tar.bz2) = fc98506620b059d712341d624eb720d6
2	SHA256 (lftp-3.7.1.tar.bz2) = a91b411acd3e1df394a8340a8ce0352795486cbc032e49d7093dc6a9cfb42864	2	SHA256 (lftp-3.7.3.tar.bz2) = f81d70b148d1f460658dad8a48b21b8ed918f60211770299151b64c8e49edfcf
3	SIZE (lftp-3.7.1.tar.bz2) = 1165288	3	SIZE (lftp-3.7.3.tar.bz2) = 1315201




--- build-aux/ltmain.sh.orig	2007-12-29 12:41:13.000000000 +0100
+++ build-aux/ltmain.sh	2008-05-28 16:41:23.818197162 +0200
@@ -6058,10 +6058,12 @@
 	fi
 
 	# Install the pseudo-library for information purposes.
+	if false; then
 	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"




--- lib/Makefile.in.orig	2008-05-23 15:54:06.000000000 +0200
+++ lib/Makefile.in	2008-05-28 17:40:42.280514020 +0200
@@ -576,8 +576,6 @@
 libgnu_la_LDFLAGS = $(AM_LDFLAGS)
 GPERF = gperf
 LINK_WARNING_H = $(top_srcdir)/build-aux/link-warning.h
-charset_alias = $(DESTDIR)$(libdir)/charset.alias
-charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
 all: $(BUILT_SOURCES) config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
@@ -1107,29 +1105,8 @@
 all-local: charset.alias ref-add.sed ref-del.sed
 install-exec-local: all-local
 	test $(GLIBC21) != no || $(mkinstalldirs) $(DESTDIR)$(libdir)
-	if test -f $(charset_alias); then \
-	  sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
-	  $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
-	  rm -f $(charset_tmp) ; \
-	else \
-	  if test $(GLIBC21) = no; then \
-	    sed -f ref-add.sed charset.alias > $(charset_tmp) ; \
-	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
-	    rm -f $(charset_tmp) ; \
-	  fi ; \
-	fi
 
 uninstall-local: all-local
-	if test -f $(charset_alias); then \
-	  sed -f ref-del.sed $(charset_alias) > $(charset_tmp); \
-	  if grep '^# Packages using this file: $$' $(charset_tmp) \
-	      > /dev/null; then \
-	    rm -f $(charset_alias); \
-	  else \
-	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias); \
-	  fi; \
-	  rm -f $(charset_tmp); \
-	fi
 
 charset.alias: config.charset
 	rm -f t-$@ $@




--- ltmain.sh.orig	Fri May 23 15:22:56 2003
+++ ltmain.sh	Thu May 27 12:50:36 2004
@@ -5425,10 +5425,12 @@
 	fi
 
 	# Install the pseudo-library for information purposes.
+	if false; then
 	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"

Line 0 Link Here

(-)lftp/files/patch-src-Makefile.in (+11 lines)
	1	--- src/Makefile.in.orig 2008-05-23 15:54:07.000000000 +0200
	2	+++ src/Makefile.in 2008-05-28 16:41:23.857301294 +0200
	3	@@ -1217,7 +1217,7 @@
	4
	5	info-am:
	6
	7	-install-data-am: install-pkgdataSCRIPTS install-pkgverlibLTLIBRARIES
	8	+install-data-am: install-pkgdataSCRIPTS
	9	@$(NORMAL_INSTALL)
	10	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
	11

Lines 1-11 Link Here

(-)lftp/files/patch-src_Makefile.in (-11 lines)
1	--- src/Makefile.in.orig Thu Dec 23 15:03:41 2004
2	+++ src/Makefile.in Thu Dec 23 15:06:20 2004
3	@@ -834,7 +834,7 @@
4
5	info-am:
6
7	-install-data-am: install-pkgdataSCRIPTS install-pkgverlibLTLIBRARIES
8	+install-data-am: install-pkgdataSCRIPTS
9	@$(NORMAL_INSTALL)
10	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
11

Lines 9-14 Link Here

(-)lftp/pkg-plist (-1 / +3 lines)
9	%%DATADIR%%/import-ncftp	9	%%DATADIR%%/import-ncftp
10	%%DATADIR%%/import-netscape	10	%%DATADIR%%/import-netscape
11	%%DATADIR%%/verify-file	11	%%DATADIR%%/verify-file
		12	@dirrm %%DATADIR%%
12	%%NLS%%share/locale/de/LC_MESSAGES/lftp.mo	13	%%NLS%%share/locale/de/LC_MESSAGES/lftp.mo
13	%%NLS%%share/locale/es/LC_MESSAGES/lftp.mo	14	%%NLS%%share/locale/es/LC_MESSAGES/lftp.mo
14	%%NLS%%share/locale/fr/LC_MESSAGES/lftp.mo	15	%%NLS%%share/locale/fr/LC_MESSAGES/lftp.mo
Lines 21-24 Link Here
21	%%NLS%%share/locale/zh_CN/LC_MESSAGES/lftp.mo	22	%%NLS%%share/locale/zh_CN/LC_MESSAGES/lftp.mo
22	%%NLS%%share/locale/zh_HK/LC_MESSAGES/lftp.mo	23	%%NLS%%share/locale/zh_HK/LC_MESSAGES/lftp.mo
23	%%NLS%%share/locale/zh_TW/LC_MESSAGES/lftp.mo	24	%%NLS%%share/locale/zh_TW/LC_MESSAGES/lftp.mo
24	@dirrm %%DATADIR%%	25	%%NLS%%@dirrmtry share/locale/zh_HK/LC_MESSAGES
		26	%%NLS%%@dirrmtry share/locale/zh_HK

Return to bug 124069

Lines 6-12 Link Here

(-)lftp/Makefile (-4 / +9 lines)
6	#	6	#
7		7
8	PORTNAME= lftp	8	PORTNAME= lftp
9	PORTVERSION= 3.7.1	9	PORTVERSION= 3.7.3
10	CATEGORIES= ftp ipv6	10	CATEGORIES= ftp ipv6
11	MASTER_SITES= ftp://ftp.wiretapped.net/pub/mirrors/lftp/ \	11	MASTER_SITES= ftp://ftp.wiretapped.net/pub/mirrors/lftp/ \
12	ftp://ftp.wiretapped.net/pub/mirrors/lftp/old/ \	12	ftp://ftp.wiretapped.net/pub/mirrors/lftp/old/ \
Lines 20-26 Link Here
20	http://lftp.cybermirror.org/ \	20	http://lftp.cybermirror.org/ \
21	http://lftp.cybermirror.org/old/	21	http://lftp.cybermirror.org/old/
22		22
23	MAINTAINER= ports@FreeBSD.org	23	MAINTAINER= ganael.laplanche@martymac.com
24	COMMENT= Shell-like command line ftp client	24	COMMENT= Shell-like command line ftp client
25		25
26	LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2	26	LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2
Lines 48-67 Link Here
48	.endif	48	.endif
49		49
50	.if defined(WITH_GNUTLS)	50	.if defined(WITH_GNUTLS)
51	CONFIGURE_ARGS+= --with-gnutls
52	LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls	51	LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls
		52	CONFIGURE_ARGS+= --with-gnutls
		53	.else
		54	CONFIGURE_ARGS+= --without-gnutls
53	.endif	55	.endif
54		56
55	.if !defined(WITHOUT_OPENSSL)	57	.if !defined(WITHOUT_OPENSSL)
56	.include "${PORTSDIR}/Mk/bsd.openssl.mk"	58	.include "${PORTSDIR}/Mk/bsd.openssl.mk"
57	CONFIGURE_ARGS+= --with-openssl	59	CONFIGURE_ARGS+= --with-openssl
		60	.else
		61	CONFIGURE_ARGS+= --without-openssl
58	.endif	62	.endif
59		63
60	.if !defined(WITHOUT_NLS)	64	.if !defined(WITHOUT_NLS)
61	USE_GETTEXT= yes	65	USE_GETTEXT= yes
		66	CONFIGURE_ARGS+= --enable-nls
62	PLIST_SUB+= NLS=""	67	PLIST_SUB+= NLS=""
63	.else	68	.else
64	CONFIGURE_ARGS+=--disable-nls	69	CONFIGURE_ARGS+= --disable-nls
65	PLIST_SUB+= NLS="@comment "	70	PLIST_SUB+= NLS="@comment "
66	.endif	71	.endif
67		72

Line 0 Link Here

(-)lftp/files/patch-build-aux-ltmain.sh (+15 lines)
	1	--- build-aux/ltmain.sh.orig 2007-12-29 12:41:13.000000000 +0100
	2	+++ build-aux/ltmain.sh 2008-05-28 16:41:23.818197162 +0200
	3	@@ -6058,10 +6058,12 @@
	4	fi
	5
	6	# Install the pseudo-library for information purposes.
	7	+ if false; then
	8	name=`$echo "X$file" \| $Xsed -e 's%^.*/%%'`
	9	instname="$dir/$name"i
	10	$show "$install_prog $instname $destdir/$name"
	11	$run eval "$install_prog $instname $destdir/$name" \|\| exit $?
	12	+ fi
	13
	14	# Maybe install the static library, too.
	15	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"

Line 0 Link Here

(-)lftp/files/patch-lib-Makefile.in (+41 lines)
	1	--- lib/Makefile.in.orig 2008-05-23 15:54:06.000000000 +0200
	2	+++ lib/Makefile.in 2008-05-28 17:40:42.280514020 +0200
	3	@@ -576,8 +576,6 @@
	4	libgnu_la_LDFLAGS = $(AM_LDFLAGS)
	5	GPERF = gperf
	6	LINK_WARNING_H = $(top_srcdir)/build-aux/link-warning.h
	7	-charset_alias = $(DESTDIR)$(libdir)/charset.alias
	8	-charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
	9	all: $(BUILT_SOURCES) config.h
	10	$(MAKE) $(AM_MAKEFLAGS) all-am
	11
	12	@@ -1107,29 +1105,8 @@
	13	all-local: charset.alias ref-add.sed ref-del.sed
	14	install-exec-local: all-local
	15	test $(GLIBC21) != no \|\| $(mkinstalldirs) $(DESTDIR)$(libdir)
	16	- if test -f $(charset_alias); then \
	17	- sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
	18	- $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
	19	- rm -f $(charset_tmp) ; \
	20	- else \
	21	- if test $(GLIBC21) = no; then \
	22	- sed -f ref-add.sed charset.alias > $(charset_tmp) ; \
	23	- $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
	24	- rm -f $(charset_tmp) ; \
	25	- fi ; \
	26	- fi
	27
	28	uninstall-local: all-local
	29	- if test -f $(charset_alias); then \
	30	- sed -f ref-del.sed $(charset_alias) > $(charset_tmp); \
	31	- if grep '^# Packages using this file: $$' $(charset_tmp) \
	32	- > /dev/null; then \
	33	- rm -f $(charset_alias); \
	34	- else \
	35	- $(INSTALL_DATA) $(charset_tmp) $(charset_alias); \
	36	- fi; \
	37	- rm -f $(charset_tmp); \
	38	- fi
	39
	40	charset.alias: config.charset
	41	rm -f t-$@ $@

Lines 1-15 Link Here

(-)lftp/files/patch-ltmain.sh (-15 lines)
1	--- ltmain.sh.orig Fri May 23 15:22:56 2003
2	+++ ltmain.sh Thu May 27 12:50:36 2004
3	@@ -5425,10 +5425,12 @@
4	fi
5
6	# Install the pseudo-library for information purposes.
7	+ if false; then
8	name=`$echo "X$file" \| $Xsed -e 's%^.*/%%'`
9	instname="$dir/$name"i
10	$show "$install_prog $instname $destdir/$name"
11	$run eval "$install_prog $instname $destdir/$name" \|\| exit $?
12	+ fi
13
14	# Maybe install the static library, too.
15	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"