svn commit: r525268 - head/lang/expect

[Pietro Cerutti]

Author: gahr
Date: Wed Feb  5 11:46:34 2020
New Revision: 525268
URL: https://svnweb.freebsd.org/changeset/ports/525268

Log:
  lang/expect: register LDCONFIG path
  
  Because expect installs its shared libraries as symlinks
    libexpect.so.1 -> lib/expect5.45.4/libexpect5.45.4.so
  programs and libraries linked with -lexpect will fail to locate the final .so
  file.
  
  See
  https://lists.freebsd.org/pipermail/freebsd-tcltk/2020-February/000677.html
  
  Reported by:	Daniel Morante <daniel at morante.net>

Modified:
  head/lang/expect/Makefile

Modified: head/lang/expect/Makefile
==============================================================================
--- head/lang/expect/Makefile	Wed Feb  5 11:42:25 2020	(r525267)
+++ head/lang/expect/Makefile	Wed Feb  5 11:46:34 2020	(r525268)
@@ -3,10 +3,10 @@
 
 PORTNAME=	expect
 PORTVERSION=	5.45.4
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	lang tcl tk
-MASTER_SITES=	SF/expect/Expect/${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/Expect/${PORTVERSION}
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	tcltk at FreeBSD.org
@@ -16,7 +16,7 @@ LICENSE=	PD
 LICENSE_FILE=	${WRKSRC}/license.terms
 
 USES=		tcl:tea autoreconf
-USE_LDCONFIG=	yes
+USE_LDCONFIG=	${LOCALBASE}/lib/${DISTNAME}
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
@@ -25,8 +25,8 @@ SUB_LIST+=	MANPREFIX=${MANPREFIX}
 TEST_TARGET=	test
 
 post-install:
-	${LN} -sf expect${PORTVERSION}/libexpect${PORTVERSION}.so \
-		${STAGEDIR}${PREFIX}/lib/libexpect.so.1
-	${LN} -sf libexpect.so.1 ${STAGEDIR}${PREFIX}/lib/libexpect.so
+	${LN} -sf ${DISTNAME}/lib${DISTNAME}.so \
+		${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.1
+	${LN} -sf lib${PORTNAME}.so.1 ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so
 
 .include <bsd.port.mk>