summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorobache <obache@pkgsrc.org>2008-01-04 05:36:35 +0000
committerobache <obache@pkgsrc.org>2008-01-04 05:36:35 +0000
commitdfcce693b39f4c64f93d0c3015ad37d8b74b1076 (patch)
treedfa0e0ed2de44e58bef5bece6de36a5d21035428
parent898f026a27ec430541e1178fb168352691d8aaf0 (diff)
downloadpkgsrc-dfcce693b39f4c64f93d0c3015ad37d8b74b1076.tar.gz
Change patch & sed to USE_TOOLS & REPLACE_INTERPRETER.
-rw-r--r--misc/zorro/Makefile13
-rw-r--r--misc/zorro/distinfo3
-rw-r--r--misc/zorro/patches/patch-aa19
3 files changed, 9 insertions, 26 deletions
diff --git a/misc/zorro/Makefile b/misc/zorro/Makefile
index 8b1e9efea79..4098e88882f 100644
--- a/misc/zorro/Makefile
+++ b/misc/zorro/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2008/01/04 05:11:32 obache Exp $
+# $NetBSD: Makefile,v 1.26 2008/01/04 05:36:35 obache Exp $
DISTNAME= zorro-1.1p8
PKGNAME= zorro-1.1.8
@@ -15,14 +15,17 @@ DEPENDS+= tk>=8.3.2:../../x11/tk
NO_BUILD= yes
+USE_TOOLS+= wish
+
+REPLACE_INTERPRETER+= wish
+REPLACE.wish.old= [^[:space:]]*wish
+REPLACE.wish.new= ${WISH}
+REPLACE_FILES.wish= zorro
+
PKG_DESTDIR_SUPPORT= user-destdir
INSTALLATION_DIRS= bin share/zorro
-post-patch:
- ( cd ${WRKSRC} ; ${SED} 's|@PREFIX@|'${PREFIX}'|g' \
- <zorro >zorro.BAK ; ${MV} zorro.BAK zorro )
-
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/zorro ${DESTDIR}${PREFIX}/bin/zorro
${INSTALL_DATA} ${WRKSRC}/DOTzorrorc ${DESTDIR}${PREFIX}/share/zorro
diff --git a/misc/zorro/distinfo b/misc/zorro/distinfo
index 7e1841033d9..4add27a2590 100644
--- a/misc/zorro/distinfo
+++ b/misc/zorro/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 11:02:59 agc Exp $
+$NetBSD: distinfo,v 1.4 2008/01/04 05:36:35 obache Exp $
SHA1 (zorro-1.1p8.tar.gz) = 216c1b1c3c652791f89661c92abb39059d5086ce
RMD160 (zorro-1.1p8.tar.gz) = 85f126b4906dbd680080ba8b88c810361ed2340f
Size (zorro-1.1p8.tar.gz) = 14672 bytes
-SHA1 (patch-aa) = 4424f317aeaa08e359544471ef7c716ebf7685ab
SHA1 (patch-ab) = 426b97beb92837f8f1c63ae7c0b6937cfd75ff93
diff --git a/misc/zorro/patches/patch-aa b/misc/zorro/patches/patch-aa
deleted file mode 100644
index 0f17679a5bb..00000000000
--- a/misc/zorro/patches/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2000/08/31 14:51:52 jwise Exp $
-
-*** zorro.orig Sat Aug 3 22:52:54 1996
---- zorro Sat Aug 3 22:53:10 1996
-***************
-*** 1,6 ****
-! #!/usr/local/bin/wish
- #
-! # Version 1.1 Patch 7
- #
- # ----------------------------------------------------------------------
- # AUTHOR: Lindsay Marshall <lindsay.marshall@newcastle.ac.uk>
---- 1,6 ----
-! #!/@PREFIX@/bin/wish
- #
-! # Version 1.1 Patch 8
- #
- # ----------------------------------------------------------------------
- # AUTHOR: Lindsay Marshall <lindsay.marshall@newcastle.ac.uk>