Date: Wed, 6 Feb 2013 15:42:16 +0000 (UTC) From: Pietro Cerutti <gahr@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r311776 - in head: cad/opencascade devel/newt games/scid graphics/aolserver-nsgd graphics/ocaml-lablgl lang/ocaml lang/xotcl net-im/amsn security/aolserver-nsmcrypt security/aolserver-n... Message-ID: <201302061542.r16FgGPA065802@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Wed Feb 6 15:42:16 2013 New Revision: 311776 URL: http://svnweb.freebsd.org/changeset/ports/311776 Log: - Get rid of USE_TCL_THREAD and USE_TK_THREAD usages Modified: head/cad/opencascade/Makefile (contents, props changed) head/devel/newt/Makefile (contents, props changed) head/games/scid/Makefile (contents, props changed) head/graphics/aolserver-nsgd/Makefile (contents, props changed) head/graphics/ocaml-lablgl/Makefile (contents, props changed) head/lang/ocaml/Makefile (contents, props changed) head/lang/xotcl/Makefile (contents, props changed) head/net-im/amsn/Makefile head/security/aolserver-nsmcrypt/Makefile head/security/aolserver-nsmhash/Makefile head/sysutils/openipmi/Makefile head/www/aolserver/Makefile head/www/tdom/Makefile Modified: head/cad/opencascade/Makefile ============================================================================== --- head/cad/opencascade/Makefile Wed Feb 6 15:36:58 2013 (r311775) +++ head/cad/opencascade/Makefile Wed Feb 6 15:42:16 2013 (r311776) @@ -26,7 +26,6 @@ USE_BISON= build USE_TK= 84+ USE_TCL_BUILD= 84+ USE_TCL_RUN= 84+ -USE_TCL_THREADS=yes USE_JAVA= yes USE_XORG= xmu JAVA_VERSION= 1.6+ Modified: head/devel/newt/Makefile ============================================================================== --- head/devel/newt/Makefile Wed Feb 6 15:36:58 2013 (r311775) +++ head/devel/newt/Makefile Wed Feb 6 15:42:16 2013 (r311776) @@ -47,7 +47,7 @@ PLIST_SUB+= PYTHONOPT="@comment " USE_TCL= 84+ TCLSUFFIX= -${TCL_NODOT} MAKE_ENV+= WITH_TCL=yes TCL_LIBDIR=${TCL_LIBDIR:Q} -PLIST_SUB+= TCLOPT="" TCL_VER=${TCL_VER}${_TCL_THREADS_SUFFIX} +PLIST_SUB+= TCLOPT="" TCL_VER=${TCL_VER} CPPFLAGS+= -I${TCL_INCLUDEDIR:Q} SUB_FILES+= pkgIndex.tcl Modified: head/games/scid/Makefile ============================================================================== --- head/games/scid/Makefile Wed Feb 6 15:36:58 2013 (r311775) +++ head/games/scid/Makefile Wed Feb 6 15:42:16 2013 (r311776) @@ -23,7 +23,7 @@ USE_PYTHON= yes USE_GMAKE= yes MAKE_JOBS_SAFE= yes -TCL_LIBRARY= -L${LOCALBASE}/lib -ltcl${USE_TCL}${_TCL_THREADS_SUFFIX} +TCL_LIBRARY= -L${LOCALBASE}/lib -ltcl${USE_TCL} CONFIGURE_ARGS= \ BINDIR="${PREFIX}/bin" \ @@ -31,7 +31,7 @@ CONFIGURE_ARGS= \ TCL_VERSION="${TCL_VER}" \ TCL_INCLUDE="-I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} -I${LOCALBASE}/include" \ TCL_LIBRARY="${TCL_LIBRARY}" \ - TK_LIBRARY="${TCL_LIBRARY} -ltk${USE_TK}${_TCL_THREADS_SUFFIX} -lX11" \ + TK_LIBRARY="${TCL_LIBRARY} -ltk${USE_TK} -lX11" \ OPTIMIZE="${CXXFLAGS} -fno-rtti -fno-exceptions" \ WARNINGS="" @@ -39,10 +39,4 @@ ALL_TARGET= all strip WRKSRC= ${WRKDIR}/${PORTNAME} -.include <bsd.port.pre.mk> - -.if defined(USE_TCL_THREADS) -TCL_LIBRARY+= ${PTHREAD_LIBS} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/graphics/aolserver-nsgd/Makefile ============================================================================== --- head/graphics/aolserver-nsgd/Makefile Wed Feb 6 15:36:58 2013 (r311775) +++ head/graphics/aolserver-nsgd/Makefile Wed Feb 6 15:42:16 2013 (r311776) @@ -30,7 +30,6 @@ RUN_DEPENDS+= ${LOCALBASE}/${AOLSERVERBA USE_GMAKE= yes USE_TCL= 84+ -USE_TCL_THREADS= yes .include <bsd.port.pre.mk> Modified: head/graphics/ocaml-lablgl/Makefile ============================================================================== --- head/graphics/ocaml-lablgl/Makefile Wed Feb 6 15:36:58 2013 (r311775) +++ head/graphics/ocaml-lablgl/Makefile Wed Feb 6 15:42:16 2013 (r311776) @@ -41,7 +41,6 @@ CONFLICTS= ocaml-notk-[0-9]* ocaml-nox11 USE_TK= 84+ INVALID_TK_VER = 86 .if defined(WITH_THREADS) -USE_TK_THREADS = yes THR_CPP= ${PTHREAD_CFLAGS} THR_LD = ${PTHREAD_LIBS} .endif @@ -58,8 +57,8 @@ post-patch: -e "s,^#\(LIBDIR[ \t]*=\).*,\1${PREFIX}/lib/ocaml,g" \ -e "s,^#\(DLLDIR[ \t]*=\).*,\1${PREFIX}/lib/ocaml/stublibs,g" \ -e "/^TKINCLUDES/s,=.*$$,= -I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR}," \ - -e "/^TKLIBS/s,=.*$$,= -L${LOCALBASE}/lib -ltk${TK_VER:S/.//}${_TCL_THREADS_SUFFIX}\ - -ltcl${TCL_VER:S/.//}${_TCL_THREADS_SUFFIX} ${THR_LD}," \ + -e "/^TKLIBS/s,=.*$$,= -L${LOCALBASE}/lib -ltk${TK_VER:S/.//}\ + -ltcl${TCL_VER:S/.//} ${THR_LD}," \ ${WRKSRC}/Makefile.config @${REINPLACE_CMD} \ Modified: head/lang/ocaml/Makefile ============================================================================== --- head/lang/ocaml/Makefile Wed Feb 6 15:36:58 2013 (r311775) +++ head/lang/ocaml/Makefile Wed Feb 6 15:42:16 2013 (r311776) @@ -84,16 +84,13 @@ CONFIGURE_ARGS+=-no-tk .else USE_TK= 84+ INVALID_TK_VER = 86 -.if defined(WITH_THREADS) -USE_TK_THREADS = yes -.endif .include "${PORTSDIR}/Mk/bsd.tcl.mk" PLIST_SUB+= TK="" CONFLICTS+= ocaml-nox11-[0-9]* ocaml-notk-[0-9]* CONFIGURE_ARGS+= -tkdefs \ "-I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} ${THR_CPP}" \ - -tklibs "-L${LOCALBASE}/lib -ltk${TK_VER:S|.||}${_TCL_THREADS_SUFFIX} \ - -ltcl${TCL_VER:S|.||}${_TCL_THREADS_SUFFIX} ${THR_LD}" + -tklibs "-L${LOCALBASE}/lib -ltk${TK_VER:S|.||} \ + -ltcl${TCL_VER:S|.||} ${THR_LD}" .endif .if ${ARCH} == sparc64 Modified: head/lang/xotcl/Makefile ============================================================================== --- head/lang/xotcl/Makefile Wed Feb 6 15:36:58 2013 (r311775) +++ head/lang/xotcl/Makefile Wed Feb 6 15:42:16 2013 (r311776) @@ -19,7 +19,6 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYRIGHT USE_TCL= 84+ -USE_TCL_THREADS= yes INSTALL_TARGET= install ALL_TARGET= all test-nohttp Modified: head/net-im/amsn/Makefile ============================================================================== --- head/net-im/amsn/Makefile Wed Feb 6 15:36:58 2013 (r311775) +++ head/net-im/amsn/Makefile Wed Feb 6 15:42:16 2013 (r311776) @@ -36,8 +36,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVER USE_TCL= 86 USE_TK= 86 -WITH_TCL_THREADS= 86 -WITH_TK_THREADS= 86 GNU_CONFIGURE= yes Modified: head/security/aolserver-nsmcrypt/Makefile ============================================================================== --- head/security/aolserver-nsmcrypt/Makefile Wed Feb 6 15:36:58 2013 (r311775) +++ head/security/aolserver-nsmcrypt/Makefile Wed Feb 6 15:42:16 2013 (r311776) @@ -33,7 +33,6 @@ USE_GMAKE= yes MAKEFILE= Makefile.ns USE_TCL= 84+ -USE_TCL_THREADS= yes PLIST_FILES= ${AOLSERVERBASE}/bin/nsmcrypt.so \ ${AOLSERVERBASE}/lib/libnsmcrypt.a \ Modified: head/security/aolserver-nsmhash/Makefile ============================================================================== --- head/security/aolserver-nsmhash/Makefile Wed Feb 6 15:36:58 2013 (r311775) +++ head/security/aolserver-nsmhash/Makefile Wed Feb 6 15:42:16 2013 (r311776) @@ -33,7 +33,6 @@ USE_GMAKE= yes MAKEFILE= Makefile.ns USE_TCL= 84+ -USE_TCL_THREADS= yes PLIST_FILES= ${AOLSERVERBASE}/bin/nsmhash.so \ ${AOLSERVERBASE}/lib/libnsmhash.a \ Modified: head/sysutils/openipmi/Makefile ============================================================================== --- head/sysutils/openipmi/Makefile Wed Feb 6 15:36:58 2013 (r311775) +++ head/sysutils/openipmi/Makefile Wed Feb 6 15:42:16 2013 (r311776) @@ -107,7 +107,6 @@ CONFIGURE_ARGS+= --with-swig=no .if defined(WITH_TCL) USE_TCL= 84 -USE_TCL_THREADS= yes CONFIGURE_ARGS+= --with-tcl \ --with-tclcflags=-I${TCL_INCLUDEDIR} \ --with-tcllibs=-ltcl${TCL_VER:S/.//} Modified: head/www/aolserver/Makefile ============================================================================== --- head/www/aolserver/Makefile Wed Feb 6 15:36:58 2013 (r311775) +++ head/www/aolserver/Makefile Wed Feb 6 15:42:16 2013 (r311776) @@ -40,7 +40,6 @@ SUB_LIST+= ${SUB_VARS} AOLSERVERBASE="${ PLIST_SUB+= ${SUB_VARS} AOLSERVERBASE="${AOLSERVERBASE}" USE_TCL= 84+ -USE_TCL_THREADS= yes INVALID_TCL_VER= 86 ONLY_FOR_ARCHS= i386 amd64 Modified: head/www/tdom/Makefile ============================================================================== --- head/www/tdom/Makefile Wed Feb 6 15:36:58 2013 (r311775) +++ head/www/tdom/Makefile Wed Feb 6 15:42:16 2013 (r311776) @@ -18,7 +18,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVER TDOMBASE= ${PREFIX}/lib/tdom${PORTVERSION} USE_TCL= 84+ -USE_TCL_THREADS= yes USE_GMAKE= yes HAS_CONFIGURE= yes
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302061542.r16FgGPA065802>