Update to 0.8.1 after repocopy.

PR:		ports/130085
Submitted by:	Hannes Hauswedell (maintainer)

7 files changed, 80 insertions, 75 deletions

diff --git a/ports-mgmt/kports-qt4/Makefile b/ports-mgmt/kports-qt4/Makefile
index ec058cd2086a..477287c7f961 100644
--- a/ports-mgmt/kports-qt4/Makefile
+++ b/ports-mgmt/kports-qt4/Makefile
@@ -6,55 +6,53 @@
 #
 
 PORTNAME=	kports
-PORTVERSION=	0.6.1
-PORTREVISION=	3
+PORTVERSION=	0.8.1
 CATEGORIES=	ports-mgmt kde
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	kports@soulrebel.in-berlin.de
-COMMENT=	KDE3-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
+
+CONFLICTS=	kports-0.[0-7]*
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_KDELIBS_VER=3
-USE_AUTOTOOLS=	libtool:15
 
-RUN_DEPENDS+=	portupgrade:${PORTSDIR}/ports-mgmt/portupgrade
-RUN_DEPENDS+=	kdehier>=0:${PORTSDIR}/misc/kdehier
+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
 
-OPTIONS=	PORTAUDIT "Require Portaudit" on \
-		KDESU "With KDE3 kdesu" on \
-		KDESU4 "With KDE4 kdesu" off \
-		GKSU "With gksu" off
+HAS_CONFIGURE=	yes
 
-.include <bsd.port.pre.mk>
+LATEST_LINK=	kports-qt4
 
-.if defined(WITHOUT_KDESU) && defined(WITHOUT_KDESU4) && defined(WITHOUT_GKSU)
-PKGMESSAGE=	${FILESDIR}/pkg-message.nosu
-.endif
+OPTIONS=	DEBUG "Add Debugging Symbols" off \
+		KDE "Pull in kdebase-runtime" on
 
-.if !defined(WITHOUT_PORTAUDIT)
-RUN_DEPENDS+=	portaudit:${PORTSDIR}/ports-mgmt/portaudit
-.endif
+.include <bsd.port.pre.mk>
 
-.if defined(WITH_KDESU)
-RUN_DEPENDS+=	${LOCALBASE}/bin/kdesu:${PORTSDIR}/x11/kdebase3
+.if !defined(WITHOUT_KDE)
+RUN_DEPENDS+=	${LOCALBASE}/kde4/share/icons/oxygen/index.theme:${PORTSDIR}/x11/kdebase4-runtime
+.else
+PKGMESSAGE=	pkg-message.nokdebase
 .endif
 
-.if defined(WITH_KDESU4)
-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_GKSU)
-RUN_DEPENDS+=	${LOCALBASE}/bin/gksu:${PORTSDIR}/sysutils/gksu
+.if defined(WITH_DEBUG)
+pre-configure:
+	@(${ECHO_CMD} "CONFIG += debug" >> ${WRKSRC}/src/src.pro)
 .endif
 
-post-patch:
-	${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' ${WRKSRC}/src/kports.desktop
+do-configure:
+	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
+		${QMAKE} -unix ${QMAKE_ARGS} kports.pro
 
 post-install:
-.if defined(WITHOUT_KDESU) && defined(WITHOUT_KDESU4) && defined(WITHOUT_GKSU)
+.if defined(WITHOUT_KDE)
 	@${CAT} ${PKGMESSAGE}
 .endif
 
diff --git a/ports-mgmt/kports-qt4/distinfo b/ports-mgmt/kports-qt4/distinfo
index 5d0767ed54eb..eca7ddfda41b 100644
--- a/ports-mgmt/kports-qt4/distinfo
+++ b/ports-mgmt/kports-qt4/distinfo
@@ -1,3 +1,3 @@
-MD5 (kports-0.6.1.tar.bz2) = c02cb4cdcfd8112bcb5ff0bfc1fe94b6
-SHA256 (kports-0.6.1.tar.bz2) = c06e7fd25f5c0c63dcbff1b2a569f185d2252e8b16c2f7ccadfa1cbcfab902fa
-SIZE (kports-0.6.1.tar.bz2) = 620443
+MD5 (kports-0.8.1.tar.bz2) = acd86d2ec8465ea8353e053ee885708e
+SHA256 (kports-0.8.1.tar.bz2) = 4156937590db7a904c50411e4ccb4aae6a1a201bd2aebc3096ea023e73ca1a2d
+SIZE (kports-0.8.1.tar.bz2) = 242536
diff --git a/ports-mgmt/kports-qt4/files/patch-src-kports.desktop b/ports-mgmt/kports-qt4/files/patch-src-kports.desktop
deleted file mode 100644
index c86151c6f53b..000000000000
--- a/ports-mgmt/kports-qt4/files/patch-src-kports.desktop
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/kports.desktop.old	2009-01-21 20:13:06.000000000 +0100
-+++ src/kports.desktop	2009-01-21 20:13:27.000000000 +0100
-@@ -1,10 +1,10 @@
- [Desktop Entry]
- Encoding=UTF-8
- Name=KPorts
--Exec=kdesu -c 'kports %i %m -caption "%c"'
-+Exec=/bin/sh -c 'if [ -x /usr/local/bin/kdesu ]; then /usr/local/bin/kdesu kports; elif [ -x /usr/local/kde4/lib/kde4/libexec/kdesu ]; then /usr/local/kde4/lib/kde4/libexec/kdesu kports; elif [ -x /usr/local/bin/gksu ]; then /usr/local/bin/gksu kports; else kports; fi'
- Icon=kports
- Type=Application
--DocPath=kports/index.html
- Comment=A tool for managing Software in FreeBSD
- Comment[de]=Ein Programm zur Softwareverwaltung unter FreeBSD
- Terminal=0
-+Categories=Qt;KDE;System;
diff --git a/ports-mgmt/kports-qt4/files/pkg-message.nosu b/ports-mgmt/kports-qt4/files/pkg-message.nosu
deleted file mode 100644
index 400249898e62..000000000000
--- a/ports-mgmt/kports-qt4/files/pkg-message.nosu
+++ /dev/null
@@ -1,5 +0,0 @@
-You have selected neither kdesu nor gksu during make config, but
-KPorts needs to be started as root for it to be useful.
-
-You can still install a package providing kdesu or gksu, or use
-another program to start KPorts as root, e.g. sudo or ssh -X.
diff --git a/ports-mgmt/kports-qt4/pkg-descr b/ports-mgmt/kports-qt4/pkg-descr
index b4534c1f3f28..f82b8bf8be18 100644
--- a/ports-mgmt/kports-qt4/pkg-descr
+++ b/ports-mgmt/kports-qt4/pkg-descr
@@ -1,16 +1,10 @@
-KPorts is KDE-Frontend to the FreeBSD-Ports and in future also to the
-OpenBsd-Ports, PkgSrc and maybe others.
-You can browse and search through your Portstree and perform actions
-like Upgrades, Installs, Uninstall a.s.o. More advanced features like
-setting Options and Vulnerability checking are also available. For a
-complete list, check the Homepage or the Changelog.
-Functionality is KPorts' main goal, not simplification by reducing
-options; however KPorts should be rather easy to use.
+KPorts is Qt-based frontend to the FreeBSD-Ports.
+Support for the OpenBSD-Ports and PkgSrc is planned for a future release.
 
-A new version of KPorts based on completely new code and Qt4 is 
-available @ /usr/ports/ports-mgmt/kports-qt4
-NOTE that the new version cannot yet compete with this version
-feature-wise.
+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.
 
 WWW: http://kports.sf.net
diff --git a/ports-mgmt/kports-qt4/pkg-message.nokdebase b/ports-mgmt/kports-qt4/pkg-message.nokdebase
new file mode 100644
index 000000000000..100d851f718f
--- /dev/null
+++ b/ports-mgmt/kports-qt4/pkg-message.nokdebase
@@ -0,0 +1,16 @@
+*********************************************************
+* 			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:		*
+*							*
+* 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 7ac0e9d0590e..92937ad27485 100644
--- a/ports-mgmt/kports-qt4/pkg-plist
+++ b/ports-mgmt/kports-qt4/pkg-plist
@@ -1,12 +1,29 @@
 bin/kports
-bin/kports_client
-share/applnk/System/kports.desktop
-share/apps/kports/kports-splash.jpg
-share/apps/kports/kportsui.rc
-share/doc/HTML/en/kports/index.cache.bz2
-share/doc/HTML/en/kports/index.docbook
+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
-@dirrm share/doc/HTML/en/kports/common
-@dirrm share/doc/HTML/en/kports
-@dirrm share/apps/kports
+share/icons/hicolor/48x48/apps/kports.png
+share/icons/hicolor/64x64/apps/kports.png
+share/icons/hicolor/scalable/apps/kports.svgz
+@dirrmtry share/icons/hicolor/scalable/apps
+@dirrmtry share/icons/hicolor/scalable
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/256x256/apps
+@dirrmtry share/icons/hicolor/256x256
+@dirrmtry share/icons/hicolor/22x22/apps
+@dirrmtry share/icons/hicolor/22x22
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor/128x128/apps
+@dirrmtry share/icons/hicolor/128x128
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
+@dirrmtry share/applications