pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/chat/konversation Non GNU sed's don't like '\b' in a r...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/e70eace85ec0
branches:  trunk
changeset: 531201:e70eace85ec0
user:      markd <markd%pkgsrc.org@localhost>
date:      Wed Jul 25 02:44:10 2007 +0000

description:
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.

diffstat:

 chat/konversation/Makefile         |  10 ++++++++--
 chat/konversation/distinfo         |   3 ++-
 chat/konversation/patches/patch-ac |  15 +++++++++++++++
 3 files changed, 25 insertions(+), 3 deletions(-)

diffs (58 lines):

diff -r 76227ea88039 -r e70eace85ec0 chat/konversation/Makefile
--- a/chat/konversation/Makefile        Wed Jul 25 02:33:03 2007 +0000
+++ b/chat/konversation/Makefile        Wed Jul 25 02:44:10 2007 +0000
@@ -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_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 -r 76227ea88039 -r e70eace85ec0 chat/konversation/distinfo
--- a/chat/konversation/distinfo        Wed Jul 25 02:33:03 2007 +0000
+++ b/chat/konversation/distinfo        Wed Jul 25 02:44:10 2007 +0000
@@ -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 -r 76227ea88039 -r e70eace85ec0 chat/konversation/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/konversation/patches/patch-ac        Wed Jul 25 02:44:10 2007 +0000
@@ -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}'`



Home | Main Index | Thread Index | Old Index