summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--games/merlin/Makefile13
-rw-r--r--games/merlin/files/patch-aa6
-rw-r--r--games/merlin/pkg-descr2
3 files changed, 11 insertions, 10 deletions
diff --git a/games/merlin/Makefile b/games/merlin/Makefile
index 49ed84ae2359..47349b91b4fa 100644
--- a/games/merlin/Makefile
+++ b/games/merlin/Makefile
@@ -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_WRKSUBDIR= yes
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 --git a/games/merlin/files/patch-aa b/games/merlin/files/patch-aa
index 589bb717c3fe..d06a98bb9252 100644
--- a/games/merlin/files/patch-aa
+++ b/games/merlin/files/patch-aa
@@ -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 --git a/games/merlin/pkg-descr b/games/merlin/pkg-descr
index 3b8a498f03f5..da1f3371624f 100644
--- a/games/merlin/pkg-descr
+++ b/games/merlin/pkg-descr
@@ -8,4 +8,4 @@ button costs a point. If you clear the board, you get some more points
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