Update to 4.0rc2

Add options for enabling or disabling python and perl

PR:		ports/145278
Submitted by:	Chris Petrik (maintainer)

4 files changed, 35 insertions, 34 deletions

diff --git a/irc/kvirc-devel/Makefile b/irc/kvirc-devel/Makefile
index f5953e29e799..13c71551c2ed 100644
--- a/irc/kvirc-devel/Makefile
+++ b/irc/kvirc-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	kvirc
-DISTVERSION=	4.0rc1
-PORTREVISION=	1
+DISTVERSION=	4.0rc2
 CATEGORIES=	irc kde
 MASTER_SITES=	ftp://ftp.kvirc.de/pub/kvirc/snapshots/source/ \
 		http://distfiles.officialunix.com/
@@ -18,25 +17,27 @@ COMMENT=	IRC client for QT4 and KDE4
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
-USE_PERL5=	yes
 USE_QT_VER=	4
 QT_COMPONENTS=	moc_build qmake_build rcc_build uic_build \
 		dbus webkit gui network sql xml
 USE_CMAKE=	yes
 CMAKE_ARGS=	-DWITHOUT_ESD=yes -DWITHOUT_DOXYGEN=yes \
-		-DMANUAL_REVISION=${SVN_REV}
+		-DMANUAL_REVISION=${SVN_REV} -DMANDIR=${MANPREFIX}
 INSTALLS_ICONS=	yes
 CONFLICTS=	kvirc-3.4.*
-SVN_REV=	3459
+# Fixes certain issues when installing/configuring
+SVN_REV=	3713
 
 MAN1=	kvirc.1
-MANLANG=	"" de.ISO8859-1 de.UTF-8 it it.ISO8859-1 it.UTF-8
+MANLANG=	"" de it
 
 OPTIONS=	AUDIOFILE "Compile with libaudiofile dependency" on \
 			DEBUG "Compile with debug support" off \
 			GSM "Compile with gsm support" off \
 			KDE4 "Compile with KDE4 support" off \
-			PHONON "Compile with phonon support" on
+			PHONON "Compile with phonon support" on \
+			PYTHON "Compile support for python" off \
+			PERL "Compile support for perl" on
 
 .include <bsd.port.options.mk>
 
@@ -47,6 +48,24 @@ CMAKE_ARGS+=	-DWITH_KDE4=yes
 CMAKE_ARGS+=	-DWITHOUT_KDE4=yes
 .endif
 
+.if defined(WITH_PYTHON)
+USE_PYTHON=	yes
+CMAKE_ARGS+=	-DWITH_PYTHON=yes
+PLIST_SUB+=	PYTHONMOD=""
+.else
+CMAKE_ARGS+=	-DWITHOUT_PYTHON=yes
+PLIST_SUB+=	PYTHONMOD="@comment "
+.endif
+
+.if defined(WITH_PERL)
+USE_PERL5=	yes
+CMAKE_ARGS+=	-DWITH_PERL=yes
+PLIST_SUB+=	PERLMOD=""
+.else
+CMAKE_ARGS+=	-DWITHOUT_PERL=yes
+PLIST_SUB+=	PERLMOD="@comment "
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION}<700042
@@ -81,10 +100,4 @@ post-configure:
 	@${MV} ${WRKSRC}/data/protocols/irc.protocol ${WRKSRC}/data/protocols/kvirc.protocol
 	@${MV} ${WRKSRC}/data/protocols/irc6.protocol ${WRKSRC}/data/protocols/kvirc6.protocol
 
-# Todo
-# Add NOPORTDOCS part (include support for doxygen)
-# If user requires docs
-# Add in special %%VER%% to pkg-plist
-# Add in DATADIR instead of share/..
-
 .include <bsd.port.post.mk>
diff --git a/irc/kvirc-devel/distinfo b/irc/kvirc-devel/distinfo
index 4f9fecbe6be7..79350892852b 100644
--- a/irc/kvirc-devel/distinfo
+++ b/irc/kvirc-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (kvirc-4.0rc1.tar.bz2) = fbf84c24864b7a89922574bcfa68f292
-SHA256 (kvirc-4.0rc1.tar.bz2) = cb59c65d759d67d883eb9387de9413e15de9d7aa4f06c8b5b0fe0bdcfdcb483e
-SIZE (kvirc-4.0rc1.tar.bz2) = 4873356
+MD5 (kvirc-4.0rc2.tar.bz2) = 36856df4a423f25e20f884a23bfbdbc7
+SHA256 (kvirc-4.0rc2.tar.bz2) = a9b47ab7e8cee86bd9adb4268c3cb9e6fc6f819eb7f704322c67fb49669bf16c
+SIZE (kvirc-4.0rc2.tar.bz2) = 4869422
diff --git a/irc/kvirc-devel/files/patch-man-CmakeLists.txt b/irc/kvirc-devel/files/patch-man-CmakeLists.txt
deleted file mode 100644
index f7a08e84f10e..000000000000
--- a/irc/kvirc-devel/files/patch-man-CmakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
---- data/man/CMakeLists.txt.bak	2009-09-09 13:50:57.000000000 -0500
-+++ data/man/CMakeLists.txt	2009-09-09 13:51:29.000000000 -0500
-@@ -16,9 +16,9 @@
- 			# If the man is in English, it uses the root directory
- 			STRING(COMPARE EQUAL ${LANGCODE} "en" STREQUAL)
- 			IF(${STREQUAL})
--				INSTALL(FILES ${MAN} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1/ RENAME "kvirc.1")
-+				INSTALL(FILES ${MAN} DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1/ RENAME "kvirc.1")
- 			ELSE()
--				INSTALL(FILES ${MAN} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/${LANGCODE}/man1/ RENAME "kvirc.1")
-+				INSTALL(FILES ${MAN} DESTINATION ${CMAKE_INSTALL_PREFIX}/man/${LANGCODE}/man1/ RENAME "kvirc.1")
- 			ENDIF()
- 		ENDFOREACH()
- 	ENDIF()
diff --git a/irc/kvirc-devel/pkg-plist b/irc/kvirc-devel/pkg-plist
index 654b33384f80..418a37ccb688 100644
--- a/irc/kvirc-devel/pkg-plist
+++ b/irc/kvirc-devel/pkg-plist
@@ -35,8 +35,8 @@ lib/kvirc/4.0/modules/libkvimy.so
 lib/kvirc/4.0/modules/libkvinotifier.so
 lib/kvirc/4.0/modules/libkviobjects.so
 lib/kvirc/4.0/modules/libkvioptions.so
-lib/kvirc/4.0/modules/libkviperl.so
-lib/kvirc/4.0/modules/libkviperlcore.so
+%%PERLMOD%%lib/kvirc/4.0/modules/libkviperl.so
+%%PERLMOD%%lib/kvirc/4.0/modules/libkviperlcore.so
 lib/kvirc/4.0/modules/libkvipopupeditor.so
 lib/kvirc/4.0/modules/libkviproxydb.so
 lib/kvirc/4.0/modules/libkvipythoncore.so
@@ -66,6 +66,7 @@ lib/kvirc/4.0/modules/libkvitrayicon.so
 lib/kvirc/4.0/modules/libkviupnp.so
 lib/kvirc/4.0/modules/libkviurl.so
 lib/kvirc/4.0/modules/libkviwindow.so
+%%PYTHONMOD%%lib/kvirc/4.0/modules/libkvipython.so
 lib/libkvilib.so
 lib/libkvilib.so.4
 lib/libkvilib.so.4.0.0
@@ -377,8 +378,6 @@ share/kvirc/4.0/help/en/cmd_notice.html
 share/kvirc/4.0/help/en/cmd_notifier.hide.html
 share/kvirc/4.0/help/en/cmd_notifier.message.html
 share/kvirc/4.0/help/en/cmd_notifier.show.html
-share/kvirc/4.0/help/en/cmd_objects.bitblt.html
-share/kvirc/4.0/help/en/cmd_objects.blend.html
 share/kvirc/4.0/help/en/cmd_objects.classes.html
 share/kvirc/4.0/help/en/cmd_objects.clear.html
 share/kvirc/4.0/help/en/cmd_objects.connect.html
@@ -1019,6 +1018,7 @@ share/kvirc/4.0/help/en/fnc_chan.bancount.html
 share/kvirc/4.0/help/en/fnc_chan.banexceptioncount.html
 share/kvirc/4.0/help/en/fnc_chan.banexceptionlist.html
 share/kvirc/4.0/help/en/fnc_chan.banlist.html
+share/kvirc/4.0/help/en/fnc_chan.common.html
 share/kvirc/4.0/help/en/fnc_chan.getflag.html
 share/kvirc/4.0/help/en/fnc_chan.geturl.html
 share/kvirc/4.0/help/en/fnc_chan.halfopcount.html
@@ -1041,6 +1041,7 @@ share/kvirc/4.0/help/en/fnc_chan.isvoice.html
 share/kvirc/4.0/help/en/fnc_chan.key.html
 share/kvirc/4.0/help/en/fnc_chan.limit.html
 share/kvirc/4.0/help/en/fnc_chan.matchban.html
+share/kvirc/4.0/help/en/fnc_chan.matchqban.html
 share/kvirc/4.0/help/en/fnc_chan.matchbanexception.html
 share/kvirc/4.0/help/en/fnc_chan.matchinvite.html
 share/kvirc/4.0/help/en/fnc_chan.mode.html
@@ -1240,6 +1241,7 @@ share/kvirc/4.0/help/en/fnc_query.html
 share/kvirc/4.0/help/en/fnc_r.html
 share/kvirc/4.0/help/en/fnc_rand.html
 share/kvirc/4.0/help/en/fnc_real.html
+share/kvirc/4.0/help/en/fnc_realname.html
 share/kvirc/4.0/help/en/fnc_receivedbytes.html
 share/kvirc/4.0/help/en/fnc_regchan.find.html
 share/kvirc/4.0/help/en/fnc_regchan.list.html