Attachment 86103 Details for Bug 122482 – wget.1112.txt

wget.1112.txt

wget.1112.txt (text/plain), 3.91 KB, created by bf on 2008-05-01 11:10:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: bf

Created: 2008-05-01 11:10:16 UTC

Size: 3.91 KB

patch

obsolete

>diff -ruN wget.orig/Makefile wget/Makefile
>--- wget.orig/Makefile	2008-02-02 03:03:21.000000000 -0500
>+++ wget/Makefile	2008-05-01 05:42:39.708036859 -0400
>@@ -5,52 +5,71 @@
> # $FreeBSD: ports/ftp/wget/Makefile,v 1.85 2008/02/02 08:03:21 vd Exp $
> #
> 
>-PORTNAME=	wget
>-DISTVERSION=	1.11
>-CATEGORIES=	ftp www ipv6
>-MASTER_SITES=	${MASTER_SITE_GNU}
>+PORTNAME=		wget
>+DISTVERSION=		1.11.2
>+CATEGORIES=		ftp www ipv6
>+MASTER_SITES=		${MASTER_SITE_GNU}
> MASTER_SITE_SUBDIR=	wget
> 
> MAINTAINER=	vd@FreeBSD.org
>-COMMENT=	Retrieve files from the Net via HTTP and FTP
>+COMMENT=	Retrieve files from the Net via HTTP(S) and FTP
> 
>-USE_BZIP2=	yes
>-
>-.if !defined(WITHOUT_NLS)
>-USE_GETTEXT=	yes
>+USE_BZIP2=		yes
>+USE_GMAKE=		yes
>+USE_PERL5_BUILD=	yes
>+GNU_CONFIGURE=		yes
>+CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}" \
>+			LDFLAGS="${LDFLAGS}"
>+
>+MAN1=	wget.1
>+INFO=	wget
>+
>+OPTIONS=	GNUTLS "HTTPS support with gnutls" Off \
>+		IPV6 "IPV6 support" On \
>+		NLS "Native Language Support with gettext" On \
>+		SSL "HTTPS support with openssl"  On
>+
>+.include <bsd.port.pre.mk>
>+
>+.ifdef(WITH_GNUTLS)
>+.ifdef(WITH_SSL)
>+IGNORE= 	options WITH_GNUTLS and WITH_SSL are mutually exclusive, enable only one of the two
> .endif
>-
>-USE_GMAKE=	yes
>-USE_PERL5_BUILD=yes
>-GNU_CONFIGURE=	yes
>-
>-.if defined(WITHOUT_SSL)
>-CONFIGURE_ARGS=		--with-ssl=no
>+LIB_DEPENDS+=		gnutls:${PORTSDIR}/security/gnutls
>+CONFIGURE_ARGS+=	--with-ssl=gnutls
>+LDFLAGS+=		-L${LOCALBASE}/lib
>+CPPFLAGS+=		-I${LOCALBASE}/include
>+.elifdef(WITH_SSL)
>+.include "${PORTSDIR}/Mk/bsd.openssl.mk"
>+CONFIGURE_ARGS+=	--with-ssl
> .else
>-USE_OPENSSL=	yes
>+CONFIGURE_ARGS+=	--without-ssl
> .endif
> 
>-.if defined(WITHOUT_NLS)
>-CONFIGURE_ARGS+=	--disable-nls
>-PLIST_SUB=	NLS="@comment "
>+.ifdef(WITH_IPV6)
>+CONFIGURE_ARGS+=	--enable-ipv6
> .else
>-CONFIGURE_ARGS+=	--enable-nls
>-LDFLAGS=	-L${LOCALBASE}/lib
>-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
>-		"LDFLAGS=${LDFLAGS}"
>-PLIST_SUB=	NLS=""
>+CONFIGURE_ARGS+=	--disable-ipv6
> .endif
> 
>-MAN1=		wget.1
>-INFO=		wget
>+.ifdef(WITH_NLS)
>+USE_GETTEXT=		yes
>+CONFIGURE_ARGS+=	--enable-nls
>+LDFLAGS+=		-L${LOCALBASE}/lib
>+CPPFLAGS+=		-I${LOCALBASE}/include
>+PLIST_SUB+=		NLS=""
>+.else
>+CONFIGURE_ARGS+=	--disable-nls
>+PLIST_SUB=		NLS="@comment "
>+.endif
> 
> post-patch:
> 	${RM} -f ${WRKSRC}/doc/wget.info* ${WRKSRC}/po/*.mo ${WRKSRC}/po/*.gmo
>-	@# eliminate gmakism
>+	@# eliminate gmakeism
> 	${REINPLACE_CMD} -e 's,$$<,$$(srcdir)/wget.texi,' \
> 		${WRKSRC}/doc/Makefile.in
> 	${REINPLACE_CMD} -e 's,/usr/local/etc/wgetrc,${PREFIX}/etc/wgetrc,' \
> 			 -e 's,@file{},@file{${PREFIX}},' \
> 		${WRKSRC}/doc/sample.wgetrc* ${WRKSRC}/doc/wget.texi
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>diff -ruN wget.orig/distinfo wget/distinfo
>--- wget.orig/distinfo	2008-02-02 03:03:21.000000000 -0500
>+++ wget/distinfo	2008-05-01 05:04:55.263799673 -0400
>@@ -1,3 +1,3 @@
>-MD5 (wget-1.11.tar.bz2) = d2746aac29f2c0f661ee8e26c6b695ad
>-SHA256 (wget-1.11.tar.bz2) = 3daa33dc67b9096d785253331b6a95db6901caa913f09e2377e1b61f50180d56
>-SIZE (wget-1.11.tar.bz2) = 930167
>+MD5 (wget-1.11.2.tar.bz2) = 730d2687231934f51e47f6f85260b2d3
>+SHA256 (wget-1.11.2.tar.bz2) = a22756034521e5d5d9c8f075f0adaab8ef2da13eed06f722ef2e4c28e6b117cb
>+SIZE (wget-1.11.2.tar.bz2) = 936502
>diff -ruN wget.orig/files/patch-doc_Makefile.in wget/files/patch-doc_Makefile.in
>--- wget.orig/files/patch-doc_Makefile.in	2007-04-11 15:38:50.000000000 -0400
>+++ wget/files/patch-doc_Makefile.in	2008-05-01 05:04:55.263799673 -0400
>@@ -1,5 +1,5 @@
>---- doc/Makefile.in.orig	Mon Jun  6 23:42:17 2005
>-+++ doc/Makefile.in	Wed Apr 11 22:18:59 2007
>+--- doc/Makefile.in.orig	2008-05-01 04:57:18.613091552 -0400
>++++ doc/Makefile.in	2008-05-01 04:58:14.768389781 -0400
> @@ -22,7 +22,7 @@
>  SHELL = /bin/sh
>  
>@@ -10,7 +10,7 @@
>  TEXI2DVI = texi2dvi
>  # Program to convert DVI files to PostScript
> @@ -51,7 +51,7 @@
>- TEXI2POD     = texi2pod.pl
>+ TEXI2POD     = $(srcdir)/texi2pod.pl
>  POD2MAN      = @POD2MAN@
>  MAN          = wget.$(manext)
> -WGETRC       = $(sysconfdir)/wgetrc

Actions: View

Attachments on bug 122482: 86102 | 86103