Date: Wed, 15 Feb 2006 13:11:21 -0600 (CST) From: "chris@i13i.com" <kse@admin.i13i.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/93402: Fix kvirc kdenetwork conflict Message-ID: <200602151911.k1FJBLM7067057@admin.i13i.com> Resent-Message-ID: <200602151920.k1FJK5CN057761@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 93402 >Category: ports >Synopsis: Fix kvirc kdenetwork conflict >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Feb 15 19:20:05 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Chris >Release: FreeBSD 6.0-RELEASE-p4 i386 >Organization: i13i >Environment: System: FreeBSD admin.i13i.com 6.0-RELEASE-p4 FreeBSD 6.0-RELEASE-p4 #0: Sun Jan 29 16:21:18 CST 2006 kse@admin.i13i.com:/usr/obj/usr/src/sys/SharkTECH5 i386 >Description: Patch to fix conflict between kvirc and kdenetwork >How-To-Repeat: >Fix: --- kvirc.shar begins here --- # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # kvirc-patch # pkg-plist-patch # files/patch-Makefile.am # files/patch-Makefile.in # echo x - kvirc-patch sed 's/^X//' >kvirc-patch << 'END-of-kvirc-patch' X--- Makefile.orig Wed Feb 15 11:30:14 2006 X+++ Makefile Wed Feb 15 11:17:11 2006 X@@ -7,7 +7,7 @@ X X PORTNAME= kvirc X PORTVERSION= 3.2.0 X-PORTREVISION= 1 X+PORTREVISION= 2 X CATEGORIES= irc kde X MASTER_SITES= ftp://ftp.kvirc.net/pub/%SUBDIR%/ \ X ftp://ftp.kvirc.de/pub/%SUBDIR%/ \ X@@ -18,8 +18,6 @@ X MAINTAINER= mranner@inode.at X COMMENT= IRC client for QT and KDE X X-CONFLICTS= kdenetwork-3.5.[0-9]* X- X GNU_CONFIGURE= yes X INSTALLS_SHLIB= yes X USE_BZIP2= yes X@@ -71,5 +69,8 @@ X -e "s,.SS_KDE_GENERAL_DIR/share/mimelnk,${PREFIX}/share/mimelnk," \ X -e "s,kdeservicesdir=\".SS_KDE_SERVICESDIR\",kdeservicesdir=\"${PREFIX}/share/services\"," \ X ${WRKSRC}/configure X+post-configure: X+ @${MV} ${WRKSRC}/data/protocols/irc.protocol ${WRKSRC}/data/protocols/kvirc.protocol X+ @${MV} ${WRKSRC}/data/protocols/irc6.protocol ${WRKSRC}/data/protocols/kvirc6.protocol X X .include <bsd.port.post.mk> END-of-kvirc-patch echo x - pkg-plist-patch sed 's/^X//' >pkg-plist-patch << 'END-of-pkg-plist-patch' X--- pkg-plist.orig Wed Feb 15 11:30:28 2006 X+++ pkg-plist Wed Feb 15 11:26:43 2006 X@@ -267,8 +267,8 @@ X share/icons/hicolor/48x48/mimetypes/kvs.png X share/icons/hicolor/64x64/apps/kvirc.png X share/icons/hicolor/64x64/mimetypes/kvs.png X-share/services/irc.protocol X-share/services/irc6.protocol X+share/services/kvirc.protocol X+share/services/kvirc6.protocol X share/mimelnk/text/x-kvs.desktop X %%DATADIR%%/%%VER%%/config/modules/libkvinotifier.kvc X %%DATADIR%%/%%VER%%/config/modules/libkvitip.kvc END-of-pkg-plist-patch echo x - files/patch-Makefile.am sed 's/^X//' >files/patch-Makefile.am << 'END-of-files/patch-Makefile.am' X--- data/protocols/Makefile.am.bak Wed Feb 15 10:30:27 2006 X+++ data/protocols/Makefile.am Sun Aug 3 21:33:44 2003 X@@ -4,6 +4,6 @@ X X tmpdir = $(kdeservicesdir) X X+tmp_DATA = kvirc.protocol kvirc6.protocol X-tmp_DATA = irc.protocol irc6.protocol X X EXTRA_DIST = $(tmp_DATA) END-of-files/patch-Makefile.am echo x - files/patch-Makefile.in sed 's/^X//' >files/patch-Makefile.in << 'END-of-files/patch-Makefile.in' X--- data/protocols/Makefile.in.bak Wed Feb 15 10:36:43 2006 X+++ data/protocols/Makefile.in Fri Feb 25 21:34:49 2005 X@@ -183,7 +183,7 @@ X X tmpdir = $(kdeservicesdir) X X-tmp_DATA = irc.protocol irc6.protocol X+tmp_DATA = kvirc.protocol kvirc6.protocol X X EXTRA_DIST = $(tmp_DATA) X subdir = data/protocols END-of-files/patch-Makefile.in exit --- kvirc.shar ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200602151911.k1FJBLM7067057>