- Update to 1.25

PR:		ports/104803
Submitted by:	Janos Mohacsi <janos.mohacsi@bsd.hu> (maintainer)

5 files changed, 112 insertions, 155 deletions

diff --git a/games/njam/Makefile b/games/njam/Makefile
index beee8f73fd13..94b69bcace4d 100644
--- a/games/njam/Makefile
+++ b/games/njam/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	njam
-PORTVERSION=	1.21
-PORTREVISION=	1
+PORTVERSION=	1.25
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,6 +16,8 @@ MAINTAINER=	janos.mohacsi@bsd.hu
 COMMENT=	Fast paced multiplayer pac-man clone
 
 USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	"CPPFLAGS=-I${LOCALBASE}/include"
 USE_SDL=	mixer image net sdl
 DOC_FILES=	assassin.gif award-2.gif cookie.gif doc-editor.html \
 		doc.html doc2.html door.gif freezer.gif ghactive.gif \
@@ -27,7 +28,7 @@ DOC_FILES=	assassin.gif award-2.gif cookie.gif doc-editor.html \
 post-install:
 	${CP} ${FILESDIR}/njam.sh ${WRKDIR}/njam.sh
 	${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' ${WRKDIR}/njam.sh
-	${INSTALL_SCRIPT} ${WRKDIR}/njam.sh ${PREFIX}/bin/njam
+	${INSTALL_SCRIPT} ${WRKDIR}/njam.sh ${PREFIX}/bin/
 .ifndef(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/html/* ${DOCSDIR}
diff --git a/games/njam/distinfo b/games/njam/distinfo
index 839098fc87c8..4b510184b044 100644
--- a/games/njam/distinfo
+++ b/games/njam/distinfo
@@ -1,3 +1,3 @@
-MD5 (njam-1.21-src.tar.gz) = aa1889ea750fabff3029b95ad21ad1fa
-SHA256 (njam-1.21-src.tar.gz) = 3b3ceea512b5fd945971e81e5d4edff49e3caf853cfe054bc066b8aa30441640
-SIZE (njam-1.21-src.tar.gz) = 1438351
+MD5 (njam-1.25-src.tar.gz) = 231fda022d309e1ef4a0d993ca693462
+SHA256 (njam-1.25-src.tar.gz) = 8ed3eee3f387ce5ecdab7dd528f98cf77f65971510964000f2f1dfbf8b6f3000
+SIZE (njam-1.25-src.tar.gz) = 1665803
diff --git a/games/njam/files/njam.sh b/games/njam/files/njam.sh
deleted file mode 100644
index 4dda52f63ebb..000000000000
--- a/games/njam/files/njam.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-cd %%PREFIX%%/share/njam
-%%PREFIX%%/share/njam/njam
diff --git a/games/njam/files/patch-Makefile b/games/njam/files/patch-Makefile
deleted file mode 100644
index 0f46e5cf3365..000000000000
--- a/games/njam/files/patch-Makefile
+++ /dev/null
@@ -1,66 +0,0 @@
---- Makefile.orig	Thu Mar 25 07:34:46 2004
-+++ Makefile	Sun Mar 28 14:37:35 2004
-@@ -20,7 +20,7 @@
- 
- # directory where the games are installed (/usr, /usr/local, ... or something)
- ifndef PREFIX
--PREFIX=/usr
-+PREFIX=/usr/local
- endif
- 
- PROGRAM = njam
-@@ -29,15 +29,15 @@
- 
- # If you hate warnings under Cygwin use these flags instead
- # MY_CFLAGS = -I/usr/local/include/SDL -Dmain=SDL_main -DWIN32 -Uunix -mno-cygwin
--MY_CFLAGS = `sdl-config --cflags`
-+MY_CFLAGS += `sdl-config --cflags`
- 
- %.o:	%.cpp
--	$(CC) -O3 -c $(MY_CFLAGS) $< -o $@
-+	$(CC) -c $(MY_CFLAGS) $< -o $@
- 
- all:	$(PROGRAM)
- 
- $(PROGRAM):	$(OBJECTS)
--	$(CC) `sdl-config --libs` -o$(PROGRAM) $(OBJECTS) -lSDL -lSDL_mixer -lSDL_net -lSDL_image
-+	$(CC) `sdl-config --libs` -o$(PROGRAM) $(OBJECTS) -lSDL_mixer -lSDL_net -lSDL_image
- 
- clean:
- 	$(RM) *.o
-@@ -45,25 +45,16 @@
- 	$(RM) $(PROGRAM).exe
- 
- install:	$(PROGRAM)
--	mkdir -m 755 -p $(PREFIX)/games/njam
--	mkdir -m 755 -p $(PREFIX)/games/njam/data
--	mkdir -m 755 -p $(PREFIX)/games/njam/skins
--	mkdir -m 755 -p $(PREFIX)/games/njam/html
--	mkdir -m 755 -p $(PREFIX)/games/njam/levels
--	install -o root -g games -m 755 njam 		$(PREFIX)/games/njam
--	install -o root -g games -m 644 data/*  	$(PREFIX)/games/njam/data
--	install -o root -g games -m 644 skins/* 	$(PREFIX)/games/njam/skins
--	install -o root -g games -m 644 html/* 		$(PREFIX)/games/njam/html
--	install -o root -g games -m 6777 levels/* 	$(PREFIX)/games/njam/levels
--	echo '#!/bin/sh' > /usr/bin/njam
--	echo '$(PREFIX)/games/njam/njam $$1' >> /usr/bin/njam
--	chmod 755 /usr/bin/njam
--	@echo
--	@echo ------------------ Install completed ------------------------------
--	@echo Type \"njam\" to play the game.
--	@echo You can link \"$(PREFIX)/games/njam/njam\" into menus/toolbars.
--	@echo -------------------------------------------------------------------
--	@echo
-+	mkdir -m 755 -p $(PREFIX)/share/njam
-+	mkdir -m 755 -p $(PREFIX)/share/njam/data
-+	mkdir -m 755 -p $(PREFIX)/share/njam/skins
-+	mkdir -m 755 -p $(PREFIX)/share/njam/html
-+	mkdir -m 755 -p $(PREFIX)/share/njam/levels
-+	install -o root -g games -m 755 njam 		$(PREFIX)/share/njam
-+	install -o root -g games -m 644 data/*  	$(PREFIX)/share/njam/data
-+	install -o root -g games -m 644 skins/* 	$(PREFIX)/share/njam/skins
-+	install -o root -g games -m 644 html/* 		$(PREFIX)/share/njam/html
-+	install -o root -g games -m 644 levels/* 	$(PREFIX)/share/njam/levels
- 
- uninstall:
- 	rm -rf $(PREFIX)/games/njam
diff --git a/games/njam/pkg-plist b/games/njam/pkg-plist
index 45f13daba74f..a2b675247ff6 100644
--- a/games/njam/pkg-plist
+++ b/games/njam/pkg-plist
@@ -1,83 +1,109 @@
 bin/njam
-share/njam/data/50pts.wav
-share/njam/data/bonus.wav
-share/njam/data/dali.xm
-share/njam/data/dead.wav
-share/njam/data/dead2.wav
-share/njam/data/dead3.wav
-share/njam/data/enter-ip.jpg
-share/njam/data/font-blue.bmp
-share/njam/data/font-yellow.bmp
-share/njam/data/freeze.wav
-share/njam/data/gameover.jpg
-share/njam/data/hiscore.jpg
-share/njam/data/invisible.wav
-share/njam/data/juice.wav
-share/njam/data/kill.wav
-share/njam/data/kill2.wav
-share/njam/data/kill3.wav
-share/njam/data/killply.wav
-share/njam/data/levelset.jpg
-share/njam/data/mainmenu.jpg
-share/njam/data/mapend.wav
-share/njam/data/mapend2.wav
-share/njam/data/netsend.jpg
-share/njam/data/network.bmp
-share/njam/data/njamicon.bmp
-share/njam/data/options.jpg
-share/njam/data/ritam.s3m
-share/njam/data/satisfy.xm
-share/njam/data/script.txt
-share/njam/data/sprites.bmp
-share/njam/data/stats.jpg
-share/njam/data/teleport.wav
-share/njam/data/trapdoor.wav
-share/njam/data/tripleding.wav
-share/njam/data/winall.jpg
-share/njam/data/win1.jpg
-share/njam/data/win2.jpg
-share/njam/data/win3.jpg
-share/njam/data/win4.jpg
-share/njam/levels/ORIGINAL.COOP
-share/njam/levels/ORIGINAL.DUEL
-share/njam/levels/BEAMTEAM.DUEL
-share/njam/levels/DRAGON.COOP
-share/njam/levels/DULIO.DUEL
-share/njam/levels/EASY.COOP
-share/njam/levels/HUNT.DUEL
-share/njam/levels/RAVENS CURSE.COOP
-share/njam/levels/WOLF.COOP
-share/njam/levels/readme.txt
-share/njam/njam
-share/njam/skins/Back000.bmp
-share/njam/skins/Back001.bmp
-share/njam/skins/Back002.bmp
-share/njam/skins/Back003.bmp
-share/njam/html/assassin.gif
-share/njam/html/cookie.gif
-share/njam/html/doc-editor.html
-share/njam/html/doc.html
-share/njam/html/doc2.html
-share/njam/html/door.gif
-share/njam/html/freezer.gif
-share/njam/html/ghactive.gif
-share/njam/html/ghinactive.gif
-share/njam/html/hunter.gif
-share/njam/html/invisible.gif
-share/njam/html/juice.gif
-share/njam/html/sample.gif
-share/njam/html/shaddy.gif
-share/njam/html/skin000.gif
-share/njam/html/skin001.gif
-share/njam/html/skin003.gif
-share/njam/html/teleport.gif
-share/njam/html/thinline.gif
-share/njam/html/trap.gif
-@dirrm share/njam/html
-@dirrm share/njam/data
-@dirrm share/njam/levels
-@dirrm share/njam/skins
-@dirrm share/njam
+bin/njam.sh
+%%DATADIR%%/njam.conf
+%%DATADIR%%/njamicon.ico
+%%DATADIR%%/njam.iss
+%%DATADIR%%/njam.rc
+%%DATADIR%%/hiscore.dat
+%%DATADIR%%/README
+%%DATADIR%%/data/50pts.wav
+%%DATADIR%%/data/bonus.wav
+%%DATADIR%%/data/dali.xm
+%%DATADIR%%/data/dead.wav
+%%DATADIR%%/data/dead2.wav
+%%DATADIR%%/data/dead3.wav
+%%DATADIR%%/data/enter-ip.jpg
+%%DATADIR%%/data/font-blue.bmp
+%%DATADIR%%/data/font-yellow.bmp
+%%DATADIR%%/data/freeze.wav
+%%DATADIR%%/data/gameover.jpg
+%%DATADIR%%/data/hiscore.jpg
+%%DATADIR%%/data/invisible.wav
+%%DATADIR%%/data/juice.wav
+%%DATADIR%%/data/kill.wav
+%%DATADIR%%/data/kill2.wav
+%%DATADIR%%/data/kill3.wav
+%%DATADIR%%/data/killply.wav
+%%DATADIR%%/data/levelset.jpg
+%%DATADIR%%/data/mainmenu.jpg
+%%DATADIR%%/data/mapend.wav
+%%DATADIR%%/data/mapend2.wav
+%%DATADIR%%/data/netsend.jpg
+%%DATADIR%%/data/network.bmp
+%%DATADIR%%/data/njamicon.bmp
+%%DATADIR%%/data/options.jpg
+%%DATADIR%%/data/ritam.s3m
+%%DATADIR%%/data/satisfy.xm
+%%DATADIR%%/data/script.txt
+%%DATADIR%%/data/sprites.bmp
+%%DATADIR%%/data/stats.jpg
+%%DATADIR%%/data/teleport.wav
+%%DATADIR%%/data/trapdoor.wav
+%%DATADIR%%/data/tripleding.wav
+%%DATADIR%%/data/winall.jpg
+%%DATADIR%%/data/win1.jpg
+%%DATADIR%%/data/win2.jpg
+%%DATADIR%%/data/win3.jpg
+%%DATADIR%%/data/win4.jpg
+%%DATADIR%%/levels/ALIS.COOP
+%%DATADIR%%/levels/ALISPLUS.COOP
+%%DATADIR%%/levels/ALLSFAIR.DUEL
+%%DATADIR%%/levels/BEAMTEAM.DUEL
+%%DATADIR%%/levels/BEAS.DUEL
+%%DATADIR%%/levels/BUCHI.COOP
+%%DATADIR%%/levels/BUCHI.DUEL
+%%DATADIR%%/levels/DEADLYSPIRIT.DUEL
+%%DATADIR%%/levels/DRAGON.COOP
+%%DATADIR%%/levels/DULIO.DUEL
+%%DATADIR%%/levels/DUNGEON.COOP
+%%DATADIR%%/levels/EASY.COOP
+%%DATADIR%%/levels/EIKE.COOP
+%%DATADIR%%/levels/EIKE.DUEL
+%%DATADIR%%/levels/GAUNTLET.COOP
+%%DATADIR%%/levels/HUNT.DUEL
+%%DATADIR%%/levels/INSANIAC.COOP
+%%DATADIR%%/levels/KILLER.COOP
+%%DATADIR%%/levels/KILLER.DUEL
+%%DATADIR%%/levels/LABYRINTHE.COOP
+%%DATADIR%%/levels/LABYRINTHE.DUEL
+%%DATADIR%%/levels/LA_GINECAL.COOP
+%%DATADIR%%/levels/ONE4ALL.COOP
+%%DATADIR%%/levels/ORIGINAL.COOP
+%%DATADIR%%/levels/ORIGINAL.DUEL
+%%DATADIR%%/levels/RAVENS CURSE.COOP
+%%DATADIR%%/levels/SPIRITWORLD.COOP
+%%DATADIR%%/levels/STEPHANE.DUEL
+%%DATADIR%%/levels/WOLF.COOP
+%%DATADIR%%/levels/readme.txt
+%%DATADIR%%/skins/Back000.bmp
+%%DATADIR%%/skins/Back001.bmp
+%%DATADIR%%/skins/Back002.bmp
+%%DATADIR%%/skins/Back003.bmp
+%%DATADIR%%/html/assassin.gif
+%%DATADIR%%/html/cookie.gif
+%%DATADIR%%/html/doc-editor.html
+%%DATADIR%%/html/doc.html
+%%DATADIR%%/html/doc2.html
+%%DATADIR%%/html/door.gif
+%%DATADIR%%/html/freezer.gif
+%%DATADIR%%/html/ghactive.gif
+%%DATADIR%%/html/ghinactive.gif
+%%DATADIR%%/html/hunter.gif
+%%DATADIR%%/html/invisible.gif
+%%DATADIR%%/html/juice.gif
+%%DATADIR%%/html/sample.gif
+%%DATADIR%%/html/shaddy.gif
+%%DATADIR%%/html/skin000.gif
+%%DATADIR%%/html/skin001.gif
+%%DATADIR%%/html/skin003.gif
+%%DATADIR%%/html/teleport.gif
+%%DATADIR%%/html/thinline.gif
+%%DATADIR%%/html/trap.gif
+@dirrm %%DATADIR%%/html
+@dirrm %%DATADIR%%/data
+@dirrm %%DATADIR%%/levels
+@dirrm %%DATADIR%%/skins
+@dirrm %%DATADIR%%
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/assassin.gif
 %%PORTDOCS%%%%DOCSDIR%%/cookie.gif