From 2859ebe5a5b5de0cacd3cd55f093d9b144bfabb9 Mon Sep 17 00:00:00 2001
From: rillig <rillig>
Date: Sat, 24 Jun 2006 08:37:40 +0000
Subject: Fixed installation for unprivileged builds. Bumped PKGREVISION.

---
 audio/tosha/Makefile         |  3 ++-
 audio/tosha/distinfo         |  4 ++--
 audio/tosha/patches/patch-aa | 16 +++++++++-------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/audio/tosha/Makefile b/audio/tosha/Makefile
index 948258dd333..f16e223fd1f 100644
--- a/audio/tosha/Makefile
+++ b/audio/tosha/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2006/03/09 21:04:41 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2006/06/24 08:37:40 rillig Exp $
 
 DISTNAME=	tosha-0.05
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.tu-clausthal.de/pub/unix/audio/
 
diff --git a/audio/tosha/distinfo b/audio/tosha/distinfo
index 961f9b3cc42..3c62f4118f2 100644
--- a/audio/tosha/distinfo
+++ b/audio/tosha/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 20:39:52 agc Exp $
+$NetBSD: distinfo,v 1.5 2006/06/24 08:37:40 rillig Exp $
 
 SHA1 (tosha-0.05.tar.gz) = b567f452843b544b082c88403d74ad1ca07f6820
 RMD160 (tosha-0.05.tar.gz) = 21ed9253b020efba1035febe86080a2bd8cc04da
 Size (tosha-0.05.tar.gz) = 17859 bytes
-SHA1 (patch-aa) = 6f0a7ed4f4e5cc314d2aa52793c00ede0ba00707
+SHA1 (patch-aa) = 10e3bff1ce1859e0389f39e4042960c0a61ca2b7
 SHA1 (patch-ab) = 9b4b43d6cb0fe2871cfd0e7e76ffdbd19123573a
 SHA1 (patch-ac) = 26feb1151d4fb02c5831762447c7bb264517f4d6
 SHA1 (patch-af) = 4a1debd7dec8eaa6e2cae2dc33c8ec1aecbfc736
diff --git a/audio/tosha/patches/patch-aa b/audio/tosha/patches/patch-aa
index 4a76cace02b..4f61fed67bd 100644
--- a/audio/tosha/patches/patch-aa
+++ b/audio/tosha/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.9 2004/05/31 17:35:14 minskim Exp $
+$NetBSD: patch-aa,v 1.10 2006/06/24 08:37:40 rillig Exp $
 
---- Makefile.orig	1997-05-20 18:57:17.000000000 -0500
-+++ Makefile
+--- Makefile.orig	1997-05-21 01:57:17.000000000 +0200
++++ Makefile	2006-06-24 10:36:24.000000000 +0200
 @@ -5,7 +5,6 @@
  #   Wed May 21 01:51:37 MET DST 1997
  #
@@ -19,7 +19,7 @@ $NetBSD: patch-aa,v 1.9 2004/05/31 17:35:14 minskim Exp $
  # CFLAGS=-g -Wall -ansi -pedantic
  
  all:	tosha pcmplay pcmfade
-@@ -28,21 +27,18 @@ pcmplay.o:	pcmplay.c utils.h getlopt.h
+@@ -28,21 +27,17 @@ pcmplay.o:	pcmplay.c utils.h getlopt.h
  pcmfade.o:	pcmfade.c utils.h
  
  tosha:	tosha.o utils.o getlopt.o
@@ -35,12 +35,14 @@ $NetBSD: patch-aa,v 1.9 2004/05/31 17:35:14 minskim Exp $
 +	$(CC) $(CFLAGS) -o pcmfade pcmfade.o utils.o ${LDFLAGS}
  
  install:	tosha pcmplay pcmfade
- 	install -s -g bin -o bin -m 755 tosha pcmplay pcmfade $(BINDIR)
- 	install -c -g bin -o bin -m 644 tosha.1 pcmplay.1 pcmfade.1 \
- 		$(MANDIR)/man$(SECTION)
+-	install -s -g bin -o bin -m 755 tosha pcmplay pcmfade $(BINDIR)
+-	install -c -g bin -o bin -m 644 tosha.1 pcmplay.1 pcmfade.1 \
+-		$(MANDIR)/man$(SECTION)
 -	gzip -f -9 $(MANDIR)/man$(SECTION)/tosha.1 \
 -		$(MANDIR)/man$(SECTION)/pcmplay.1 \
 -		$(MANDIR)/man$(SECTION)/pcmfade.1
++	${BSD_INSTALL_PROGRAM} tosha pcmplay pcmfade $(BINDIR)
++	${BSD_INSTALL_MAN} tosha.1 pcmplay.1 pcmfade.1 $(MANDIR)/man$(SECTION)
  
  clean:
  	rm -f *.o *~ *core tosha pcmplay pcmfade
-- 
cgit v1.2.3