From nobody@FreeBSD.org  Fri Apr  2 05:23:18 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AD72F106566B
	for <freebsd-gnats-submit@FreeBSD.org>; Fri,  2 Apr 2010 05:23:18 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 9C2AA8FC0C
	for <freebsd-gnats-submit@FreeBSD.org>; Fri,  2 Apr 2010 05:23:18 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o325NIHT016988
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 2 Apr 2010 05:23:18 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o325NI6n016987;
	Fri, 2 Apr 2010 05:23:18 GMT
	(envelope-from nobody)
Message-Id: <201004020523.o325NI6n016987@www.freebsd.org>
Date: Fri, 2 Apr 2010 05:23:18 GMT
From: Chris Petrik <chris@officialunix.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] irc/kvirc-devel update to rc2
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         145278
>Category:       ports
>Synopsis:       [PATCH] irc/kvirc-devel update to rc2
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    makc
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Apr 02 05:30:08 UTC 2010
>Closed-Date:    Thu Apr 15 06:52:43 UTC 2010
>Last-Modified:  Thu Apr 15 07:00:11 UTC 2010
>Originator:     Chris Petrik
>Release:        FreeBSD 8-STABLE
>Organization:
Officialunix
>Environment:
FreeBSD 8 AMD64
>Description:
Update kvirc-devel to rc2

1. remove couple man langs
2. add support for enabling or disabling python and perl
3. add in MANDIR option to fix the man page install
   A. No longer need the man patch
4. add in vars to pkg-plist
5. Test in 8.0 tinderbox
6. co clean port and apply patch 

This version fixes the perl libperl.so issue which was present in rc1.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: kvirc-devel/Makefile
===================================================================
RCS file: /usr/local/freebsdncvs/ports/irc/kvirc-devel/Makefile,v
retrieving revision 1.65
diff -u -r1.65 Makefile
--- kvirc-devel/Makefile	28 Mar 2010 06:38:16 -0000	1.65
+++ kvirc-devel/Makefile	2 Apr 2010 05:16:42 -0000
@@ -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 @@
 
 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+=	-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 @@
 	@${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>
Index: kvirc-devel/distinfo
===================================================================
RCS file: /usr/local/freebsdncvs/ports/irc/kvirc-devel/distinfo,v
retrieving revision 1.13
diff -u -r1.13 distinfo
--- kvirc-devel/distinfo	14 Sep 2009 18:45:11 -0000	1.13
+++ kvirc-devel/distinfo	2 Apr 2010 05:16:06 -0000
@@ -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
Index: kvirc-devel/pkg-plist
===================================================================
RCS file: /usr/local/freebsdncvs/ports/irc/kvirc-devel/pkg-plist,v
retrieving revision 1.18
diff -u -r1.18 pkg-plist
--- kvirc-devel/pkg-plist	18 Sep 2009 06:07:33 -0000	1.18
+++ kvirc-devel/pkg-plist	2 Apr 2010 05:16:06 -0000
@@ -35,8 +35,8 @@
 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/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_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.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.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_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
Index: kvirc-devel/files/patch-man-CmakeLists.txt
===================================================================
RCS file: kvirc-devel/files/patch-man-CmakeLists.txt
diff -N kvirc-devel/files/patch-man-CmakeLists.txt
--- kvirc-devel/files/patch-man-CmakeLists.txt	14 Sep 2009 18:45:11 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -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()


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->makc 
Responsible-Changed-By: makc 
Responsible-Changed-When: Mon Apr 5 11:42:38 UTC 2010 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=145278 
State-Changed-From-To: open->closed 
State-Changed-By: makc 
State-Changed-When: Thu Apr 15 06:52:42 UTC 2010 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=145278 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/145278: commit references a PR
Date: Thu, 15 Apr 2010 06:52:04 +0000 (UTC)

 makc        2010-04-15 06:51:50 UTC
 
   FreeBSD ports repository
 
   Modified files:
     irc/kvirc-devel      Makefile distinfo pkg-plist 
   Removed files:
     irc/kvirc-devel/files patch-man-CmakeLists.txt 
   Log:
   Update to 4.0rc2
   Add options for enabling or disabling python and perl
   
   PR:             ports/145278
   Submitted by:   Chris Petrik (maintainer)
   
   Revision  Changes    Path
   1.66      +26 -13    ports/irc/kvirc-devel/Makefile
   1.14      +3 -3      ports/irc/kvirc-devel/distinfo
   1.2       +0 -14     ports/irc/kvirc-devel/files/patch-man-CmakeLists.txt (dead)
   1.19      +6 -4      ports/irc/kvirc-devel/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
