Thu Apr 24 09:04:56 2008 UTC ()
Another try at fixing installation of the pkgconfig file under pbulk.


(wiz)
diff -r1.33 -r1.34 pkgsrc/comms/asterisk/distinfo
diff -r1.12 -r1.13 pkgsrc/comms/asterisk/patches/patch-aa
cvs diff -r1.33 -r1.34 pkgsrc/comms/asterisk/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/comms/asterisk/Attic/distinfo 2008/03/19 10:32:02 1.33
+++ pkgsrc/comms/asterisk/Attic/distinfo 2008/04/24 09:04:55 1.34
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: distinfo,v 1.33 2008/03/19 10:32:02 mjl Exp $ 1$NetBSD: distinfo,v 1.34 2008/04/24 09:04:55 wiz Exp $
2 2
3SHA1 (asterisk-1.2.27.tar.gz) = e20659e4d637d740fd45e18d363189ffff431bf4 3SHA1 (asterisk-1.2.27.tar.gz) = e20659e4d637d740fd45e18d363189ffff431bf4
4RMD160 (asterisk-1.2.27.tar.gz) = 5a6fedd420ee36c8f7d174352c3f09db9bc34a42 4RMD160 (asterisk-1.2.27.tar.gz) = 5a6fedd420ee36c8f7d174352c3f09db9bc34a42
5Size (asterisk-1.2.27.tar.gz) = 10645295 bytes 5Size (asterisk-1.2.27.tar.gz) = 10645295 bytes
6SHA1 (patch-aa) = 00bd8a8bb4c5ca71d8ac9e9caecb95f23602281a 6SHA1 (patch-aa) = 0070d874445d5bad7eb5a4cbd023a8f698e1f938
7SHA1 (patch-ab) = 1bdae0ff206b63fe63373a307ecd23859c10cb79 7SHA1 (patch-ab) = 1bdae0ff206b63fe63373a307ecd23859c10cb79
8SHA1 (patch-ac) = 4f783699c7d701030788646f8b961fa9245dc127 8SHA1 (patch-ac) = 4f783699c7d701030788646f8b961fa9245dc127
9SHA1 (patch-ad) = 93a40eebdd2049cce2a976e54fcc3ea6a0548ebb 9SHA1 (patch-ad) = 93a40eebdd2049cce2a976e54fcc3ea6a0548ebb
10SHA1 (patch-ae) = d3ff3a6e2340c53814d2e7ac97b798e9905a4c57 10SHA1 (patch-ae) = d3ff3a6e2340c53814d2e7ac97b798e9905a4c57
11SHA1 (patch-af) = 393bfbe218e843039fc9f4bc59a42ba1b9e896bd 11SHA1 (patch-af) = 393bfbe218e843039fc9f4bc59a42ba1b9e896bd
12SHA1 (patch-ag) = 7adec0d05371f6ffa56e067770c04c8acec2d922 12SHA1 (patch-ag) = 7adec0d05371f6ffa56e067770c04c8acec2d922
13SHA1 (patch-ai) = 81c0ff8f8a273562a64ab7cfb301d578e18808e3 13SHA1 (patch-ai) = 81c0ff8f8a273562a64ab7cfb301d578e18808e3
14SHA1 (patch-aj) = 9111528ac9702040233308c655e5233120ee9bcf 14SHA1 (patch-aj) = 9111528ac9702040233308c655e5233120ee9bcf
15SHA1 (patch-ak) = 3027134258138ca9163d9569548c7d4faffb874f 15SHA1 (patch-ak) = 3027134258138ca9163d9569548c7d4faffb874f
16SHA1 (patch-al) = 1457c9a12eb5c5621eb244423c2190fb430866e7 16SHA1 (patch-al) = 1457c9a12eb5c5621eb244423c2190fb430866e7
17SHA1 (patch-am) = a652b091462673390e19ab47e17500d055779094 17SHA1 (patch-am) = a652b091462673390e19ab47e17500d055779094
18SHA1 (patch-an) = 5bfb86853e868bc78eb0061871f4abce0df1ba2c 18SHA1 (patch-an) = 5bfb86853e868bc78eb0061871f4abce0df1ba2c
cvs diff -r1.12 -r1.13 pkgsrc/comms/asterisk/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/comms/asterisk/patches/Attic/patch-aa 2008/02/20 10:14:19 1.12
+++ pkgsrc/comms/asterisk/patches/Attic/patch-aa 2008/04/24 09:04:56 1.13
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-aa,v 1.12 2008/02/20 10:14:19 wiz Exp $ 1$NetBSD: patch-aa,v 1.13 2008/04/24 09:04:56 wiz Exp $
2 2
3--- Makefile.orig 2007-07-16 18:33:02.000000000 +0000 3--- Makefile.orig 2007-07-16 20:33:02.000000000 +0200
4+++ Makefile 4+++ Makefile
5@@ -47,7 +47,6 @@ ifneq ($(findstring dont-optimize,$(MAKE 5@@ -47,7 +47,6 @@ ifneq ($(findstring dont-optimize,$(MAKE
6 #K6OPT = -DK6OPT 6 #K6OPT = -DK6OPT
7  7
8 #Tell gcc to optimize the code 8 #Tell gcc to optimize the code
9-OPTIMIZE+=-O6 9-OPTIMIZE+=-O6
10 endif 10 endif
11  11
12 #Overwite config files on "make samples" 12 #Overwite config files on "make samples"
13@@ -111,31 +110,32 @@ BUSYDETECT+= #-DBUSYDETECT_TONEONLY 13@@ -111,31 +110,32 @@ BUSYDETECT+= #-DBUSYDETECT_TONEONLY
14 BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE 14 BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE
15  15
16 ifneq ($(OSARCH),SunOS) 16 ifneq ($(OSARCH),SunOS)
@@ -146,27 +146,27 @@ $NetBSD: patch-aa,v 1.12 2008/02/20 10:1 @@ -146,27 +146,27 @@ $NetBSD: patch-aa,v 1.12 2008/02/20 10:1
146+endif 146+endif
147+ 147+
148 ifeq ($(OSARCH),NetBSD) 148 ifeq ($(OSARCH),NetBSD)
149- LIBS+=-lpthread -lcrypto -lm -L$(CROSS_COMPILE_TARGET)/usr/pkg/lib -lncurses 149- LIBS+=-lpthread -lcrypto -lm -L$(CROSS_COMPILE_TARGET)/usr/pkg/lib -lncurses
150+ LIBS+=-lpthread -lcrypto -lm -L${PREFIX}/lib -R${PREFIX}/lib -lncurses 150+ LIBS+=-lpthread -lcrypto -lm -L${PREFIX}/lib -R${PREFIX}/lib -lncurses
151 endif 151 endif
152  152
153 ifeq ($(OSARCH),OpenBSD) 153 ifeq ($(OSARCH),OpenBSD)
154@@ -551,7 +560,7 @@ clean: 154@@ -551,7 +560,7 @@ clean:
155 $(MAKE) -C stdtime clean 155 $(MAKE) -C stdtime clean
156  156
157 datafiles: all 157 datafiles: all
158- if [ x`$(ID) -un` = xroot ]; then sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi 158- if [ x`$(ID) -un` = xroot ]; then sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
159+ if [ x`$(ID) -un` = xroot ]; then sh mkpkgconfig $(DESTDIR)${PREFIX}/lib/pkgconfig; fi 159+ sh mkpkgconfig $(DESTDIR)${PREFIX}/lib/pkgconfig
160 mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits 160 mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
161 mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/silence 161 mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/silence
162 mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros 162 mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros
163@@ -651,7 +660,7 @@ bininstall: all 163@@ -651,7 +660,7 @@ bininstall: all
164 mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp 164 mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp
165 mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme 165 mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme
166 mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor 166 mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor
167- if [ -f asterisk ]; then $(INSTALL) -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/; fi 167- if [ -f asterisk ]; then $(INSTALL) -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/; fi
168+ if [ -f asterisk ]; then $(BSD_INSTALL_PROGRAM) asterisk $(DESTDIR)$(ASTSBINDIR)/; fi 168+ if [ -f asterisk ]; then $(BSD_INSTALL_PROGRAM) asterisk $(DESTDIR)$(ASTSBINDIR)/; fi
169 if [ -f cygwin/asterisk.exe ]; then $(INSTALL) -m 755 cygwin/asterisk.exe $(DESTDIR)$(ASTSBINDIR)/; fi 169 if [ -f cygwin/asterisk.exe ]; then $(INSTALL) -m 755 cygwin/asterisk.exe $(DESTDIR)$(ASTSBINDIR)/; fi
170 if [ -f asterisk.dll ]; then $(INSTALL) -m 755 asterisk.dll $(DESTDIR)$(ASTSBINDIR)/; fi 170 if [ -f asterisk.dll ]; then $(INSTALL) -m 755 asterisk.dll $(DESTDIR)$(ASTSBINDIR)/; fi
171 $(LN) -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk 171 $(LN) -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk
172@@ -740,31 +749,31 @@ install: all datafiles bininstall instal 172@@ -740,31 +749,31 @@ install: all datafiles bininstall instal