5 files changed, 38 insertions, 30 deletions

diff --git a/ports-mgmt/kports-qt4/Makefile b/ports-mgmt/kports-qt4/Makefile
index bba5c7a204af..cb2c7c6bb06f 100644
--- a/ports-mgmt/kports-qt4/Makefile
+++ b/ports-mgmt/kports-qt4/Makefile
@@ -6,15 +6,15 @@
 #
 
 PORTNAME=	kports
-PORTVERSION=	0.8.1
-PORTREVISION=	1
+PORTVERSION=	0.8.2
 CATEGORIES=	ports-mgmt kde
 MASTER_SITES=	SF
 
 MAINTAINER=	kports@soulrebel.in-berlin.de
-COMMENT=	 Qt4-Version of your favorite frontend to the Ports
+COMMENT=	Qt4-Version of your favorite frontend to the Ports
 
-RUN_DEPENDS=	portaudit:${PORTSDIR}/ports-mgmt/portaudit
+RUN_DEPENDS=	portaudit:${PORTSDIR}/ports-mgmt/portaudit \
+		uma:${PORTSDIR}/sysutils/bsdadminscripts
 
 CONFLICTS=	kports-0.[0-7]*
 
@@ -30,15 +30,17 @@ HAS_CONFIGURE=	yes
 LATEST_LINK=	kports-qt4
 
 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>
+.include <bsd.port.options.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)
+USE_KDE4=	oxygen
+.endif
+
+.if !defined(WITHOUT_KDEBASE)
+USE_KDE4=	runtime
 .endif
 
 post-patch:
@@ -47,6 +49,9 @@ post-patch:
 .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 +59,12 @@ do-configure:
 		${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>
+.include <bsd.port.mk>
diff --git a/ports-mgmt/kports-qt4/distinfo b/ports-mgmt/kports-qt4/distinfo
index eca7ddfda41b..e773cd2fe25d 100644
--- a/ports-mgmt/kports-qt4/distinfo
+++ b/ports-mgmt/kports-qt4/distinfo
@@ -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 --git a/ports-mgmt/kports-qt4/pkg-descr b/ports-mgmt/kports-qt4/pkg-descr
index f82b8bf8be18..48ef600b0a8a 100644
--- a/ports-mgmt/kports-qt4/pkg-descr
+++ b/ports-mgmt/kports-qt4/pkg-descr
@@ -3,8 +3,8 @@ Support for the OpenBSD-Ports and PkgSrc is planned for a future release.
 
 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
diff --git a/ports-mgmt/kports-qt4/pkg-message.nokdebase b/ports-mgmt/kports-qt4/pkg-message.nokdebase
index 100d851f718f..7aad56e3dc3a 100644
--- a/ports-mgmt/kports-qt4/pkg-message.nokdebase
+++ b/ports-mgmt/kports-qt4/pkg-message.nokdebase
@@ -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@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.		*
-* 							*
 *********************************************************
diff --git a/ports-mgmt/kports-qt4/pkg-plist b/ports-mgmt/kports-qt4/pkg-plist
index 92937ad27485..516b0227a09a 100644
--- a/ports-mgmt/kports-qt4/pkg-plist
+++ b/ports-mgmt/kports-qt4/pkg-plist
@@ -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,5 @@ share/icons/hicolor/scalable/apps/kports.svgz
 @dirrmtry share/icons/hicolor
 @dirrmtry share/icons
 @dirrmtry share/applications
+@dirrm share/kports/translations
+@dirrm share/kports