From owner-svn-ports-all@FreeBSD.ORG  Fri Mar 28 19:47:15 2014
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 33D93C04;
 Fri, 28 Mar 2014 19:47: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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 07636AD7;
 Fri, 28 Mar 2014 19:47:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2SJlEXJ043531;
 Fri, 28 Mar 2014 19:47:14 GMT (envelope-from swills@svn.freebsd.org)
Received: (from swills@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2SJlEKC043529;
 Fri, 28 Mar 2014 19:47:14 GMT (envelope-from swills@svn.freebsd.org)
Message-Id: <201403281947.s2SJlEKC043529@svn.freebsd.org>
From: Steve Wills <swills@FreeBSD.org>
Date: Fri, 28 Mar 2014 19:47:14 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r349454 - head/games/adom
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.17
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: Fri, 28 Mar 2014 19:47:15 -0000

Author: swills
Date: Fri Mar 28 19:47:14 2014
New Revision: 349454
URL: http://svnweb.freebsd.org/changeset/ports/349454
QAT: https://qat.redports.org/buildarchive/r349454/

Log:
  - Stagify
  - Cleanup Makefile order
  - Use %%DOCSDIR%% macro in pkg-plist
  - Allow builds on amd64
  
  PR:		ports/187502
  Submitted by:	Johannes Jost Meixner <xmj@chaot.net>
  Approved by:	maintainer timeout (sr-13@mail.ru, >2 weeks)

Modified:
  head/games/adom/Makefile
  head/games/adom/pkg-plist

Modified: head/games/adom/Makefile
==============================================================================
--- head/games/adom/Makefile	Fri Mar 28 19:44:37 2014	(r349453)
+++ head/games/adom/Makefile	Fri Mar 28 19:47:14 2014	(r349454)
@@ -3,7 +3,7 @@
 
 PORTNAME=	adom
 PORTVERSION=	1.1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games linux
 MASTER_SITES=	http://www.adom.de/adom/download/linux/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}-elf
@@ -13,12 +13,14 @@ COMMENT=	An rogue-like advanced rpg with
 
 LICENSE=	unknown
 LICENSE_NAME=	The ADOM License
-LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror
 LICENSE_FILE=	${WRKSRC}/readme.1st
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror
 
 NO_CDROM=	Copy of CD must be sent to author
 
-ONLY_FOR_ARCHS=	i386
+OPTIONS_DEFINE=	DOCS
+
+ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX=	yes
 USE_LINUX_APPS=	xorglibs
 
@@ -26,14 +28,13 @@ WRKSRC=		${WRKDIR}/adom
 NO_BUILD=	yes
 STRIP=		# empty: do not strip linux binary!
 
-NO_STAGE=	yes
+.include <bsd.port.options.mk>
+
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/adom ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_PROGRAM} ${WRKSRC}/adom ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for docs in readme.1st adomfaq.txt manual.doc
-	@${INSTALL_DATA} ${WRKSRC}/${docs} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/${docs} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>

Modified: head/games/adom/pkg-plist
==============================================================================
--- head/games/adom/pkg-plist	Fri Mar 28 19:44:37 2014	(r349453)
+++ head/games/adom/pkg-plist	Fri Mar 28 19:47:14 2014	(r349454)
@@ -1,5 +1,5 @@
 bin/adom
-%%PORTDOCS%%share/doc/adom/adomfaq.txt
-%%PORTDOCS%%share/doc/adom/manual.doc
-%%PORTDOCS%%share/doc/adom/readme.1st
+%%PORTDOCS%%%%DOCSDIR%%/adomfaq.txt
+%%PORTDOCS%%%%DOCSDIR%%/manual.doc
+%%PORTDOCS%%%%DOCSDIR%%/readme.1st
 %%PORTDOCS%%@dirrm share/doc/adom