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: ports/187502: [PATCH] games/adom: Stage, Makefile/plist cleanup Message-ID: <4768080030380751620.enqueue@mx12.chaot.net> Resent-Message-ID: <201403121920.s2CJK1qM057997@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 187502 >Category: ports >Synopsis: [PATCH] games/adom: Stage, Makefile/plist cleanup >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Mar 12 19:20:00 UTC 2014 >Closed-Date: >Last-Modified: >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: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4768080030380751620.enqueue>