Attachment 152881 Details for Bug 197549 – Unified diff

Unified diff

desktop-installer-diff.txt (text/plain), 3.84 KB, created by Jason W. Bacon on 2015-02-11 23:45:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason W. Bacon

Created: 2015-02-11 23:45:57 UTC

Size: 3.84 KB

patch

obsolete

>diff -ruN --exclude=CVS --exclude=.svn /usr/ports/sysutils/desktop-installer/Makefile /usr/wip/sysutils/desktop-installer/Makefile
>--- /usr/ports/sysutils/desktop-installer/Makefile	2014-07-29 16:25:30.000000000 -0500
>+++ /usr/wip/sysutils/desktop-installer/Makefile	2015-02-11 17:32:12.000000000 -0600
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/sysutils/desktop-installer/Makefile 363395 2014-07-29 21:25:30Z adamw $
> 
> 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 @@
> 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 @@
> 	${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 -ruN --exclude=CVS --exclude=.svn /usr/ports/sysutils/desktop-installer/distinfo /usr/wip/sysutils/desktop-installer/distinfo
>--- /usr/ports/sysutils/desktop-installer/distinfo	2013-11-27 09:17:42.000000000 -0600
>+++ /usr/wip/sysutils/desktop-installer/distinfo	2015-02-11 17:29:21.000000000 -0600
>@@ -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 -ruN --exclude=CVS --exclude=.svn /usr/ports/sysutils/desktop-installer/pkg-descr /usr/wip/sysutils/desktop-installer/pkg-descr
>--- /usr/ports/sysutils/desktop-installer/pkg-descr	2013-04-19 06:46:48.000000000 -0500
>+++ /usr/wip/sysutils/desktop-installer/pkg-descr	2015-02-11 17:35:41.000000000 -0600
>@@ -3,4 +3,4 @@
> 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 -ruN --exclude=CVS --exclude=.svn /usr/ports/sysutils/desktop-installer/pkg-plist /usr/wip/sysutils/desktop-installer/pkg-plist
>--- /usr/ports/sysutils/desktop-installer/pkg-plist	2014-11-22 03:13:35.000000000 -0600
>+++ /usr/wip/sysutils/desktop-installer/pkg-plist	2015-02-08 09:39:08.000000000 -0600
>@@ -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 @@
> %%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 @@
> %%DATADIR%%/todo
> %%DATADIR%%/vbox
> %%DATADIR%%/xfce4-print-options
>-man/man1/desktop-installer.1.gz

Flags:

koobs: maintainer-approval+

Actions: View

Attachments on bug 197549: 152881