Thu Jul 28 19:31:28 2016 UTC ()
Do not alter LIBS in in patch-Makefile (so SUBST_* correctly applies)

Bump PKGREVISION


(leot)
diff -r1.1 -r1.2 pkgsrc/games/ztrack/Makefile
diff -r1.1 -r1.2 pkgsrc/games/ztrack/distinfo
diff -r1.1 -r1.2 pkgsrc/games/ztrack/patches/patch-Makefile
cvs diff -r1.1 -r1.2 pkgsrc/games/ztrack/Makefile (expand / switch to unified diff)

--- pkgsrc/games/ztrack/Makefile 2016/07/28 17:51:20 1.1
+++ pkgsrc/games/ztrack/Makefile 2016/07/28 19:31:28 1.2
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.1 2016/07/28 17:51:20 kamil Exp $ 1# $NetBSD: Makefile,v 1.2 2016/07/28 19:31:28 leot Exp $
2 2
3DISTNAME= ztrack-1.0 3DISTNAME= ztrack-1.0
 4PKGREVISION= 1
4CATEGORIES= games 5CATEGORIES= games
5MASTER_SITES= ${MASTER_SITE_SUNSITE:=games/arcade/} 6MASTER_SITES= ${MASTER_SITE_SUNSITE:=games/arcade/}
6 7
7MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
8# Nothing better available 9# Nothing better available
9HOMEPAGE= ${MASTER_SITE_SUNSITE:=games/arcade/} 10HOMEPAGE= ${MASTER_SITE_SUNSITE:=games/arcade/}
10COMMENT= Simple curses-based pseudo-3D driving game 11COMMENT= Simple curses-based pseudo-3D driving game
11LICENSE= public-domain 12LICENSE= public-domain
12 13
13WRKSRC= ${WRKDIR}/${PKGBASE} 14WRKSRC= ${WRKDIR}/${PKGBASE}
14 15
15MAKE_FLAGS+= BINDIR=${PREFIX}/bin 16MAKE_FLAGS+= BINDIR=${PREFIX}/bin
16MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR}/man6 17MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR}/man6
cvs diff -r1.1 -r1.2 pkgsrc/games/ztrack/distinfo (expand / switch to unified diff)

--- pkgsrc/games/ztrack/distinfo 2016/07/28 17:51:20 1.1
+++ pkgsrc/games/ztrack/distinfo 2016/07/28 19:31:28 1.2
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.1 2016/07/28 17:51:20 kamil Exp $ 1$NetBSD: distinfo,v 1.2 2016/07/28 19:31:28 leot Exp $
2 2
3SHA1 (ztrack-1.0.tar.gz) = 1cc31c82d78b87efa18623edf72eaa02859b38f0 3SHA1 (ztrack-1.0.tar.gz) = 1cc31c82d78b87efa18623edf72eaa02859b38f0
4RMD160 (ztrack-1.0.tar.gz) = ff3deaf1a31e048350cb94f1d9fed87e84a99fde 4RMD160 (ztrack-1.0.tar.gz) = ff3deaf1a31e048350cb94f1d9fed87e84a99fde
5SHA512 (ztrack-1.0.tar.gz) = 10efc72b593f6068ebf515ebd5be8d4c0451f37e798161dca5addbfcc468b6ee1d2bfc6b92701c6024ae4cb4fd3b1053a7891c2e7a023855aa2821420e6bb62c 5SHA512 (ztrack-1.0.tar.gz) = 10efc72b593f6068ebf515ebd5be8d4c0451f37e798161dca5addbfcc468b6ee1d2bfc6b92701c6024ae4cb4fd3b1053a7891c2e7a023855aa2821420e6bb62c
6Size (ztrack-1.0.tar.gz) = 10186 bytes 6Size (ztrack-1.0.tar.gz) = 10186 bytes
7SHA1 (patch-Makefile) = cb68993430fa3286ebb1c5828c3e5209adf844f9 7SHA1 (patch-Makefile) = a5bf4297abf24d2fc17d5fa2dc4da975bc242869
8SHA1 (patch-ztrack.c) = f47973334a3baa59e8ac675fc43280a6f9bb6881 8SHA1 (patch-ztrack.c) = f47973334a3baa59e8ac675fc43280a6f9bb6881
cvs diff -r1.1 -r1.2 pkgsrc/games/ztrack/patches/patch-Makefile (expand / switch to unified diff)

--- pkgsrc/games/ztrack/patches/patch-Makefile 2016/07/28 17:51:20 1.1
+++ pkgsrc/games/ztrack/patches/patch-Makefile 2016/07/28 19:31:28 1.2
@@ -1,41 +1,37 @@ @@ -1,41 +1,37 @@
1$NetBSD: patch-Makefile,v 1.1 2016/07/28 17:51:20 kamil Exp $ 1$NetBSD: patch-Makefile,v 1.2 2016/07/28 19:31:28 leot Exp $
2 2
3- Accept user defined CC, CFLAGS and LDFLAGS. 3- Accept user defined CC, CFLAGS and LDFLAGS.
4- Add DESTDIR support 4- Add DESTDIR support
5- Fix permissions of installed files 5- Fix permissions of installed files
6 6
7--- Makefile.orig 1996-09-30 03:34:20.000000000 +0000 7--- Makefile.orig 1996-09-30 03:34:20.000000000 +0000
8+++ Makefile 8+++ Makefile
9@@ -2,16 +2,16 @@ 9@@ -2,13 +2,13 @@
10 # 10 #
11 # note that you need an ANSI C compiler; 11 # note that you need an ANSI C compiler;
12 # gcc is easiest if you've got it or can get it 12 # gcc is easiest if you've got it or can get it
13-CC=gcc 13-CC=gcc
14+CC?=gcc 14+CC?=gcc
15  15
16 # flags for Linux/gcc, hack as required 16 # flags for Linux/gcc, hack as required
17 # remove '-DHAVE_RANDOM' if your libc doesn't have 'random' and 'srandom'. 17 # remove '-DHAVE_RANDOM' if your libc doesn't have 'random' and 'srandom'.
18 # add '-DNO_COLOUR' if you don't want colour or the colour support 18 # add '-DNO_COLOUR' if you don't want colour or the colour support
19 # causes problems. 19 # causes problems.
20-CFLAGS=-O2 -Wall -DHAVE_RANDOM -I/usr/include/ncurses #-DDEBUG 20-CFLAGS=-O2 -Wall -DHAVE_RANDOM -I/usr/include/ncurses #-DDEBUG
21+CFLAGS+= -Wall -DHAVE_RANDOM 21+CFLAGS+= -Wall -DHAVE_RANDOM
22  22
23 # if using ncurses: 23 # if using ncurses:
24-LIBS=-lncurses 24 LIBS=-lncurses
25+LIBS=-lcurses 
26  
27 # bsd-derived is usually: 
28 #LIBS=-lcurses -ltermcap 
29@@ -20,6 +20,7 @@ LIBS=-lncurses 25@@ -20,6 +20,7 @@ LIBS=-lncurses
30 #LIBS=-lcurses -lterminfo 26 #LIBS=-lcurses -lterminfo
31  27
32 # change these if needed - they're used by 'make install' 28 # change these if needed - they're used by 'make install'
33+DESTDIR?= 29+DESTDIR?=
34 BINDIR=/usr/games 30 BINDIR=/usr/games
35 MANDIR=/usr/man/man6 31 MANDIR=/usr/man/man6
36  32
37@@ -31,11 +32,13 @@ OBJS=ztrack.o 33@@ -31,11 +32,13 @@ OBJS=ztrack.o
38 all: ztrack 34 all: ztrack
39  35
40 ztrack: $(OBJS) 36 ztrack: $(OBJS)
41- $(CC) $(CFLAGS) -o ztrack $(OBJS) $(LIBS) 37- $(CC) $(CFLAGS) -o ztrack $(OBJS) $(LIBS)