wordwarvi: pkglint

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Tue Jul 26 21:08:42 2016 +0200
Changeset:	efb93f3f5ae0070e554d15facdcadbfb2c4b8369

Modified Files:
	wordwarvi/Makefile
	wordwarvi/distinfo
Added Files:
	wordwarvi/patches/patch-Makefile
	wordwarvi/patches/patch-wordwarvi.c
Removed Files:
	wordwarvi/patches/patch-aa
	wordwarvi/patches/patch-ab

Log Message:
wordwarvi: pkglint

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=efb93f3f5ae0070e554d15facdcadbfb2c4b8369

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 wordwarvi/Makefile                  |  4 +++-
 wordwarvi/distinfo                  |  4 ++--
 wordwarvi/patches/patch-Makefile    | 19 +++++++++++++++++++
 wordwarvi/patches/patch-aa          | 22 ----------------------
 wordwarvi/patches/patch-ab          | 13 -------------
 wordwarvi/patches/patch-wordwarvi.c | 15 +++++++++++++++
 6 files changed, 39 insertions(+), 38 deletions(-)

diffs:
diff --git a/wordwarvi/Makefile b/wordwarvi/Makefile
index 7914166..4d0df6a 100644
--- a/wordwarvi/Makefile
+++ b/wordwarvi/Makefile
@@ -1,7 +1,6 @@
 # $NetBSD: Makefile,v 1.3 2012/10/07 20:11:07 asau Exp $
 #
 
-
 DISTNAME=	wordwarvi-1.0.2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GITHUB:=smcameron/}
@@ -10,8 +9,11 @@ GITHUB_TAG=	v${PKGVERSION_NOREV}
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://smcameron.github.io/wordwarvi/
 COMMENT=	Side-scrolling shoot 'em up '80s style arcade game
+LICENSE=	gnu-gpl-v2
 
 USE_TOOLS+=	gmake pkg-config
+
+MAKE_FLAGS+=	PREFIX=${PREFIX}
 MAKE_ENV+=	MANDIR=${PREFIX}/${PKGMANDIR}
 
 .include "../../audio/libvorbis/buildlink3.mk"
diff --git a/wordwarvi/distinfo b/wordwarvi/distinfo
index 345e12a..f484bc8 100644
--- a/wordwarvi/distinfo
+++ b/wordwarvi/distinfo
@@ -4,5 +4,5 @@ SHA1 (wordwarvi-1.0.2.tar.gz) = 3db0e404113d0377c358083d78ee21645ab654b6
 RMD160 (wordwarvi-1.0.2.tar.gz) = ab4a0442384610db3fd9d598c183638949612546
 SHA512 (wordwarvi-1.0.2.tar.gz) = 231e02b339dc1f73345113ee37ddcd4fc5110e6e4402b46aee60a969c6b554cc59dc4bb6389f2537d1e418489831f84580fadb05df42ebeede7b56945389b86d
 Size (wordwarvi-1.0.2.tar.gz) = 8814650 bytes
-SHA1 (patch-aa) = 64866facf5e2d7e35bd1ca2f9da39975e52f5468
-SHA1 (patch-ab) = 722752254fd64a2d4e30927ca9558d3947512693
+SHA1 (patch-Makefile) = 6bfbabe7d925e0332c482ba5d4d7911e66f22698
+SHA1 (patch-wordwarvi.c) = 140b2bbef5741c0d7a4c5d7813c54d3903c0a73e
diff --git a/wordwarvi/patches/patch-Makefile b/wordwarvi/patches/patch-Makefile
new file mode 100644
index 0000000..e7a0980
--- /dev/null
+++ b/wordwarvi/patches/patch-Makefile
@@ -0,0 +1,19 @@
+$NetBSD: patch-aa,v 1.1.1.1 2008/12/25 12:27:03 thomasklausner Exp $
+
+Install executable into ${PREFIX}/bin
+
+--- Makefile.orig	2016-03-11 15:16:11.000000000 +0000
++++ Makefile
+@@ -116,10 +116,10 @@ wordwarvi.6.gz:	wordwarvi.6
+ 	gzip -c wordwarvi.6 > wordwarvi.6.gz
+ 
+ install: wordwarvi wordwarvi.6.gz
+-	mkdir -p $(DESTDIR)$(PREFIX)/games
++	mkdir -p $(DESTDIR)$(PREFIX)/bin
+ 	mkdir -p $(DESTDIR)$(DATADIR)/sounds
+ 	mkdir -p $(DESTDIR)$(MANPAGEDIR)
+-	install -p -m 755 wordwarvi $(DESTDIR)$(PREFIX)/games
++	install -p -m 755 wordwarvi $(DESTDIR)$(PREFIX)/bin
+ 	install -p -m 644 sounds/*.ogg $(DESTDIR)$(DATADIR)/sounds
+ 	install -p -m 644 wordwarvi.6.gz $(DESTDIR)$(MANPAGEDIR)
+ 
diff --git a/wordwarvi/patches/patch-aa b/wordwarvi/patches/patch-aa
deleted file mode 100644
index 8cedb8a..0000000
--- a/wordwarvi/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/12/25 12:27:03 thomasklausner Exp $
-
---- Makefile.orig	2016-03-11 15:16:11.000000000 +0000
-+++ Makefile
-@@ -1,4 +1,3 @@
--PREFIX=/usr
- DATADIR=${PREFIX}/share/wordwarvi
- MANDIR?=${PREFIX}/share/man
- MANPAGEDIR=${MANDIR}/man6
-@@ -116,10 +115,10 @@ wordwarvi.6.gz:	wordwarvi.6
- 	gzip -c wordwarvi.6 > wordwarvi.6.gz
- 
- install: wordwarvi wordwarvi.6.gz
--	mkdir -p $(DESTDIR)$(PREFIX)/games
-+	mkdir -p $(DESTDIR)$(PREFIX)
- 	mkdir -p $(DESTDIR)$(DATADIR)/sounds
- 	mkdir -p $(DESTDIR)$(MANPAGEDIR)
--	install -p -m 755 wordwarvi $(DESTDIR)$(PREFIX)/games
-+	install -p -m 755 wordwarvi $(DESTDIR)$(PREFIX)
- 	install -p -m 644 sounds/*.ogg $(DESTDIR)$(DATADIR)/sounds
- 	install -p -m 644 wordwarvi.6.gz $(DESTDIR)$(MANPAGEDIR)
- 
diff --git a/wordwarvi/patches/patch-ab b/wordwarvi/patches/patch-ab
deleted file mode 100644
index 310c039..0000000
--- a/wordwarvi/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2008/12/25 12:27:03 thomasklausner Exp $
-
---- wordwarvi.c.orig	2008-12-12 02:24:34.000000000 +0000
-+++ wordwarvi.c
-@@ -13078,7 +13078,7 @@ int main(int argc, char *argv[])
- 
- 	while (1) {
- 		int rc, n; 
--		rc = getopt_long_only(argc, argv, "", wordwarvi_options, &opt);
-+		rc = getopt_long(argc, argv, "", wordwarvi_options, &opt);
- 		if (rc == -1)
- 			break;
- 		switch (rc) {
diff --git a/wordwarvi/patches/patch-wordwarvi.c b/wordwarvi/patches/patch-wordwarvi.c
new file mode 100644
index 0000000..99ce3ac
--- /dev/null
+++ b/wordwarvi/patches/patch-wordwarvi.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1.1.1 2008/12/25 12:27:03 thomasklausner Exp $
+
+Use standard getopt_long(3) - fixes NetBSD.
+
+--- wordwarvi.c.orig	2008-12-12 02:24:34.000000000 +0000
++++ wordwarvi.c
+@@ -13078,7 +13078,7 @@ int main(int argc, char *argv[])
+ 
+ 	while (1) {
+ 		int rc, n; 
+-		rc = getopt_long_only(argc, argv, "", wordwarvi_options, &opt);
++		rc = getopt_long(argc, argv, "", wordwarvi_options, &opt);
+ 		if (rc == -1)
+ 			break;
+ 		switch (rc) {