diff options
| author | mi <mi@FreeBSD.org> | 2014-11-18 12:28:09 +0800 |
|---|---|---|
| committer | mi <mi@FreeBSD.org> | 2014-11-18 12:28:09 +0800 |
| commit | 7b61657997d04472ea29893328cb55bbe3e4c874 (patch) | |
| tree | 8205106437bd546a886e968506e6ffe1dd5ca060 | |
| parent | 83eda98e9fe4fa6ae9afc646b7bf68abca81b889 (diff) | |
| download | freebsd-ports-gnome-7b61657997d04472ea29893328cb55bbe3e4c874.tar.gz freebsd-ports-gnome-7b61657997d04472ea29893328cb55bbe3e4c874.tar.zst freebsd-ports-gnome-7b61657997d04472ea29893328cb55bbe3e4c874.zip | |
Allow building (packaging, rather) against Tcl-8.6 as well.
| -rw-r--r-- | www/websh/Makefile | 22 | ||||
| -rw-r--r-- | www/websh/pkg-plist | 4 |
2 files changed, 17 insertions, 9 deletions
diff --git a/www/websh/Makefile b/www/websh/Makefile index 56326955ebeb..a2e414811025 100644 --- a/www/websh/Makefile +++ b/www/websh/Makefile @@ -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-message 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 \ diff --git a/www/websh/pkg-plist b/www/websh/pkg-plist index 0b31e11fe9da..f1e198e52780 100644 --- a/www/websh/pkg-plist +++ b/www/websh/pkg-plist @@ -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 |