Bug 184001 - maintainer update: sysutils/desktop-installer
Summary: maintainer update: sysutils/desktop-installer
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: freebsd-ports-bugs (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-11-15 15:10 UTC by Jason W. Bacon
Modified: 2013-11-27 15:20 UTC (History)
0 users

See Also:


Attachments
file.diff (3.04 KB, patch)
2013-11-15 15:10 UTC, Jason W. Bacon
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Jason W. Bacon freebsd_committer freebsd_triage 2013-11-15 15:10:01 UTC
Important updates add support for 10.0, staged installation, and pkgng.

Fix: Patch attached with submission follows:
Comment 1 dfilter service freebsd_committer freebsd_triage 2013-11-27 15:17:50 UTC
Author: jadawin
Date: Wed Nov 27 15:17:42 2013
New Revision: 335023
URL: http://svnweb.freebsd.org/changeset/ports/335023

Log:
  - Update to 0.4.6
  - Support STAGEDIR
  
  PR:		ports/184001
  Submitted by:	Jason Bacon <jwbacon@tds.net>

Modified:
  head/sysutils/desktop-installer/Makefile
  head/sysutils/desktop-installer/distinfo
  head/sysutils/desktop-installer/pkg-plist

Modified: head/sysutils/desktop-installer/Makefile
==============================================================================
--- head/sysutils/desktop-installer/Makefile	Wed Nov 27 15:08:16 2013	(r335022)
+++ head/sysutils/desktop-installer/Makefile	Wed Nov 27 15:17:42 2013	(r335023)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	desktop-installer
-PORTVERSION=	0.4.5
+PORTVERSION=	0.4.6
 CATEGORIES=	sysutils
 MASTER_SITES=	http://acadix.biz/Ports/distfiles/ \
 		http://personalpages.tds.net/~jwbacon/Ports/distfiles/
@@ -10,28 +10,29 @@ MASTER_SITES=	http://acadix.biz/Ports/di
 MAINTAINER=	jwbacon@tds.net
 COMMENT=	Quickly configure a FreeBSD desktop system
 
-RUN_DEPENDS=	auto-admin>=0.3.2:${PORTSDIR}/sysutils/auto-admin
+LICENSE=	BSD
 
-NO_BUILD=	yes
+RUN_DEPENDS=	auto-admin>=0.3.3:${PORTSDIR}/sysutils/auto-admin
+
+USE_XZ=		yes
 
-MAN1=		${PORTNAME}.1
+NO_BUILD=	yes
 
-NO_STAGE=	yes
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/sbin
+	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_MAN} ${WRKSRC}/Doc/${PORTNAME}.man \
-		${PREFIX}/man/man1/${PORTNAME}.1
-	${MKDIR} ${DATADIR}
-	${CP} -r ${WRKSRC}/Data/* ${DATADIR}
-	${MKDIR} ${DATADIR}/Scripts
-	${INSTALL_SCRIPT} ${WRKSRC}/Scripts/* ${DATADIR}/Scripts
+		${STAGEDIR}${PREFIX}/man/man1/${PORTNAME}.1
+	${MKDIR} ${STAGEDIR}${DATADIR}
+	${CP} -r ${WRKSRC}/Data/* ${STAGEDIR}${DATADIR}
+	${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=${PREFIX}/share/desktop-installer|g' \
+		's|DATADIR=Data|DATADIR=${STAGEDIR}${PREFIX}/share/desktop-installer|g' \
 		${WRKSRC}/desktop-installer
 
 .include <bsd.port.post.mk>

Modified: head/sysutils/desktop-installer/distinfo
==============================================================================
--- head/sysutils/desktop-installer/distinfo	Wed Nov 27 15:08:16 2013	(r335022)
+++ head/sysutils/desktop-installer/distinfo	Wed Nov 27 15:17:42 2013	(r335023)
@@ -1,2 +1,2 @@
-SHA256 (desktop-installer-0.4.5.tar.gz) = 06d7b77f63358465ecac7864ce147c22513f477720836fe7b1816dffd1bf41d0
-SIZE (desktop-installer-0.4.5.tar.gz) = 270660
+SHA256 (desktop-installer-0.4.6.tar.xz) = 89526ae1918722931dbcd0f9aefca3ddf653806434b4c2c86a9fab26fb75555f
+SIZE (desktop-installer-0.4.6.tar.xz) = 176508

Modified: head/sysutils/desktop-installer/pkg-plist
==============================================================================
--- head/sysutils/desktop-installer/pkg-plist	Wed Nov 27 15:08:16 2013	(r335022)
+++ head/sysutils/desktop-installer/pkg-plist	Wed Nov 27 15:17:42 2013	(r335023)
@@ -1,3 +1,4 @@
+@comment Generated by sysutils/genplist
 sbin/desktop-installer
 %%DATADIR%%/90-vboxguest.fdi
 %%DATADIR%%/Gnome/Xsession
@@ -47,6 +48,7 @@ sbin/desktop-installer
 %%DATADIR%%/todo
 %%DATADIR%%/vbox
 %%DATADIR%%/xfce4-print-options
+man/man1/desktop-installer.1.gz
 @dirrm %%DATADIR%%/gcc45/files
 @dirrm %%DATADIR%%/gcc45
 @dirrm %%DATADIR%%/XFCE4
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 2 Philippe Audeoud freebsd_committer freebsd_triage 2013-11-27 15:18:08 UTC
State Changed
From-To: open->closed

Committed, with minor changes. Thanks!