1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-12 07:27:57 +00:00

When the WITH_TCLTK option is turned on at config-time, use the

bsd.tcl.mk API. Although this changes Tcl version from 8.4 to 8.5
for most Tcl-users, there is no PORTREVISION bump, because TCLTK
option is off by default.

While here, slightly rephrase the descriptions of the two SSL-options
(GNUTLS vs. NSS).

Approved by:	maintainer
This commit is contained in:
Mikhail Teterin 2011-09-27 20:19:28 +00:00
parent 7fbb65c620
commit 7a61ea7a83
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=282515

View File

@ -49,8 +49,8 @@ PRPL_MODULES=
OPTIONS= BONJOUR "Enable mDNS support" on \
DBUS "Enable DBUS bindings" on \
GNUTLS "GNUTLS encryption support" off \
NSS "Mozilla NSS encryption support" on \
GNUTLS "Use GNUTLS for encryption support" off \
NSS "Use Mozilla NSS for encryption support" on \
SASL "Cyrus SASL support (for jabberd)" off \
GSTREAMER "Use GStreamer for playing sounds" on \
VV "Enable video and voice support" on \
@ -78,6 +78,19 @@ OPTIONS+= GTKSPELL "Spell checking support" on \
CONFIGURE_ARGS+=--disable-doxygen
.include <bsd.port.options.mk>
.if defined(WITH_TCLTK)
USE_TK= yes
CFLAGS+= -I${LOCALBASE}/include/tk${TK_VER} -I${LOCALBASE}/include/tcl${TCL_VER}
CONFIGURE_ARGS+= --with-tclconfig=${LOCALBASE}/lib/tcl${TCL_VER} \
--with-tkconfig=${LOCALBASE}/lib/tk${TK_VER}
PLIST_SUB+= TCL:=""
.else
CONFIGURE_ARGS+= --disable-tcl
PLIST_SUB+= TCL:="@comment not installed: "
.endif
.include <bsd.port.pre.mk>
.if ${OSVERSION} > 700032 || (${OSVERSION} < 700000 && ${OSVERSION} > 602106)
@ -165,19 +178,6 @@ CONFIGURE_ARGS+=--disable-avahi
PLIST_SUB+= BONJOUR="@comment not installed: "
.endif
.if defined(WITH_TCLTK)
TCLTK_VER?= 8.4 # user can override it
TCLTK_VER_NODOT= ${TCLTK_VER:S/.//}
LIB_DEPENDS+= tk${TCLTK_VER_NODOT}:${PORTSDIR}/x11-toolkits/tk${TCLTK_VER_NODOT}
CONFIGURE_ARGS+= --with-tclconfig=${LOCALBASE}/lib/tcl${TCLTK_VER} \
--with-tkconfig=${LOCALBASE}/lib/tk${TCLTK_VER}
CFLAGS+= -I${LOCALBASE}/include/tk${TCLTK_VER} -I${LOCALBASE}/include/tcl${TCLTK_VER}
PLIST_SUB+= TCL:=""
.else
CONFIGURE_ARGS+= --disable-tcl
PLIST_SUB+= TCL:="@comment not installed: "
.endif
.if defined(WITH_GTKUI) && !defined(WITHOUT_GTKSPELL)
LIB_DEPENDS+= gtkspell.0:${PORTSDIR}/textproc/gtkspell
.else