mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-12 07:27:57 +00:00
Code Issues Releases Activity

Fix conflict between kvirc and kdenetwork.

Browse Source 
PR:		ports/93402
Submitted by:	"chris@i13i.com" <kse@admin.i13i.com>
Approved by:	maintainer
This commit is contained in:
Andrey Slusar 2006-04-30 16:23:47 +00:00
parent 1424154cbf
commit fd092d0ec0
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=160922
8 changed files with 54 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
irc/kvirc-devel/Makefile
View File

@ -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>

10
irc/kvirc-devel/files/patch-Makefile.am Normal file
View File

@ -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)

11
irc/kvirc-devel/files/patch-Makefile.in Normal file
View File

@ -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

4
irc/kvirc-devel/pkg-plist
View File

@ -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

7
irc/kvirc/Makefile
View File

@ -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>

10
irc/kvirc/files/patch-Makefile.am Normal file
View File

@ -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)

11
irc/kvirc/files/patch-Makefile.in Normal file
View File

@ -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

4
irc/kvirc/pkg-plist
View File

@ -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