From owner-freebsd-ports  Fri Oct 27 15:50:30 2000
Delivered-To: freebsd-ports@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 0BDDC37B4FE
	for <freebsd-ports@FreeBSD.org>; Fri, 27 Oct 2000 15:50:02 -0700 (PDT)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id PAA38381;
	Fri, 27 Oct 2000 15:50:02 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0E61937B479; Fri, 27 Oct 2000 15:47:49 -0700 (PDT)
Message-Id: <20001027224749.0E61937B479@hub.freebsd.org>
Date: Fri, 27 Oct 2000 15:47:49 -0700 (PDT)
From: tkato@prontomail.ne.jp
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-1.0
Subject: ports/22364: Update port: games/xdigger
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         22364
>Category:       ports
>Synopsis:       Update port: games/xdigger
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Oct 27 15:50:01 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.1.1-RELEASE i386
>Organization:
>Environment:
>Description:
- Fix Imakefile breakage under XFree86 4.x

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/games/xdigger/Makefile games/xdigger/Makefile
--- /usr/ports/games/xdigger/Makefile	Fri Aug 18 18:28:20 2000
+++ games/xdigger/Makefile	Fri Oct 27 03:03:39 2000
@@ -16,18 +16,13 @@
 
 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 -urN /usr/ports/games/xdigger/files/patch-aa games/xdigger/files/patch-aa
--- /usr/ports/games/xdigger/files/patch-aa	Sun Apr  2 09:59:50 2000
+++ games/xdigger/files/patch-aa	Thu Oct 26 04:41:20 2000
@@ -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 -urN /usr/ports/games/xdigger/files/patch-ad games/xdigger/files/patch-ad
--- /usr/ports/games/xdigger/files/patch-ad	Sun Apr  2 09:59:50 2000
+++ games/xdigger/files/patch-ad	Fri Oct 27 03:04:38 2000
@@ -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::


>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message