From 8cf271c6e87684e5c59b2dc80574a145a78c786f Mon Sep 17 00:00:00 2001 From: ghen Date: Thu, 9 Mar 2006 14:50:31 +0000 Subject: Use REPLACE_INTERPRETER instead of a patch. --- converters/fribidi/Makefile | 7 ++++++- converters/fribidi/distinfo | 3 +-- converters/fribidi/patches/patch-aa | 10 ---------- editors/ce/Makefile | 7 ++++++- editors/ce/distinfo | 4 ++-- editors/ce/patches/patch-ab | 10 ++-------- games/orbital_eunuchs_sniper/Makefile | 7 ++++++- games/orbital_eunuchs_sniper/distinfo | 3 +-- games/orbital_eunuchs_sniper/patches/patch-ac | 10 ---------- geography/gpspoint/Makefile | 7 ++++++- geography/gpspoint/distinfo | 4 ++-- geography/gpspoint/patches/patch-aa | 21 ++++++++++----------- graphics/aview/Makefile | 7 ++++++- graphics/aview/distinfo | 3 +-- graphics/aview/patches/patch-ab | 10 ---------- sysutils/tob/Makefile | 7 ++++++- sysutils/tob/distinfo | 4 ++-- sysutils/tob/patches/patch-aa | 8 +------- textproc/antiword/Makefile | 7 ++++++- textproc/antiword/distinfo | 4 ++-- textproc/antiword/patches/patch-ab | 7 +------ wm/ratpoison/Makefile | 7 ++++++- wm/ratpoison/distinfo | 4 ++-- wm/ratpoison/patches/patch-aa | 8 +------- x11/xteddy2/Makefile | 7 ++++++- x11/xteddy2/distinfo | 4 ++-- x11/xteddy2/patches/patch-ac | 9 ++++----- 27 files changed, 88 insertions(+), 101 deletions(-) delete mode 100644 converters/fribidi/patches/patch-aa delete mode 100644 games/orbital_eunuchs_sniper/patches/patch-ac delete mode 100644 graphics/aview/patches/patch-ab diff --git a/converters/fribidi/Makefile b/converters/fribidi/Makefile index d6edf93b971..9bd2530293a 100644 --- a/converters/fribidi/Makefile +++ b/converters/fribidi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/03/04 21:29:06 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2006/03/09 14:50:31 ghen Exp $ # DISTNAME= fribidi-0.10.4 @@ -11,6 +11,11 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://fribidi.sourceforge.net/ COMMENT= Free Implementation of the Unicode Bidirectional Algorithm +REPLACE_INTERPRETER+= bash +_REPLACE.bash.old= /bin/bash +_REPLACE.bash.new= ${SH:Q} +_REPLACE_FILES.bash= run.tests + USE_LIBTOOL= yes GNU_CONFIGURE= yes USE_TOOLS+= pkg-config diff --git a/converters/fribidi/distinfo b/converters/fribidi/distinfo index 10585c0d75f..ea87a759a26 100644 --- a/converters/fribidi/distinfo +++ b/converters/fribidi/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.2 2005/02/23 16:12:33 agc Exp $ +$NetBSD: distinfo,v 1.3 2006/03/09 14:50:31 ghen Exp $ SHA1 (fribidi-0.10.4.tar.bz2) = a77f55797095ea5de6e620370f5968b891aed103 RMD160 (fribidi-0.10.4.tar.bz2) = 9afd13f64ba8907ece99b7c04a7d4e98b23f9d92 Size (fribidi-0.10.4.tar.bz2) = 335733 bytes -SHA1 (patch-aa) = bc930c1df929716aa5e4bf8e8951668f15f71ec0 diff --git a/converters/fribidi/patches/patch-aa b/converters/fribidi/patches/patch-aa deleted file mode 100644 index 56d825f52d0..00000000000 --- a/converters/fribidi/patches/patch-aa +++ /dev/null @@ -1,10 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2003/12/14 01:16:39 xtraeme Exp $ - ---- run.tests.orig Mon Oct 6 14:12:47 2003 -+++ run.tests Mon Oct 6 14:12:57 2003 -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - # run.tests - Check that the algorithm does what it is supposed to - # Copyright (C) 1999,2000 Dov Grobgeld, and - # Copyright (C) 2001,2002 Behdad Esfahbod. diff --git a/editors/ce/Makefile b/editors/ce/Makefile index 52a77c9e0b7..811b8c9d1db 100644 --- a/editors/ce/Makefile +++ b/editors/ce/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/05/23 09:17:45 rillig Exp $ +# $NetBSD: Makefile,v 1.15 2006/03/09 14:50:31 ghen Exp $ # .include "Makefile.common" @@ -7,6 +7,11 @@ COMMENT+= , tty version PKG_INSTALLATION_TYPES= overwrite pkgviews +REPLACE_INTERPRETER+= bash +_REPLACE.bash.old= .*/bin/bash +_REPLACE.bash.new= ${SH:Q} +_REPLACE_FILES.bash= teach-ce.in + BUILD_TARGET= ce INSTALL_TARGET= install man-install diff --git a/editors/ce/distinfo b/editors/ce/distinfo index 0e9b897717d..17bd9d8cf5f 100644 --- a/editors/ce/distinfo +++ b/editors/ce/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.6 2006/01/13 10:10:46 schmonz Exp $ +$NetBSD: distinfo,v 1.7 2006/03/09 14:50:31 ghen Exp $ SHA1 (ce-4.6.tar.gz) = 94d7ef6db3e9baf60205e922038d040380b67879 RMD160 (ce-4.6.tar.gz) = 9a9f55d639f5bae7a4f9a18b4480333bfe400785 Size (ce-4.6.tar.gz) = 287489 bytes SHA1 (patch-aa) = 50322176da6a8dc2460aadf649a7f4dd2979a047 -SHA1 (patch-ab) = 4c9cc4535ce750e84efc65ce9aed08581aa302d6 +SHA1 (patch-ab) = d41e4ece57025fe0c65a7897e55e34b51717f659 diff --git a/editors/ce/patches/patch-ab b/editors/ce/patches/patch-ab index 6e6e63e0e01..fcf9f413ac3 100644 --- a/editors/ce/patches/patch-ab +++ b/editors/ce/patches/patch-ab @@ -1,13 +1,7 @@ -$NetBSD: patch-ab,v 1.2 2005/01/08 07:46:15 schmonz Exp $ +$NetBSD: patch-ab,v 1.3 2006/03/09 14:50:31 ghen Exp $ ---- teach-ce.in.orig 1999-03-30 12:56:24.000000000 -0500 +--- teach-ce.in.orig 2006-03-09 15:27:38.000000000 +0100 +++ teach-ce.in -@@ -1,4 +1,4 @@ --#! /bin/bash -+#! /bin/sh - # - # @configure_input@ - # @@ -34,7 +34,7 @@ esac export PATH diff --git a/games/orbital_eunuchs_sniper/Makefile b/games/orbital_eunuchs_sniper/Makefile index ae8e0c4d9f5..026f7883352 100644 --- a/games/orbital_eunuchs_sniper/Makefile +++ b/games/orbital_eunuchs_sniper/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2006/02/05 23:09:21 joerg Exp $ +# $NetBSD: Makefile,v 1.8 2006/03/09 14:50:31 ghen Exp $ # DISTNAME= orbital_eunuchs_sniper-1.29 @@ -13,6 +13,11 @@ COMMENT= Overhead shooting game GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-games-dir=${PREFIX}/libexec +REPLACE_INTERPRETER+= bash +_REPLACE.bash.old= .*/bin/bash +_REPLACE.bash.new= ${SH:Q} +_REPLACE_FILES.bash= src/snipe2d.in + post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/orbital_eunuchs_sniper ${INSTALL_DATA} ${WRKSRC}/README \ diff --git a/games/orbital_eunuchs_sniper/distinfo b/games/orbital_eunuchs_sniper/distinfo index 7110e6ad5f3..bd9f47f7027 100644 --- a/games/orbital_eunuchs_sniper/distinfo +++ b/games/orbital_eunuchs_sniper/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.4 2005/02/23 23:12:01 agc Exp $ +$NetBSD: distinfo,v 1.5 2006/03/09 14:50:31 ghen Exp $ SHA1 (orbital_eunuchs_sniper-1.29.tar.gz) = c5c33de0645c717b35e6eff7c88946e9de65b866 RMD160 (orbital_eunuchs_sniper-1.29.tar.gz) = 49520028f6f21e9163c37fcf14030a4868a01b01 Size (orbital_eunuchs_sniper-1.29.tar.gz) = 4043177 bytes SHA1 (patch-aa) = 05ce263d290c8508c49d0902418ed56d9f129cb9 SHA1 (patch-ab) = 23fc32880df6c5457fd2f303988e24d9de76b587 -SHA1 (patch-ac) = d2e2e7f5f96248c6327f3a29ae714c8aff55b3b8 SHA1 (patch-ad) = 94d479604dad6737ab85b7260f2b0e125de24df9 diff --git a/games/orbital_eunuchs_sniper/patches/patch-ac b/games/orbital_eunuchs_sniper/patches/patch-ac deleted file mode 100644 index 36aa98b33f6..00000000000 --- a/games/orbital_eunuchs_sniper/patches/patch-ac +++ /dev/null @@ -1,10 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 2004/07/23 16:07:15 wiz Exp $ - ---- src/snipe2d.in.orig 2002-10-08 06:42:52.000000000 +0200 -+++ src/snipe2d.in -@@ -1,4 +1,4 @@ --#! /bin/bash -+#! /bin/sh - prefix=@prefix@ - cd @datadir@/@PACKAGE@ - ./snipe2d.x86.dynamic $* diff --git a/geography/gpspoint/Makefile b/geography/gpspoint/Makefile index 477b2a7c3a4..74c64506771 100644 --- a/geography/gpspoint/Makefile +++ b/geography/gpspoint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/04/11 21:45:59 tv Exp $ +# $NetBSD: Makefile,v 1.6 2006/03/09 14:50:31 ghen Exp $ DISTNAME= gpspoint-2.030521 PKGREVISION= 1 @@ -15,4 +15,9 @@ USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes +REPLACE_INTERPRETER+= bash +_REPLACE.bash.old= /bin/bash +_REPLACE.bash.new= ${SH:Q} +_REPLACE_FILES.bash= src/mgpspoint + .include "../../mk/bsd.pkg.mk" diff --git a/geography/gpspoint/distinfo b/geography/gpspoint/distinfo index 902c31d7ba0..9a8b1b28747 100644 --- a/geography/gpspoint/distinfo +++ b/geography/gpspoint/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2005/02/22 21:08:32 agc Exp $ +$NetBSD: distinfo,v 1.3 2006/03/09 14:50:31 ghen Exp $ SHA1 (gpspoint-2.030521.tar.gz) = b65466fae17e35bed019869d66515acc388b3242 RMD160 (gpspoint-2.030521.tar.gz) = a1be4a5230488965533254a82cf0f57fe7abbfb8 Size (gpspoint-2.030521.tar.gz) = 235522 bytes -SHA1 (patch-aa) = 0f20b9a87eeff5d9c3fbc203b183b24be87bbd9c +SHA1 (patch-aa) = 0e5c2cf25fc46c923bbcb11296f24679f7e743ee diff --git a/geography/gpspoint/patches/patch-aa b/geography/gpspoint/patches/patch-aa index 829f747db9d..8b7308f231c 100644 --- a/geography/gpspoint/patches/patch-aa +++ b/geography/gpspoint/patches/patch-aa @@ -1,15 +1,14 @@ -$NetBSD: patch-aa,v 1.1.1.1 2003/10/04 20:51:18 jschauma Exp $ +$NetBSD: patch-aa,v 1.2 2006/03/09 14:50:31 ghen Exp $ ---- src/mgpspoint.orig 2003-05-19 14:56:49.000000000 -0400 -+++ src/mgpspoint 2003-10-04 15:33:45.000000000 -0400 +--- src/mgpspoint.orig 2006-03-09 15:32:06.000000000 +0100 ++++ src/mgpspoint @@ -1,4 +1,5 @@ --#!/bin/bash -+#!/bin/sh + #!/bin/bash +set -x -@@ -10,7 +11,7 @@ +@@ -10,7 +11,7 @@ if [ $GPSPOINT="" ]; then GPSPOINT=$(which gpspoint); fi @@ -18,7 +17,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/10/04 20:51:18 jschauma Exp $ GPSPORT=/dev/gps fi -@@ -19,7 +20,7 @@ +@@ -19,7 +20,7 @@ if [ $GPSDATADIR="" ]; then fi tempfile=`tempfile -p GPSPT 2>/dev/null` || tempfile=/tmp/test$$ @@ -27,7 +26,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/10/04 20:51:18 jschauma Exp $ WAYPOINTS=true; ROUTES=false; -@@ -28,7 +29,7 @@ +@@ -28,7 +29,7 @@ TRACKS=false; ############################################################# main menu QUIT=0; while [ $QUIT = 0 ]; do @@ -36,7 +35,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/10/04 20:51:18 jschauma Exp $ --menu "Welcome to menu for gpspoint. Mayby check settings first\ and try info afterwards. Have fun. " 16 51 8 \ "about" "" \ -@@ -81,7 +82,7 @@ +@@ -81,7 +82,7 @@ while [ $QUIT = 0 ]; do FILE=$(date +%y-%m-%d_somegpsdata.gpd); while $DOWNLOADMENU ; do DOWNLOAD=true; @@ -45,7 +44,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/10/04 20:51:18 jschauma Exp $ "continue" ""\ "waypoints" "$WAYPOINTS" \ "routes" "$ROUTES" \ -@@ -138,7 +139,7 @@ +@@ -138,7 +139,7 @@ while [ $QUIT = 0 ]; do FILE=$(date +%y-%m-%d_somegpsdata.gpd); while $UPLOADMENU ; do UPLOAD=true; @@ -54,7 +53,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/10/04 20:51:18 jschauma Exp $ "continue" ""\ "waypoints" "$WAYPOINTS" \ "routes" "$ROUTES" \ -@@ -192,7 +193,7 @@ +@@ -192,7 +193,7 @@ while [ $QUIT = 0 ]; do settings) ####################################################### settings QUITSETTINGS=0; while [ $QUITSETTINGS = 0 ]; do diff --git a/graphics/aview/Makefile b/graphics/aview/Makefile index f5e5d0a9bf5..9cf0ab53a4d 100644 --- a/graphics/aview/Makefile +++ b/graphics/aview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2006/02/05 23:09:28 joerg Exp $ +# $NetBSD: Makefile,v 1.17 2006/03/09 14:50:31 ghen Exp $ # DISTNAME= aview-1.3.0rc1 @@ -31,6 +31,11 @@ SUBST_SED.programs+= -e 's,@BIN_PROGRAMS@,aview aaflip,g' SUBST_SED.programs+= -e 's,@BIN_PROGRAMS@,aview,g' .endif +REPLACE_INTERPRETER+= bash +_REPLACE.bash.old= /bin/bash +_REPLACE.bash.new+= ${SH:Q} +_REPLACE_FILES.bash= asciiview + post-install: @${CP} ${PKGDIR}/PLIST ${PLIST_SRC} ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/aview/ diff --git a/graphics/aview/distinfo b/graphics/aview/distinfo index efdc52032c0..70bb8b73551 100644 --- a/graphics/aview/distinfo +++ b/graphics/aview/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.3 2005/02/24 08:45:03 agc Exp $ +$NetBSD: distinfo,v 1.4 2006/03/09 14:50:31 ghen Exp $ SHA1 (aview-1.3.0rc1.tar.gz) = d757ff9f62e6ce4d926c03ae4f4096d9fcf353fc RMD160 (aview-1.3.0rc1.tar.gz) = f57808dfb9efc36af3b4107bfd48ae875d709cd0 Size (aview-1.3.0rc1.tar.gz) = 54317 bytes SHA1 (patch-aa) = 4fb90e608e912839a3febef1b7086909eb93d42a -SHA1 (patch-ab) = ed1d623e8ffe18e5cdb18727a2ccbb2cf8c50b1d SHA1 (patch-ac) = c9a66a3e6bf97dffe7335ccb9af666250d25f370 SHA1 (patch-ad) = 690a8af07eee1e44611b9111678ab1aff52c7bfa diff --git a/graphics/aview/patches/patch-ab b/graphics/aview/patches/patch-ab deleted file mode 100644 index 4206c4c41c6..00000000000 --- a/graphics/aview/patches/patch-ab +++ /dev/null @@ -1,10 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/01/09 11:49:33 agc Exp $ - ---- asciiview.orig Wed Apr 25 17:59:22 2001 -+++ asciiview -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - # asciiview - an ascii art image browser script. Front end for aview/aaflip - clear() - { diff --git a/sysutils/tob/Makefile b/sysutils/tob/Makefile index 4f8129d4cf5..2f800afdad1 100644 --- a/sysutils/tob/Makefile +++ b/sysutils/tob/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2006/03/04 21:30:43 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2006/03/09 14:50:31 ghen Exp $ DISTNAME= tob-0.25 CATEGORIES= sysutils @@ -17,6 +17,11 @@ CONF_FILES+= ${EGDIR}/example.startdir ${PKG_SYSCONFDIR}/tob/volumes/example.sta INSTALLATION_DIRS= man/man8 sbin +REPLACE_INTERPRETER+= bash +_REPLACE.bash.old= /bin/bash +_REPLACE.bash.new= ${SH:Q} +_REPLACE_FILES.bash= tob + do-build: for f in tob tob.rc; do \ ${MV} ${WRKSRC}/$$f ${WRKSRC}/$$f-pre && \ diff --git a/sysutils/tob/distinfo b/sysutils/tob/distinfo index 4a7ab272697..e1d1dc26536 100644 --- a/sysutils/tob/distinfo +++ b/sysutils/tob/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.2 2005/02/24 13:40:58 agc Exp $ +$NetBSD: distinfo,v 1.3 2006/03/09 14:50:31 ghen Exp $ SHA1 (tob-0.25.tgz) = 71a5bb9dac7c2d4aa800392213b11e9616370b80 RMD160 (tob-0.25.tgz) = 31ce5e85a10835909834853f1f95077cd3ad9542 Size (tob-0.25.tgz) = 107423 bytes -SHA1 (patch-aa) = b83fdd64a257005146bc577554a416f56c072948 +SHA1 (patch-aa) = 746a93edb629023107dd67ad7193c8d6ca589bce SHA1 (patch-ab) = a4c27f1b93a669f2be0a6f2579e528c583393be8 diff --git a/sysutils/tob/patches/patch-aa b/sysutils/tob/patches/patch-aa index dcdc1f67274..85f0ebaad90 100644 --- a/sysutils/tob/patches/patch-aa +++ b/sysutils/tob/patches/patch-aa @@ -1,13 +1,7 @@ -$NetBSD: patch-aa,v 1.1.1.1 2003/06/27 12:01:12 agc Exp $ +$NetBSD: patch-aa,v 1.2 2006/03/09 14:50:31 ghen Exp $ --- tob 2003/06/27 11:08:36 1.1 +++ tob 2003/06/27 11:13:55 -@@ -1,4 +1,4 @@ --#!/bin/bash -+#! /bin/sh - # - # tob --- Tape Oriented Backup - # @@ -13,8 +13,8 @@ # diff --git a/textproc/antiword/Makefile b/textproc/antiword/Makefile index 1a26a4d69d8..2d3eaa6dd38 100644 --- a/textproc/antiword/Makefile +++ b/textproc/antiword/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2006/01/23 14:23:56 salo Exp $ +# $NetBSD: Makefile,v 1.19 2006/03/09 14:50:31 ghen Exp $ # DISTNAME= antiword-0.37 @@ -16,6 +16,11 @@ USE_TOOLS+= mktemp:run CFLAGS.SunOS+= -D__STDC_ISO_10646__ +REPLACE_INTERPRETER+= bash +_REPLACE.bash.old= /bin/bash +_REPLACE.bash.new= ${SH:Q} +_REPLACE_FILES.bash= kantiword + post-patch: cd ${WRKSRC} ; \ for pf in antiword.h Docs/antiword.1 ; do \ diff --git a/textproc/antiword/distinfo b/textproc/antiword/distinfo index 613465b1cfd..388e1500081 100644 --- a/textproc/antiword/distinfo +++ b/textproc/antiword/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.17 2006/01/23 14:23:56 salo Exp $ +$NetBSD: distinfo,v 1.18 2006/03/09 14:50:31 ghen Exp $ SHA1 (antiword-0.37.tar.gz) = 4364f7f99cb2d37f7d1d5bc14a335ccc0c67292e RMD160 (antiword-0.37.tar.gz) = 506ca4a7a7fa9fd4574092798a7fffacd9a3a0a0 Size (antiword-0.37.tar.gz) = 317884 bytes SHA1 (patch-aa) = 27cd582ced9822bbaefddd73d2fe2ba6c904ae1f -SHA1 (patch-ab) = 554f2f2d9dfdc06a5cd8869488043b62fb32108d +SHA1 (patch-ab) = d2cb15824b78346a8a5ae301b0618a81437ce971 diff --git a/textproc/antiword/patches/patch-ab b/textproc/antiword/patches/patch-ab index d03593bcb98..58da164b292 100644 --- a/textproc/antiword/patches/patch-ab +++ b/textproc/antiword/patches/patch-ab @@ -1,14 +1,9 @@ -$NetBSD: patch-ab,v 1.11 2006/01/23 14:23:56 salo Exp $ +$NetBSD: patch-ab,v 1.12 2006/03/09 14:50:31 ghen Exp $ Security fix for CVE-2005-3126. --- kantiword.orig 2004-11-19 20:39:38.000000000 +0100 +++ kantiword 2006-01-23 15:14:55.000000000 +0100 -@@ -1,4 +1,3 @@ --#!/bin/bash - #!/bin/sh - # - # Script to make drag and drop in KDE possible @@ -10,41 +9,12 @@ exit 0 fi diff --git a/wm/ratpoison/Makefile b/wm/ratpoison/Makefile index 6c0bd07fc9b..4836def4fd9 100644 --- a/wm/ratpoison/Makefile +++ b/wm/ratpoison/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2006/02/16 11:12:13 tonio Exp $ +# $NetBSD: Makefile,v 1.19 2006/03/09 14:50:31 ghen Exp $ # DISTNAME= ratpoison-1.4.0-beta4 @@ -15,6 +15,11 @@ USE_GNU_READLINE= YES INFO_FILES= ratpoison.info +REPLACE_INTERPRETER+= bash +_REPLACE.bash.old= /usr/bin/env bash +_REPLACE.bash.new= ${SH:Q} +_REPLACE_FILES.bash= contrib/rpws + .include "../../devel/readline/buildlink3.mk" .include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/ratpoison/distinfo b/wm/ratpoison/distinfo index 55c2a4a146f..85bae164d1f 100644 --- a/wm/ratpoison/distinfo +++ b/wm/ratpoison/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.8 2006/02/16 11:12:13 tonio Exp $ +$NetBSD: distinfo,v 1.9 2006/03/09 14:50:31 ghen Exp $ SHA1 (ratpoison-1.4.0-beta4.tar.gz) = 78d682ae8321040a2ba8ae3f780f07d3c8d464ae RMD160 (ratpoison-1.4.0-beta4.tar.gz) = 3e00d661cfcc43b5c75d77f90eb438d97c754976 Size (ratpoison-1.4.0-beta4.tar.gz) = 373068 bytes -SHA1 (patch-aa) = dd1ede29e14bcd7948eb5f0336c017d392244ff5 +SHA1 (patch-aa) = f18b28f85dabb73be2ff3f371288326b29aa69be diff --git a/wm/ratpoison/patches/patch-aa b/wm/ratpoison/patches/patch-aa index 7390c8e4697..2ea00c187f1 100644 --- a/wm/ratpoison/patches/patch-aa +++ b/wm/ratpoison/patches/patch-aa @@ -1,13 +1,7 @@ -$NetBSD: patch-aa,v 1.2 2006/02/16 11:12:13 tonio Exp $ +$NetBSD: patch-aa,v 1.3 2006/03/09 14:50:31 ghen Exp $ --- contrib/rpws.orig 2004-11-17 17:27:38.000000000 +0100 +++ contrib/rpws -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/bin/sh - # - # Workspaces for ratpoison - # Copyright (C) 2003 Shawn Betts @@ -80,7 +80,7 @@ ws_save () ws_restore () { diff --git a/x11/xteddy2/Makefile b/x11/xteddy2/Makefile index dabb746f43d..b9569932c47 100644 --- a/x11/xteddy2/Makefile +++ b/x11/xteddy2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2006/02/05 23:11:49 joerg Exp $ +# $NetBSD: Makefile,v 1.22 2006/03/09 14:50:32 ghen Exp $ DISTNAME= xteddy-2.0.1 PKGREVISION= 8 @@ -13,6 +13,11 @@ CONFLICTS+= xteddy-1.* GNU_CONFIGURE= yes +REPLACE_INTERPRETER+= bash +_REPLACE.bash.old= /bin/bash +_REPLACE.bash.new= /bin/ksh +_REPLACE_FILES.bash= xtoys + pre-configure: files="configure xteddy_test xtoys"; \ cd ${WRKSRC}; for file in $${files}; do \ diff --git a/x11/xteddy2/distinfo b/x11/xteddy2/distinfo index ed417d89551..9487fa89cd7 100644 --- a/x11/xteddy2/distinfo +++ b/x11/xteddy2/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.5 2005/02/23 17:36:25 wiz Exp $ +$NetBSD: distinfo,v 1.6 2006/03/09 14:50:32 ghen Exp $ SHA1 (xteddy-2.0.1.tar.gz) = 371810d7a509cbf6ffd3a4d94c87412ae68022d8 RMD160 (xteddy-2.0.1.tar.gz) = 20d5f696e5815bf81cf9f2eba0d6ff83313181e2 Size (xteddy-2.0.1.tar.gz) = 348055 bytes SHA1 (patch-aa) = 69425a7ccae41c7852c2ccfed7d029a7b93ada6c SHA1 (patch-ab) = af66f8f31baf8581b7b9a115eab6f513cd0c5e5e -SHA1 (patch-ac) = e1e5f5e716f70355cb092e726b0400d15601fd96 +SHA1 (patch-ac) = 6d09bef66d1cb78f842349afa7dcad9ed47add89 diff --git a/x11/xteddy2/patches/patch-ac b/x11/xteddy2/patches/patch-ac index a999052899c..ec4554c6346 100644 --- a/x11/xteddy2/patches/patch-ac +++ b/x11/xteddy2/patches/patch-ac @@ -1,11 +1,10 @@ -$NetBSD: patch-ac,v 1.1.1.1 2000/12/05 22:54:03 hubertf Exp $ +$NetBSD: patch-ac,v 1.2 2006/03/09 14:50:32 ghen Exp $ ---- xtoys Mon Aug 2 01:11:02 1999 -+++ xtoys Wed Sep 22 12:55:58 1999 +--- xtoys.orig 2006-03-09 15:44:03.000000000 +0100 ++++ xtoys @@ -1,5 +1,5 @@ --#!/bin/bash + #!/bin/bash -ximg="`ls /usr/share/xteddy` `ls /usr/local/share/xteddy`" -+#!/bin/ksh +ximg="`ls @PREFIX@/share/xteddy`" NUM=0 for i in $ximg ; do -- cgit v1.2.3