pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/pkgsrc-2015Q1]: pkgsrc/games/orbital_eunuchs_sniper Pullup ticket #46...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/08ae6f41f9e6
branches:  pkgsrc-2015Q1
changeset: 649177:08ae6f41f9e6
user:      tron <tron%pkgsrc.org@localhost>
date:      Tue Apr 21 19:00:54 2015 +0000

description:
Pullup ticket #4674 - requested by joerg
games/orbital_eunuchs_sniper: packaging fix

Revisions pulled up:
- games/orbital_eunuchs_sniper/Makefile                         1.23

---
   Module Name: pkgsrc
   Committed By:        joerg
   Date:                Sat Apr 18 20:43:19 UTC 2015

   Modified Files:
        pkgsrc/games/orbital_eunuchs_sniper: Makefile

   Log Message:
   Use uname -m output for NetBSD/ARM in the PLIST as the package does.

diffstat:

 games/orbital_eunuchs_sniper/Makefile |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 2dcfa1134ae5 -r 08ae6f41f9e6 games/orbital_eunuchs_sniper/Makefile
--- a/games/orbital_eunuchs_sniper/Makefile     Tue Apr 21 18:55:45 2015 +0000
+++ b/games/orbital_eunuchs_sniper/Makefile     Tue Apr 21 19:00:54 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2012/10/06 11:54:49 asau Exp $
+# $NetBSD: Makefile,v 1.22.20.1 2015/04/21 19:00:54 tron Exp $
 #
 
 DISTNAME=              orbital_eunuchs_sniper-1.30
@@ -24,11 +24,15 @@
 .include "../../mk/bsd.prefs.mk"
 
 .if ${MACHINE_ARCH} == "x86_64" && ${OPSYS} != "DragonFly"
-PLIST_SUBST+=          CPU=amd64
+CPU=                   amd64
+.elif ${OPSYS} == "NetBSD" && ${MACHINE_CPU:U} == "arm"
+CPU!=                  uname -m
 .else
-PLIST_SUBST+=          CPU=${MACHINE_ARCH}
+CPU=                   ${MACHINE_ARCH}
 .endif
 
+PLIST_SUBST+=          CPU=${CPU:Q}
+
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/README \
                ${DESTDIR}${PREFIX}/share/doc/orbital_eunuchs_sniper



Home | Main Index | Thread Index | Old Index