From 5b426b017f0424904c33389c4ca4711c2e70bd5d Mon Sep 17 00:00:00 2001
From: marcus <marcus@FreeBSD.org>
Date: Mon, 30 Jun 2003 16:36:01 +0000
Subject: Fix patching on -CURRENT by using REINPLACE to do the do.

Reported by:	many
---
 irc/xchat-gnome/Makefile              |  4 ++++
 irc/xchat-gnome/files/patch-configure | 18 ------------------
 2 files changed, 4 insertions(+), 18 deletions(-)

(limited to 'irc/xchat-gnome')

diff --git a/irc/xchat-gnome/Makefile b/irc/xchat-gnome/Makefile
index 59c3e34104aa..31f42c6640a1 100644
--- a/irc/xchat-gnome/Makefile
+++ b/irc/xchat-gnome/Makefile
@@ -79,4 +79,8 @@ pre-everything::
 	@${ECHO_MSG} "WITH_TCL=yes for tcl support"
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -E -e 's|PY_LIBS=.*|PY_LIBS="-L\$$PY_EXEC_PREFIX/lib/python\$$PY_VERSION/config -lpython\$$PY_VERSION ${PTHREAD_LIBS} -lutil"|' \
+		${WRKSRC}/configure
+
 .include <bsd.port.post.mk>
diff --git a/irc/xchat-gnome/files/patch-configure b/irc/xchat-gnome/files/patch-configure
index 674516a44029..0547a1b05bb9 100644
--- a/irc/xchat-gnome/files/patch-configure
+++ b/irc/xchat-gnome/files/patch-configure
@@ -15,21 +15,3 @@
    ;
    return 0;
  }
-@@ -12799,7 +12799,7 @@
-                 echo "$as_me:$LINENO: checking Python version" >&5
- echo $ECHO_N "checking Python version... $ECHO_C" >&6
-                                 PY_VERSION=`$pythonpath -c 'import sys; print sys.version[:3]'`
--                PY_PATH=`$pythonpath -c 'import sys ; print sys.path[1][5:]'`
-+                PY_PATH=`$pythonpath -c 'import sys ; print sys.path[1][10:]'`
-                 $pythonpath -c "import sys; map(int,sys.version[:3].split('.')) >= [2,2] or sys.exit(1)"
-                                 echo "$as_me:$LINENO: result: $PY_VERSION" >&5
- echo "${ECHO_T}$PY_VERSION" >&6
-@@ -12809,7 +12809,7 @@
-                         PY_PREFIX=`$pythonpath -c 'import sys; print sys.prefix'`
-                         PY_EXEC_PREFIX=`$pythonpath -c 'import sys; print sys.exec_prefix'`
-                         if test -f $PY_PREFIX/include/python$PY_VERSION/Python.h; then
--                                PY_LIBS="-L$PY_EXEC_PREFIX/$PY_PATH/config -lpython$PY_VERSION -pthread -lutil"
-+                                PY_LIBS="-L$PY_EXEC_PREFIX/lib/python$PY_VERSION/config -lpython$PY_VERSION -pthread -lutil"
-                                 PY_CFLAGS="-I$PY_PREFIX/include/python$PY_VERSION"
-                                 echo "$as_me:$LINENO: result: ok" >&5
- echo "${ECHO_T}ok" >&6
-- 
cgit