Date: Fri, 17 Jan 2014 10:33:09 +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: r340026 - head/net-im/libpurple Message-ID: <201401171033.s0HAX99I020937@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Fri Jan 17 10:33:08 2014 New Revision: 340026 URL: http://svnweb.freebsd.org/changeset/ports/340026 QAT: https://qat.redports.org/buildarchive/r340026/ Log: - Convert to USES=tk Modified: head/net-im/libpurple/Makefile Modified: head/net-im/libpurple/Makefile ============================================================================== --- head/net-im/libpurple/Makefile Fri Jan 17 10:30:16 2014 (r340025) +++ head/net-im/libpurple/Makefile Fri Jan 17 10:33:08 2014 (r340026) @@ -83,10 +83,10 @@ NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MTCLTK} -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} +USES+= tk +CFLAGS+= -I${TK_INCLUDEDIR} -I${TCL_INCLUDEDIR} +CONFIGURE_ARGS+= --with-tclconfig=${TCL_LIBDIR} \ + --with-tkconfig=${TK_LIBDIR} PLIST_SUB+= TCL:="" .else CONFIGURE_ARGS+= --disable-tcl @@ -314,8 +314,8 @@ post-patch: -e 's|-lpanel |-lpanel -lncurses|g' \ -e 's|-lpthread|${PTHREAD_LIBS:S/"//g}|g' \ -e 's|-lsilc -lsilcclient ${PTHREAD_LIBS} $$LIBDL|-lsilc -lsilcclient ${PTHREAD_LIBS} ${ICONV_LIB}|' \ - -e 's|TCL_VERSION found but 8.3 required|TCL_VERSION found but ${TCLTK_VER} required|g' \ - -e 's|TCL_MINOR_VERSION" -ne 3|TCL_MINOR_VERSION" -ne ${TCLTK_VER:E}|' \ + -e 's|TCL_VERSION found but 8.3 required|TCL_VERSION found but ${TCL_VER} required|g' \ + -e 's|TCL_MINOR_VERSION" -ne 3|TCL_MINOR_VERSION" -ne ${TCL_VER:E}|' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/bin/bash|${SH}|' \ ${WRKSRC}/libpurple/purple-send \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401171033.s0HAX99I020937>