PERFORCE change 117596 for review
Gabor Kovesdan
gabor at FreeBSD.org
Sat Apr 7 15:45:08 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=117596
Change 117596 by gabor at gabor_server on 2007/04/07 15:44:57
IFC
Affected files ...
.. //depot/projects/soc2006/gabor_destdir/CHANGES#5 integrate
.. //depot/projects/soc2006/gabor_destdir/GIDs#4 integrate
.. //depot/projects/soc2006/gabor_destdir/LEGAL#4 integrate
.. //depot/projects/soc2006/gabor_destdir/MOVED#5 integrate
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.autotools.mk#4 integrate
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.emacs.mk#4 integrate
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#9 integrate
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.ruby.mk#4 integrate
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.sites.mk#5 integrate
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.tcl.mk#3 integrate
.. //depot/projects/soc2006/gabor_destdir/Tools/scripts/rmport#3 integrate
.. //depot/projects/soc2006/gabor_destdir/Tools/scripts/security-check.awk#2 edit
.. //depot/projects/soc2006/gabor_destdir/UIDs#4 integrate
.. //depot/projects/soc2006/gabor_destdir/UPDATING#5 integrate
Differences ...
==== //depot/projects/soc2006/gabor_destdir/CHANGES#5 (text+ko) ====
@@ -10,6 +10,22 @@
All ports committers are allowed to commit to this file.
+20070403:
+AUTHOR: portmgr at FreeBSD.org
+The following changes were made to the ports infrastructure:
+
+ * The default dependency of USE_GHOSTSCRIPT has been changed from
+ ghostscript-gnu to ghostscript-gpl. The WITH_GHOSTSCRIPT_GPL variable is
+ now no-op. New WITH_GHOSTSCRIPT_GNU variable was added.
+
+ * bsd.tcl.mk was overhauled. Most importantly, the semantics of USE_TCL* and
+ USE_TK* variables was changed. USE_TCL and USE_TK now implies both build
+ and run dependencies, USE_TCL_RUN and USE_TK_BUILD variables were
+ introduced. Existing ports in the tree were modified.
+
+ * Unused category tcl81 was removed, and new categories tcl and tk were
+ added.
+
20070324:
AUTHOR: portmgr at FreeBSD.org
The following changes were made to the ports infrastructure:
@@ -1304,4 +1320,4 @@
Contact Erwin Lansing if you have any questions about your use of
this document.
-$FreeBSD: ports/CHANGES,v 1.67 2007/03/24 14:02:05 pav Exp $
+$FreeBSD: ports/CHANGES,v 1.68 2007/04/02 23:14:45 pav Exp $
==== //depot/projects/soc2006/gabor_destdir/GIDs#4 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: ports/GIDs,v 1.32 2007/03/24 05:10:35 marcus Exp $
+$FreeBSD: ports/GIDs,v 1.34 2007/03/31 12:53:57 laszlof Exp $
# Please keep this file sorted by GID!
smmsp:*:25:
bind:*:53:
@@ -14,6 +14,7 @@
pgsql:*:70:
ircd:*:72:
simscan:*:74:
+hybserv:*:76:
audit:*:77:
virtuoso:*:79:
www:*:80:
@@ -103,4 +104,5 @@
bnetd:*:700:
bopm:*:717:
openxpki:*:777:
+netdisco:*:840:
bacula:*:910:
==== //depot/projects/soc2006/gabor_destdir/LEGAL#4 (text+ko) ====
@@ -1,5 +1,5 @@
# Creator: Jordan Hubbard
-# $FreeBSD: ports/LEGAL,v 1.530 2007/03/20 11:09:57 miwi Exp $
+# $FreeBSD: ports/LEGAL,v 1.531 2007/03/31 03:41:14 alepulver Exp $
**********************************************************************
*** NOTE TO COMMITTERS ***
@@ -49,7 +49,10 @@
author
aestats-* games/aestats Commercial use is prohibited
AGSatellite0520* net-p2p/linux-agsatellite Unsure of licensing issues
-infinity.* games/alephone-data Bungie/Microsoft do not
+alephone/M1A1.zip games/alephone-data Bungie/Microsoft do not
+ allow charging for Marathon
+ data files
+alephone/Marathon*.zip games/alephone-data Bungie/Microsoft do not
allow charging for Marathon
data files
ads-java-novm-* databases/adstudio Free for personal or educational
@@ -392,12 +395,6 @@
l_fc_p*_*.*.*.tar lang/ifc7 No redistribution allowed
l_fc_p*_*.*.*.tar.gz lang/ifc No redistribution allowed
macopix-*.tar.gz games/macopix Contains commercial character data
-MarathonEvil-*.tar.gz games/marathon-evil Bungie/Microsoft do not
- allow charging for Marathon data
- files
-marathon2.zip games/marathon2-data Bungie/Microsoft do not
- allow charging for Marathon data
- files.
mathfonts-4.1/* x11-fonts/mathfonts No redistribution allowed
MB339-PAN.zip games/flightgear-mb339-pan Redistribution prohibited
mbrola-freebsd/* audio/mbrola No commercial, military use
==== //depot/projects/soc2006/gabor_destdir/MOVED#5 (text+ko) ====
@@ -1,7 +1,7 @@
#
# MOVED - a list of (recently) moved or removed ports
#
-# $FreeBSD: ports/MOVED,v 1.1333 2007/03/25 20:41:50 ahze Exp $
+# $FreeBSD: ports/MOVED,v 1.1339 2007/04/06 21:48:08 gerald Exp $
#
# Each entry consists of a single line containing the following four
# fields in the order named, separated with the pipe (`|') character:
@@ -2887,3 +2887,14 @@
www/drupal-textile|www/drupal4-textile|2007-03-25|rename for drupal5
security/drupal-ldap_integration|security/drupal4-ldap_integration|2007-03-25|rename for drupal5
devel/xdg-user-dirs-gtk||2007-03-25|Not all dependencies are in ports yet
+net/pcs|net/py-pcs|2007-03-26|Renamed to fit python module naming convention
+japanese/gal||2007-03-28|Has expired: Broken on all supported versions of FreeBSD
+japanese/gnome||2007-03-28|Has expired: Broken on all supported versions of FreeBSD
+japanese/gnomelibs||2007-03-28|Has expired: Broken on all supported versions of FreeBSD
+x11-toolkits/ruby-fox|x11-toolkits/ruby-fox10|2007-03-29|rename for supporting multiple fox version
+x11-toolkits/ruby-fox-devel|x11-toolkits/ruby-fox12|2007-03-29|rename for supporting multiple fox version
+lang/tcl81-thread||2007-03-29|Remove an ancient, unused tcl version
+editors/emacs20-dl||2007-04-02|Has expired: unfetchable, obsolete
+editors/flim113-emacs20||2007-04-02|Has expired: unfetchable, obsolete
+editors/semi113-emacs20||2007-04-02|Has expired: unfetchable, obsolete
+lang/gfortran|lang/gcc42|2007-04-06|Superseded by and equivalent to gcc42
==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.autotools.mk#4 (text+ko) ====
@@ -1,7 +1,7 @@
#-*- mode: makefile; tab-width: 4; -*-
# ex:ts=4
#
-# $FreeBSD: ports/Mk/bsd.autotools.mk,v 1.26 2007/03/24 14:02:06 pav Exp $
+# $FreeBSD: ports/Mk/bsd.autotools.mk,v 1.28 2007/03/27 01:23:56 linimon Exp $
#
# Please view me with 4 column tabs!
#
==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.emacs.mk#4 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: ports/Mk/bsd.emacs.mk,v 1.61 2007/02/06 20:58:06 anray Exp $
+# $FreeBSD: ports/Mk/bsd.emacs.mk,v 1.62 2007/04/04 07:24:06 clsung Exp $
#
# bsd.emacs.mk - 19990829 Shigeyuki Fukushima.
#
@@ -115,7 +115,7 @@
# Emacs-22.x
.elif (${EMACS_PORT_NAME} == "emacs22")
EMACS_NAME= emacs
-EMACS_VER= 22.0.93
+EMACS_VER= 22.0.97
EMACS_MAJOR_VER= 22
EMACS_LIBDIR?= share/${EMACS_NAME}
EMACS_LIBDIR_WITH_VER?= share/${EMACS_NAME}/${EMACS_VER}
==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#9 (text+ko) ====
@@ -1,7 +1,7 @@
#-*- mode: makefile; tab-width: 4; -*-
# ex:ts=4
#
-# $FreeBSD: ports/Mk/bsd.port.mk,v 1.557 2007/03/24 14:02:06 pav Exp $
+# $FreeBSD: ports/Mk/bsd.port.mk,v 1.565 2007/04/07 12:51:47 pav Exp $
# $NetBSD: $
#
# bsd.port.mk - 940820 Jordan K. Hubbard.
@@ -355,12 +355,13 @@
# Some installations may wish to override the default
# to specify a version without X11 and/or localized
# versions for their nationality.
-# WITH_GHOSTSCRIPT_GPL
-# - If set, this port uses the GPL version of the ghostscript
-# software instead of the GNU version, which is used otherwise.
+# Default: print/ghostscript-gpl
# WITH_GHOSTSCRIPT_AFPL
# - If set, this port uses the AFPL version of the ghostscript
-# software instead of the GNU version, which is used otherwise.
+# software instead of the GPL version, which is used otherwise.
+# WITH_GHOSTSCRIPT_GNU
+# - If set, this port uses the GNU version of the ghostscript
+# software instead of the GPL version, which is used otherwise.
##
# USE_BISON - If set, this port uses bison for building.
##
@@ -1273,7 +1274,13 @@
OPTIONSFILE?= ${PORT_DBDIR}/${UNIQUENAME}/options
_OPTIONSFILE!= ${ECHO_CMD} "${OPTIONSFILE}"
.if defined(OPTIONS)
-. if defined(PACKAGE_BUILDING) || (defined(BATCH) && !exists(${_OPTIONSFILE}))
+# include OPTIONSFILE first if exists
+. if exists(${_OPTIONSFILE}) && !make(rmconfig)
+. include "${_OPTIONSFILE}"
+. endif
+. if exists(${_OPTIONSFILE}.local)
+. include "${_OPTIONSFILE}.local"
+. endif
WITHOUT:=
WITH:=
. if defined(OPTIONS)
@@ -1289,23 +1296,21 @@
OPT:=${RO}
. endfor
. endif
+# define only if NO WITH/WITHOUT_${W} is defined
. for W in ${WITH}
+. if !defined(WITH_${W}) && !defined(WITHOUT_${W})
WITH_${W}:= true
+. endif
. endfor
. for W in ${WITHOUT}
+. if !defined(WITH_${W}) && !defined(WITHOUT_${W})
WITHOUT_${W}:= true
+. endif
. endfor
. undef WITH
. undef WITHOUT
. undef RO
. undef REALOPTIONS
-. endif
-. if exists(${_OPTIONSFILE}) && !make(rmconfig)
-. include "${_OPTIONSFILE}"
-. endif
-. if exists(${_OPTIONSFILE}.local)
-. include "${_OPTIONSFILE}.local"
-. endif
.endif
.endif
@@ -1481,7 +1486,7 @@
.include "${PORTSDIR}/Mk/bsd.ocaml.mk"
.endif
-.if defined(USE_TCL) || defined(USE_TCL_BUILD) || defined(USE_TK) || defined(USE_TK_BUILD)
+.if defined(USE_TCL) || defined(USE_TCL_BUILD) || defined(USE_TCL_RUN) || defined(USE_TCL_WRAPPER) || defined(USE_TK) || defined(USE_TK_BUILD) || defined(USE_TK_RUN) || defined(USE_TK_WRAPPER)
.include "${PORTSDIR}/Mk/bsd.tcl.mk"
.endif
@@ -2007,20 +2012,20 @@
# Set the default for the installation of Postscript(TM)-
# compatible functionality.
.if !defined(WITHOUT_X11)
-.if defined(WITH_GHOSTSCRIPT_AFPL)
+.if defined(WITH_GHOSTSCRIPT_GNU)
+GHOSTSCRIPT_PORT?= print/ghostscript-gnu
+.elif defined(WITH_GHOSTSCRIPT_AFPL)
GHOSTSCRIPT_PORT?= print/ghostscript-afpl
-.elif defined(WITH_GHOSTSCRIPT_GPL)
+.else
GHOSTSCRIPT_PORT?= print/ghostscript-gpl
-.else
-GHOSTSCRIPT_PORT?= print/ghostscript-gnu
.endif
.else
-.if defined(WITH_GHOSTSCRIPT_AFPL)
+.if defined(WITH_GHOSTSCRIPT_GNU)
+GHOSTSCRIPT_PORT?= print/ghostscript-gnu-nox11
+.elif defined(WITH_GHOSTSCRIPT_AFPL)
GHOSTSCRIPT_PORT?= print/ghostscript-afpl-nox11
-.elif defined(WITH_GHOSTSCRIPT_GPL)
+.else
GHOSTSCRIPT_PORT?= print/ghostscript-gpl-nox11
-.else
-GHOSTSCRIPT_PORT?= print/ghostscript-gnu-nox11
.endif
.endif
@@ -2727,8 +2732,8 @@
palm parallel pear perl5 plan9 polish portuguese ports-mgmt \
print python ruby rubygems russian \
scheme science security shells spanish sysutils \
- tcl80 tcl81 tcl82 tcl83 tcl84 textproc \
- tk80 tk82 tk83 tk84 tkstep80 \
+ tcl tcl80 tcl82 tcl83 tcl84 textproc \
+ tk tk80 tk82 tk83 tk84 tkstep80 \
ukrainian vietnamese windowmaker www \
x11 x11-clocks x11-fm x11-fonts x11-servers x11-themes x11-toolkits \
x11-wm xfce zope
@@ -3124,8 +3129,7 @@
#
################################################################
.if (!defined(OPTIONS) || defined(CONFIG_DONE) || \
- defined(PACKAGE_BUILDING) || defined(BATCH) || \
- exists(${_OPTIONSFILE}) || exists(${_OPTIONSFILE}.local))
+ defined(PACKAGE_BUILDING) || defined(BATCH))
_OPTIONS_OK=yes
.endif
@@ -3259,16 +3263,25 @@
fi
.endif
+# set alg to any of SIZE, MD5, SHA256 (or any other checksum algorithm):
+DISTINFO_DATA?= if [ \( -n "${DISABLE_SIZE}" -a -n "${NO_CHECKSUM}" \) -o ! -f "${MD5_FILE}" ]; then exit; fi; \
+ DIR=${DIST_SUBDIR}; ${AWK} -v alg=$$alg -v file=$${DIR:+$$DIR/}$${file} \
+ '$$1 == alg && $$2 == "(" file ")" {print $$4}' ${MD5_FILE}
+
# Fetch
.if !target(do-fetch)
do-fetch:
@${MKDIR} ${_DISTDIR}
- @(cd ${_DISTDIR}; \
+ @cd ${_DISTDIR};\
${_MASTER_SITES_ENV} ; \
for _file in ${DISTFILES}; do \
- file=`${ECHO_CMD} $$_file | ${SED} -E -e 's/:[^:]+$$//'` ; \
- select=`${ECHO_CMD} $${_file#$${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` ; \
+ file=$${_file%%:*}; \
+ if [ $$_file = $$file ]; then \
+ select=''; \
+ else \
+ select=`${ECHO_CMD} $${_file##*:} | ${SED} -e 's/,/ /g'` ; \
+ fi; \
force_fetch=false; \
filebasename=`${BASENAME} $$file`; \
for afile in ${FORCE_FETCH}; do \
@@ -3278,8 +3291,6 @@
fi; \
done; \
if [ ! -f $$file -a ! -f $$filebasename -o "$$force_fetch" = "true" ]; then \
- DIR=${DIST_SUBDIR}; \
- pattern="$${DIR:+$$DIR/}`${ECHO_CMD} $$file | ${SED} -e 's/\./\\\\./g'`"; \
if [ -L $$file -o -L $$filebasename ]; then \
${ECHO_MSG} "=> ${_DISTDIR}/$$file is a broken symlink."; \
${ECHO_MSG} "=> Perhaps a filesystem (most likely a CD) isn't mounted?"; \
@@ -3287,7 +3298,8 @@
exit 1; \
fi ; \
if [ -f ${MD5_FILE} -a "x${NO_CHECKSUM}" = "x" ]; then \
- if ! ${GREP} -q "^MD5 ($$pattern)" ${MD5_FILE}; then \
+ _md5sum=`alg=MD5; ${DISTINFO_DATA}`; \
+ if [ -z "$$_md5sum" ]; then \
${ECHO_MSG} "=> $${DIR:+$$DIR/}$$file is not in ${MD5_FILE}."; \
${ECHO_MSG} "=> Either ${MD5_FILE} is out of date, or"; \
${ECHO_MSG} "=> $${DIR:+$$DIR/}$$file is spelled incorrectly."; \
@@ -3314,8 +3326,7 @@
fi ; \
for site in `eval $$SORTED_MASTER_SITES_CMD_TMP ${_RANDOMIZE_SITES}`; do \
${ECHO_MSG} "=> Attempting to fetch from $${site}."; \
- DIR=${DIST_SUBDIR}; \
- CKSIZE=`${GREP} "^SIZE ($${DIR:+$$DIR/}$$file)" ${MD5_FILE} | ${AWK} '{print $$4}'`; \
+ CKSIZE=`alg=SIZE; ${DISTINFO_DATA}`; \
case $${file} in \
*/*) ${MKDIR} $${file%/*}; \
args="-o $${file} $${site}$${file}";; \
@@ -3329,10 +3340,10 @@
${ECHO_MSG} "=> port manually into ${_DISTDIR} and try again."; \
exit 1; \
fi \
- done)
+ done
.if defined(PATCHFILES)
- @(cd ${_DISTDIR}; \
- ${_PATCH_SITES_ENV} ; \
+ @cd ${_DISTDIR};\
+ ${_PATCH_SITES_ENV} ; \
for _file in ${PATCHFILES}; do \
file=`${ECHO_CMD} $$_file | ${SED} -E -e 's/:[^:]+$$//'` ; \
select=`${ECHO_CMD} $${_file#$${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` ; \
@@ -3367,9 +3378,7 @@
fi ; \
for site in `eval $$SORTED_PATCH_SITES_CMD_TMP`; do \
${ECHO_MSG} "=> Attempting to fetch from $${site}."; \
- DIR=${DIST_SUBDIR}; \
- pattern="$${DIR:+$$DIR/}`${ECHO_CMD} $$file | ${SED} -e 's/\./\\\\./g'`"; \
- CKSIZE=`${GREP} "^SIZE ($$pattern)" ${MD5_FILE} | ${AWK} '{print $$4}'`; \
+ CKSIZE=`alg=SIZE; ${DISTINFO_DATA}`; \
case $${file} in \
*/*) ${MKDIR} $${file%/*}; \
args="-o $${file} $${site}$${file}";; \
@@ -3383,7 +3392,7 @@
${ECHO_MSG} "=> port manually into ${_DISTDIR} and try again."; \
exit 1; \
fi \
- done)
+ done
.endif
.endif
@@ -4035,7 +4044,7 @@
.if !target(${target}) && defined(_OPTIONS_OK)
${target}: ${${target:U}_COOKIE}
.elif !target(${target})
-${target}: config
+${target}: config-conditional
@cd ${.CURDIR} && ${MAKE} CONFIG_DONE=1 ${__softMAKEFLAGS} ${${target:U}_COOKIE}
.elif target(${target}) && defined(IGNORE)
.endif
@@ -4327,8 +4336,8 @@
continue; \
fi; \
fi; \
- DIR=${DIST_SUBDIR}; \
- CKSIZE=`${GREP} "^SIZE ($${DIR:+$$DIR/}$$file)" ${MD5_FILE} | ${AWK} '{print $$4}'`; \
+ DIR=${DIST_SUBDIR};\
+ CKSIZE=`alg=SIZE; ${DISTINFO_DATA}`; \
case $${file} in \
*/*) args="-o $${file} $${site}$${file}";; \
*) args=$${site}$${file};; \
@@ -4359,8 +4368,7 @@
SORTED_PATCH_SITES_CMD_TMP="${SORTED_PATCH_SITES_DEFAULT_CMD}" ; \
fi ; \
for site in `eval $$SORTED_PATCH_SITES_CMD_TMP ${_RANDOMIZE_SITES}`; do \
- DIR=${DIST_SUBDIR}; \
- CKSIZE=`${GREP} "^SIZE ($${DIR:+$$DIR/}$$file)" ${MD5_FILE} | ${AWK} '{print $$4}'`; \
+ CKSIZE=`alg=SIZE; ${DISTINFO_DATA}`; \
case $${file} in \
*/*) args="-o $${file} $${site}$${file}";; \
*) args=$${site}$${file};; \
@@ -4437,23 +4445,19 @@
.if !target(checksum)
checksum: fetch check-checksum-algorithms
- @ \
- \
- ${checksum_init} \
- \
+ @${checksum_init} \
if [ -f ${MD5_FILE} ]; then \
- ( cd ${DISTDIR}; OK=""; \
+ cd ${DISTDIR}; OK="";\
for file in ${_CKSUMFILES}; do \
- pattern="`${ECHO_CMD} $$file | ${SED} -e 's/\./\\\\./g'`"; \
- \
ignored="true"; \
+ _file=$${file#${DIST_SUBDIR}/*}; \
for alg in ${CHECKSUM_ALGORITHMS:U}; do \
ignore="false"; \
eval alg_executable=\$$$$alg; \
\
if [ $$alg_executable != "NO" ]; then \
MKSUM=`$$alg_executable < $$file`; \
- CKSUM=`${GREP} "^$$alg ($$pattern)" ${MD5_FILE} | ${AWK} '{print $$4}'`; \
+ CKSUM=`file=$$_file; ${DISTINFO_DATA}`; \
else \
ignore="true"; \
fi; \
@@ -4498,8 +4502,7 @@
done; \
\
for file in ${_IGNOREFILES}; do \
- pattern="`${ECHO_CMD} $$file | ${SED} -e 's/\./\\\\./g'`"; \
- \
+ _file=$${file#${DIST_SUBDIR}/*}; \
ignored="true"; \
alreadymatched="false"; \
for alg in ${CHECKSUM_ALGORITHMS:U}; do \
@@ -4507,7 +4510,7 @@
eval alg_executable=\$$$$alg; \
\
if [ $$alg_executable != "NO" ]; then \
- CKSUM=`${GREP} "^$$alg ($$pattern)" ${MD5_FILE} | ${AWK} '{print $$4}'`; \
+ CKSUM=`file=$$_file; ${DISTINFO_DATA}`; \
else \
ignore="true"; \
fi; \
@@ -4555,7 +4558,6 @@
if [ "$$OK" != "true" ]; then \
exit 1; \
fi \
- ); \
elif [ -n "${_CKSUMFILES:M*}" ]; then \
${ECHO_MSG} "=> No checksum file (${MD5_FILE})."; \
fi
@@ -4840,61 +4842,59 @@
done
.endif
+# Used by fetch-required and fetch-required list, this script looks
+# at each of the dependencies. If 3 items are specified in the tuple,
+# such as foo:${PORTSDIR}/graphics/foo:extract, the first item (foo)
+# is examined. Only if it begins with a / and does not exist on the
+# file-system will ``make targ'' proceed.
+# For more usual (dual-item) dependency tuples, the ``make targ''
+# proceeds, if the exact package, which the directory WOULD'VE installed,
+# is not yet installed.
+# This is the exact behaviour of the old code, and it may need
+# revisiting. For example, the entire first case seems dubious, and in
+# the second case we, probably, should be satisfied with _any_ (earlier)
+# package, with the same origin as that of the dir.
+#
+# -mi
+FETCH_LIST?= for i in $$deps; do \
+ prog=$${i%%:*}; dir=$${i\#*:}; \
+ case $$dir in \
+ *:*) if [ $$prog != $${prog\#/} -o ! -e $$prog ]; then \
+ dir=$${dir%%:*}; \
+ else \
+ continue; \
+ fi;; \
+ *) if [ -d ${PKG_DBDIR}/$$(cd $$dir; ${MAKE} -V PKGNAME) ]; then \
+ continue; \
+ fi;; \
+ esac; \
+ echo cd $$dir; ${MAKE} $$targ; \
+ done
+
.if !target(fetch-required)
fetch-required: fetch
+.if defined(NO_DEPENDS)
+ @${ECHO_MSG} "===> NO_DEPENDS is set, not fetching any distfiles for ${PKG_NAME}"
+.else
@${ECHO_MSG} "===> Fetching all required distfiles for ${PKGNAME} and dependencies"
.for deptype in EXTRACT PATCH FETCH BUILD RUN
.if defined(${deptype}_DEPENDS)
-.if !defined(NO_DEPENDS)
- @for i in ${${deptype}_DEPENDS}; do \
- prog=`${ECHO_CMD} $$i | ${CUT} -f 1 -d ':'`; \
- dir=`${ECHO_CMD} $$i | ${CUT} -f 2-999 -d ':'`; \
- if ${EXPR} "$$dir" : '.*:' > /dev/null; then \
- dir=`${ECHO_CMD} $$dir | ${CUT} -f 1 -d ':'`; \
- if ${EXPR} "$$prog" : \\/ >/dev/null; then \
- if [ ! -e "$$prog" ]; then \
- (cd $$dir; ${MAKE} fetch); \
- fi; \
- fi; \
- else \
- (cd $$dir; \
- tmp=`${MAKE} -V PKGNAME`; \
- if [ ! -d ${PKG_DBDIR}/$${tmp} ]; then \
- ${MAKE} fetch; \
- fi ); \
- fi; \
- done
+ @targ=fetch; deps="${${deptype}_DEPENDS}"; ${FETCH_LIST}
.endif
+.endfor
.endif
-.endfor
+
.endif
.if !target(fetch-required-list)
fetch-required-list: fetch-list
+.if !defined(NO_DEPENDS)
.for deptype in EXTRACT PATCH FETCH BUILD RUN
.if defined(${deptype}_DEPENDS)
-.if !defined(NO_DEPENDS)
- @for i in ${${deptype}_DEPENDS}; do \
- prog=`${ECHO_CMD} $$i | ${CUT} -f 1 -d ':'`; \
- dir=`${ECHO_CMD} $$i | ${CUT} -f 2-999 -d ':'`; \
- if ${EXPR} "$$dir" : '.*:' > /dev/null; then \
- dir=`${ECHO_CMD} $$dir | ${CUT} -f 1 -d ':'`; \
- if ${EXPR} "$$prog" : \\/ >/dev/null; then \
- if [ ! -e "$$prog" ]; then \
- (cd $$dir; ${MAKE} fetch-list); \
- fi; \
- fi; \
- else \
- (cd $$dir; \
- tmp=`${MAKE} -V PKGNAME`; \
- if [ ! -d ${PKG_DBDIR}/$${tmp} ]; then \
- ${MAKE} fetch-list; \
- fi ); \
- fi; \
- done
+ @targ=fetch-list; deps="${${deptype}_DEPENDS}"; ${FETCH_LIST}
.endif
+.endfor
.endif
-.endfor
.endif
.if !target(checksum-recursive)
@@ -4913,7 +4913,7 @@
.endif
BUILD-DEPENDS-LIST= \
- for dir in $$(${ECHO_CMD} "${EXTRACT_DEPENDS} ${PATCH_DEPENDS} ${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS}" | ${TR} '\040' '\012' | ${SED} -e 's/^[^:]*://' -e 's/:.*//' | ${SORT} -u); do \
+ for dir in $$(${ECHO_CMD} "${EXTRACT_DEPENDS} ${PATCH_DEPENDS} ${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS}" | ${SED} -E -e 's,([^: ]*):([^: ]*)(:[^ ]*)?,\2,g' -e 'y/ /\n/'| ${SORT} -u); do \
if [ -d $$dir ]; then \
${ECHO_CMD} $$dir; \
else \
@@ -4927,7 +4927,7 @@
.endif
RUN-DEPENDS-LIST= \
- for dir in $$(${ECHO_CMD} "${LIB_DEPENDS} ${RUN_DEPENDS}" | ${SED} -e 'y/ /\n/' | ${CUT} -f 2 -d ':' | ${SORT} -u); do \
+ for dir in $$(${ECHO_CMD} "${_LIB_RUN_DEPENDS:C,.*:([^:]*).*,\1,}" | ${SED} -e 'y/ /\n/' | ${SORT} -u); do \
if [ -d $$dir ]; then \
${ECHO_CMD} $$dir; \
else \
@@ -4943,6 +4943,7 @@
@${PACKAGE-DEPENDS-LIST}
.endif
+_LIB_RUN_DEPENDS= ${LIB_DEPENDS} ${RUN_DEPENDS}
PACKAGE-DEPENDS-LIST?= \
if [ "${CHILD_DEPENDS}" ]; then \
installed=$$(${PKG_INFO} -qO ${PKGORIGIN} 2>/dev/null || \
@@ -4958,21 +4959,22 @@
done; \
fi; \
checked="${PARENT_CHECKED}"; \
- for dir in $$(${ECHO_CMD} "${LIB_DEPENDS} ${RUN_DEPENDS}" | ${SED} -e 'y/ /\n/' | ${CUT} -f 2 -d ':'); do \
+ for dir in ${_LIB_RUN_DEPENDS:C,[^:]*:([^:]*):?.*,\1,}; do \
dir=$$(${REALPATH} $$dir); \
if [ -d $$dir ]; then \
- if (${ECHO_CMD} $$checked | ${GREP} -qwv "$$dir"); then \
- childout=$$(cd $$dir; ${MAKE} CHILD_DEPENDS=yes PARENT_CHECKED="$$checked" package-depends-list); \
- set -- $$childout; \
- childdir=""; \
- while [ $$\# != 0 ]; do \
- childdir="$$childdir $$2"; \
- ${ECHO_CMD} "$$1 $$2 $$3"; \
- shift 3; \
- done; \
- checked="$$dir $$childdir $$checked"; \
- fi; \
- else \
+ case $$checked in \
+ $$dir|$$dir\ *|*\ $$dir|*\ $$dir\ *) continue;; \
+ esac; \
+ childout=$$(cd $$dir; ${MAKE} CHILD_DEPENDS=yes PARENT_CHECKED="$$checked" package-depends-list); \
+ set -- $$childout; \
+ childdir=""; \
+ while [ $$\# != 0 ]; do \
+ childdir="$$childdir $$2"; \
+ ${ECHO_CMD} "$$1 $$2 $$3"; \
+ shift 3; \
+ done; \
+ checked="$$dir $$childdir $$checked"; \
+ else \\
${ECHO_MSG} "${PKGNAME}: \"$$dir\" non-existent -- dependency list incomplete" >&2; \
fi; \
done
@@ -4992,7 +4994,7 @@
# Show missing dependiencies
missing:
@for dir in $$(${ALL-DEPENDS-LIST}); do \
- THISORIGIN=$$(${ECHO_CMD} $$dir | ${SED} 's,${PORTSDIR}/,,'); \
+ THISORIGIN=$${dir##${PORTSDIR}/}; \
installed=$$(${PKG_INFO} -qO $${THISORIGIN}); \
if [ -z "$$installed" ]; then \
${ECHO_CMD} $$THISORIGIN; \
@@ -5195,7 +5197,7 @@
@${ECHO_CMD} '@cwd ${PREFIX}' >> ${TMPPLIST}
.endif
@for i in $$(${ECHO_CMD} ${__MANPAGES} ${_TMLINKS:M${_PREFIX}*:S|^${_PREFIX}/||} ' ' | ${SED} -E -e 's|man([1-9ln])/([^/ ]+) |cat\1/\2 |g'); do \
- ${ECHO_CMD} "@unexec rm -f %D/$${i%.gz} %D/$${i%.gz}.gz" >> ${TMPPLIST}; \
+ ${ECHO_CMD} "@unexec rm -f %D/$$i %D/$${i%.gz} %D/$${i%.bz2} %D/$$i.gz %D/$$i.bz2" >> ${TMPPLIST}; \
done
.endfor
@if [ -f ${PLIST} ]; then \
@@ -5208,7 +5210,7 @@
.endfor
.for dir in ${PLIST_DIRS}
- @${ECHO_CMD} ${dir} | ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} | ${SED} -e 's,^, at dirrm ,' >> ${TMPPLIST}
+ @${ECHO_CMD} ${dir} | ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} -e 's,^, at dirrm ,' >> ${TMPPLIST}
.endfor
# To be removed once INSTALLS_SHLIB has been eradicated.
.if defined(INSTALLS_SHLIB) && !defined(INSTALL_AS_USER)
@@ -5386,7 +5388,7 @@
if [ -f ${PKGMESSAGE} ]; then \
${CP} ${PKGMESSAGE} ${PKG_DBDIR}/${PKGNAME}/+DISPLAY; \
fi; \
- for dep in `${PKG_INFO} -qf ${PKGNAME} | ${GREP} -w ^@pkgdep | ${AWK} '{print $$2}' | ${SORT} -u`; do \
+ for dep in `${PKG_INFO} -qf ${PKGNAME} | ${AWK} '/^@pkgdep / {print $$2}' | ${SORT} -u`; do \
if [ -d ${PKG_DBDIR}/$$dep -a -z `${ECHO_CMD} $$dep | ${GREP} -E ${PKG_IGNORE_DEPENDS}` ]; then \
if ! ${GREP} ^${PKGNAME}$$ ${PKG_DBDIR}/$$dep/+REQUIRED_BY \
>/dev/null 2>&1; then \
@@ -5529,10 +5531,36 @@
.if !target(config-conditional)
config-conditional:
-.if defined(OPTIONS) && !exists(${_OPTIONSFILE})
+.if defined(OPTIONS)
+.if exists(${_OPTIONSFILE})
+# scan saved options and invalidate them, if the set of options does not match
+ @. ${_OPTIONSFILE}; \
+ set ${OPTIONS} XXX; \
+ while [ $$# -gt 3 ]; do \
+ withvar=WITH_$$1; \
+ withoutvar=WITHOUT_$$1; \
+ withval=$$(eval ${ECHO_CMD} $$\{$${withvar}\}); \
+ withoutval=$$(eval ${ECHO_CMD} $$\{$${withoutvar}\}); \
+ if [ ! -z "$${withval}" ]; then \
+ val=on; \
+ elif [ ! -z "$${withoutval}" ]; then \
+ val=off; \
+ else \
+ val=missing; \
+ fi; \
+ if [ "$${val}" = "missing" ]; then \
+ OPTIONS_INVALID=yes; \
+ fi; \
+ shift 3; \
+ done; \
+ if [ "$${OPTIONS_INVALID}" = "yes" ]; then \
+ cd ${.CURDIR} && ${MAKE} config; \
+ fi;
+.else
cd ${.CURDIR} && ${MAKE} config;
.endif
.endif
+.endif
.if !target(showconfig)
showconfig:
==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.ruby.mk#4 (text+ko) ====
@@ -3,7 +3,7 @@
#
# Created by: Akinori MUSHA <knu at FreeBSD.org>
#
-# $FreeBSD: ports/Mk/bsd.ruby.mk,v 1.158 2007/02/13 10:33:46 stas Exp $
+# $FreeBSD: ports/Mk/bsd.ruby.mk,v 1.160 2007/04/04 12:52:04 stas Exp $
#
.if !defined(Ruby_Include)
@@ -74,6 +74,8 @@
# suffix in the form of `xyz'.
# RUBY_PORTVERSION - PORTVERSION for the standard ruby ports (ruby,
# ruby-gdbm, etc.).
+# RUBY_PORTREVISION - PORTREVISION for the standard ruby ports.
+# RUBY_PORTEPOCH - PORTEPOCH for the standard ruby ports.
# RUBY_DISTNAME - DISTNAME for the standard ruby ports, i.e. the
# basename of the ruby distribution tarball.
# RUBY_DISTVERSION - The version number part of RUBY_DISTNAME.
@@ -159,12 +161,18 @@
RUBY?= ${LOCALBASE}/bin/${RUBY_NAME}
.if defined(RUBY_VER) && ${RUBY_VER} == 1.8
-RUBY_RELVERSION= 1.8.5
-RUBY_PATCHLEVEL= 12
+RUBY_RELVERSION= 1.8.6
+RUBY_PORTREVISION= 0
+RUBY_PORTEPOCH= 1
+RUBY_PATCHLEVEL= 0
+
+.if ${RUBY_PATCHLEVEL} == 0
+RUBY_VERSION?= ${RUBY_RELVERSION}
+RUBY_DISTVERSION?= ${RUBY_RELVERSION}
+.else
RUBY_VERSION?= ${RUBY_RELVERSION}.${RUBY_PATCHLEVEL}
RUBY_DISTVERSION?= ${RUBY_RELVERSION}-p${RUBY_PATCHLEVEL}
-RUBY_PORTREVISION= 1
-#RUBY_PATCHFILES?= ruby-${RUBY_DISTVERSION}-yyyy.mm.dd.diff.bz2
+.endif
# Security patch
RUBY_PATCHFILES?= ${RUBY_VERSION}-patch1.gz
==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.sites.mk#5 (text+ko) ====
@@ -20,7 +20,7 @@
#
# Note: all entries should terminate with a slash.
#
-# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.415 2007/03/24 18:50:20 lofi Exp $
+# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.416 2007/04/03 21:58:35 stas Exp $
#
# Where to put distfiles that don't have any other master site
@@ -968,11 +968,11 @@
.if !defined(IGNORE_MASTER_SITE_RUBY)
MASTER_SITE_RUBY+= \
- ftp://ftp.iij.ad.jp/pub/lang/ruby/%SUBDIR%/ \
+ ftp://ftp.SpringDaemons.com/pub/ruby/ruby/%SUBDIR%/ \
+ ftp://ftp.ruby-lang.org/pub/ruby/%SUBDIR%/ \
http://www.ibiblio.org/pub/languages/ruby/%SUBDIR%/ \
ftp://xyz.lcs.mit.edu/pub/ruby/%SUBDIR%/ \
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,lang/ruby/&,} \
- ftp://ftp.ruby-lang.org/pub/ruby/%SUBDIR%/ \
ftp://ftp.fu-berlin.de/unix/languages/ruby/%SUBDIR%/ \
ftp://ftp.easynet.be/ruby/ruby/%SUBDIR%/ \
ftp://ftp.ntua.gr/pub/lang/ruby/%SUBDIR%/ \
==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.tcl.mk#3 (text+ko) ====
@@ -1,7 +1,7 @@
# -*- mode: Makefile; tab-width: 4; -*-
# ex: ts=4
#
-# $FreeBSD: ports/Mk/bsd.tcl.mk,v 1.7 2007/02/05 14:03:40 pav Exp $
+# $FreeBSD: ports/Mk/bsd.tcl.mk,v 1.8 2007/04/02 22:55:29 pav Exp $
#
.if !defined(_POSTMKINCLUDED) && !defined(Tcl_Pre_Include)
@@ -9,157 +9,431 @@
Tcl_Pre_Include= bsd.tcl.mk
Tcl_Include_MAINTAINER= ports at FreeBSD.org
-# USE_TCL - Depend on tcl to run. In case of incompatible APIs of
-# different TCL versions the version can be specified directly.
-# If version is not specified (USE_TCL=yes) then the latest
-# version is used (8.4 currently).
-# Available values are: 85, 85-thread, 84, 84-thread, 83, 82,
-# 81 and 80.
-# USE_TCL_BUILD - Build time dependency on tcl. Same semantics as USE_TCL.
+# USE_TCL - Add library dependency on Tcl. If no version is given by the maintainer
+# via the port or by the user via defined variable try to find the highest
+# stable installed version.
+# Available values: yes 85+ 84+ 83+ 82+ 80+ 85 84 83 82 80
+# NOTE: - default value 84 is used in case of USE_TCL=yes
+#
+# USE_TCL_BUILD - Add buildtime dependency on Tcl (tclsh).
+# Available values: see USE_TCL
+# NOTE: - has no effect if USE_TCL is defined
+#
+# USE_TCL_RUN - Add runtime dependency on Tcl (tclsh).
+# Available values: see USE_TCL
+# NOTE: - has no effect if USE_TCL is defined
+# - value is implied by USE_TCL_BUILD (if defined)
+#
+# USE_TCL_WRAPPER - Depend on the tclsh wrapper to run. Ports that do not explicitly require
+# a specific tclsh version may use this.
+# The tclsh wrapper script installs into ${LOCALBASE}/bin/tclsh
+# NOTE: - USE_TCL_WRAPPER and USE_TCL can be used together
+# - ports using the wrapper should support default Tcl (8.4)
+##
+# INVALID_TCL_VER - This variable contains a list of Tcl versions not supported by the port.
+# This setting is effective only when USE_TCL is set to a range (e.g. 83+)
+# WITH_TCL_VER - User defined global variable to set Tcl version
+# This variable is effective only if USE_TCL is set to a range (e.g. 83+)
+# and WITH_TCL_VER points inside that range.
+# NOTE: INVALID_TCL_VER takes precedence
+# <UNIQUENAME>_WITH_TCL_VER - User defined port specific variable to set Tcl version
+##
+# USE_TCL_THREADS - If defined, Tcl a threaded version of tcl is required.
+# NOTE: support for threaded builds starts with version 84
+# USE_TCL_NO_THREADS - If defined, port may not use a threaded Tcl, even if requested via
+# USE_TCL_THREADS or WITH_TCL_THREADS
+# WITH_TCL_THREADS - User defined variable to use Tcl with threads
+# <UNIQUENAME>_WITH_TCL_THREADS - User defined port specific variable to require Tcl with threads
+##
+# TCL_VER - Detected by bsd.tcl.mk. Contains the version number of Tcl to be used.
+#
+##
+# USE_TK - Add library dependency on Tk. If no version is given by the maintainer
+# via the port or by the user via defined variable try to find the highest
+# stable installed version.
+# Avaliable values: yes 85+ 84+ 83+ 82+ 80+ 85 84 83 82 80
+# NOTE: - overrides USE_TCL
+# - default value 84 is used in case of USE_TK=yes
+#
+# USE_TK_BUILD - Add buildtime dependency on Tk (wish).
+# Available values: see USE_TK
+# NOTE: - has no effect if USE_TK is defined
+#
+# USE_TK_RUN - Add runtime dependency on Tk (wish).
+# Available values: see USE_TK
+# NOTE: - has no effect if USE_TK is defined
+# - value is implied by USE_TK_BUILD (if defined)
#
-# USE_TK - Depend on tk to run. In case of incompatible APIs of different
-# TK versions the version can be specified directly. If version
-# is not specified (USE_TK=yes) then the latest version is
-# used (8.4 currently).
-# Available values are: 85, 84, 83, 82, 81 and 80.
-# USE_TK_BUILD - Build time dependency on tk. Same semantics as USE_TK.
+# USE_TK_WRAPPER - Depend on the wish wrapper to run. Ports that do not explicitly require
+# a specific wish version may use this.
+# The wish wrapper script installs into ${LOCALBASE}/bin/wish
+# NOTE: - USE_TK_WRAPPER and USE_TK can be used together.
+# - ports using the wrapper should support default Tk (8.4)
+##
+# INVALID_TK_VER - This variable contains a list of Tk versions not supported by the port
+# This setting is effective only when USE_TK is set to a range (e.g. 83+)
+# WITH_TK_VER - User defined global variable to set Tk version.
+# This variable is effective only if USE_TK is set to a range (e.g. 83+)
+# and WITH_TK_VER points inside that range.
+# NOTE: overrides WITH_TCL_VER.
+# <UNIQUENAME>_WITH_TK_VER - User defined port specific variable to set Tk version
+# NOTE: overrides <UNIQUENAME>_WITH_TCL_VER.
##
-# TCL_LIBDIR - Path where tcl libraries can be found
+# USE_TK_THREADS - Tk has to obey tcl in threads. A threaded Tk requires
+# a threaded Tcl and a non-threaded Tcl requires a non-threaded Tk.
+# This variable defines USE_TCL_THREADS
+# USE_TK_NO_THREADS - If defined, port may not use a threaded Tk, even if requested via
+# USE_TK_THREADS or WITH_TK_THREADS. Defines USE_TCL_NO_THREADS
+# WITH_TK_THREADS - User defined variable to use Tk with threads
+# <UNIQUENAME>_WITH_TK_THREADS - User defined port specific variable to require Tk with threads
+###
+# TCL_LIBDIR - Path where tcl libraries can be found
#
-# TCL_INCLUDEDIR
-# - Path where tcl C headers can be found
+# TCL_INCLUDEDIR - Path where tcl C headers can be found
##
# TK_LIBDIR - Path where tk libraries can be found
#
-# TK_INCLUDEDIR - Path where tk C headers can be found
+# TK_INCLUDEDIR - Path where tk C headers can be found
##
-# TCLSH - Path to tclsh executable respecting tcl version
+# TCLSH - Path to tclsh executable respecting Tcl version
+# or to the tclsh wrapper if USE_TCL_WRAPPER is set
+#
+# WISH - Path to wish executable respecting Tk version
+# or to the wish wrapper if USE_TK_WRAPPER is set
#
-# WISH - Path to wish executable respecting tk version
##
-# PATCH_TCL_SCRIPTS
-# - List of tcl scripts that need to be patched to replace
-# tclsh calls with tclsh${TK_VER} calls. Also note that
-# post-patch target is used.
+# PATCH_TCL_SCRIPTS - List of tcl scripts that need to be patched to replace
+# tclsh calls with tclsh${TK_VER} calls. Also note that
+# post-patch target is used.
#
-# PATCH_TK_SCRIPTS
-# - List of tcl scripts that need to be patched to replace
-# wish calls with wish${TK_VER} calls. Also note that
-# post-patch target is used.
+# PATCH_TK_SCRIPTS - List of tcl scripts that need to be patched to replace
+# wish calls with wish${TK_VER} calls. Also note that
+# post-patch target is used.
-.if defined(USE_TCL) || defined(USE_TCL_BUILD)
+# Set RUN_DEPENDS for wrappers
+. if defined(USE_TCL_WRAPPER)
+RUN_DEPENDS+= tclsh:${PORTSDIR}/lang/tcl-wrapper
+. endif
+. if defined(USE_TK_WRAPPER)
+RUN_DEPENDS+= wish:${PORTSDIR}/x11-toolkits/tk-wrapper
+. endif
-_TCL_VERSIONS= 85 85-thread 84 84-thread 83 82 81 80
+# Process USE_TCL_BUILD and USE_TCL_RUN
+.if !defined(USE_TCL)
+. if defined(USE_TCL_RUN)
+USE_TCL:= ${USE_TCL_RUN}
+_TCL_RUN_DEPENDS= yes
+. endif
+. if defined(USE_TCL_BUILD)
+USE_TCL:= ${USE_TCL_BUILD}
+_TCL_BUILD_DEPENDS= yes
+. endif
+.endif
-.if defined(USE_TCL)
-_RUN= yes
+# Process USE_TK_BUILD and USE_TK_RUN
+.if !defined(USE_TK)
+. if defined(USE_TK_RUN)
+USE_TK:= ${USE_TK_RUN}
+_TK_RUN_DEPENDS= yes
+. endif
+. if defined(USE_TK_BUILD)
+USE_TK:= ${USE_TK_BUILD}
+_TK_BUILD_DEPENDS= yes
+. endif
.endif
-.if defined(USE_TCL_BUILD)
-USE_TCL= ${USE_TCL_BUILD}
-_BUILD= yes
+# Set WITH_TCL_THREADS or WITH_TK_THREADS if port-specific define
+. if defined(${UNIQUENAME:U:S,-,_,}_WITH_TCL_THREADS)
+WITH_TCL_THREADS= yes
+. endif
+. if defined(${UNIQUENAME:U:S,-,_,}_WITH_TK_THREADS)
+WITH_TK_THREADS= yes
.endif
-.if ${USE_TCL} == "yes"
-USE_TCL= 84
-.endif
+# If a threaded Tcl or Tk is requested we require a threaded Tcl
+. if !defined(USE_TK_NO_THREADS) && !defined(USE_TCL_NO_THREADS)
+. if defined(USE_TCL_THREADS) || defined(USE_TK_THREADS)
+USE_TCL_THREADS= yes
+. endif
+. if defined(WITH_TK_THREADS)
+WITH_TCL_THREADS= ${WITH_TK_THREADS}
+. endif
+. endif
+
+# Override the global WITH_TCL_VER or WITH_TK_VER with the
+# port specific <UNIQUENAME>_WITH_TCL_VER or <UNIQUENAME>_WITH_TK_VER
+. if defined(${UNIQUENAME:U:S,-,_,}_WITH_TCL_VER)
+WITH_TCL_VER:= ${${UNIQUENAME:U:S,-,_,}_WITH_TCL_VER}
+. endif
+. if defined(${UNIQUENAME:U:S,-,_,}_WITH_TK_VER)
+WITH_TK_VER:= ${${UNIQUENAME:U:S,-,_,}_WITH_TK_VER}
+. endif
+
+# If USE_TK, WITH_TK_VER, INVALID_TK_VER is defined,
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list