diff options
author | minskim <minskim@pkgsrc.org> | 2004-05-12 17:56:45 +0000 |
---|---|---|
committer | minskim <minskim@pkgsrc.org> | 2004-05-12 17:56:45 +0000 |
commit | 985810ddb73f670219dbf25b146017ed144e5c47 (patch) | |
tree | 8d8ba69c5280fe5ef2598799bb75150bf8950e85 /lang | |
parent | ebad988b3694eeaf159a23118df2165d4b96cabb (diff) | |
download | pkgsrc-985810ddb73f670219dbf25b146017ed144e5c47.tar.gz |
Make this package build with thread-enabled Tcl, and simplify patches
by using -ltcl and -ltk instead of version-dependent tcl library name
such as -ltcl83 and -ltk83.
Diffstat (limited to 'lang')
-rw-r--r-- | lang/tcl-tclX/Makefile | 8 | ||||
-rw-r--r-- | lang/tcl-tclX/distinfo | 6 | ||||
-rw-r--r-- | lang/tcl-tclX/patches/patch-ab | 19 | ||||
-rw-r--r-- | lang/tcl-tclX/patches/patch-af | 8 |
4 files changed, 18 insertions, 23 deletions
diff --git a/lang/tcl-tclX/Makefile b/lang/tcl-tclX/Makefile index 7e5760092cd..603f298f77c 100644 --- a/lang/tcl-tclX/Makefile +++ b/lang/tcl-tclX/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2004/03/20 19:28:52 minskim Exp $ +# $NetBSD: Makefile,v 1.18 2004/05/12 17:56:45 minskim Exp $ # DISTNAME= tclX8.2.0 @@ -29,12 +29,6 @@ MAKE_ENV+= GTAR=${GTAR} CHOWN=${CHOWN} CHMOD=${CHMOD} \ SHAREMODE=${SHAREMODE} SHAREOWN=${SHAREOWN} \ SHAREGRP=${SHAREGRP} -SUBST_CLASSES+= paths -SUBST_MESSAGE.paths= "Fixing Tcl library names." -SUBST_STAGE.paths= post-patch -SUBST_FILES.paths= ${WRKSRC}/../tcl/unix/Makefile.in -SUBST_SED.paths= -e 's,ltcl83,ltcl,g' - .include "../../lang/tcl/buildlink2.mk" post-extract: diff --git a/lang/tcl-tclX/distinfo b/lang/tcl-tclX/distinfo index f433975934c..ef7fedf7e8c 100644 --- a/lang/tcl-tclX/distinfo +++ b/lang/tcl-tclX/distinfo @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.5 2004/03/20 19:28:52 minskim Exp $ +$NetBSD: distinfo,v 1.6 2004/05/12 17:56:45 minskim Exp $ SHA1 (tclX8.2.0.tar.gz) = 51295ad001d9d057e4ec2f13016f6aa4111fdd28 Size (tclX8.2.0.tar.gz) = 721198 bytes SHA1 (patch-aa) = 47eb7e69e714a8bccf862c5115f6694c3b213881 -SHA1 (patch-ab) = da32caa8d65643f2159496ef016ce68b3f304e9e +SHA1 (patch-ab) = 70a0aa51cf1809ad00c15d9ad92179b8e6e745d6 SHA1 (patch-ac) = 10f778e6a8336ff41164e2f089ac8ad7c8d5ccdb SHA1 (patch-ad) = 252a21da464267d7c7d45e168a89b29a40273359 SHA1 (patch-ae) = a43144f37706245779362026073e09d8505a3d3f -SHA1 (patch-af) = 5b68c6ea909437c66dad60bf7b330805d854baca +SHA1 (patch-af) = 137d6c8e0ee88609763d638d32eac7f6b5747dcb SHA1 (patch-ag) = 6c8876699bfe325b3370bb554d4727e05fc64b8b SHA1 (patch-ah) = 8283f991ccc4f1cf35e9e100596bfbdf54157ad2 diff --git a/lang/tcl-tclX/patches/patch-ab b/lang/tcl-tclX/patches/patch-ab index a85d380c468..7ce8a0bfa28 100644 --- a/lang/tcl-tclX/patches/patch-ab +++ b/lang/tcl-tclX/patches/patch-ab @@ -1,13 +1,14 @@ -$NetBSD: patch-ab,v 1.2 2004/03/20 19:28:52 minskim Exp $ ---- ../tcl/unix/Makefile.in.orig Sun Feb 6 19:53:59 2000 -+++ ../tcl/unix/Makefile.in Tue Sep 5 19:23:03 2000 -@@ -142,30 +142,23 @@ +$NetBSD: patch-ab,v 1.3 2004/05/12 17:56:45 minskim Exp $ + +--- ../tcl/unix/Makefile.in.orig 2000-02-06 18:53:59.000000000 -0600 ++++ ../tcl/unix/Makefile.in +@@ -142,30 +142,23 @@ static: tcl.static tclXtest.static standalone: tcl.standalone tclXtest.standalone hello tcl: tclXAppInit.o @TCLX_SHLIB_BUILD_REF@ @TCLX_STLIB_BUILD_REF@ Makefile - ${CC} ${LD_SWITCHES} tclXAppInit.o ${ALL_LIBS} \ - -o $@ || (rm -f $@; exit 1) -+ ${LD} tclXAppInit.o -o $@ ${TCLX_SHLIB_NAME:C/\.so.*/.la/} -L${PREFIX}/lib -rpath ${PREFIX}/lib -ltcl83 -lm ++ ${LD} tclXAppInit.o -o $@ ${TCLX_SHLIB_NAME:C/\.so.*/.la/} -L${PREFIX}/lib -rpath ${PREFIX}/lib -ltcl -lm ${TCL_LIBS} tcl.static: tclXAppInit.o @TCLX_STLIB_BUILD_REF@ Makefile - ${CC} ${LD_SWITCHES} tclXAppInit.o ${STATIC_LIBS} \ @@ -31,7 +32,7 @@ $NetBSD: patch-ab,v 1.2 2004/03/20 19:28:52 minskim Exp $ - 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} -+ ${LIBTOOL} @CC@ --mode=link -o ${TCLX_SHLIB_NAME:C/\.so.*/.la/} ${SOBJS:.o=.lo} -L${PREFIX}/lib -Wl,-R${PREFIX}/lib -rpath ${PREFIX}/lib -ltcl83 -lm -version-info 1:0 ++ ${LIBTOOL} @CC@ --mode=link -o ${TCLX_SHLIB_NAME:C/\.so.*/.la/} ${SOBJS:.o=.lo} -L${PREFIX}/lib -Wl,-R${PREFIX}/lib -rpath ${PREFIX}/lib -ltcl -lm -version-info 1:0 hello: hello.c - ${CC} ${LD_SWITCHES} -o $@ hello.c ${STATIC_LIBS} @@ -39,13 +40,13 @@ $NetBSD: patch-ab,v 1.2 2004/03/20 19:28:52 minskim Exp $ #------------------------------------------------------------------------------ # Do some special checks to make sure TclX is built ok. -@@ -219,16 +212,13 @@ +@@ -219,16 +212,13 @@ help.tmp: # Generate the test programs. # tclXtest: ${TEST_OBJS} ${TCLX_LIB_NAME} - ${CC} ${LD_SWITCHES} ${TEST_OBJS} ${ALL_LIBS} \ - -o $@ || (rm -f $@; exit 1) -+ ${LD} ${TEST_OBJS} -o $@ ${TCLX_SHLIB_NAME:C/\.so.*/.la/} -L${PREFIX}/lib -rpath ${PREFIX}/lib -ltcl83 -lm ++ ${LD} ${TEST_OBJS} -o $@ ${TCLX_SHLIB_NAME:C/\.so.*/.la/} -L${PREFIX}/lib -rpath ${PREFIX}/lib -ltcl -lm ${TCL_LIBS} tclXtest.static: ${TEST_OBJS} ${TCLX_STLIB_NAME} - ${CC} ${LD_SWITCHES} ${TEST_OBJS} ${STATIC_LIBS} \ @@ -59,7 +60,7 @@ $NetBSD: patch-ab,v 1.2 2004/03/20 19:28:52 minskim Exp $ tclXtest.o: ${TCLX_GENERIC_DIR}/tclXtest.c ${CC} -c ${CC_SWITCHES} ${TCLX_GENERIC_DIR}/tclXtest.c -@@ -320,29 +310,24 @@ +@@ -320,29 +310,24 @@ install-libraries: install-runtime insta install-doc: diff --git a/lang/tcl-tclX/patches/patch-af b/lang/tcl-tclX/patches/patch-af index 4c9156bb676..effdb9a8d96 100644 --- a/lang/tcl-tclX/patches/patch-af +++ b/lang/tcl-tclX/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.3 2001/04/27 09:16:19 skrll Exp $ +$NetBSD: patch-af,v 1.4 2004/05/12 17:56:45 minskim Exp $ --- ../tk/unix/Makefile.in.orig Mon Feb 7 00:54:01 2000 +++ ../tk/unix/Makefile.in @@ -21,7 +21,7 @@ $NetBSD: patch-af,v 1.3 2001/04/27 09:16:19 skrll Exp $ - -o $@ || (rm -f $@; exit 1) + ${LD} tkXAppInit.o -o $@ -Wl,-R ${PREFIX}/lib -Wl,-R${X11BASE}/lib \ + -L${PREFIX}/lib -L${X11BASE}/lib \ -+ ${TKX_SHLIB_NAME:C/\.so.*/.la/} -ltclx82 -ltk83 -ltcl83 -lX11 -lm ++ ${TKX_SHLIB_NAME:C/\.so.*/.la/} -ltclx82 -ltk -ltcl -lX11 -lm wishx.static: tkXAppInit.o ${TKX_STLIB_NAME} ${LIBTCLX} Makefile - ${CC} ${LD_SWITCHES} tkXAppInit.o ${STATIC_LIBS} -o $@ || \ @@ -46,7 +46,7 @@ $NetBSD: patch-af,v 1.3 2001/04/27 09:16:19 skrll Exp $ - ${TCL_BUILD_STUB_LIB_SPEC} ${TCL_SHLIB_LD_LIBS} + ${LIBTOOL} --mode=link @CC@ -o ${TKX_SHLIB_NAME:C/\.so.*/.la/} ${SOBJS:.o=.lo} \ + -Wl,-R${PREFIX}/lib -Wl,-R${X11BASE}/lib -rpath ${PREFIX}/lib \ -+ -L${PREFIX}/lib -L${X11BASE}/lib -ltclx82 -ltk83 -ltcl83 -lX11 -lm -version-info 1:0 ++ -L${PREFIX}/lib -L${X11BASE}/lib -ltclx82 -ltk -ltcl -lX11 -lm -version-info 1:0 hello: hello.c - ${CC} ${LD_SWITCHES} -o $@ hello.c ${STATIC_LIBS} @@ -62,7 +62,7 @@ $NetBSD: patch-af,v 1.3 2001/04/27 09:16:19 skrll Exp $ - -o $@ || (rm -f $@; exit 1) + ${LD} ${TEST_OBJS} -o $@ -Wl,-R${PREFIX}/lib -Wl,-R${X11BASE}/lib \ + -L${PREFIX}/lib -L${X11BASE}/lib \ -+ ${TKX_SHLIB_NAME:C/\.so.*/.la/} -ltclx82 -ltk83 -ltcl83 -lX11 -lm ++ ${TKX_SHLIB_NAME:C/\.so.*/.la/} -ltclx82 -ltk -ltcl -lX11 -lm tktest.static: ${TEST_OBJS} @TKX_STLIB_BUILD_REF@ ${TCL} - ${CC} ${LD_SWITCHES} ${TEST_OBJS} ${STATIC_LIBS} \ |