Update to 1.1:

- Improved package manager withs support for portaudit and portsnap
- Configurable warning thresholds for battery monitor
- Translation updates

PR:		ports/101031
Submitted by:	Peter Hofer <ph@desktopbsd.net> (maintainer)

3 files changed, 22 insertions, 7 deletions

diff --git a/sysutils/desktopbsd-tools/Makefile b/sysutils/desktopbsd-tools/Makefile
index e46ae764d648..2249e99b29cb 100644
--- a/sysutils/desktopbsd-tools/Makefile
+++ b/sysutils/desktopbsd-tools/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	desktopbsd-tools
-PORTVERSION=	1.0.1
+PORTVERSION=	1.1
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.desktopbsd.net/
 
@@ -15,9 +15,9 @@ COMMENT=	DesktopBSD tools for easy system configuration
 BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
 RUN_DEPENDS=	xterm:${PORTSDIR}/x11/xterm \
 		bash:${PORTSDIR}/shells/bash \
-		csup:${PORTSDIR}/net/csup \
 		fastest_cvsup:${PORTSDIR}/sysutils/fastest_cvsup \
-		portupgrade:${PORTSDIR}/sysutils/portupgrade
+		portupgrade:${PORTSDIR}/sysutils/portupgrade \
+		portaudit:${PORTSDIR}/security/portaudit
 
 INSTALLS_SHLIB=	yes
 USE_BZIP2=	yes
@@ -39,6 +39,14 @@ DATADIR=	${PREFIX}/share/desktopbsd
 IGNORE=		requires FreeBSD 5 or newer
 .endif
 
+.if ${OSVERSION} < 601101 || ( ${OSVERSION} >= 700000 && ${OSVERSION} < 700015 )
+RUN_DEPENDS+=	csup:${PORTSDIR}/net/csup
+.endif
+
+.if ${OSVERSION} < 504103 || ( ${OSVERSION} >= 600000 && ${OSVERSION} < 600033 )
+RUN_DEPENDS+=	portsnap:${PORTSDIR}/sysutils/portsnap
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e \
 		"/Installation/d; /Documentation/d; /InitialConf/d" \
diff --git a/sysutils/desktopbsd-tools/distinfo b/sysutils/desktopbsd-tools/distinfo
index 4c6ee44a973b..5ad1a65b44c9 100644
--- a/sysutils/desktopbsd-tools/distinfo
+++ b/sysutils/desktopbsd-tools/distinfo
@@ -1,3 +1,3 @@
-MD5 (desktopbsd-tools-1.0.1.tar.bz2) = 367da9ae1d3d457fc59cb34514a4282f
-SHA256 (desktopbsd-tools-1.0.1.tar.bz2) = fb63cc5cb7440c04d441795ef7ef6deb7a651dfdbd4956d6f4d457aebd9487fa
-SIZE (desktopbsd-tools-1.0.1.tar.bz2) = 538175
+MD5 (desktopbsd-tools-1.1.tar.bz2) = 95adb399fac27bb8a66977d1636cd05b
+SHA256 (desktopbsd-tools-1.1.tar.bz2) = 5b187a92fe91789d61793da81498a41f1be037133849b13ed85ea68f15d32817
+SIZE (desktopbsd-tools-1.1.tar.bz2) = 664483
diff --git a/sysutils/desktopbsd-tools/pkg-plist b/sysutils/desktopbsd-tools/pkg-plist
index 99d563a1bc9b..844946fa679d 100644
--- a/sysutils/desktopbsd-tools/pkg-plist
+++ b/sysutils/desktopbsd-tools/pkg-plist
@@ -3,6 +3,8 @@ bin/dbsd-hwnotify
 bin/dbsd-nettray
 bin/dbsd-pkgmgr
 bin/dbsd-traymounter
+bin/dbsd-userstart
+bin/kdialog-ports-wrapper
 bin/pgrpmgr
 lib/kde3/libkcm_desktopbsd.la
 lib/kde3/libkcm_desktopbsd.prl
@@ -22,6 +24,7 @@ lib/libdesktopbsd.so
 lib/libdesktopbsd.so.1.0
 lib/libdesktopbsd.so.1
 lib/libdesktopbsd.so.1.0.0
+sbin/dbsd-portsnap
 sbin/pkgdb_check
 share/applnk/Settings/Network/dbsdnetworking.desktop
 share/applnk/Settings/Peripherals/dbsddevinfo.desktop
@@ -32,7 +35,8 @@ share/applnk/Settings/System/dbsdpackages.desktop
 share/applnk/System/dbsd-pkgmgr.desktop
 share/icons/hicolor/16x16/actions/ledgreen.png
 share/icons/hicolor/16x16/actions/ledorange.png
-share/icons/hicolor/16x16/actions/package_old.png
+share/icons/hicolor/16x16/actions/warning.png
+share/icons/hicolor/22x22/actions/package_old.png
 share/icons/hicolor/22x22/apps/dbsd-battinfo-battery.png
 share/icons/hicolor/22x22/apps/dbsd-battinfo-power.png
 share/icons/hicolor/22x22/apps/dbsd-battinfo-recharge.png
@@ -46,6 +50,7 @@ share/icons/hicolor/32x32/apps/desktopbsd.png
 %%DATADIR%%/translations/desktopbsd.es.qm
 %%DATADIR%%/translations/desktopbsd.fr.qm
 %%DATADIR%%/translations/desktopbsd.hr.qm
+%%DATADIR%%/translations/desktopbsd.hu.qm
 %%DATADIR%%/translations/desktopbsd.it.qm
 %%DATADIR%%/translations/desktopbsd.nb.qm
 %%DATADIR%%/translations/desktopbsd.nl.qm
@@ -56,5 +61,7 @@ share/icons/hicolor/32x32/apps/desktopbsd.png
 %%DATADIR%%/translations/desktopbsd.sv.qm
 %%DATADIR%%/translations/desktopbsd.zh_CN.qm
 %%DATADIR%%/translations/locale-map
+%%DATADIR%%/images/pkgmgr-splash.png
+@dirrm %%DATADIR%%/images
 @dirrm %%DATADIR%%/translations
 @dirrm %%DATADIR%%