From ba7e685ad607d0f54424669e2c02c08a526d3625 Mon Sep 17 00:00:00 2001 From: Adam Weinberger Date: Tue, 2 Sep 2014 22:12:35 +0000 Subject: [PATCH] Fix install. While here, use INSTALL_LIB instead of INSTALL_DATA. PORTREVISION bump for new plist. --- www/websh/Makefile | 12 +++++++----- www/websh/pkg-plist | 1 + 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