Make sure the shared library is explicitly linked with -lm. On

some occasions, this prevent it from being loaded properly, even
though other libs  already loaded already bring in  -lm. I don't
understand the rtld :(

Only  build the  Tk related  help files,  if WITHOUT_X11  is not
specified. Previously they were built, but not installed. If you
did not have  Tk installed, that build failed for  you -- see PR
29722...

PR:		ports/29722

4 files changed, 22 insertions, 6 deletions

diff --git a/lang/tclX/Makefile b/lang/tclX/Makefile
index 5143e9356215..6b6df140a190 100644
--- a/lang/tclX/Makefile
+++ b/lang/tclX/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tclX
 PORTVERSION=	8.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang tcl${TCL_DVER} tk${TCL_DVER}
 MASTER_SITES=	ftp://ftp.neosoft.com/pub/tcl/tclx-distrib/
 DISTNAME=	tclX8.2.0
@@ -27,7 +27,6 @@ TCL_DVER?=	${TCL_VER:S/.//}
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-ALL_TARGET=	all buildhelp
 CONFIGURE_ARGS= --enable-shared \
 		--with-tcl="${LOCALBASE}/lib/tcl${TCL_VER}" \
 		--with-tk="${LOCALBASE}/lib/tk${TCL_VER}"
@@ -41,6 +40,8 @@ CONFIGURE_ARGS+=--with-tk="${LOCALBASE}/lib/tk${TCL_VER}"
 PLIST_SUB+=	X11=''
 .endif
 
+MAKE_ENV=	LDFLAGS="-lm"
+
 MAN3=   CmdWrite.3 Handles.3 Keylist.3 ObjCmdWrite.3 TclXInit.3 \
 	TclCommandWriting.3 \
 	TclX_KeyedListDelete.3 TclX_KeyedListGet.3 TclX_KeyedListGetKeys.3 \
@@ -52,6 +53,13 @@ MAN3=   CmdWrite.3 Handles.3 Keylist.3 ObjCmdWrite.3 TclXInit.3 \
 MANN=	Memory.n TclX.n Tcl_DisplayMemory.n Tcl_InitMemory.n \
 	Tcl_ValidateAllMemory.n ckalloc.n ckfree.n memory.n
 
+post-build:
+	cd ${WRKSRC}/../tcl/unix && ${MAKE} buildhelp
+.ifndef WITHOUT_X11
+	cd ${WRKSRC}/../tk/unix && ${MAKE} buildhelp
+.endif
+
+
 .include <bsd.port.pre.mk>
 
 post-install:
diff --git a/lang/tclX/files/patch-ab b/lang/tclX/files/patch-ab
index 9c0dfb7a7b08..a06c14156d7e 100644
--- a/lang/tclX/files/patch-ab
+++ b/lang/tclX/files/patch-ab
@@ -14,7 +14,7 @@
  	TCL_LIBRARY=${TCL_UNIX_DIR}/../library; export TCL_LIBRARY; \
  	LD_LIBRARY_PATH=${TCL_UNIX_DIR}:${LD_LIBRARY_PATH}; export LD_LIBRARY_PATH; \
 -	${TCL_SHLIB_LD} -o ${TCLX_SHLIB_NAME} ${SOBJS} ${TCL_SHLIB_LD_LIBS}
-+	${TCL_SHLIB_LD} -o ${TCLX_SHLIB_NAME} ${SOBJS} @NEED_TCL_STUB@
++	${TCL_SHLIB_LD} -o ${TCLX_SHLIB_NAME} ${SOBJS} @NEED_TCL_STUB@ -lm
 +	ln -sf ${TCLX_SHLIB_NAME} `echo ${TCLX_SHLIB_NAME} | sed 's/\.so.*$$/.so/'`
  
  hello:	hello.c
diff --git a/lang/tclX82/Makefile b/lang/tclX82/Makefile
index 5143e9356215..6b6df140a190 100644
--- a/lang/tclX82/Makefile
+++ b/lang/tclX82/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tclX
 PORTVERSION=	8.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang tcl${TCL_DVER} tk${TCL_DVER}
 MASTER_SITES=	ftp://ftp.neosoft.com/pub/tcl/tclx-distrib/
 DISTNAME=	tclX8.2.0
@@ -27,7 +27,6 @@ TCL_DVER?=	${TCL_VER:S/.//}
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-ALL_TARGET=	all buildhelp
 CONFIGURE_ARGS= --enable-shared \
 		--with-tcl="${LOCALBASE}/lib/tcl${TCL_VER}" \
 		--with-tk="${LOCALBASE}/lib/tk${TCL_VER}"
@@ -41,6 +40,8 @@ CONFIGURE_ARGS+=--with-tk="${LOCALBASE}/lib/tk${TCL_VER}"
 PLIST_SUB+=	X11=''
 .endif
 
+MAKE_ENV=	LDFLAGS="-lm"
+
 MAN3=   CmdWrite.3 Handles.3 Keylist.3 ObjCmdWrite.3 TclXInit.3 \
 	TclCommandWriting.3 \
 	TclX_KeyedListDelete.3 TclX_KeyedListGet.3 TclX_KeyedListGetKeys.3 \
@@ -52,6 +53,13 @@ MAN3=   CmdWrite.3 Handles.3 Keylist.3 ObjCmdWrite.3 TclXInit.3 \
 MANN=	Memory.n TclX.n Tcl_DisplayMemory.n Tcl_InitMemory.n \
 	Tcl_ValidateAllMemory.n ckalloc.n ckfree.n memory.n
 
+post-build:
+	cd ${WRKSRC}/../tcl/unix && ${MAKE} buildhelp
+.ifndef WITHOUT_X11
+	cd ${WRKSRC}/../tk/unix && ${MAKE} buildhelp
+.endif
+
+
 .include <bsd.port.pre.mk>
 
 post-install:
diff --git a/lang/tclX82/files/patch-ab b/lang/tclX82/files/patch-ab
index 9c0dfb7a7b08..a06c14156d7e 100644
--- a/lang/tclX82/files/patch-ab
+++ b/lang/tclX82/files/patch-ab
@@ -14,7 +14,7 @@
  	TCL_LIBRARY=${TCL_UNIX_DIR}/../library; export TCL_LIBRARY; \
  	LD_LIBRARY_PATH=${TCL_UNIX_DIR}:${LD_LIBRARY_PATH}; export LD_LIBRARY_PATH; \
 -	${TCL_SHLIB_LD} -o ${TCLX_SHLIB_NAME} ${SOBJS} ${TCL_SHLIB_LD_LIBS}
-+	${TCL_SHLIB_LD} -o ${TCLX_SHLIB_NAME} ${SOBJS} @NEED_TCL_STUB@
++	${TCL_SHLIB_LD} -o ${TCLX_SHLIB_NAME} ${SOBJS} @NEED_TCL_STUB@ -lm
 +	ln -sf ${TCLX_SHLIB_NAME} `echo ${TCLX_SHLIB_NAME} | sed 's/\.so.*$$/.so/'`
  
  hello:	hello.c