From owner-freebsd-ports@FreeBSD.ORG Thu Aug 3 21:40:04 2006 Return-Path: X-Original-To: freebsd-ports@freebsd.org Delivered-To: freebsd-ports@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AD7DE16A4E6; Thu, 3 Aug 2006 21:40:04 +0000 (UTC) (envelope-from beech@alaskaparadise.com) Received: from stargate.alaskaparadise.com (114-103-74-65.gci.net [65.74.103.114]) by mx1.FreeBSD.org (Postfix) with ESMTP id AF6B443D6B; Thu, 3 Aug 2006 21:40:01 +0000 (GMT) (envelope-from beech@alaskaparadise.com) Received: by stargate.alaskaparadise.com (Postfix, from userid 0) id 3CB5F4036; Thu, 3 Aug 2006 13:40:06 -0800 (AKDT) From: Beech Rintoul Organization: Alaska Paradise To: freebsd-ports@freebsd.org Date: Thu, 3 Aug 2006 13:39:45 -0800 User-Agent: KMail/1.9.3 References: <200608031217.24275.beech@alaskaparadise.com> <790a9fff0608031359u4937ad98m528de3989a46ad59@mail.gmail.com> In-Reply-To: <790a9fff0608031359u4937ad98m528de3989a46ad59@mail.gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart7191555.OaIMEDKyDq"; protocol="application/pgp-signature"; micalg=pgp-sha1 Content-Transfer-Encoding: 7bit Message-Id: <200608031340.04942.beech@alaskaparadise.com> Cc: roam@freebsd.org, Scot Hetzel Subject: Re: Makefile problem X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Aug 2006 21:40:04 -0000 --nextPart7191555.OaIMEDKyDq Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Thursday 03 August 2006 12:59, Scot Hetzel wrote: > On 8/3/06, Beech Rintoul wrote: > > I have an ongoing problem with the makefile for ftp/proftpd. This probl= em > > existed when I took over maintainership of the port and I'd like to fix > > it if possible before the next update. > > > > When I run portlint, I get the following: > > > > FATAL: Makefile: [131]: USE_OPENSSL is set after including > > bsd.port.pre.mk. > > > > I can cheat by adding a space instead of a tab after the line and turn = it > > into a warning, but I'd really like to fix this properly. I've tried > > moving bsd.port.pre.mk to various places, but all I accomplish is > > changing the error. > > > > Can someone take a look at this and maybe give me a suggestion? > > Since you include bsd.openssl.mk in the ports Makefile after the > include for bsd.port.pre.mk, you don't need to set the USE_OPENSSL > variable. > > .include <${PORTSDIR}/Mk/bsd.port.pre.mk> > > .if defined(WITH_OPENSSL) > CFLAGS+=3D -DHAVE_OPENSSL > -USE_OPENSSL=3D YES > .include <${PORTSDIR}/Mk/bsd.openssl.mk> > PROFTPD_LIBS+=3D -lssl -lcrypto -L${LOCALBASE}/lib > MODULES:=3D${MODULES}:mod_tls > .if defined(WITH_LDAP_TLS) > EXTRA_PATCHES+=3D ${FILESDIR}/extra_patch-ldap-tls-mod_ldap.c > .endif > .endif > > > The same thing can be done to the ftp/curl port: > > 1. Get rid of USE_OPENSSL before bsd.port.pre.mk > > -.if defined(WITHOUT_SSL) > -USE_OPENSSL=3D YES > -.endif > > .include > > 2. add a new option for OpenSSL that defaults to on > > OPTIONS=3D CARES "Asynchronous DNS resolution via c-ares" off \ > CURL_DEBUG "Enable curl diagnostic output" off \ > + SSL "OpenSSL Support" on \ > + GNUTLS "Use GNU TLS if OpenSSL is OFF" off \ > - GNUTLS "Use GNU TLS if WITHOUT_SSL is specified" off \ > IPV6 "IPv6 support" on \ > KERBEROS4 "Kerberos 4 authentication" off \ > LIBIDN "Internationalized Domain Names via libidn" off \ > NTLM "NTLM authentication" off > > > 3. Change: > > .if !defined(WITHOUT_SSL) > CONFIGURE_ARGS+=3D --with-ssl=3D${OPENSSLBASE} > .else > CONFIGURE_ARGS+=3D --without-ssl > .endif > > to > > .if !defined(WITHOUT_SSL) > .include "${PORTSDIR}/Mk/bsd.openssl.mk" > .include > CONFIGURE_ARGS+=3D --with-ssl=3D${OPENSSLBASE} > .else > CONFIGURE_ARGS+=3D --without-ssl > .endif > > Do we need to specify the full patch to bsd.openssl.mk, or can we > getaway with just: > > .include > > in the ports Makefile. > > This should fix the ports that have an optional dependancy on OpenSSL. > > Scot Thank you Scot, that fixed the error. I'll have it committed after some=20 testing. Beech =2D-=20 =2D------------------------------------------------------------------------= =2D------------- Beech Rintoul - Sys. Administrator - beech@alaskaparadise.com /"\ ASCII Ribbon Campaign | Alaska Paradise \ / - NO HTML/RTF in e-mail | 201 East 9Th Avenue Ste.310 X - NO Word docs in e-mail | Anchorage, AK 99501 / \ - Please visit Alaska Paradise - http://www.alaskaparadise.com =2D------------------------------------------------------------------------= =2D------------- --nextPart7191555.OaIMEDKyDq Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (FreeBSD) iD8DBQBE0m00p5D0B1NlT4URAgp0AJ9L5zgyGA0/u3aMFTnTkcM6PchgHACePXsk ryP8wY8Gxqje58jB6YqJIYk= =5APV -----END PGP SIGNATURE----- --nextPart7191555.OaIMEDKyDq--