svn commit: r372699 - head/www/websh

[Baptiste Daroussin]

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/
> 
> 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
> - at dirrm lib/websh/
> + at 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 plist.
sometime they should be replaced by @dir but only sometime see the handbook
and CHANGES for details

regards,
Bapt
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20141118/8a939873/attachment.sig>