Wed Mar 23 15:10:46 2016 UTC ()
Set debug options in package Makefile


(hauke)
diff -r1.2 -r1.3 pkgsrc/emulators/shoebill/Makefile
diff -r1.1 -r1.2 pkgsrc/emulators/shoebill/distinfo
diff -r1.1 -r1.2 pkgsrc/emulators/shoebill/patches/patch-sdl-gui_lin_build.sh
cvs diff -r1.2 -r1.3 pkgsrc/emulators/shoebill/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/shoebill/Makefile 2016/03/23 14:44:37 1.2
+++ pkgsrc/emulators/shoebill/Makefile 2016/03/23 15:10:46 1.3
@@ -1,39 +1,42 @@ @@ -1,39 +1,42 @@
1# $NetBSD: Makefile,v 1.2 2016/03/23 14:44:37 hauke Exp $ 1# $NetBSD: Makefile,v 1.3 2016/03/23 15:10:46 hauke Exp $
2 2
3GITHUB_PROJECT= shoebill 3GITHUB_PROJECT= shoebill
4DISTNAME= 0.0.5 4DISTNAME= 0.0.5
5PKGNAME= ${GITHUB_PROJECT}-${DISTNAME} 5PKGNAME= ${GITHUB_PROJECT}-${DISTNAME}
6CATEGORIES= emulators 6CATEGORIES= emulators
7MASTER_SITES= ${MASTER_SITE_GITHUB:=pruten/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=pruten/}
8DIST_SUBDIR= ${GITHUB_PROJECT} 8DIST_SUBDIR= ${GITHUB_PROJECT}
9 9
10MAINTAINER= hauke@NetBSD.org 10MAINTAINER= hauke@NetBSD.org
11HOMEPAGE= ${MASTER_SITE_GITHUB:=pruten/shoebill/} 11HOMEPAGE= ${MASTER_SITE_GITHUB:=pruten/shoebill/}
12COMMENT= Macintosh II emulator that runs A/UX 12COMMENT= Macintosh II emulator that runs A/UX
13LICENSE= 2-clause-bsd 13LICENSE= 2-clause-bsd
14 14
15# Missing long double math functions 15# Missing long double math functions
16NOT_FOR_PLATFORM= NetBSD-[0-6]*-* 16NOT_FOR_PLATFORM= NetBSD-[0-6]*-*
17 17
18USE_TOOLS+= perl gtar 18USE_TOOLS+= perl gtar
19EXTRACT_USING= gtar 19EXTRACT_USING= gtar
20 20
21REPLACE_PERL+= core/macro.pl 21REPLACE_PERL+= core/macro.pl
22 22
23WRKSRC= ${WRKDIR}/${PKGNAME} 23WRKSRC= ${WRKDIR}/${PKGNAME}
24 24
25DOCDIR= share/doc/shoebill 25DOCDIR= share/doc/shoebill
26INSTALLATION_DIRS= bin ${DOCDIR} 26INSTALLATION_DIRS= bin ${DOCDIR}
27 27
 28CFLAGS+= -g3
 29INSTALL_UNSTRIPPED= yes
 30
28do-build: 31do-build:
29 ( cd ${WRKSRC}/sdl-gui && \ 32 ( cd ${WRKSRC}/sdl-gui && \
30 ${ENV} CC=${CC:Q} CFLAGS=${CFLAGS:Q} LDFLAGS=${LDFLAGS:Q} \ 33 ${ENV} CC=${CC:Q} CFLAGS=${CFLAGS:Q} LDFLAGS=${LDFLAGS:Q} \
31 ${SH} ./lin_build.sh ) 34 ${SH} ./lin_build.sh )
32 35
33do-install: 36do-install:
34 ${INSTALL_DATA} files/shoebill.usage ${DESTDIR}${PREFIX}/${DOCDIR} 37 ${INSTALL_DATA} files/shoebill.usage ${DESTDIR}${PREFIX}/${DOCDIR}
35 ${INSTALL_DATA} ${WRKSRC}/README.md ${DESTDIR}${PREFIX}/${DOCDIR} 38 ${INSTALL_DATA} ${WRKSRC}/README.md ${DESTDIR}${PREFIX}/${DOCDIR}
36 ${INSTALL_PROGRAM} ${WRKSRC}/sdl-gui/shoebill ${DESTDIR}${PREFIX}/bin 39 ${INSTALL_PROGRAM} ${WRKSRC}/sdl-gui/shoebill ${DESTDIR}${PREFIX}/bin
37 40
38.include "../../devel/SDL2/buildlink3.mk" 41.include "../../devel/SDL2/buildlink3.mk"
39.include "../../mk/bsd.pkg.mk" 42.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/emulators/shoebill/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/shoebill/distinfo 2016/03/23 14:21:03 1.1
+++ pkgsrc/emulators/shoebill/distinfo 2016/03/23 15:10:46 1.2
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.1 2016/03/23 14:21:03 hauke Exp $ 1$NetBSD: distinfo,v 1.2 2016/03/23 15:10:46 hauke Exp $
2 2
3SHA1 (shoebill/0.0.5.tar.gz) = 40b9ae839bbb9d065ca7d36363b1b4660d780010 3SHA1 (shoebill/0.0.5.tar.gz) = 40b9ae839bbb9d065ca7d36363b1b4660d780010
4RMD160 (shoebill/0.0.5.tar.gz) = 20143081d2418d6961f86626e3d994b2feda8a4b 4RMD160 (shoebill/0.0.5.tar.gz) = 20143081d2418d6961f86626e3d994b2feda8a4b
5SHA512 (shoebill/0.0.5.tar.gz) = cf8d7945943d6d7a505c233b5c99371f5d37d5d60dd5beeeadbe442ef43b9980e96d51f193d69a03eb58a0a2b13103b4dba311a53c939b633b20753a8c19a772 5SHA512 (shoebill/0.0.5.tar.gz) = cf8d7945943d6d7a505c233b5c99371f5d37d5d60dd5beeeadbe442ef43b9980e96d51f193d69a03eb58a0a2b13103b4dba311a53c939b633b20753a8c19a772
6Size (shoebill/0.0.5.tar.gz) = 253877 bytes 6Size (shoebill/0.0.5.tar.gz) = 253877 bytes
7SHA1 (patch-sdl-gui_lin_build.sh) = 024efbe3dbec708148bc205c01cddff4fd6d74e1 7SHA1 (patch-sdl-gui_lin_build.sh) = 5e5a87ef66e5df2d8f816b440b315f107603d0bd
8SHA1 (patch-sdl-gui_sdl.c) = ee433b37104dcccc700d1d08b97807689ed8da67 8SHA1 (patch-sdl-gui_sdl.c) = ee433b37104dcccc700d1d08b97807689ed8da67
cvs diff -r1.1 -r1.2 pkgsrc/emulators/shoebill/patches/patch-sdl-gui_lin_build.sh (expand / switch to unified diff)

--- pkgsrc/emulators/shoebill/patches/patch-sdl-gui_lin_build.sh 2016/03/23 14:21:03 1.1
+++ pkgsrc/emulators/shoebill/patches/patch-sdl-gui_lin_build.sh 2016/03/23 15:10:46 1.2
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1$NetBSD: patch-sdl-gui_lin_build.sh,v 1.1 2016/03/23 14:21:03 hauke Exp $ 1$NetBSD: patch-sdl-gui_lin_build.sh,v 1.2 2016/03/23 15:10:46 hauke Exp $
2 2
3Make build parameters settable from pkg Makefile 3Make build parameters settable from pkg Makefile
4 4
5--- sdl-gui/lin_build.sh.orig 2015-09-14 02:11:18.000000000 +0000 5--- sdl-gui/lin_build.sh.orig 2015-09-14 02:11:18.000000000 +0000
6+++ sdl-gui/lin_build.sh 6+++ sdl-gui/lin_build.sh
7@@ -1,6 +1,7 @@ 7@@ -1,6 +1,7 @@
8-#!/bin/bash 8-#!/bin/bash
9+#!/bin/sh 9+#!/bin/sh
10  10
11-CC=gcc 11-CC=gcc
12+CC=${CC:-"gcc"} 12+CC=${CC:-"gcc"}
13+CFLAGS=${CFLAGS:-"-O2"} 13+CFLAGS=${CFLAGS:-"-O2"}
14  14
15 files="" 15 files=""
16 for i in adb fpu mc68851 mem via floppy core_api cpu dis; do 16 for i in adb fpu mc68851 mem via floppy core_api cpu dis; do
17@@ -17,6 +18,6 @@ $CC -O1 ../core/decoder_gen.c -o decoder 17@@ -17,6 +18,6 @@ $CC -O1 ../core/decoder_gen.c -o decoder
18 ./decoder_gen dis . 18 ./decoder_gen dis .
19  19
20  20
21-cmd="$CC -O3 -ggdb -flto $files sdl.c -lpthread -lm -lSDL2 -lGL -o shoebill" 21-cmd="$CC -O3 -ggdb -flto $files sdl.c -lpthread -lm -lSDL2 -lGL -o shoebill"
22+cmd="$CC ${CFLAGS} -ggdb -flto $files sdl.c -lpthread -lm -lSDL2 -lGL ${LDFLAGS} -o shoebill" 22+cmd="$CC ${CFLAGS} -flto $files sdl.c -lpthread -lm -lSDL2 -lGL ${LDFLAGS} -o shoebill"
23 echo $cmd 23 echo $cmd
24 $cmd 24 $cmd