From 8e841dbd49c39ba524da8021a078f3d9adf5eff2 Mon Sep 17 00:00:00 2001 From: Joe Marcus Clarke Date: Sun, 9 Nov 2003 19:28:33 +0000 Subject: * We don't need to include bsd.port.pre.mk here as it actually messes up Python support [1] * Clean up some other portlint warnings Spotted by: Oliver Eikemeier [1] --- irc/xchat-gnome/Makefile | 6 ++---- irc/xchat2/Makefile | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/irc/xchat-gnome/Makefile b/irc/xchat-gnome/Makefile index e5cc7c26e77d..31a42190563d 100644 --- a/irc/xchat-gnome/Makefile +++ b/irc/xchat-gnome/Makefile @@ -31,8 +31,6 @@ CONFIGURE_ARGS= --enable-nls \ CONFLICTS= xchat-* -.include - .if defined(WITH_SOCKS) BUILD_DEPENDS+= ${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5 CONFIGURE_ARGS+= --enable-socks @@ -50,7 +48,7 @@ PLIST_SUB+= PYTHON="@comment " .endif .if defined(WITH_TCL) -LIB_DEPENDS= tcl83.1:${PORTSDIR}/lang/tcl83 +LIB_DEPENDS+= tcl83.1:${PORTSDIR}/lang/tcl83 CONFIGURE_ARGS+=--enable-tcl=${LOCALBASE}/lib/tcl8.3 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} \ -I${LOCALBASE}/include/tcl8.3" \ @@ -81,4 +79,4 @@ post-patch: @${REINPLACE_CMD} -E -e 's|PY_LIBS=.*|PY_LIBS="-L\$$PY_EXEC_PREFIX/lib/python\$$PY_VER/config -lpython\$$PY_VER ${PTHREAD_LIBS} -lutil"|' \ ${WRKSRC}/configure -.include +.include diff --git a/irc/xchat2/Makefile b/irc/xchat2/Makefile index e5cc7c26e77d..31a42190563d 100644 --- a/irc/xchat2/Makefile +++ b/irc/xchat2/Makefile @@ -31,8 +31,6 @@ CONFIGURE_ARGS= --enable-nls \ CONFLICTS= xchat-* -.include - .if defined(WITH_SOCKS) BUILD_DEPENDS+= ${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5 CONFIGURE_ARGS+= --enable-socks @@ -50,7 +48,7 @@ PLIST_SUB+= PYTHON="@comment " .endif .if defined(WITH_TCL) -LIB_DEPENDS= tcl83.1:${PORTSDIR}/lang/tcl83 +LIB_DEPENDS+= tcl83.1:${PORTSDIR}/lang/tcl83 CONFIGURE_ARGS+=--enable-tcl=${LOCALBASE}/lib/tcl8.3 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} \ -I${LOCALBASE}/include/tcl8.3" \ @@ -81,4 +79,4 @@ post-patch: @${REINPLACE_CMD} -E -e 's|PY_LIBS=.*|PY_LIBS="-L\$$PY_EXEC_PREFIX/lib/python\$$PY_VER/config -lpython\$$PY_VER ${PTHREAD_LIBS} -lutil"|' \ ${WRKSRC}/configure -.include +.include -- cgit v1.2.3