Date: Tue, 18 Nov 2014 07:44:57 +0100 From: Baptiste Daroussin <bapt@FreeBSD.org> To: Mikhail Teterin <mi@FreeBSD.org> Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org Subject: Re: svn commit: r372699 - head/www/websh Message-ID: <20141118064457.GH48896@ivaldir.etoilebsd.net> In-Reply-To: <201411180428.sAI4SAh6083653@svn.freebsd.org> References: <201411180428.sAI4SAh6083653@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20141118064457.GH48896>