From owner-svn-ports-all@FreeBSD.ORG  Wed Nov 20 19:10:15 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 1F961A9E;
 Wed, 20 Nov 2013 19:10:15 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id F3AD62223;
 Wed, 20 Nov 2013 19:10:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAKJAEaA028072;
 Wed, 20 Nov 2013 19:10:14 GMT (envelope-from wg@svn.freebsd.org)
Received: (from wg@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAKJAEkm028070;
 Wed, 20 Nov 2013 19:10:14 GMT (envelope-from wg@svn.freebsd.org)
Message-Id: <201311201910.rAKJAEkm028070@svn.freebsd.org>
From: William Grzybowski <wg@FreeBSD.org>
Date: Wed, 20 Nov 2013 19:10:14 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r334442 - in head/sysutils/linux-crashplan: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.16
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 20 Nov 2013 19:10:15 -0000

Author: wg
Date: Wed Nov 20 19:10:14 2013
New Revision: 334442
URL: http://svnweb.freebsd.org/changeset/ports/334442

Log:
  sysutils/linux-crashplan: allow staging
  
  - Allow staging
  - Workaround problem starting up crashplan with SMP

Modified:
  head/sysutils/linux-crashplan/Makefile
  head/sysutils/linux-crashplan/files/crashplan.in

Modified: head/sysutils/linux-crashplan/Makefile
==============================================================================
--- head/sysutils/linux-crashplan/Makefile	Wed Nov 20 18:32:58 2013	(r334441)
+++ head/sysutils/linux-crashplan/Makefile	Wed Nov 20 19:10:14 2013	(r334442)
@@ -3,6 +3,7 @@
 
 PORTNAME=	linux-crashplan
 DISTVERSION=	3.5.3
+PORTREVISION=	1
 CATEGORIES=	sysutils linux
 MASTER_SITES=	http://download.crashplan.com/installs/linux/install/CrashPlan/
 DISTNAME=	CrashPlan_3.5.3_Linux
@@ -26,7 +27,6 @@ SHEBANG_FILES=	scripts/CrashPlanEngine s
 ONLY_FOR_ARCHS=	i386 amd64
 
 NO_BUILD=	yes
-NO_STAGE=	yes
 
 CRASHDIR=	${PREFIX}/share/crashplan
 
@@ -38,15 +38,15 @@ post-patch:
 	@${REINPLACE_CMD} 's/GUI_JAVA_OPTS="/GUI_JAVA_OPTS="-Djava.nio.channels.spi.SelectorProvider=sun.nio.ch.PollSelectorProvider /' ${WRKSRC}/scripts/run.conf
 
 do-install:
-	@${MKDIR} ${CRASHDIR}
-	cd ${CRASHDIR} && ${CAT} ${WRKSRC}/CrashPlan_${DISTVERSION}.cpi | ${GZIP_CMD} -d -c - | ${CPIO} -i --no-preserve-owner
-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/CrashPlanDesktop ${PREFIX}/bin/
-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/CrashPlanEngine ${CRASHDIR}/bin/
-	${CP} ${WRKSRC}/scripts/run.conf ${CRASHDIR}/bin/
-	${ECHO_CMD} > ${CRASHDIR}/install.vars
-	${ECHO_CMD} "TARGETDIR=${CRASHDIR}" >> ${CRASHDIR}/install.vars
-	${ECHO_CMD} "BINSDIR=${CRASHDIR}/bin" >> ${CRASHDIR}/install.vars
-	${ECHO_CMD} "JAVACOMMON=${LOCALBASE}/linux-sun-jre1.6.0/bin/java" >> ${CRASHDIR}/install.vars
-	${CAT} ${WRKSRC}/install.defaults >> ${CRASHDIR}/install.vars
+	@${MKDIR} ${STAGEDIR}${CRASHDIR}
+	cd ${STAGEDIR}${CRASHDIR} && ${CAT} ${WRKSRC}/CrashPlan_${DISTVERSION}.cpi | ${GZIP_CMD} -d -c - | ${CPIO} -i --no-preserve-owner
+	${INSTALL_SCRIPT} ${WRKSRC}/scripts/CrashPlanDesktop ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_SCRIPT} ${WRKSRC}/scripts/CrashPlanEngine ${STAGEDIR}${CRASHDIR}/bin/
+	${CP} ${WRKSRC}/scripts/run.conf ${STAGEDIR}${CRASHDIR}/bin/
+	${ECHO_CMD} > ${STAGEDIR}${CRASHDIR}/install.vars
+	${ECHO_CMD} "TARGETDIR=${CRASHDIR}" >> ${STAGEDIR}${CRASHDIR}/install.vars
+	${ECHO_CMD} "BINSDIR=${CRASHDIR}/bin" >> ${STAGEDIR}${CRASHDIR}/install.vars
+	${ECHO_CMD} "JAVACOMMON=${LOCALBASE}/linux-sun-jre1.6.0/bin/java" >> ${STAGEDIR}${CRASHDIR}/install.vars
+	${CAT} ${WRKSRC}/install.defaults >> ${STAGEDIR}${CRASHDIR}/install.vars
 
 .include <bsd.port.mk>

Modified: head/sysutils/linux-crashplan/files/crashplan.in
==============================================================================
--- head/sysutils/linux-crashplan/files/crashplan.in	Wed Nov 20 18:32:58 2013	(r334441)
+++ head/sysutils/linux-crashplan/files/crashplan.in	Wed Nov 20 19:10:14 2013	(r334442)
@@ -10,7 +10,7 @@
 name="crashplan"
 rcvar=${name}_enable
 
-command="%%PREFIX%%/share/crashplan/bin/CrashPlanEngine"
+command="/usr/bin/cpuset -l 0 %%PREFIX%%/share/crashplan/bin/CrashPlanEngine"
 
 pidfile="/var/run/CrashPlanEngine.pid"