Create pkgconfig file in correct location. Add it to PLIST.

Bump PKGREVISION.

4 files changed, 20 insertions, 10 deletions

diff --git a/comms/asterisk/Makefile b/comms/asterisk/Makefile
index 56114d30119..0027dde303c 100644
--- a/comms/asterisk/Makefile
+++ b/comms/asterisk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2008/01/18 05:06:25 tnn Exp $
+# $NetBSD: Makefile,v 1.46 2008/02/20 10:14:19 wiz Exp $
 
 DISTNAME=	asterisk-1.2.24
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	comms net audio
 MASTER_SITES=	http://ftp.digium.com/pub/asterisk/ \
 		http://ftp.digium.com/pub/asterisk/old-releases/
diff --git a/comms/asterisk/PLIST.common b/comms/asterisk/PLIST.common
index 59f0c5399b1..6e50493d3f1 100644
--- a/comms/asterisk/PLIST.common
+++ b/comms/asterisk/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.9 2007/07/19 09:39:57 mjl Exp $
+@comment $NetBSD: PLIST.common,v 1.10 2008/02/20 10:14:19 wiz Exp $
 include/asterisk/acl.h
 include/asterisk/adsi.h
 include/asterisk/aes.h
@@ -198,6 +198,7 @@ ${ZAPTEL}lib/asterisk/modules/app_zapbarge.so
 ${ZAPTEL}lib/asterisk/modules/app_zapras.so
 ${ZAPTEL}lib/asterisk/modules/app_zapscan.so
 ${ZAPTEL}lib/asterisk/modules/chan_zap.so
+lib/pkgconfig/asterisk.pc
 libdata/asterisk/agi-bin/agi-test.agi
 libdata/asterisk/agi-bin/eagi-sphinx-test
 libdata/asterisk/agi-bin/eagi-test
diff --git a/comms/asterisk/distinfo b/comms/asterisk/distinfo
index d3638622e96..9028ac588ce 100644
--- a/comms/asterisk/distinfo
+++ b/comms/asterisk/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.31 2007/08/10 00:03:28 mjl Exp $
+$NetBSD: distinfo,v 1.32 2008/02/20 10:14:19 wiz Exp $
 
 SHA1 (asterisk-1.2.24.tar.gz) = ba06b0ea3cec9eea0468b55d3226f8eb69ae4667
 RMD160 (asterisk-1.2.24.tar.gz) = 73bdaa3bda22ff0e91b954b5a25dd2278b33ea90
 Size (asterisk-1.2.24.tar.gz) = 10644451 bytes
-SHA1 (patch-aa) = e457617cb3fbec6a67971258af145cc25f0ca03e
+SHA1 (patch-aa) = 00bd8a8bb4c5ca71d8ac9e9caecb95f23602281a
 SHA1 (patch-ab) = 1bdae0ff206b63fe63373a307ecd23859c10cb79
 SHA1 (patch-ac) = 4f783699c7d701030788646f8b961fa9245dc127
 SHA1 (patch-ad) = 93a40eebdd2049cce2a976e54fcc3ea6a0548ebb
diff --git a/comms/asterisk/patches/patch-aa b/comms/asterisk/patches/patch-aa
index 8ae58145191..c4d0a443c23 100644
--- a/comms/asterisk/patches/patch-aa
+++ b/comms/asterisk/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.11 2006/08/18 11:32:51 adam Exp $
+$NetBSD: patch-aa,v 1.12 2008/02/20 10:14:19 wiz Exp $
 
---- Makefile.orig	2006-06-29 21:23:18.000000000 +0200
+--- Makefile.orig	2007-07-16 18:33:02.000000000 +0000
 +++ Makefile
 @@ -47,7 +47,6 @@ ifneq ($(findstring dont-optimize,$(MAKE
  #K6OPT  = -DK6OPT
@@ -151,7 +151,16 @@ $NetBSD: patch-aa,v 1.11 2006/08/18 11:32:51 adam Exp $
  endif
  
  ifeq ($(OSARCH),OpenBSD)
-@@ -642,7 +651,7 @@ bininstall: all
+@@ -551,7 +560,7 @@ clean:
+ 	$(MAKE) -C stdtime clean
+ 
+ datafiles: all
+-	if [ x`$(ID) -un` = xroot ]; then sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
++	if [ x`$(ID) -un` = xroot ]; then sh mkpkgconfig $(DESTDIR)${PREFIX}/lib/pkgconfig; fi
+ 	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
+ 	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/silence
+ 	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros
+@@ -651,7 +660,7 @@ bininstall: all
  	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp
  	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme
  	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor
@@ -160,7 +169,7 @@ $NetBSD: patch-aa,v 1.11 2006/08/18 11:32:51 adam Exp $
  	if [ -f cygwin/asterisk.exe ]; then $(INSTALL) -m 755 cygwin/asterisk.exe $(DESTDIR)$(ASTSBINDIR)/; fi
  	if [ -f asterisk.dll ]; then $(INSTALL) -m 755 asterisk.dll $(DESTDIR)$(ASTSBINDIR)/; fi
  	$(LN) -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk
-@@ -731,31 +740,31 @@ install: all datafiles bininstall instal
+@@ -740,31 +749,31 @@ install: all datafiles bininstall instal
  upgrade: all bininstall
  
  adsi:
@@ -201,7 +210,7 @@ $NetBSD: patch-aa,v 1.11 2006/08/18 11:32:51 adam Exp $
  		( \
  		echo "[directories]" ; \
  		echo "astetcdir => $(ASTETCDIR)" ; \
-@@ -772,7 +781,7 @@ samples: adsi
+@@ -781,7 +790,7 @@ samples: adsi
  		echo ";astctlowner = root" ; \
  		echo ";astctlgroup = apache" ; \
  		echo ";astctl = asterisk.ctl" ; \