6 files changed, 33 insertions, 30 deletions

diff --git a/games/dodgindiamond2/Makefile b/games/dodgindiamond2/Makefile
index 1d2d13d44706..f5e6ed4f271c 100644
--- a/games/dodgindiamond2/Makefile
+++ b/games/dodgindiamond2/Makefile
@@ -11,25 +11,28 @@ DISTNAME=	dd2-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Old school shoot'em up game
 
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 USE_SDL=	sdl image mixer
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var/games
 
-OPTIONS_DEFINE=	DOCS
+DATADIR=	${PREFIX}/share/dd2
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|COPYING||g' ${WRKSRC}/Makefile.in
-.if empty(PORT_OPTIONS:MDOCS)
+
+post-patch-DOCS-off:
 	@${REINPLACE_CMD} '/install-data-am:/s/install-docsDATA//' \
 		${WRKSRC}/Makefile.in
-.endif
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc
 	${INSTALL_DATA} ${WRKSRC}/src/data/dd2.cfg ${STAGEDIR}${PREFIX}/etc/dd2.cfg.sample
-	${MKDIR} ${STAGEDIR}/var/games
+	@${MKDIR} ${STAGEDIR}/var/games
 	${TOUCH} ${STAGEDIR}/var/games/dd2-hiscore.sample
 
 .include <bsd.port.mk>
diff --git a/games/dodgindiamond2/files/patch-src__Makefile.in b/games/dodgindiamond2/files/patch-src__Makefile.in
index f0b924eeede9..15ef7529fcf1 100644
--- a/games/dodgindiamond2/files/patch-src__Makefile.in
+++ b/games/dodgindiamond2/files/patch-src__Makefile.in
@@ -1,6 +1,6 @@
---- src/Makefile.in.orig	Thu Jul 15 15:23:01 2004
-+++ src/Makefile.in	Thu Jul 15 15:23:41 2004
-@@ -73,7 +73,7 @@
+--- src/Makefile.in.orig	2007-08-16 17:11:33 UTC
++++ src/Makefile.in
+@@ -73,7 +73,7 @@ bin_PROGRAMS = dd2
  dd2_SOURCES = menu.c SDL_plus.c cfg.c engine.c control.c engine.h control.h cfg.h SDL_plus.h menu.h main.c main.h
  EXTRA_DIST = menu.c SDL_plus.c cfg.c engine.c control.c engine.h control.h cfg.h SDL_plus.h menu.h main.c main.h
  
diff --git a/games/dodgindiamond2/files/patch-src__data__Makefile.in b/games/dodgindiamond2/files/patch-src__data__Makefile.in
index 54a315bc23ec..6fa531b2ad19 100644
--- a/games/dodgindiamond2/files/patch-src__data__Makefile.in
+++ b/games/dodgindiamond2/files/patch-src__data__Makefile.in
@@ -1,6 +1,6 @@
---- src/data/Makefile.in.orig	Fri Jul  2 17:43:12 2004
-+++ src/data/Makefile.in	Thu Jul 15 15:28:35 2004
-@@ -65,7 +65,7 @@
+--- src/data/Makefile.in.orig	2007-08-16 17:11:33 UTC
++++ src/data/Makefile.in
+@@ -65,7 +65,7 @@ SDL_CONFIG = @SDL_CONFIG@
  SDL_LIBS = @SDL_LIBS@
  VERSION = @VERSION@
  
@@ -9,7 +9,7 @@
  
  EXTRA_DIST = bgm1.xm bgm2.xm efx1.wav efx2.wav efx3.wav efx4.wav efx5.wav efx6.wav efx7.wav efx8.wav gfx.bmp dd2.cfg game.act dd2-hiscore
  
-@@ -192,7 +192,6 @@
+@@ -197,7 +197,6 @@ maintainer-clean-generic clean mostlycle
  
  
  install-data-hook:
diff --git a/games/dodgindiamond2/files/patch-src__main.c b/games/dodgindiamond2/files/patch-src__main.c
index ad1f4590b3a8..3c41f58577bd 100644
--- a/games/dodgindiamond2/files/patch-src__main.c
+++ b/games/dodgindiamond2/files/patch-src__main.c
@@ -1,6 +1,6 @@
---- src/main.c.orig	Thu Jul 15 15:04:36 2004
-+++ src/main.c	Thu Jul 15 15:17:57 2004
-@@ -284,7 +284,7 @@
+--- src/main.c.orig	2007-08-14 18:59:42 UTC
++++ src/main.c
+@@ -285,7 +285,7 @@ main (int argc, char *argv[])
  	sprintf(buffer,"%.500s/.dd2rc",getenv("HOME"));
  	if(!loadCFG(buffer,&conf)) {
  		/* if there's no local, use global */
@@ -9,7 +9,7 @@
  		if(!loadCFG(buffer,&conf))
  			fprintf(stderr,"unable to read configuration, using defaults\n");
  	}
-@@ -295,7 +295,7 @@
+@@ -296,7 +296,7 @@ main (int argc, char *argv[])
  #endif
  
  	/* read hi-scores */
@@ -18,7 +18,7 @@
  	if(!loadScore(buffer,hiscore))
  		fprintf(stderr,"unable to read hi-scores, using defaults\n");
  
-@@ -462,7 +462,7 @@
+@@ -463,7 +463,7 @@ main (int argc, char *argv[])
  	saveCFG(buffer,&conf);
  
  	/* save hi-scores */
diff --git a/games/dodgindiamond2/pkg-descr b/games/dodgindiamond2/pkg-descr
index dc4223f1b02e..d4e83eef6273 100644
--- a/games/dodgindiamond2/pkg-descr
+++ b/games/dodgindiamond2/pkg-descr
@@ -3,4 +3,4 @@ aims to be an 'old school' arcade game with low resolution graphics,
 top-down scroll action, energy based gameplay and different weapons
 with several levels of power.
 
-WWW: http://www.usebox.net/jjm/dd2/
+WWW: https://www.usebox.net/jjm/dd2/
diff --git a/games/dodgindiamond2/pkg-plist b/games/dodgindiamond2/pkg-plist
index 07045419a9bf..45e8ce48d808 100644
--- a/games/dodgindiamond2/pkg-plist
+++ b/games/dodgindiamond2/pkg-plist
@@ -1,18 +1,18 @@
 @(,games,2755) bin/dd2
 @sample(,games,664) /var/games/dd2-hiscore.sample
 @sample etc/dd2.cfg.sample
-share/dd2/bgm1.xm
-share/dd2/bgm2.xm
-share/dd2/efx1.wav
-share/dd2/efx2.wav
-share/dd2/efx3.wav
-share/dd2/efx4.wav
-share/dd2/efx5.wav
-share/dd2/efx6.wav
-share/dd2/efx7.wav
-share/dd2/efx8.wav
-share/dd2/game.act
-share/dd2/gfx.bmp
+%%DATADIR%%/bgm1.xm
+%%DATADIR%%/bgm2.xm
+%%DATADIR%%/efx1.wav
+%%DATADIR%%/efx2.wav
+%%DATADIR%%/efx3.wav
+%%DATADIR%%/efx4.wav
+%%DATADIR%%/efx5.wav
+%%DATADIR%%/efx6.wav
+%%DATADIR%%/efx7.wav
+%%DATADIR%%/efx8.wav
+%%DATADIR%%/game.act
+%%DATADIR%%/gfx.bmp
 %%PORTDOCS%%share/doc/dd2/AUTHORS
 %%PORTDOCS%%share/doc/dd2/ChangeLog
 %%PORTDOCS%%share/doc/dd2/NEWS