Mercurial > nsnake
changeset 57:b67d3b194300 stable-2
misc: merge from release-2.2
author | David Demelier <markand@malikania.fr> |
---|---|
date | Sun, 26 Jan 2020 10:39:45 +0100 |
parents | 7077374097f2 (current diff) 8f5b0fe3f08e (diff) |
children | d8613c3942fd 973d086fbc84 |
files | |
diffstat | 8 files changed, 38 insertions(+), 42 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsigs Mon Oct 14 21:02:50 2019 +0200 +++ b/.hgsigs Sun Jan 26 10:39:45 2020 +0100 @@ -1,3 +1,4 @@ d2ce6f8e24ead1d75fb70084b54012617e0eb614 0 iQEcBAABCAAGBQJW0DmCAAoJEKHa+bhAI/MfzNgIAIPuyaRbtARMWwRHNbzxTf1njMlwwhyF7jSRvDjWt7RTTAZkhVRWeLATG+4WiyK5o2Vvrd4PxAUBotdTGNQvK5zMv9Q1NXlzz4WLnaRiLa48Dwsw8B8kKr/O39vTJk5g2XS+QO79RJLzZPrx/Q8HeuWfvOmcEz7XjA095g6Jgqc2rMM4o66AfSdG5dMNPUIIQjyyVlAoJeLekHngkN50sMHK3HZfIajicfIRPaMGPfs7Qx3wzcfSajeBDMj54t+5EuOoBU3KkVtA44H99Pfzz2W8VqJnZvfrEERa43YK35ObZaItXrn1mZu1jPyqrIQ8kVqONzwddeBoyEGI0GI+4vA= 44c1c77266529529c03bf0947aeb5c6fe81b0c7f 0 iQEzBAABCAAdFiEEvr8S/JLqYAXrLA5Xodr5uEAj8x8FAl1wlNcACgkQodr5uEAj8x/OAwf/X2HJY3QLznZ2UUCeubUZHA6psFwxsXKX9qho/wlg8TEvN/CWHFipsn42Q4uT3rpgnhPiOCYWv13jlxOJfIsAw32e6oGWMzihlXMJcOlEwrgP1WKVKOPrr0cMu4dk4coSjAIv3OHs9BBZToP36aHY8cYMnSzPHQt9eV/oKJrGeeSvsjRaBRHpeyvsNemfxgAPAYz5MpbXY/XdsIZ7Oc/+4aeNx8wtYQir2D8eNb6tHhe8HfP92e1XfT69VwbXeARl7q7ZEwbmFijXIBfqVq/6sEZ/JxUM2Q5P6Ub6JrdH84HdroP9yBX4IGLqd9+hMhhECG6IpzuapV9avmSpBh9LYA== 55ed59e85613cdcd0d8204c96d82ed845b897bc5 0 iQEzBAABCAAdFiEEvr8S/JLqYAXrLA5Xodr5uEAj8x8FAl2kxkEACgkQodr5uEAj8x9vCQgAo0vF06e67MyS7QqIe/DV13ZhCKzv4YN6tL15/A6htmqE2fNqaaA5AJQQtt6E0KCusV6bQjAbrlhSMK5FQ0FIne+7iBVzLe6Nu3SYKzItvPNNh+CSyLbV+fSfWAXzhR3Lqmkv6l4MoT13g3R5wITsT/EhQJ+t5XkZR3Sg0SXnvUTXoUNi7TE5SxaySMa4kqdJ1Utr/3DuhS+JFWDhq4KDIAkWlBwKBTYJu1zTpFhIn1Tj+UE8aXuHK6blm5u/P0iM/GbsxS0/v4U4g6WnwLK+5LMRozdDN8AF0IIJ8vrmmZiebtj6GqYtzzRJdcQMRi3sG3vBDJYu/P7Fwu42fdHNOg== +ab490eecbf17ec09bd17737b2a8bc7cc556ec46d 0 iQEzBAABCAAdFiEEvr8S/JLqYAXrLA5Xodr5uEAj8x8FAl4tXkUACgkQodr5uEAj8x8TXwf+Pu5FiHRyu/QOrKAOrau8BRzGp5wM87Aefs99g+S0B62GDH6eHPXeNkqZn2HAQPopfdpf1BopRd7shJK42kcuOegXz6/VTygPH8RDWX9Ql7C3t4akyPvGZ6dhqlCFPq7Er1iODe4HjoDKhUr3JUKBi+IyaLYDD66r1kbiZE+QBCrhwICsKjhJPbBCjcWY5pMgN3I9j0V/XgrpjDPnUMYX+1iYvpm5xES6VQ3XSTCTU8jDKrqBV8JsLv0l2DieJz8D/IC9r53FjSZZCmddEtWhPW7qRrusZVYI0irPJgr+NSJ2fQvrM5HaUf0ZQGQvUoEMACuonjqivxHZgj8lzEAu9g==
--- a/.hgtags Mon Oct 14 21:02:50 2019 +0200 +++ b/.hgtags Sun Jan 26 10:39:45 2020 +0100 @@ -1,3 +1,4 @@ 50b1795b7df302f27d7f9a586aed00c76096f24b 2.0.0 b50f9c2d3c6409f9910ccffaa13deae6e8254833 2.1.0 c98218c6513fa8f8d0d088fd39c4dddca584bae1 2.2.0 +f3fb12ee841014d02244e399fa34510a2cb653ad 2.2.1
--- a/CHANGES.md Mon Oct 14 21:02:50 2019 +0200 +++ b/CHANGES.md Sun Jan 26 10:39:45 2020 +0100 @@ -1,6 +1,13 @@ NSnake CHANGES ============== +nsnake 2.2.1 2020-01-26 +----------------------- + +- Fix build by passing -lncurses at the end, +- Merge config.mk in Makefile, +- Remove non-POSIX commands in Makefile. + nsnake 2.2.0 2019-10-14 -----------------------
--- a/LICENSE.md Mon Oct 14 21:02:50 2019 +0200 +++ b/LICENSE.md Sun Jan 26 10:39:45 2020 +0100 @@ -1,7 +1,7 @@ NSnake LICENSE ============== -Copyright (c) 2011-2019 David Demelier <markand@malikania.fr> +Copyright (c) 2011-2020 David Demelier <markand@malikania.fr> Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above
--- a/Makefile Mon Oct 14 21:02:50 2019 +0200 +++ b/Makefile Sun Jan 26 10:39:45 2020 +0100 @@ -1,7 +1,7 @@ # # Makefile -- NSnake makefile # -# Copyright (c) 2011-2019 David Demelier <markand@malikania.fr> +# Copyright (c) 2011-2020 David Demelier <markand@malikania.fr> # # Permission to use, copy, modify, and/or distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -18,9 +18,19 @@ .POSIX: -include config.mk +# Build options. +CFLAGS= -Wall -Wextra -pedantic -D_XOPEN_SOURCE=700 +LDFLAGS= -lncurses +GID= games +UID= games -VERSION= 2.2.0 +# Installation options. +PREFIX= /usr/local +BINDIR= ${PREFIX}/bin +MANDIR= ${PREFIX}/share/man +VARDIR= ${PREFIX}/var + +VERSION= 2.2.1 SRCS= nsnake.c OBJS= ${SRCS:.c=.o} @@ -32,18 +42,24 @@ .c.o: ${CC} -c -DVARDIR=\"${VARDIR}\" ${PORTCFLAGS} ${CFLAGS} $< -${OBJS}: config.mk sysconfig.h +${OBJS}: sysconfig.h sysconfig.h: sysconfig.sh CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ./sysconfig.sh > $@ nsnake: ${OBJS} - ${CC} -o $@ ${LDFLAGS} ${OBJS} ${LIBS} + ${CC} -o $@ ${OBJS} ${LDFLAGS} ${LIBS} install: nsnake - install -Dm2555 -g ${GID} -o ${UID} nsnake ${DESTDIR}${BINDIR}/nsnake - install -Dm0644 nsnake.6 ${DESTDIR}${MANDIR}/man6/nsnake.6 - install -dm0770 -g ${GID} -o ${UID} ${DESTDIR}${VARDIR}/db/nsnake + mkdir -p ${DESTDIR}${BINDIR} + cp nsnake ${DESTDIR}${BINDIR} + chmod 2555 ${DESTDIR}${BINDIR}/nsnake + chown ${GID}:${UID} ${DESTDIR}${BINDIR}/nsnake + mkdir -p ${DESTDIR}${MANDIR}/man6 + cp nsnake.6 ${DESTDIR}${MANDIR}/man6 + mkdir -p ${DESTDIR}${VARDIR}/db/nsnake + chmod 770 ${DESTDIR}${VARDIR}/db/nsnake + chown ${GID}:${UID} ${DESTDIR}${VARDIR}/db/nsnake uninstall: rm -f ${DESTDIR}${BINDIR}/nsnake @@ -56,7 +72,7 @@ mkdir nsnake-${VERSION} cp -R extern nsnake-${VERSION} cp CHANGES.md INSTALL.md LICENSE.md README.md nsnake-${VERSION} - cp Makefile config.mk nsnake.6 nsnake.c sysconfig.sh nsnake-${VERSION} + cp Makefile nsnake.6 nsnake.c sysconfig.sh nsnake-${VERSION} tar -cJf nsnake-${VERSION}.tar.xz nsnake-${VERSION} rm -rf nsnake-${VERSION}
--- a/config.mk Mon Oct 14 21:02:50 2019 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -# -# config.mk -- NSnake configuration -# -# Copyright (c) 2011-2019 David Demelier <markand@malikania.fr> -# -# Permission to use, copy, modify, and/or distribute this software for any -# purpose with or without fee is hereby granted, provided that the above -# copyright notice and this permission notice appear in all copies. -# -# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# - -# Build options. -CFLAGS= -Wall -Wextra -pedantic -D_XOPEN_SOURCE=700 -LDFLAGS= -lncurses -GID= games -UID= games - -# Installation options. -PREFIX= /usr/local -BINDIR= ${PREFIX}/bin -MANDIR= ${PREFIX}/share/man -VARDIR= ${PREFIX}/var
--- a/nsnake.6 Mon Oct 14 21:02:50 2019 +0200 +++ b/nsnake.6 Sun Jan 26 10:39:45 2020 +0100 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 2011-2019 David Demelier <markand@malikania.fr> +.\" Copyright (c) 2011-2020 David Demelier <markand@malikania.fr> .\" .\" Permission to use, copy, modify, and/or distribute this software for any .\" purpose with or without fee is hereby granted, provided that the above @@ -13,7 +13,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd September 05, 2019 +.Dd January 26, 2020 .Dt NSNAKE 6 .Os .Sh NAME
--- a/nsnake.c Mon Oct 14 21:02:50 2019 +0200 +++ b/nsnake.c Sun Jan 26 10:39:45 2020 +0100 @@ -1,7 +1,7 @@ /* * nsnake.c -- a snake game for your terminal * - * Copyright (c) 2011-2019 David Demelier <markand@malikania.fr> + * Copyright (c) 2011-2020 David Demelier <markand@malikania.fr> * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above