misc/141435: [ports-mgmt/kports-qt4] update to new version

[Hannes]

>Number:         141435
>Category:       misc
>Synopsis:       [ports-mgmt/kports-qt4] update to new version
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Dec 13 19:10:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Hannes
>Release:        
>Organization:
>Environment:
>Description:
The attached diff should update the port to the new version.

Thanks for your help!

Regards,
Hannes

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ru ports-mgmt/kports-qt4.orig/Makefile ports-mgmt/kports-qt4/Makefile
--- ports-mgmt/kports-qt4.orig/Makefile	2009-08-18 13:05:32.000000000 +0000
+++ ports-mgmt/kports-qt4/Makefile	2009-12-12 23:45:15.000000000 +0000
@@ -1,52 +1,55 @@
-# New ports collection makefile for:	kports
-# Date created:				Thu Jan 12 12:47:58 UTC 2006
-# Whom:				Hannes Hauswedell <hannes.hauswedell at gmail.com>
-#
-# $FreeBSD: ports/ports-mgmt/kports-qt4/Makefile,v 1.13 2009/08/18 13:05:32 makc Exp $
-#
-
-PORTNAME=	kports
-PORTVERSION=	0.8.1
-PORTREVISION=	1
-CATEGORIES=	ports-mgmt kde
-MASTER_SITES=	SF
-
-MAINTAINER=	kports at soulrebel.in-berlin.de
-COMMENT=	 Qt4-Version of your favorite frontend to the Ports
-
-RUN_DEPENDS=	portaudit:${PORTSDIR}/ports-mgmt/portaudit
-
-CONFLICTS=	kports-0.[0-7]*
-
-USE_BZIP2=	yes
-
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui network qmake_build moc_build uic_build rcc_build
-QMAKE_ARGS+=	PREFIX=${PREFIX}
-MAKE_JOBS_SAFE=	yes
 
-HAS_CONFIGURE=	yes
+
+PORTNAME=       kports
+PORTVERSION=    0.8.2
+PORTREVISION=   0
+CATEGORIES=     ports-mgmt kde
+MASTER_SITES=   SF
+
+MAINTAINER=     kports at soulrebel.in-berlin.de
+COMMENT=        Qt4-Version of your favorite frontend to the Ports
+
+CONFLICTS=      kports-0.[0-7]*
+
+USE_BZIP2=      yes
+
+USE_QT_VER=     4
+USE_GMAKE=	yes
+QT_COMPONENTS=  corelib gui network qmake_build moc_build uic_build rcc_build
+QMAKE_ARGS+=    PREFIX=${PREFIX}
+MAKE_JOBS_SAFE= yes
+HAS_CONFIGURE= 	yes
 
 LATEST_LINK=	kports-qt4
 
+RUN_DEPENDS+=   portaudit:${PORTSDIR}/ports-mgmt/portaudit \
+                uma:${PORTSDIR}/sysutils/bsdadminscripts
+
+
 OPTIONS=	DEBUG "Add Debugging Symbols" off \
-		KDE "Pull in kdebase-runtime" on
+                OXYGEN "Pull in Oxygen icons (recommended)" on \
+                KDEBASE "Pull in kdebase-runtime for kdesu" on
 
 .include <bsd.port.pre.mk>
 
-.if !defined(WITHOUT_KDE)
-RUN_DEPENDS+=	${LOCALBASE}/kde4/lib/kde4/libexec/kdesu:${PORTSDIR}/x11/kdebase4-runtime \
-		${LOCALBASE}/kde4/share/icons/oxygen/index.theme:${PORTSDIR}/x11-themes/kde4-icons-oxygen
-.else
-PKGMESSAGE=	pkg-message.nokdebase
+.if !defined(WITHOUT_OXYGEN)
+RUN_DEPENDS+= 	${LOCALBASE}/kde4/share/icons/oxygen/index.theme:${PORTSDIR}/x11-themes/kde4-icons-oxygen
+.endif
+
+.if !defined(WITHOUT_KDEBASE)
+RUN_DEPENDS+= 	${LOCALBASE}/kde4/lib/kde4/libexec/kdesu:${PORTSDIR}/x11/kdebase4-runtime
 .endif
 
+
 post-patch:
 	${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' ${WRKSRC}/data/kports.desktop
 
 .if defined(WITH_DEBUG)
 pre-configure:
 	@(${ECHO_CMD} "CONFIG += debug" >> ${WRKSRC}/src/src.pro)
+	@(${ECHO_CMD} "CONFIG -= release warn_off" >> ${WRKSRC}/src/src.pro)
+	@(${ECHO_CMD} "CONFIG += debug warn_on" >> ${WRKSRC}/src/src.pro)
+	@(${ECHO_CMD} "DEFINES -= QT_NO_DEBUG_OUTPUT" >> ${WRKSRC}/src/src.pro)
 .endif
 
 do-configure:
@@ -54,8 +57,14 @@
 		${QMAKE} -unix ${QMAKE_ARGS} kports.pro
 
 post-install:
-.if defined(WITHOUT_KDE)
-	@${CAT} ${PKGMESSAGE}
+.if defined(WITHOUT_OXYGEN)
+	@${CAT} pkg-message.nooxygen
+.endif
+
+.if defined(WITHOUT_KDEBASE)
+	@${CAT} pkg-message.nokdebase
 .endif
 
+
+
 .include <bsd.port.post.mk>
diff -ru ports-mgmt/kports-qt4.orig/distinfo ports-mgmt/kports-qt4/distinfo
--- ports-mgmt/kports-qt4.orig/distinfo	2009-04-06 20:11:39.000000000 +0000
+++ ports-mgmt/kports-qt4/distinfo	2009-12-13 00:21:31.000000000 +0000
@@ -1,3 +1,3 @@
-MD5 (kports-0.8.1.tar.bz2) = acd86d2ec8465ea8353e053ee885708e
-SHA256 (kports-0.8.1.tar.bz2) = 4156937590db7a904c50411e4ccb4aae6a1a201bd2aebc3096ea023e73ca1a2d
-SIZE (kports-0.8.1.tar.bz2) = 242536
+MD5 (kports-0.8.2.tar.bz2) = fd0a8276a144a643bc15d354e3dd91cf
+SHA256 (kports-0.8.2.tar.bz2) = ad871eea1cfd453c112ec6d399231a92719ec8fd9e7a7df02838cc127e81adba
+SIZE (kports-0.8.2.tar.bz2) = 344648
diff -ru ports-mgmt/kports-qt4.orig/pkg-descr ports-mgmt/kports-qt4/pkg-descr
--- ports-mgmt/kports-qt4.orig/pkg-descr	2009-04-06 20:11:39.000000000 +0000
+++ ports-mgmt/kports-qt4/pkg-descr	2009-11-22 00:38:29.000000000 +0000
@@ -3,8 +3,8 @@
 
 It is designed to make managing your applications easier and more pleasent.
 
-This is the Port based on the new Qt4-only codebase. You cannot(!) use this to
-actually install and remove packages. If you need to do that use the version
-based on KDE3: ports-mgmt/kports.
+This is the Port based on the new Qt4-only codebase. You cannot use this to
+actually install and remove packages. If you need that use the version based
+on KDE3: ports-mgmt/kports.
 
-WWW: http://kports.sf.net
+WWW: http://kports.sf.net
\ No newline at end of file
diff -ru ports-mgmt/kports-qt4.orig/pkg-message.nokdebase ports-mgmt/kports-qt4/pkg-message.nokdebase
--- ports-mgmt/kports-qt4.orig/pkg-message.nokdebase	2009-04-06 20:11:39.000000000 +0000
+++ ports-mgmt/kports-qt4/pkg-message.nokdebase	2009-12-08 00:19:42.000000000 +0000
@@ -2,15 +2,10 @@
 * 			WARNING				*
 * 							*
 * You decided not to pull in kdebase-runtime during	*
-* install. If you do not have it installed and don't	*
-* want to now, you should note the following:		*
+* install, if you don't have it installed you won't 	*
+* have kdesu. However KPorts needs to be started as 	*
+* root! Alternatives to kdesu include:			*
 *							*
-* 1) KPorts needs to be started as root to be useful,	*
-*    but you won't have kdesu. Instead you can use	*
 *    gksu, sudo or 'ssh -X root at localhost'.		*
 *							*
-* 2) KPorts will expect the oxygen icon theme and not	*
-*    find it. You should go the settings and select a	*
-*    different theme. KPorts might look crap.		*
-* 							*
 *********************************************************
Only in ports-mgmt/kports-qt4: pkg-message.nooxygen
diff -ru ports-mgmt/kports-qt4.orig/pkg-plist ports-mgmt/kports-qt4/pkg-plist
--- ports-mgmt/kports-qt4.orig/pkg-plist	2009-04-06 20:11:39.000000000 +0000
+++ ports-mgmt/kports-qt4/pkg-plist	2009-12-13 18:57:57.000000000 +0000
@@ -1,13 +1,15 @@
 bin/kports
+sbin/portsnap_patched
 share/applications/kports.desktop
-share/icons/hicolor/128x128/apps/kports.png
 share/icons/hicolor/16x16/apps/kports.png
 share/icons/hicolor/22x22/apps/kports.png
-share/icons/hicolor/256x256/apps/kports.png
 share/icons/hicolor/32x32/apps/kports.png
 share/icons/hicolor/48x48/apps/kports.png
 share/icons/hicolor/64x64/apps/kports.png
+share/icons/hicolor/128x128/apps/kports.png
+share/icons/hicolor/256x256/apps/kports.png
 share/icons/hicolor/scalable/apps/kports.svgz
+share/kports/translations/kports_pt_BR.qm
 @dirrmtry share/icons/hicolor/scalable/apps
 @dirrmtry share/icons/hicolor/scalable
 @dirrmtry share/icons/hicolor/64x64/apps
@@ -27,3 +29,7 @@
 @dirrmtry share/icons/hicolor
 @dirrmtry share/icons
 @dirrmtry share/applications
+ at dirrmtry share/kports/translations
+ at dirrmtry share/kports
+
+


>Release-Note:
>Audit-Trail:
>Unformatted: