cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Get rid of USE_TCL_THREAD and USE_TK_THREAD usages

Browse Source
This commit is contained in:
Pietro Cerutti 2013-02-06 15:42:16 +00:00
parent 4aaccd87ee
commit 08d561670f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=311776
13 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cad/opencascade/Makefile
View File

@ -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+

2
devel/newt/Makefile
View File

@ -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

12
games/scid/Makefile
View File

@ -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>

1
graphics/aolserver-nsgd/Makefile
View File

@ -30,7 +30,6 @@ RUN_DEPENDS+= ${LOCALBASE}/${AOLSERVERBASE}/bin/nsd:${PORTSDIR}/www/aolserver
USE_GMAKE= yes
USE_TCL= 84+
USE_TCL_THREADS= yes
.include <bsd.port.pre.mk>

5
graphics/ocaml-lablgl/Makefile
View File

@ -41,7 +41,6 @@ CONFLICTS= ocaml-notk-[0-9]* ocaml-nox11-[0-9]*
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} \

7
lang/ocaml/Makefile
View File

@ -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

1
lang/xotcl/Makefile
View File

@ -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

2
net-im/amsn/Makefile
View File

@ -36,8 +36,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_TCL= 86
USE_TK= 86
WITH_TCL_THREADS= 86
WITH_TK_THREADS= 86
GNU_CONFIGURE= yes

1
security/aolserver-nsmcrypt/Makefile
View File

@ -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 \

1
security/aolserver-nsmhash/Makefile
View File

@ -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 \

1
sysutils/openipmi/Makefile
View File

@ -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/.//}

1
www/aolserver/Makefile
View File

@ -40,7 +40,6 @@ SUB_LIST+= ${SUB_VARS} AOLSERVERBASE="${PREFIX}/${AOLSERVERBASE}"
PLIST_SUB+= ${SUB_VARS} AOLSERVERBASE="${AOLSERVERBASE}"
USE_TCL= 84+
USE_TCL_THREADS= yes
INVALID_TCL_VER= 86
ONLY_FOR_ARCHS= i386 amd64

1
www/tdom/Makefile
View File

@ -18,7 +18,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/unix
TDOMBASE= ${PREFIX}/lib/tdom${PORTVERSION}
USE_TCL= 84+
USE_TCL_THREADS= yes
USE_GMAKE= yes
HAS_CONFIGURE= yes