From 37f6a18cb4229607c37876012167bfc0a84ddea4 Mon Sep 17 00:00:00 2001 From: markd Date: Wed, 25 Jul 2007 02:44:10 +0000 Subject: Non GNU sed's don't like '\b' in a regexp so don't use it. Also konversationircprotocolhandler script tries to use pidof command so depend on psmisc package unless linux. Bump PKGREVISION. --- chat/konversation/Makefile | 10 ++++++++-- chat/konversation/distinfo | 3 ++- chat/konversation/patches/patch-ac | 15 +++++++++++++++ 3 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 chat/konversation/patches/patch-ac (limited to 'chat') diff --git a/chat/konversation/Makefile b/chat/konversation/Makefile index 20093679ee8..d494c7ce418 100644 --- a/chat/konversation/Makefile +++ b/chat/konversation/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.11 2007/01/26 03:49:32 markd Exp $ +# $NetBSD: Makefile,v 1.12 2007/07/25 02:44:10 markd Exp $ # DISTNAME= konversation-1.0.1 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= chat kde MASTER_SITES= http://download.berlios.de/konversation/ EXTRACT_SUFX= .tar.bz2 @@ -28,6 +28,12 @@ REPLACE_PERL+= konversation/src/konversation-0.19-appearance.pl \ REPLACE_BASH+= konversation/scripts/mail USE_TOOLS+= bash:run +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} != "Linux" +DEPENDS+= psmisc>=20.1:../../sysutils/psmisc +.endif + BUILDLINK_DEPMETHOD.libXt?= build .include "../../meta-pkgs/kde3/kde3.mk" diff --git a/chat/konversation/distinfo b/chat/konversation/distinfo index 959d9ed19e7..eabc51401bf 100644 --- a/chat/konversation/distinfo +++ b/chat/konversation/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.6 2006/12/07 11:08:26 markd Exp $ +$NetBSD: distinfo,v 1.7 2007/07/25 02:44:10 markd Exp $ SHA1 (konversation-1.0.1.tar.bz2) = 7e4b2356e942848fb83584db1bf2a1b6ef63234d RMD160 (konversation-1.0.1.tar.bz2) = 1cf79a87f451aa2718560f00ddf987b68938310a Size (konversation-1.0.1.tar.bz2) = 5848563 bytes SHA1 (patch-ab) = 68c11c4e1c00286607d394cb0b0b4132cd4789d0 +SHA1 (patch-ac) = dd6181a80abe966ef07cab135491fa21af7b43fe diff --git a/chat/konversation/patches/patch-ac b/chat/konversation/patches/patch-ac new file mode 100644 index 00000000000..f4ac7cdf7db --- /dev/null +++ b/chat/konversation/patches/patch-ac @@ -0,0 +1,15 @@ +$NetBSD: patch-ac,v 1.1 2007/07/25 02:44:10 markd Exp $ + +Non GNU sed's don't like \b and its not really needed. + +--- konversation/src/konversationircprotocolhandler.orig 2007-07-24 16:42:17.000000000 +1200 ++++ konversation/src/konversationircprotocolhandler +@@ -4,7 +4,7 @@ + # A script for Konversation to call connectToServer for each instance of Konversation. + + url=`echo $1 | sed -e "s,irc://,,"` +-server_and_port=`echo $url | sed -e "s,\b/.*,,"` ++server_and_port=`echo $url | sed -e "s,/.*,,"` + server=`echo $server_and_port| awk -F":" '{print $1}'` + port=`echo $server_and_port| awk -F":" '{print $2}'` + channel_and_password=`echo $url | awk -F"/" '{print $2}'` -- cgit v1.2.3