- Trim Makefile headers

- Drop ABI versions from LIB_DEPENDS
- OptionsNG
- Pet portlint
- Switch to dynamic plist where useful

4 files changed, 31 insertions, 118 deletions

diff --git a/games/meritous/Makefile b/games/meritous/Makefile
index cf4c97cf770e..a9d07633a44e 100644
--- a/games/meritous/Makefile
+++ b/games/meritous/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	meritous
-# Date created:		24 Nov 2008
-# Whom:			Dmitry Marakasov <amdmi3@FreeBSD.org>
-#
+# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	meritous
 PORTVERSION=	1.2
@@ -22,10 +18,13 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_SDL=	sdl mixer image
 ALL_TARGET=	default
-USE_DOS2UNIX=	dat/d/helpfile.txt
+USE_DOS2UNIX=	dat/d/helpfile.txt src/*.c
 MAKE_JOBS_SAFE=	yes
 
 PORTDOCS=	*
+PORTDATA=	*
+
+PLIST_FILES=	bin/${PORTNAME}
 
 DESKTOP_ENTRIES="Meritous" \
 		"Action-adventure dungeon crawl game" \
@@ -34,15 +33,18 @@ DESKTOP_ENTRIES="Meritous" \
 		"Game;ActionGame;AdventureGame;" \
 		false
 
+.include <bsd.port.options.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|dat/|${DATADIR}/|' ${WRKSRC}/src/*.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/meritous ${PREFIX}/bin
+.if !defined(NOPORTDATA)
 	${MKDIR} ${DATADIR}
 	cd ${WRKSRC}/dat && ${COPYTREE_SHARE} \* ${DATADIR}
-
-.if !defined(NOPORTDOCS)
+.endif
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/readme.txt ${DOCSDIR}
 .endif
diff --git a/games/meritous/files/patch-src-boss.c b/games/meritous/files/patch-src-boss.c
index 1de1f790764a..de08744425fe 100644
--- a/games/meritous/files/patch-src-boss.c
+++ b/games/meritous/files/patch-src-boss.c
@@ -1,11 +1,11 @@
 --- src/boss.c.orig	2008-01-15 05:54:37.000000000 +0300
 +++ src/boss.c	2008-12-01 02:19:45.000000000 +0300
 @@ -691,7 +691,7 @@
- 			} else {

- 				if (dist(tail_x[0], tail_y[0], boss_x, boss_y) >= 24) {

- 					if (boss_tail_len < 10) boss_tail_len++;

--					for (i = 9; i >= 0; i--) {

-+					for (i = 8; i >= 0; i--) {

- 						tail_x[i+1] = tail_x[i];

- 						tail_y[i+1] = tail_y[i];

- 					}

+ 			} else {
+ 				if (dist(tail_x[0], tail_y[0], boss_x, boss_y) >= 24) {
+ 					if (boss_tail_len < 10) boss_tail_len++;
+-					for (i = 9; i >= 0; i--) {
++					for (i = 8; i >= 0; i--) {
+ 						tail_x[i+1] = tail_x[i];
+ 						tail_y[i+1] = tail_y[i];
+ 					}
diff --git a/games/meritous/files/patch-src-levelblit.c b/games/meritous/files/patch-src-levelblit.c
index bd8ae9d933b7..3889060ba95f 100644
--- a/games/meritous/files/patch-src-levelblit.c
+++ b/games/meritous/files/patch-src-levelblit.c
@@ -1,23 +1,23 @@
 --- src/levelblit.c.orig	2008-01-15 03:54:41.000000000 +0100
 +++ src/levelblit.c	2010-01-30 10:07:22.000000000 +0100
 @@ -27,7 +27,12 @@
- #include <SDL.h>

- #include <SDL_image.h>

- #include <assert.h>

--

+ #include <SDL.h>
+ #include <SDL_image.h>
+ #include <assert.h>
+-
 +
 +#include <errno.h>
 +#include <unistd.h>
 +#include <err.h>
 +#include <sys/stat.h>
 +
- #include "mapgen.h"

- #include "demon.h"

- #include "gamemap.h"

+ #include "mapgen.h"
+ #include "demon.h"
+ #include "gamemap.h"
 @@ -378,6 +383,14 @@
- 

- int main(int argc, char **argv)

- {

+ 
+ int main(int argc, char **argv)
+ {
 +	{
 +		if (chdir(getenv("HOME")) != 0)
 +			err(1, "cannot cd to $HOME");
@@ -26,6 +26,6 @@
 +		if (chdir(".meritous") != 0)
 +			err(1, "cannot cd to $HOME/.meritous");
 +	}
- 	int on_title = 1;

- 	int executable_running = 1;

- 	SDL_Surface *title, *title_pr, *asceai;

+ 	int on_title = 1;
+ 	int executable_running = 1;
+ 	SDL_Surface *title, *title_pr, *asceai;
diff --git a/games/meritous/pkg-plist b/games/meritous/pkg-plist
deleted file mode 100644
index 0c0896cfcd78..000000000000
--- a/games/meritous/pkg-plist
+++ /dev/null
@@ -1,89 +0,0 @@
-bin/meritous
-%%DATADIR%%/a/circuitcharge.wav
-%%DATADIR%%/a/circuitrecover.wav
-%%DATADIR%%/a/circuitrelease.wav
-%%DATADIR%%/a/crystal.wav
-%%DATADIR%%/a/crystal2.wav
-%%DATADIR%%/a/enemyhit.wav
-%%DATADIR%%/a/mons0shot.wav
-%%DATADIR%%/a/mons10shot.wav
-%%DATADIR%%/a/mons1shot.wav
-%%DATADIR%%/a/mons2shot.wav
-%%DATADIR%%/a/mons3shot.wav
-%%DATADIR%%/a/mons4shot.wav
-%%DATADIR%%/a/mons5shot.wav
-%%DATADIR%%/a/mons6shot.wav
-%%DATADIR%%/a/mons7shot.wav
-%%DATADIR%%/a/mons8shot.wav
-%%DATADIR%%/a/mons9shot.wav
-%%DATADIR%%/a/playerhurt.wav
-%%DATADIR%%/a/shieldhit.wav
-%%DATADIR%%/a/teleport.wav
-%%DATADIR%%/a/tone.wav
-%%DATADIR%%/d/bossroom.loc
-%%DATADIR%%/d/centre.loc
-%%DATADIR%%/d/cstream.loc
-%%DATADIR%%/d/fbossroom.loc
-%%DATADIR%%/d/font.dat
-%%DATADIR%%/d/helpfile.txt
-%%DATADIR%%/d/icon_bitmask.dat
-%%DATADIR%%/d/weapon.loc
-%%DATADIR%%/i/agate.png
-%%DATADIR%%/i/artifacts.png
-%%DATADIR%%/i/asceai.png
-%%DATADIR%%/i/automap.png
-%%DATADIR%%/i/boss1.png
-%%DATADIR%%/i/boss2.png
-%%DATADIR%%/i/boss3.png
-%%DATADIR%%/i/boss4.png
-%%DATADIR%%/i/boss_icon.png
-%%DATADIR%%/i/circuits_1.png
-%%DATADIR%%/i/fin.png
-%%DATADIR%%/i/gem.png
-%%DATADIR%%/i/glitter.png
-%%DATADIR%%/i/hidden_monster.png
-%%DATADIR%%/i/icon.png
-%%DATADIR%%/i/inrange.png
-%%DATADIR%%/i/linetest.png
-%%DATADIR%%/i/meter.png
-%%DATADIR%%/i/mons1.png
-%%DATADIR%%/i/mons10.png
-%%DATADIR%%/i/mons2.png
-%%DATADIR%%/i/mons3.png
-%%DATADIR%%/i/mons4.png
-%%DATADIR%%/i/mons5.png
-%%DATADIR%%/i/mons6.png
-%%DATADIR%%/i/mons7.png
-%%DATADIR%%/i/mons8.png
-%%DATADIR%%/i/mons9.png
-%%DATADIR%%/i/overview.png
-%%DATADIR%%/i/player.png
-%%DATADIR%%/i/reticle.png
-%%DATADIR%%/i/star1.png
-%%DATADIR%%/i/star2.png
-%%DATADIR%%/i/star3.png
-%%DATADIR%%/i/stream.png
-%%DATADIR%%/i/teleflash.png
-%%DATADIR%%/i/theend.png
-%%DATADIR%%/i/tileset.png
-%%DATADIR%%/i/title.png
-%%DATADIR%%/i/true_end.png
-%%DATADIR%%/i/wuss_ending.png
-%%DATADIR%%/m/CT_BOSS.MOD
-%%DATADIR%%/m/Cv_boss.mod
-%%DATADIR%%/m/FINALBAT.s3m
-%%DATADIR%%/m/Fr_boss.mod
-%%DATADIR%%/m/ICEFRONT.S3M
-%%DATADIR%%/m/Wood.s3m
-%%DATADIR%%/m/amblight.xm
-%%DATADIR%%/m/cave.xm
-%%DATADIR%%/m/cave06.s3m
-%%DATADIR%%/m/cavern.xm
-%%DATADIR%%/m/fear2.mod
-%%DATADIR%%/m/iller_knarkloader_final.xm
-%%DATADIR%%/m/rpg_bat1.xm
-@dirrm %%DATADIR%%/m
-@dirrm %%DATADIR%%/i
-@dirrm %%DATADIR%%/d
-@dirrm %%DATADIR%%/a
-@dirrm %%DATADIR%%