From xmj@chaot.net  Wed Mar 12 19:14:56 2014
Return-Path: <xmj@chaot.net>
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 1C253568
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 12 Mar 2014 19:14:56 +0000 (UTC)
Received: from dd16522.kasserver.com (dd16522.kasserver.com [85.13.137.124])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id D4B1F5EB
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 12 Mar 2014 19:14:55 +0000 (UTC)
Received: from mx12.chaot.net (85.253.101.219.cable.starman.ee [85.253.101.219])
	by dd16522.kasserver.com (Postfix) with ESMTPSA id 45F4A4560B7;
	Wed, 12 Mar 2014 20:14:53 +0100 (CET)
Received: from localhost (1003@localhost [local]);
	by localhost (OpenSMTPD) with ESMTPA id 0934c09c;
	Wed, 12 Mar 2014 21:14:51 +0200 (EET)
Message-Id: <4768080030380751620.enqueue@mx12.chaot.net>
Date: Wed, 12 Mar 2014 21:14:51 +0200 (EET)
From: Johannes Jost Meixner <xmj@chaot.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: sr-13@mail.ru
Subject: [PATCH] games/adom: Stage, Makefile/plist cleanup
X-Send-Pr-Version: 3.113
X-GNATS-Notify: sr-13@mail.ru

>Number:         187502
>Category:       ports
>Synopsis:       [PATCH] games/adom: Stage, Makefile/plist cleanup
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    swills
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Mar 12 19:20:00 UTC 2014
>Closed-Date:    Fri Mar 28 19:47:27 UTC 2014
>Last-Modified:  Fri Mar 28 19:50:02 UTC 2014
>Originator:     Johannes Jost Meixner
>Release:        FreeBSD 11.0-CURRENT amd64
>Organization:
Goldener Grund OUe
>Environment:
System: FreeBSD mx12.chaot.net 11.0-CURRENT FreeBSD 11.0-CURRENT #4: Sun Mar  9 15:34:03 EET
>Description:
- Stagify
- cleanup Makefile order
- Use %%DOCSDIR%% macro in pkg-plist
- Allow builds on amd64

Port maintainer (sr-13@mail.ru) is cc'd.

Generated with FreeBSD Port Tools 1.00.2014.03.12 (mode: change, diff: SVN)
>How-To-Repeat:
>Fix:

--- adom-1.1.1.patch begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 347997)
+++ Makefile	(working copy)
@@ -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 @@
 
 LICENSE=	unknown
 LICENSE_NAME=	The ADOM License
+LICENSE_FILE=	${WRKSRC}/readme.1st
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror
-LICENSE_FILE=	${WRKSRC}/readme.1st
 
 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 @@
 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>
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 347997)
+++ pkg-plist	(working copy)
@@ -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
--- adom-1.1.1.patch ends here ---

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Wed Mar 12 19:20:29 UTC 2014 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=187502 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: sr-13@mail.ru
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/187502: [PATCH] games/adom: Stage, Makefile/plist cleanup
Date: Wed, 12 Mar 2014 19:20:28 UT

 Maintainer of games/adom,
 
 Please note that PR ports/187502 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/187502
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
Responsible-Changed-From-To: freebsd-ports-bugs->swills 
Responsible-Changed-By: swills 
Responsible-Changed-When: Wed Mar 19 14:17:31 UTC 2014 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=187502 
State-Changed-From-To: feedback->closed 
State-Changed-By: swills 
State-Changed-When: Fri Mar 28 19:47:26 UTC 2014 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=187502 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/187502: commit references a PR
Date: Fri, 28 Mar 2014 19:47:17 +0000 (UTC)

 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
 _______________________________________________
 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"
 
>Unformatted:
