From owner-svn-ports-all@FreeBSD.ORG Tue Nov 18 06:45:02 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8471EC61; Tue, 18 Nov 2014 06:45:02 +0000 (UTC) Received: from mail-wi0-x235.google.com (mail-wi0-x235.google.com [IPv6:2a00:1450:400c:c05::235]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 23A2186E; Tue, 18 Nov 2014 06:45:02 +0000 (UTC) Received: by mail-wi0-f181.google.com with SMTP id r20so5106630wiv.2 for ; Mon, 17 Nov 2014 22:45:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=V33bTedKX8YPYwtm1CFLFcE4r+1SujUtC6YlNUPeJeg=; b=JMEapIIF1LbFqgkfd/HH/CZDTC1Wr+30DStjr2U+Qm7MP8PENQPjfG5v9mghmKSqFA Cbg4y7njQBqkJjquq93A1sqy9lwHoDCM2AHXWIFcfxpOCWjQNJDwfDLnW+4MF/v2p9tx 59MAOjyrZOZzMVlsPSHZOJaSnAPkuqANhbQVeti7vLUH14QhSLX11RgtsFWkzt1PvbDp o+ZQpXZ0m0fh01vo7lDqxxQTemwjockeli6SYdsYKHFIDPJk8xdKXi8nTimSRqmwxBYt naGtHwuaNuvNqyrh6/mbkLTBXAkTqDBBSOeS1klZraUbl3+xKfYaBjv6IS4fS09kChFO pa/w== X-Received: by 10.194.223.9 with SMTP id qq9mr23538975wjc.36.1416293100425; Mon, 17 Nov 2014 22:45:00 -0800 (PST) Received: from ivaldir.etoilebsd.net ([2001:41d0:8:db4c::1]) by mx.google.com with ESMTPSA id jw2sm18189562wid.3.2014.11.17.22.44.58 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Nov 2014 22:44:59 -0800 (PST) Sender: Baptiste Daroussin Date: Tue, 18 Nov 2014 07:44:57 +0100 From: Baptiste Daroussin To: Mikhail Teterin Subject: Re: svn commit: r372699 - head/www/websh Message-ID: <20141118064457.GH48896@ivaldir.etoilebsd.net> References: <201411180428.sAI4SAh6083653@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="RwGu8mu1E+uYXPWP" Content-Disposition: inline In-Reply-To: <201411180428.sAI4SAh6083653@svn.freebsd.org> User-Agent: Mutt/1.5.23 (2014-03-12) Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Nov 2014 06:45:02 -0000 --RwGu8mu1E+uYXPWP Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Nov 18, 2014 at 04:28:10AM +0000, Mikhail Teterin wrote: > Author: mi > Date: Tue Nov 18 04:28:09 2014 > New Revision: 372699 > URL: https://svnweb.freebsd.org/changeset/ports/372699 > QAT: https://qat.redports.org/buildarchive/r372699/ >=20 > Log: > Allow building (packaging, rather) against Tcl-8.6 as well. >=20 > Modified: > head/www/websh/Makefile > head/www/websh/pkg-plist >=20 > Modified: head/www/websh/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/websh/Makefile Tue Nov 18 03:14:09 2014 (r372698) > +++ head/www/websh/Makefile Tue Nov 18 04:28:09 2014 (r372699) > @@ -16,7 +16,7 @@ MAKE_JOBS_UNSAFE=3D yes > =20 > TCL_DVER=3D ${TCL_VER:S/.//} > =20 > -USES=3D gmake tcl:84,85 > +USES=3D gmake tcl:84,85,86 > USE_AUTOTOOLS=3D autoconf > WRKSRC=3D ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src/unix > CONFIGURE_ARGS+=3D--with-tclinclude=3D${TCL_INCLUDEDIR} \ > @@ -26,6 +26,7 @@ SUB_FILES=3D httpd.conf pkgIndex.tcl pkg-m > SUB_LIST+=3D TCL_DVER=3D${TCL_DVER} WS_VER=3D${PORTVERSION} > SUB_LIST+=3D APACHEETCDIR=3D${APACHEETCDIR} APACHEMODDIR=3D${APACHEMODDI= R} > PLIST_SUB+=3D TCL_DVER=3D${TCL_DVER} > +PLIST_SUB+=3D NOMINORVERSION=3D${TCL_VER:C/8.[345]//:C/^..*/"@comment "/} > =20 > PORTDOCS=3D * > PORTEXAMPLES=3D * > @@ -70,12 +71,19 @@ do-install: > ${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR} > ${INSTALL_LIB} ${WRKSRC}/mod_websh${PORTVERSION}.so \ > ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_websh.so > - ${INSTALL_LIB} ${WRKSRC}/libwebsh${TCL_DVER}.so.1.0 \ > - ${STAGEDIR}${PREFIX}/lib > - ${LN} -sf libwebsh${TCL_DVER}.so.1.0 \ > - ${STAGEDIR}${PREFIX}/lib/libwebsh${TCL_DVER}.so.1 > - ${LN} -sf libwebsh${TCL_DVER}.so.1 \ > - ${STAGEDIR}${PREFIX}/lib/libwebsh${TCL_DVER}.so > + if [ -f ${WRKSRC}/libwebsh${TCL_DVER}.so.1.0 ]; then \ > + ${INSTALL_LIB} ${WRKSRC}/libwebsh${TCL_DVER}.so.1.0 \ > + ${STAGEDIR}${PREFIX}/lib; \ > + ${LN} -sf libwebsh${TCL_DVER}.so.1.0 \ > + ${STAGEDIR}${PREFIX}/lib/libwebsh${TCL_DVER}.so.1; \ > + ${LN} -sf libwebsh${TCL_DVER}.so.1.0 \ > + ${STAGEDIR}${PREFIX}/lib/libwebsh${TCL_DVER}.so; \ > + else \ > + ${INSTALL_LIB} ${WRKSRC}/libwebsh${TCL_DVER}.so.1 \ > + ${STAGEDIR}${PREFIX}/lib; \ > + ${LN} -sf libwebsh${TCL_DVER}.so.1 \ > + ${STAGEDIR}${PREFIX}/lib/libwebsh${TCL_DVER}.so; \ > + fi > ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} > ${INSTALL_DATA} ${WRKSRC:H:H}/doc/mod_websh/htdocs/*.ws3 \ > ${WRKSRC:H:H}/doc/mod_websh/htdocs/*.whtml \ >=20 > Modified: head/www/websh/pkg-plist > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/websh/pkg-plist Tue Nov 18 03:14:09 2014 (r372698) > +++ head/www/websh/pkg-plist Tue Nov 18 04:28:09 2014 (r372699) > @@ -1,10 +1,10 @@ > -lib/libwebsh%%TCL_DVER%%.so.1.0 > +%%NOMINORVERSION%%lib/libwebsh%%TCL_DVER%%.so.1.0 > lib/libwebsh%%TCL_DVER%%.so.1 > lib/libwebsh%%TCL_DVER%%.so > lib/websh/pkgIndex.tcl > lib/websh/htmlhandler.ws3 > lib/websh/otherhandler.ws3 > -@dirrm lib/websh/ > +@dirrm lib/websh As explained in CHANGES as well as in the handbook, @dirrm are now most of = the time handled automatically by pkg(8) no need anymore to track them in the p= list. sometime they should be replaced by @dir but only sometime see the handbook and CHANGES for details regards, Bapt --RwGu8mu1E+uYXPWP Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEARECAAYFAlRq6ukACgkQ8kTtMUmk6EyHQgCfXTOuI2t9gWWtI55KS430LhO9 LdsAnjj6oyOYxeU48s+2Z0JASo3aOcYQ =8Ivc -----END PGP SIGNATURE----- --RwGu8mu1E+uYXPWP--