Date: Tue, 18 Nov 2014 04:28:10 +0000 (UTC) From: Mikhail Teterin <mi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r372699 - head/www/websh Message-ID: <201411180428.sAI4SAh6083653@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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/ Log: Allow building (packaging, rather) against Tcl-8.6 as well. Modified: head/www/websh/Makefile head/www/websh/pkg-plist Modified: head/www/websh/Makefile ============================================================================== --- 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= yes TCL_DVER= ${TCL_VER:S/.//} -USES= gmake tcl:84,85 +USES= gmake tcl:84,85,86 USE_AUTOTOOLS= autoconf WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src/unix CONFIGURE_ARGS+=--with-tclinclude=${TCL_INCLUDEDIR} \ @@ -26,6 +26,7 @@ SUB_FILES= httpd.conf pkgIndex.tcl pkg-m SUB_LIST+= TCL_DVER=${TCL_DVER} WS_VER=${PORTVERSION} SUB_LIST+= APACHEETCDIR=${APACHEETCDIR} APACHEMODDIR=${APACHEMODDIR} PLIST_SUB+= TCL_DVER=${TCL_DVER} +PLIST_SUB+= NOMINORVERSION=${TCL_VER:C/8.[345]//:C/^..*/"@comment "/} PORTDOCS= * PORTEXAMPLES= * @@ -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 \ Modified: head/www/websh/pkg-plist ============================================================================== --- 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 etc/websh.conf.dist %%APACHEMODDIR%%/mod_websh.so @exec %D/sbin/apxs -e -A -n websh %D/%F
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411180428.sAI4SAh6083653>