Fix Imakefile breakage under XFree86 4.x

PR: 22364
Submitted by: Ports Fury

3 files changed, 23 insertions, 17 deletions

diff --git a/games/xdigger/Makefile b/games/xdigger/Makefile
index 70b5def80e1d..f4d102086ab7 100644
--- a/games/xdigger/Makefile
+++ b/games/xdigger/Makefile
@@ -16,18 +16,13 @@ MAINTAINER=	ports@FreeBSD.org
 
 USE_IMAKE=	yes
 MAN6=		xdigger.6
-MANCOMPRESSED=	no
 
 post-patch:
 	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/configure.h
 
-do-install:
-	${INSTALL_PROGRAM} -m 2755 -o root -g games ${WRKSRC}/xdigger ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/xdigger.man ${PREFIX}/man/man6/xdigger.6
-	@${MKDIR} ${PREFIX}/share/xdigger
-	${INSTALL_DATA} ${WRKSRC}/xdigger.level ${PREFIX}/share/xdigger
-	${INSTALL_DATA} ${WRKSRC}/audio/*.au ${PREFIX}/share/xdigger
-	@${TOUCH} ${PREFIX}/share/xdigger/xdigger.hiscore
+post-install:
+	@${CHMOD} 2755 ${PREFIX}/bin/xdigger
+	@${CHOWN} root:games ${PREFIX}/bin/xdigger
 	@${CHMOD} 664 ${PREFIX}/share/xdigger/xdigger.hiscore
 	@${CHOWN} root:games ${PREFIX}/share/xdigger/xdigger.hiscore
 .if !defined(NOPORTDOCS)
diff --git a/games/xdigger/files/patch-aa b/games/xdigger/files/patch-aa
index 119e40e9fbec..13b379e78c52 100644
--- a/games/xdigger/files/patch-aa
+++ b/games/xdigger/files/patch-aa
@@ -1,16 +1,13 @@
---- configure.h.orig	Thu Jan  1 00:06:00 1998
-+++ configure.h	Thu Mar 30 03:40:23 2000
-@@ -19,8 +19,13 @@
+--- configure.h.orig	Sun Jul  4 18:50:04 1999
++++ configure.h	Thu Oct 26 04:40:37 2000
+@@ -19,8 +19,8 @@
  #define _CONFIGURE_H
  
  /* Directories */
-+#ifdef __FreeBSD__
+-#define XDIGGER_LIB_DIR     "/usr/lib/X11/xdigger"
+-#define XDIGGER_HISCORE_DIR "/var/X11R6/scores"
 +#define XDIGGER_LIB_DIR     "%%PREFIX%%/share/xdigger"
 +#define XDIGGER_HISCORE_DIR "%%PREFIX%%/share/xdigger"
-+#else
- #define XDIGGER_LIB_DIR     "/usr/lib/X11/xdigger"
- #define XDIGGER_HISCORE_DIR "/var/X11R6/scores"
-+#endif
  
  #define SOUND_DSP_AUDIO
  
diff --git a/games/xdigger/files/patch-ad b/games/xdigger/files/patch-ad
index 05c4033ad37d..02b3e2bc2d95 100644
--- a/games/xdigger/files/patch-ad
+++ b/games/xdigger/files/patch-ad
@@ -1,5 +1,5 @@
 --- Imakefile.orig	Sun Jul  4 18:47:11 1999
-+++ Imakefile	Thu Mar 30 03:59:25 2000
++++ Imakefile	Fri Oct 27 03:04:18 2000
 @@ -1,12 +1,12 @@
  #include "configure.h"
  
@@ -16,3 +16,17 @@
  
  #ifdef SOUND_RPLAY
  RPLAYLIB = -lrplay
+@@ -23,12 +23,10 @@
+ 
+ ComplexProgramTarget(xdigger)
+ InstallNonExecFile(xdigger.level,XDIGGER_LIB_DIR)
+-#ifdef SOUND_RPLAY
+ InstallNamedNonExec(audio/diamond.au,diamond.au,XDIGGER_LIB_DIR)
+ InstallNamedNonExec(audio/step.au,step.au,XDIGGER_LIB_DIR)
+ InstallNamedNonExec(audio/stone.au,stone.au,XDIGGER_LIB_DIR)
+-#endif
+-InstallNamedNonExec(pixmaps/xdigger.xpm,xdigger.xpm,$(ICONDIR))
++/* InstallNamedNonExec(pixmaps/xdigger.xpm,xdigger.xpm,$(ICONDIR)) */
+ /* InstallNonExecFileNoClobber(xdigger.hiscore,XDIGGER_HISCORE_DIR) */
+ 
+ install::