4 files changed, 10 insertions, 23 deletions

diff --git a/sysutils/desktop-installer/Makefile b/sysutils/desktop-installer/Makefile
index 145c737a73a5..a1aed2802589 100644
--- a/sysutils/desktop-installer/Makefile
+++ b/sysutils/desktop-installer/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	desktop-installer
-PORTVERSION=	0.4.6
+PORTVERSION=	0.4.7
 CATEGORIES=	sysutils
 MASTER_SITES=	http://acadix.biz/Ports/distfiles/ \
 		http://personalpages.tds.net/~jwbacon/Ports/distfiles/
@@ -10,9 +10,9 @@ MASTER_SITES=	http://acadix.biz/Ports/distfiles/ \
 MAINTAINER=	jwbacon@tds.net
 COMMENT=	Quickly configure a FreeBSD desktop system
 
-LICENSE=	BSD
+LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	auto-admin>=0.3.3:${PORTSDIR}/sysutils/auto-admin
+RUN_DEPENDS=	auto-admin>=0.3.4:${PORTSDIR}/sysutils/auto-admin
 
 USES=		tar:xz
 
@@ -27,12 +27,4 @@ do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}/Scripts
 	${INSTALL_SCRIPT} ${WRKSRC}/Scripts/* ${STAGEDIR}${DATADIR}/Scripts
 
-.include <bsd.port.pre.mk>
-post-patch:
-	${REINPLACE_CMD} 's|/etc/mtree|$${PORTSDIR=/usr/ports}/Templates|' \
-		${WRKSRC}/${PORTNAME}
-	${REINPLACE_CMD} \
-		's|DATADIR=Data|DATADIR=${STAGEDIR}${PREFIX}/share/desktop-installer|g' \
-		${WRKSRC}/desktop-installer
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/desktop-installer/distinfo b/sysutils/desktop-installer/distinfo
index 7bb261f23aee..ba830e973106 100644
--- a/sysutils/desktop-installer/distinfo
+++ b/sysutils/desktop-installer/distinfo
@@ -1,2 +1,2 @@
-SHA256 (desktop-installer-0.4.6.tar.xz) = 89526ae1918722931dbcd0f9aefca3ddf653806434b4c2c86a9fab26fb75555f
-SIZE (desktop-installer-0.4.6.tar.xz) = 176508
+SHA256 (desktop-installer-0.4.7.tar.xz) = f24d20dab93ecbbbaece501408d1541735c25637687de15728c014d0a5cedb86
+SIZE (desktop-installer-0.4.7.tar.xz) = 178764
diff --git a/sysutils/desktop-installer/pkg-descr b/sysutils/desktop-installer/pkg-descr
index eebbec6df4d7..48663fc637c3 100644
--- a/sysutils/desktop-installer/pkg-descr
+++ b/sysutils/desktop-installer/pkg-descr
@@ -3,4 +3,4 @@ FreeBSD desktop system using any of the mainstream desktop systems.
 It automatically installs essential software and configures subsystems
 such as HAL, CUPS, etc. for typical use.
 
-WWW: http://personalpages.tds.net/~jwbacon/Ports
+WWW: http://acadix.biz/desktop-installer.php
diff --git a/sysutils/desktop-installer/pkg-plist b/sysutils/desktop-installer/pkg-plist
index 243060239048..eae4ae10e201 100644
--- a/sysutils/desktop-installer/pkg-plist
+++ b/sysutils/desktop-installer/pkg-plist
@@ -1,20 +1,17 @@
-@comment Generated by sysutils/genplist
+man/man1/desktop-installer.1.gz
 sbin/desktop-installer
 %%DATADIR%%/90-vboxguest.fdi
-%%DATADIR%%/Gnome/Xsession
-%%DATADIR%%/Gnome/xinitrc
-%%DATADIR%%/KDE3/Xsession
+%%DATADIR%%/GNOME2/xinitrc
 %%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%%/MATE/xinitrc
 %%DATADIR%%/Patches/linux-f10-flashplugin11/Makefile
 %%DATADIR%%/Patches/linux-f10-flashplugin11/distinfo
 %%DATADIR%%/Patches/linux-f10-flashplugin11/pkg-descr
@@ -22,7 +19,6 @@ sbin/desktop-installer
 %%DATADIR%%/PolicyKit.conf
 %%DATADIR%%/Scripts/battery_shutdown.sh
 %%DATADIR%%/XFCE4/GiveConsole
-%%DATADIR%%/XFCE4/Xsession
 %%DATADIR%%/XFCE4/Xsetup_0
 %%DATADIR%%/XFCE4/Xstartup
 %%DATADIR%%/XFCE4/beastie.xpm
@@ -48,4 +44,3 @@ sbin/desktop-installer
 %%DATADIR%%/todo
 %%DATADIR%%/vbox
 %%DATADIR%%/xfce4-print-options
-man/man1/desktop-installer.1.gz