From 7789a2f2c01a2b39c0d6224be000f9ac1c092157 Mon Sep 17 00:00:00 2001
From: sborrill <sborrill@pkgsrc.org>
Date: Sat, 10 Apr 2010 08:36:43 +0000
Subject: Fix installation in non-DESTDIR case (hi joerg!)

---
 comms/asterisk-sounds-extra/distinfo         |  4 ++--
 comms/asterisk-sounds-extra/patches/patch-aa | 19 +++++++++++++------
 2 files changed, 15 insertions(+), 8 deletions(-)

(limited to 'comms')

diff --git a/comms/asterisk-sounds-extra/distinfo b/comms/asterisk-sounds-extra/distinfo
index b23f55fb1bd..abd637c1414 100644
--- a/comms/asterisk-sounds-extra/distinfo
+++ b/comms/asterisk-sounds-extra/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2010/03/17 15:16:55 joerg Exp $
+$NetBSD: distinfo,v 1.4 2010/04/10 08:36:43 sborrill Exp $
 
 SHA1 (asterisk-sounds-1.2.1.tar.gz) = 219dd5412d4bbaeeef798a49bfd0f1a591fcc177
 RMD160 (asterisk-sounds-1.2.1.tar.gz) = 02d99d136e8a0a3ddd7fa3eec70f9332febedd36
 Size (asterisk-sounds-1.2.1.tar.gz) = 3249876 bytes
-SHA1 (patch-aa) = bc21ccb005dc96d310649c21d73fffae52234c39
+SHA1 (patch-aa) = 4765fc5aa586843f9f60fc68a86c9fd941154c07
 SHA1 (patch-ab) = ec80ff880fb4d28c79af51c77a89268002681c0b
diff --git a/comms/asterisk-sounds-extra/patches/patch-aa b/comms/asterisk-sounds-extra/patches/patch-aa
index 86cd929a2e9..8686d016e16 100644
--- a/comms/asterisk-sounds-extra/patches/patch-aa
+++ b/comms/asterisk-sounds-extra/patches/patch-aa
@@ -1,17 +1,24 @@
-$NetBSD: patch-aa,v 1.2 2010/03/17 15:16:55 joerg Exp $
+$NetBSD: patch-aa,v 1.3 2010/04/10 08:36:43 sborrill Exp $
 
---- Makefile.orig	2005-09-16 23:17:30.000000000 +0200
-+++ Makefile	2005-09-16 23:36:06.000000000 +0200
-@@ -22,10 +22,10 @@
+--- Makefile.orig	2005-12-01 23:20:51.000000000 +0000
++++ Makefile	2010-04-09 22:27:38.000000000 +0100
+@@ -16,16 +16,16 @@
+ PWD=$(shell pwd)
+ # Where to install asterisk after compiling
+ # Default -> leave empty
+-INSTALL_PREFIX=
++INSTALL_PREFIX=${PREFIX}
+ 
+ # Staging directory
  # Files are copied here temporarily during the install process
  # For example, make DESTDIR=/tmp/asterisk woud put things in
  # /tmp/asterisk/etc/asterisk
 -DESTDIR=
-+DESTDIR=$(PREFIX)
++#DESTDIR=$(PREFIX)
  
  ASTLIBDIR=$(INSTALL_PREFIX)/usr/lib/asterisk
 -ASTVARLIBDIR=$(INSTALL_PREFIX)/var/lib/asterisk
-+ASTVARLIBDIR=$(INSTALL_PREFIX)${PREFIX}/libdata/asterisk
++ASTVARLIBDIR=$(INSTALL_PREFIX)/libdata/asterisk
  ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk
  ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk
  ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk
-- 
cgit v1.2.3