From 82230a3ce26f00bd1298212f55559cd4277f397b Mon Sep 17 00:00:00 2001
From: Ruslan Makhmatkhanov <rm@FreeBSD.org>
Date: Sun, 25 Mar 2012 20:09:25 +0000
Subject: [PATCH] - update to 0.4

PR:		165678
Submitted by:	Jason Bacon <jwbacon at tds dot net> (maintainer)
Feature safe:	yes
---
 sysutils/desktop-installer/Makefile  | 10 ++++++----
 sysutils/desktop-installer/distinfo  |  4 ++--
 sysutils/desktop-installer/pkg-plist | 16 ++++++++++++++--
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/sysutils/desktop-installer/Makefile b/sysutils/desktop-installer/Makefile
index 656f5a6a031b..dce9c7e28cc3 100644
--- a/sysutils/desktop-installer/Makefile
+++ b/sysutils/desktop-installer/Makefile
@@ -6,21 +6,23 @@
 #
 
 PORTNAME=	desktop-installer
-PORTVERSION=	0.3.2
+PORTVERSION=	0.4
 CATEGORIES=	sysutils
 MASTER_SITES=	http://personalpages.tds.net/~jwbacon/Ports/distfiles/ \
-		http://jbacon.dyndns.org/~bacon/Ports/distfiles/
+		http://acadix.biz/Ports/distfiles/
 
 MAINTAINER=	jwbacon@tds.net
 COMMENT=	Quickly configure a FreeBSD desktop system
 
+RUN_DEPENDS=	auto-append-line:${PORTSDIR}/sysutils/auto-admin
+
 NO_BUILD=	yes
 
 MAN1=		${PORTNAME}.1 amd-setup.1
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/amd-setup ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/sbin
+	${INSTALL_SCRIPT} ${WRKSRC}/amd-setup ${PREFIX}/sbin
 	${INSTALL_MAN} ${WRKSRC}/Doc/${PORTNAME}.man \
 		${PREFIX}/man/man1/${PORTNAME}.1
 	${INSTALL_MAN} ${WRKSRC}/Doc/amd-setup.man \
diff --git a/sysutils/desktop-installer/distinfo b/sysutils/desktop-installer/distinfo
index d3802381bace..ce7520722b7d 100644
--- a/sysutils/desktop-installer/distinfo
+++ b/sysutils/desktop-installer/distinfo
@@ -1,2 +1,2 @@
-SHA256 (desktop-installer-0.3.2.tar.gz) = af0f07492afcc21a661d02b8205f0dbfe7484eb00f33d76cc789569d991fce19
-SIZE (desktop-installer-0.3.2.tar.gz) = 185634
+SHA256 (desktop-installer-0.4.tar.gz) = 0e5695e4bb96f9d143c12021e08317282ebb4a6d4c77f1a566240443e3515f1a
+SIZE (desktop-installer-0.4.tar.gz) = 265360
diff --git a/sysutils/desktop-installer/pkg-plist b/sysutils/desktop-installer/pkg-plist
index fbd6cbd39a3e..11f61aeccb94 100644
--- a/sysutils/desktop-installer/pkg-plist
+++ b/sysutils/desktop-installer/pkg-plist
@@ -1,11 +1,19 @@
-bin/amd-setup
-bin/desktop-installer
+sbin/amd-setup
+sbin/desktop-installer
 %%DATADIR%%/Gnome/Xsession
 %%DATADIR%%/Gnome/xinitrc
 %%DATADIR%%/KDE3/Xsession
 %%DATADIR%%/KDE3/xinitrc
 %%DATADIR%%/KDE4/Xsession
 %%DATADIR%%/KDE4/xinitrc
+%%DATADIR%%/LXDE/GiveConsole
+%%DATADIR%%/LXDE/Xsession
+%%DATADIR%%/LXDE/Xsetup_0
+%%DATADIR%%/LXDE/Xstartup
+%%DATADIR%%/LXDE/beastie.xpm
+%%DATADIR%%/LXDE/bsd_background.jpg
+%%DATADIR%%/LXDE/xdmshutdown
+%%DATADIR%%/LXDE/xinitrc
 %%DATADIR%%/PolicyKit.conf
 %%DATADIR%%/Scripts/battery_shutdown.sh
 %%DATADIR%%/XFCE4/GiveConsole
@@ -16,6 +24,7 @@ bin/desktop-installer
 %%DATADIR%%/XFCE4/bsd_background.jpg
 %%DATADIR%%/XFCE4/xdmshutdown
 %%DATADIR%%/XFCE4/xinitrc
+%%DATADIR%%/fstab
 %%DATADIR%%/gcc45/Makefile
 %%DATADIR%%/gcc45/distinfo
 %%DATADIR%%/gcc45/files/gcc-4.5-r170893-freebsd-ppc.diff
@@ -28,12 +37,15 @@ bin/desktop-installer
 %%DATADIR%%/gcc45/pkg-descr
 %%DATADIR%%/gcc45/pkg-plist
 %%DATADIR%%/ntp.conf
+%%DATADIR%%/org.freedesktop.consolekit.pkla
 %%DATADIR%%/splash.bmp
 %%DATADIR%%/todo
+%%DATADIR%%/vbox
 @dirrm %%DATADIR%%/gcc45/files
 @dirrm %%DATADIR%%/gcc45
 @dirrm %%DATADIR%%/XFCE4
 @dirrm %%DATADIR%%/Scripts
+@dirrm %%DATADIR%%/LXDE
 @dirrm %%DATADIR%%/KDE4
 @dirrm %%DATADIR%%/KDE3
 @dirrm %%DATADIR%%/Gnome