aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Weinberger <adamw@FreeBSD.org>2014-09-02 22:12:35 +0000
committerAdam Weinberger <adamw@FreeBSD.org>2014-09-02 22:12:35 +0000
commitba7e685ad607d0f54424669e2c02c08a526d3625 (patch)
treef2701b2e4c7d3491b3c224de9863f69ce0912894
parente98bb1c24f3299a9a0f15345a06be894c685c47f (diff)
downloadports-ba7e685ad607d0f54424669e2c02c08a526d3625.tar.gz
ports-ba7e685ad607d0f54424669e2c02c08a526d3625.zip
Fix install. While here, use INSTALL_LIB instead of INSTALL_DATA.
PORTREVISION bump for new plist.
Notes
Notes: svn path=/head/; revision=367098
-rw-r--r--www/websh/Makefile12
-rw-r--r--www/websh/pkg-plist1
2 files changed, 8 insertions, 5 deletions
diff --git a/www/websh/Makefile b/www/websh/Makefile
index fb146b4bfb8a..56326955ebeb 100644
--- a/www/websh/Makefile
+++ b/www/websh/Makefile
@@ -3,7 +3,7 @@
PORTNAME= websh
PORTVERSION= 3.6.0b5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www tcl
MASTER_SITES= ${MASTER_SITE_APACHE}
MASTER_SITE_SUBDIR=tcl/${PORTNAME}/source
@@ -68,11 +68,13 @@ do-install:
${INSTALL_DATA} ${WRKSRC:H:H}/doc/mod_websh/conf/websh.conf \
${STAGEDIR}${PREFIX}/etc/websh.conf.dist
${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
- ${INSTALL_DATA} ${WRKSRC}/mod_websh${PORTVERSION}.so \
+ ${INSTALL_LIB} ${WRKSRC}/mod_websh${PORTVERSION}.so \
${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_websh.so
- ${INSTALL_DATA} ${WRKSRC}/libwebsh${TCL_DVER}.so.1 \
- ${STAGEDIR}${PREFIX}/lib
- ${LN} -sf ${PREFIX}/lib/libwebsh${TCL_DVER}.so.1 \
+ ${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
${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
${INSTALL_DATA} ${WRKSRC:H:H}/doc/mod_websh/htdocs/*.ws3 \
diff --git a/www/websh/pkg-plist b/www/websh/pkg-plist
index 4ca0f66b2944..0b31e11fe9da 100644
--- a/www/websh/pkg-plist
+++ b/www/websh/pkg-plist
@@ -1,3 +1,4 @@
+lib/libwebsh%%TCL_DVER%%.so.1.0
lib/libwebsh%%TCL_DVER%%.so.1
lib/libwebsh%%TCL_DVER%%.so
lib/websh/pkgIndex.tcl