Bug 187502 - [PATCH] games/adom: Stage, Makefile/plist cleanup
Summary: [PATCH] games/adom: Stage, Makefile/plist cleanup
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: Steve Wills
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-03-12 19:20 UTC by Johannes Meixner
Modified: 2014-03-28 19:50 UTC (History)
1 user (show)

See Also:


Attachments
adom-1.1.1.patch (1.65 KB, patch)
2014-03-12 19:20 UTC, Johannes Meixner
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Johannes Meixner 2014-03-12 19:20:00 UTC
- 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)
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2014-03-12 19:20:28 UTC
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
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2014-03-12 19:20:29 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 3 Steve Wills freebsd_committer freebsd_triage 2014-03-19 14:17:31 UTC
Responsible Changed
From-To: freebsd-ports-bugs->swills

I'll take it.
Comment 4 dfilter service freebsd_committer freebsd_triage 2014-03-28 19:47:17 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"
Comment 5 Steve Wills freebsd_committer freebsd_triage 2014-03-28 19:47:26 UTC
State Changed
From-To: feedback->closed

Committed. Thanks!