Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 12 Jun 2000 12:06:15 -0700 (PDT)
From:      tkato@prontomail.ne.jp
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/19220: Update port: games/merlin
Message-ID:  <20000612190615.2204837B6BF@hub.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         19220
>Category:       ports
>Synopsis:       Update port: games/merlin
>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:   Mon Jun 12 12:10:01 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.0-RELEASE i386
>Organization:
>Environment:
>Description:
- Update MASTER_SITES and WWW: line of pkg/DESCR
- Support LOCALBASE properly

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/games/merlin/Makefile games/merlin/Makefile
--- /usr/ports/games/merlin/Makefile	Sat Apr 15 06:31:34 2000
+++ games/merlin/Makefile	Sat Jun 10 11:25:42 2000
@@ -8,7 +8,7 @@
 PORTNAME=	merlin
 PORTVERSION=	1.0
 CATEGORIES=	games
-MASTER_SITES=	http://outoften.doc.ic.ac.uk/~np2/software/download/
+MASTER_SITES=	http://www-dse.doc.ic.ac.uk/~np2/software/download/
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
@@ -19,14 +19,15 @@
 NO_BUILD=	yes
 USE_X_PREFIX=	yes
 
-post-extract:
-	@ ${MV} ${WRKSRC}/merlin.tcl ${WRKSRC}/merlin
+post-patch:
+	@${SED} -e "s:%%LOCALBASE%%:${LOCALBASE}:g" \
+		${WRKSRC}/merlin.tcl > ${WRKSRC}/merlin
 
 do-install:
-	@ ${INSTALL_SCRIPT} ${WRKSRC}/${DISTNAME} ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/merlin ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${PREFIX}/share/doc/merlin
-	@ ${INSTALL_DATA} ${WRKSRC}/merlin.README.txt ${PREFIX}/share/doc/merlin/README
+	@${MKDIR} ${PREFIX}/share/doc/merlin
+	${INSTALL_DATA} ${WRKSRC}/merlin.README.txt ${PREFIX}/share/doc/merlin/README
 .endif
 
 .include <bsd.port.mk>
diff -urN /usr/ports/games/merlin/patches/patch-aa games/merlin/patches/patch-aa
--- /usr/ports/games/merlin/patches/patch-aa	Mon Nov 29 03:31:25 1999
+++ games/merlin/patches/patch-aa	Sat Jun 10 11:26:10 2000
@@ -1,8 +1,8 @@
---- merlin.orig	Mon Jul  7 11:28:19 1997
-+++ merlin	Sun Aug 23 18:09:17 1998
+--- merlin.tcl.orig	Mon Jul  7 11:28:19 1997
++++ merlin.tcl	Sun Aug 23 18:09:17 1998
 @@ -1,4 +1,4 @@
 -#!/usr/local/bin/wish4.1
-+#!/usr/local/bin/wish8.2
++#!%%LOCALBASE%%/bin/wish8.2
  # 
  # Merlin - a pointless puzzle game
  #
diff -urN /usr/ports/games/merlin/pkg/DESCR games/merlin/pkg/DESCR
--- /usr/ports/games/merlin/pkg/DESCR	Mon May  3 07:14:48 1999
+++ games/merlin/pkg/DESCR	Sat Jun 10 11:14:58 2000
@@ -8,4 +8,4 @@
 and a new level to solve.  If you run out of points, the game is over.
 Merlin records the high-score and the high-level between games.
 
-WWW: http://outofnet.doc.ac.ic.uk/~np2/software/merlin.html
+WWW: http://www-dse.doc.ac.ic.uk/~np2/software/merlin.html


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


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




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000612190615.2204837B6BF>