Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 2 Sep 2014 22:12:35 +0000 (UTC)
From:      Adam Weinberger <adamw@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r367098 - head/www/websh
Message-ID:  <201409022212.s82MCZeC095593@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: adamw
Date: Tue Sep  2 22:12:35 2014
New Revision: 367098
URL: http://svnweb.freebsd.org/changeset/ports/367098
QAT: https://qat.redports.org/buildarchive/r367098/

Log:
  Fix install. While here, use INSTALL_LIB instead of INSTALL_DATA.
  
  PORTREVISION bump for new plist.

Modified:
  head/www/websh/Makefile
  head/www/websh/pkg-plist

Modified: head/www/websh/Makefile
==============================================================================
--- head/www/websh/Makefile	Tue Sep  2 22:08:39 2014	(r367097)
+++ head/www/websh/Makefile	Tue Sep  2 22:12:35 2014	(r367098)
@@ -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	\

Modified: head/www/websh/pkg-plist
==============================================================================
--- head/www/websh/pkg-plist	Tue Sep  2 22:08:39 2014	(r367097)
+++ head/www/websh/pkg-plist	Tue Sep  2 22:12:35 2014	(r367098)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409022212.s82MCZeC095593>