diff options
| author | Andrey Slusar <anray@FreeBSD.org> | 2006-04-30 16:23:47 +0000 |
|---|---|---|
| committer | Andrey Slusar <anray@FreeBSD.org> | 2006-04-30 16:23:47 +0000 |
| commit | fd092d0ec061dcf1991745757cb0bff9c8b9b760 (patch) | |
| tree | b6eb95a6fa2004a26963dfc6d4a3ebe9431963b7 /irc/kvirc | |
| parent | Remove a forgotten patch to fix the apply patches. (diff) | |
Fix conflict between kvirc and kdenetwork.
PR: ports/93402
Submitted by: "chris@i13i.com" <kse@admin.i13i.com>
Approved by: maintainer
Notes
Notes:
svn path=/head/; revision=160922
Diffstat (limited to 'irc/kvirc')
| -rw-r--r-- | irc/kvirc/Makefile | 7 | ||||
| -rw-r--r-- | irc/kvirc/files/patch-Makefile.am | 10 | ||||
| -rw-r--r-- | irc/kvirc/files/patch-Makefile.in | 11 | ||||
| -rw-r--r-- | irc/kvirc/pkg-plist | 4 |
4 files changed, 27 insertions, 5 deletions
diff --git a/irc/kvirc/Makefile b/irc/kvirc/Makefile index 3cae87f13b43..ed3ad66a5c2b 100644 --- a/irc/kvirc/Makefile +++ b/irc/kvirc/Makefile @@ -7,7 +7,7 @@ PORTNAME= kvirc PORTVERSION= 3.2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= irc kde MASTER_SITES= ftp://ftp.kvirc.net/pub/%SUBDIR%/ \ ftp://ftp.kvirc.de/pub/%SUBDIR%/ \ @@ -18,8 +18,6 @@ MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTVERSION}/source MAINTAINER= mranner@inode.at COMMENT= IRC client for QT and KDE -CONFLICTS= kdenetwork-3.5.[0-9]* - USE_AUTOTOOLS= libtool:15 INSTALLS_SHLIB= yes USE_BZIP2= yes @@ -70,5 +68,8 @@ post-patch: -e "s,.SS_KDE_GENERAL_DIR/share/mimelnk,${PREFIX}/share/mimelnk," \ -e "s,kdeservicesdir=\".SS_KDE_SERVICESDIR\",kdeservicesdir=\"${PREFIX}/share/services\"," \ ${WRKSRC}/configure +post-configure: + @${MV} ${WRKSRC}/data/protocols/irc.protocol ${WRKSRC}/data/protocols/kvirc.protocol + @${MV} ${WRKSRC}/data/protocols/irc6.protocol ${WRKSRC}/data/protocols/kvirc6.protocol .include <bsd.port.post.mk> diff --git a/irc/kvirc/files/patch-Makefile.am b/irc/kvirc/files/patch-Makefile.am new file mode 100644 index 000000000000..f1bebcb5c8ec --- /dev/null +++ b/irc/kvirc/files/patch-Makefile.am @@ -0,0 +1,10 @@ +--- data/protocols/Makefile.am.bak Wed Feb 15 10:30:27 2006 ++++ data/protocols/Makefile.am Sun Aug 3 21:33:44 2003 +@@ -4,6 +4,6 @@ + + tmpdir = $(kdeservicesdir) + ++tmp_DATA = kvirc.protocol kvirc6.protocol +-tmp_DATA = irc.protocol irc6.protocol + + EXTRA_DIST = $(tmp_DATA) diff --git a/irc/kvirc/files/patch-Makefile.in b/irc/kvirc/files/patch-Makefile.in new file mode 100644 index 000000000000..91adc0232c8d --- /dev/null +++ b/irc/kvirc/files/patch-Makefile.in @@ -0,0 +1,11 @@ +--- data/protocols/Makefile.in.bak Wed Feb 15 10:36:43 2006 ++++ data/protocols/Makefile.in Fri Feb 25 21:34:49 2005 +@@ -183,7 +183,7 @@ + + tmpdir = $(kdeservicesdir) + +-tmp_DATA = irc.protocol irc6.protocol ++tmp_DATA = kvirc.protocol kvirc6.protocol + + EXTRA_DIST = $(tmp_DATA) + subdir = data/protocols diff --git a/irc/kvirc/pkg-plist b/irc/kvirc/pkg-plist index bce387641946..4546b70e1ce8 100644 --- a/irc/kvirc/pkg-plist +++ b/irc/kvirc/pkg-plist @@ -268,8 +268,8 @@ share/icons/hicolor/48x48/apps/kvirc.png share/icons/hicolor/48x48/mimetypes/kvs.png share/icons/hicolor/64x64/apps/kvirc.png share/icons/hicolor/64x64/mimetypes/kvs.png -share/services/irc.protocol -share/services/irc6.protocol +share/services/kvirc.protocol +share/services/kvirc6.protocol share/mimelnk/text/x-kvs.desktop %%DATADIR%%/%%VER%%/config/modules/libkvinotifier.kvc %%DATADIR%%/%%VER%%/config/modules/libkvitip.kvc |