From owner-svn-ports-head@FreeBSD.ORG  Thu Apr 10 08:29:19 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B6BAADD7;
 Thu, 10 Apr 2014 08:29:19 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 89FC9134C;
 Thu, 10 Apr 2014 08:29:19 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3A8TJ3S022496;
 Thu, 10 Apr 2014 08:29:19 GMT (envelope-from pawel@svn.freebsd.org)
Received: (from pawel@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3A8TJpv022491;
 Thu, 10 Apr 2014 08:29:19 GMT (envelope-from pawel@svn.freebsd.org)
Message-Id: <201404100829.s3A8TJpv022491@svn.freebsd.org>
From: Pawel Pekala <pawel@FreeBSD.org>
Date: Thu, 10 Apr 2014 08:29:19 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r350786 - head/emulators/simh
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 10 Apr 2014 08:29:19 -0000

Author: pawel
Date: Thu Apr 10 08:29:18 2014
New Revision: 350786
URL: http://svnweb.freebsd.org/changeset/ports/350786
QAT: https://qat.redports.org/buildarchive/r350786/

Log:
  - Add staging support
  - Define DOCS option
  - Correct typo in pkg-descr

Modified:
  head/emulators/simh/Makefile
  head/emulators/simh/pkg-descr

Modified: head/emulators/simh/Makefile
==============================================================================
--- head/emulators/simh/Makefile	Thu Apr 10 07:47:18 2014	(r350785)
+++ head/emulators/simh/Makefile	Thu Apr 10 08:29:18 2014	(r350786)
@@ -27,7 +27,8 @@ PORTDOCS=	0readme_${PORTVERSION:R:S/.//}
 PLIST_FILES=	${BIN_FILES:S/^/bin\//g} bin/simh-eclipse %%DATADIR%%/ka655x.bin
 PLIST_DIRS=	%%DATADIR%%
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	DOCS
+
 pre-patch:
 	@${MKDIR} ${WRKSRC}/BIN
 
@@ -40,19 +41,14 @@ post-patch:
 		's|%%DATADIR%%|${DATADIR}|' ${WRKSRC}/VAX/vax_sysdev.c
 
 do-install:
-.for file in ${BIN_FILES}
-	${INSTALL_PROGRAM} ${WRKDIR}/BIN/${file} ${PREFIX}/bin
-.endfor
+	(cd ${WRKDIR}/BIN && ${INSTALL_PROGRAM} ${BIN_FILES} \
+		${STAGEDIR}${PREFIX}/bin)
 # eclipse conflicts with java/eclipse, install it as simh-eclipse
-	${INSTALL_PROGRAM} ${WRKDIR}/BIN/eclipse ${PREFIX}/bin/simh-eclipse
-	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKDIR}/VAX/ka655x.bin ${DATADIR}
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for file in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKDIR}/${file} ${DOCSDIR}
-.endfor
-.endif
-	@${CAT} ${PKGMESSAGE}
+	${INSTALL_PROGRAM} ${WRKDIR}/BIN/eclipse \
+		${STAGEDIR}${PREFIX}/bin/simh-eclipse
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKDIR}/VAX/ka655x.bin ${STAGEDIR}${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKDIR} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>

Modified: head/emulators/simh/pkg-descr
==============================================================================
--- head/emulators/simh/pkg-descr	Thu Apr 10 07:47:18 2014	(r350785)
+++ head/emulators/simh/pkg-descr	Thu Apr 10 08:29:18 2014	(r350786)
@@ -1,4 +1,4 @@
-SIMH is a higly portable, multi-system simulator.
+SIMH is a highly portable, multi-system simulator.
 
 SIMH implements simulators for: 
  - Data General Nova, Eclipse