- Use ${PREFIX} [1]

- Update to 1.4.2 [2]
- Enable build on amd64 [2]

PR:		ports/113805 [1]
Submitted by:	Andrew Pilloud <ampmouse AT ampmouse.net> [1],
		"Phillip N." <pneumann AT gmail.com> [2]
Approved by:	maintainer timeout

18 files changed, 21 insertions, 111 deletions

diff --git a/net/asterisk-addons/Makefile b/net/asterisk-addons/Makefile
index 83881fcc2867..a1c1f49148e7 100644
--- a/net/asterisk-addons/Makefile
+++ b/net/asterisk-addons/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	asterisk-addons
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES=	net
 MASTER_SITES=	http://ftp.digium.com/pub/asterisk/releases/
 
@@ -18,7 +18,7 @@ RUN_DEPENDS=	asterisk:${PORTSDIR}/net/asterisk
 
 OPTIONS=	SAMPLE_CONFIG	"Install sample configuration files" off
 
-ONLY_FOR_ARCHS=	i386
+ONLY_FOR_ARCHS=	i386 amd64
 USE_AUTOTOOLS=	libtool:15
 USE_MYSQL=	yes
 USE_GMAKE=	yes
diff --git a/net/asterisk-addons/distinfo b/net/asterisk-addons/distinfo
index 5245c573e200..e77bf4de69ec 100644
--- a/net/asterisk-addons/distinfo
+++ b/net/asterisk-addons/distinfo
@@ -1,3 +1,3 @@
-MD5 (asterisk-addons-1.4.1.tar.gz) = e776b23eac9552e3543fba9202dd7c7d
-SHA256 (asterisk-addons-1.4.1.tar.gz) = b67d9ebd54c193177323eb27ceb9651de02f1e4d3f22845ec800b7b5d425942b
-SIZE (asterisk-addons-1.4.1.tar.gz) = 999765
+MD5 (asterisk-addons-1.4.2.tar.gz) = c080b02e6ddc81dab6a64691af890805
+SHA256 (asterisk-addons-1.4.2.tar.gz) = 6d12a1a73cfe0cb14c960e422d0d3c261740857d2a86785f08cf89d44574cc82
+SIZE (asterisk-addons-1.4.2.tar.gz) = 1000286
diff --git a/net/asterisk-addons/files/patch-Makefile b/net/asterisk-addons/files/patch-Makefile
index 0806e54390f4..b2810ba98ca6 100644
--- a/net/asterisk-addons/files/patch-Makefile
+++ b/net/asterisk-addons/files/patch-Makefile
@@ -5,7 +5,7 @@
  OVERWRITE:=y
  
 -CFLAGS+=-fPIC
-+CFLAGS+=-fPIC -I/usr/local/include 
++CFLAGS+=-fPIC -I${PREFIX}/include 
  
  # If the file .asteriskaddons.makeopts is present in your home directory, you can
  # include all of your favorite menuselect options so that every time you download
diff --git a/net/asterisk-addons/files/patch-asterisk-ooh323c-Makefile.in b/net/asterisk-addons/files/patch-asterisk-ooh323c-Makefile.in
index 1605c90ac306..44b6b97aca5c 100644
--- a/net/asterisk-addons/files/patch-asterisk-ooh323c-Makefile.in
+++ b/net/asterisk-addons/files/patch-asterisk-ooh323c-Makefile.in
@@ -14,7 +14,7 @@
  
  install: 
 -	cp .libs/libchan_h323.so.1.0.1 $(DESTDIR)/usr/lib/asterisk/modules/chan_ooh323.so
-+	cp .libs/libchan_h323.so /usr/local/lib/asterisk/modules/chan_ooh323.so
++	cp .libs/libchan_h323.so ${PREFIX}/lib/asterisk/modules/chan_ooh323.so
  
  sample:
  	cp h323.conf.sample $(DESTDIR)/etc/asterisk/ooh323.conf
diff --git a/net/asterisk-addons/files/patch-asterisk-ooh323c-configure b/net/asterisk-addons/files/patch-asterisk-ooh323c-configure
deleted file mode 100644
index c78dc8fb8854..000000000000
--- a/net/asterisk-addons/files/patch-asterisk-ooh323c-configure
+++ /dev/null
@@ -1,22 +0,0 @@
---- asterisk-ooh323c/configure.orig	Sat Apr 28 13:40:24 2007
-+++ asterisk-ooh323c/configure	Sat Apr 28 13:40:58 2007
-@@ -9149,8 +9149,8 @@
- 
- fi
- 
--{ echo "$as_me:$LINENO: checking for /usr/include/asterisk/channel.h" >&5
--echo $ECHO_N "checking for /usr/include/asterisk/channel.h... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: checking for /usr/local/include/asterisk/channel.h" >&5
-+echo $ECHO_N "checking for /usr/local/include/asterisk/channel.h... $ECHO_C" >&6; }
- if test "${ac_cv_file__usr_include_asterisk_channel_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -9158,7 +9158,7 @@
-   { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
- echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-    { (exit 1); exit 1; }; }
--if test -r "/usr/include/asterisk/channel.h"; then
-+if test -r "/usr/local/include/asterisk/channel.h"; then
-   ac_cv_file__usr_include_asterisk_channel_h=yes
- else
-   ac_cv_file__usr_include_asterisk_channel_h=no
diff --git a/net/asterisk-addons/files/patch-format_mp3-Makefile b/net/asterisk-addons/files/patch-format_mp3-Makefile
deleted file mode 100644
index b0b4ce26b740..000000000000
--- a/net/asterisk-addons/files/patch-format_mp3-Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
---- format_mp3/Makefile.orig	Mon Apr  2 22:26:03 2007
-+++ format_mp3/Makefile	Mon Apr  2 22:26:12 2007
-@@ -1,4 +1,4 @@
--INSTALLTO=$(DESTDIR)/usr/lib/asterisk/modules
-+INSTALLTO=/usr/local/lib/asterisk/modules
- MODS=format_mp3.so
- MP3OBJS=common.o dct64_i386.o decode_ntom.o layer3.o tabinit.o interface.o format_mp3.o
- 
diff --git a/net/asterisk14-addons/Makefile b/net/asterisk14-addons/Makefile
index 83881fcc2867..a1c1f49148e7 100644
--- a/net/asterisk14-addons/Makefile
+++ b/net/asterisk14-addons/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	asterisk-addons
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES=	net
 MASTER_SITES=	http://ftp.digium.com/pub/asterisk/releases/
 
@@ -18,7 +18,7 @@ RUN_DEPENDS=	asterisk:${PORTSDIR}/net/asterisk
 
 OPTIONS=	SAMPLE_CONFIG	"Install sample configuration files" off
 
-ONLY_FOR_ARCHS=	i386
+ONLY_FOR_ARCHS=	i386 amd64
 USE_AUTOTOOLS=	libtool:15
 USE_MYSQL=	yes
 USE_GMAKE=	yes
diff --git a/net/asterisk14-addons/distinfo b/net/asterisk14-addons/distinfo
index 5245c573e200..e77bf4de69ec 100644
--- a/net/asterisk14-addons/distinfo
+++ b/net/asterisk14-addons/distinfo
@@ -1,3 +1,3 @@
-MD5 (asterisk-addons-1.4.1.tar.gz) = e776b23eac9552e3543fba9202dd7c7d
-SHA256 (asterisk-addons-1.4.1.tar.gz) = b67d9ebd54c193177323eb27ceb9651de02f1e4d3f22845ec800b7b5d425942b
-SIZE (asterisk-addons-1.4.1.tar.gz) = 999765
+MD5 (asterisk-addons-1.4.2.tar.gz) = c080b02e6ddc81dab6a64691af890805
+SHA256 (asterisk-addons-1.4.2.tar.gz) = 6d12a1a73cfe0cb14c960e422d0d3c261740857d2a86785f08cf89d44574cc82
+SIZE (asterisk-addons-1.4.2.tar.gz) = 1000286
diff --git a/net/asterisk14-addons/files/patch-Makefile b/net/asterisk14-addons/files/patch-Makefile
index 0806e54390f4..b2810ba98ca6 100644
--- a/net/asterisk14-addons/files/patch-Makefile
+++ b/net/asterisk14-addons/files/patch-Makefile
@@ -5,7 +5,7 @@
  OVERWRITE:=y
  
 -CFLAGS+=-fPIC
-+CFLAGS+=-fPIC -I/usr/local/include 
++CFLAGS+=-fPIC -I${PREFIX}/include 
  
  # If the file .asteriskaddons.makeopts is present in your home directory, you can
  # include all of your favorite menuselect options so that every time you download
diff --git a/net/asterisk14-addons/files/patch-asterisk-ooh323c-Makefile.in b/net/asterisk14-addons/files/patch-asterisk-ooh323c-Makefile.in
index 1605c90ac306..44b6b97aca5c 100644
--- a/net/asterisk14-addons/files/patch-asterisk-ooh323c-Makefile.in
+++ b/net/asterisk14-addons/files/patch-asterisk-ooh323c-Makefile.in
@@ -14,7 +14,7 @@
  
  install: 
 -	cp .libs/libchan_h323.so.1.0.1 $(DESTDIR)/usr/lib/asterisk/modules/chan_ooh323.so
-+	cp .libs/libchan_h323.so /usr/local/lib/asterisk/modules/chan_ooh323.so
++	cp .libs/libchan_h323.so ${PREFIX}/lib/asterisk/modules/chan_ooh323.so
  
  sample:
  	cp h323.conf.sample $(DESTDIR)/etc/asterisk/ooh323.conf
diff --git a/net/asterisk14-addons/files/patch-asterisk-ooh323c-configure b/net/asterisk14-addons/files/patch-asterisk-ooh323c-configure
deleted file mode 100644
index c78dc8fb8854..000000000000
--- a/net/asterisk14-addons/files/patch-asterisk-ooh323c-configure
+++ /dev/null
@@ -1,22 +0,0 @@
---- asterisk-ooh323c/configure.orig	Sat Apr 28 13:40:24 2007
-+++ asterisk-ooh323c/configure	Sat Apr 28 13:40:58 2007
-@@ -9149,8 +9149,8 @@
- 
- fi
- 
--{ echo "$as_me:$LINENO: checking for /usr/include/asterisk/channel.h" >&5
--echo $ECHO_N "checking for /usr/include/asterisk/channel.h... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: checking for /usr/local/include/asterisk/channel.h" >&5
-+echo $ECHO_N "checking for /usr/local/include/asterisk/channel.h... $ECHO_C" >&6; }
- if test "${ac_cv_file__usr_include_asterisk_channel_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -9158,7 +9158,7 @@
-   { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
- echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-    { (exit 1); exit 1; }; }
--if test -r "/usr/include/asterisk/channel.h"; then
-+if test -r "/usr/local/include/asterisk/channel.h"; then
-   ac_cv_file__usr_include_asterisk_channel_h=yes
- else
-   ac_cv_file__usr_include_asterisk_channel_h=no
diff --git a/net/asterisk14-addons/files/patch-format_mp3-Makefile b/net/asterisk14-addons/files/patch-format_mp3-Makefile
deleted file mode 100644
index b0b4ce26b740..000000000000
--- a/net/asterisk14-addons/files/patch-format_mp3-Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
---- format_mp3/Makefile.orig	Mon Apr  2 22:26:03 2007
-+++ format_mp3/Makefile	Mon Apr  2 22:26:12 2007
-@@ -1,4 +1,4 @@
--INSTALLTO=$(DESTDIR)/usr/lib/asterisk/modules
-+INSTALLTO=/usr/local/lib/asterisk/modules
- MODS=format_mp3.so
- MP3OBJS=common.o dct64_i386.o decode_ntom.o layer3.o tabinit.o interface.o format_mp3.o
- 
diff --git a/net/asterisk16-addons/Makefile b/net/asterisk16-addons/Makefile
index 83881fcc2867..a1c1f49148e7 100644
--- a/net/asterisk16-addons/Makefile
+++ b/net/asterisk16-addons/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	asterisk-addons
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES=	net
 MASTER_SITES=	http://ftp.digium.com/pub/asterisk/releases/
 
@@ -18,7 +18,7 @@ RUN_DEPENDS=	asterisk:${PORTSDIR}/net/asterisk
 
 OPTIONS=	SAMPLE_CONFIG	"Install sample configuration files" off
 
-ONLY_FOR_ARCHS=	i386
+ONLY_FOR_ARCHS=	i386 amd64
 USE_AUTOTOOLS=	libtool:15
 USE_MYSQL=	yes
 USE_GMAKE=	yes
diff --git a/net/asterisk16-addons/distinfo b/net/asterisk16-addons/distinfo
index 5245c573e200..e77bf4de69ec 100644
--- a/net/asterisk16-addons/distinfo
+++ b/net/asterisk16-addons/distinfo
@@ -1,3 +1,3 @@
-MD5 (asterisk-addons-1.4.1.tar.gz) = e776b23eac9552e3543fba9202dd7c7d
-SHA256 (asterisk-addons-1.4.1.tar.gz) = b67d9ebd54c193177323eb27ceb9651de02f1e4d3f22845ec800b7b5d425942b
-SIZE (asterisk-addons-1.4.1.tar.gz) = 999765
+MD5 (asterisk-addons-1.4.2.tar.gz) = c080b02e6ddc81dab6a64691af890805
+SHA256 (asterisk-addons-1.4.2.tar.gz) = 6d12a1a73cfe0cb14c960e422d0d3c261740857d2a86785f08cf89d44574cc82
+SIZE (asterisk-addons-1.4.2.tar.gz) = 1000286
diff --git a/net/asterisk16-addons/files/patch-Makefile b/net/asterisk16-addons/files/patch-Makefile
index 0806e54390f4..b2810ba98ca6 100644
--- a/net/asterisk16-addons/files/patch-Makefile
+++ b/net/asterisk16-addons/files/patch-Makefile
@@ -5,7 +5,7 @@
  OVERWRITE:=y
  
 -CFLAGS+=-fPIC
-+CFLAGS+=-fPIC -I/usr/local/include 
++CFLAGS+=-fPIC -I${PREFIX}/include 
  
  # If the file .asteriskaddons.makeopts is present in your home directory, you can
  # include all of your favorite menuselect options so that every time you download
diff --git a/net/asterisk16-addons/files/patch-asterisk-ooh323c-Makefile.in b/net/asterisk16-addons/files/patch-asterisk-ooh323c-Makefile.in
index 1605c90ac306..44b6b97aca5c 100644
--- a/net/asterisk16-addons/files/patch-asterisk-ooh323c-Makefile.in
+++ b/net/asterisk16-addons/files/patch-asterisk-ooh323c-Makefile.in
@@ -14,7 +14,7 @@
  
  install: 
 -	cp .libs/libchan_h323.so.1.0.1 $(DESTDIR)/usr/lib/asterisk/modules/chan_ooh323.so
-+	cp .libs/libchan_h323.so /usr/local/lib/asterisk/modules/chan_ooh323.so
++	cp .libs/libchan_h323.so ${PREFIX}/lib/asterisk/modules/chan_ooh323.so
  
  sample:
  	cp h323.conf.sample $(DESTDIR)/etc/asterisk/ooh323.conf
diff --git a/net/asterisk16-addons/files/patch-asterisk-ooh323c-configure b/net/asterisk16-addons/files/patch-asterisk-ooh323c-configure
deleted file mode 100644
index c78dc8fb8854..000000000000
--- a/net/asterisk16-addons/files/patch-asterisk-ooh323c-configure
+++ /dev/null
@@ -1,22 +0,0 @@
---- asterisk-ooh323c/configure.orig	Sat Apr 28 13:40:24 2007
-+++ asterisk-ooh323c/configure	Sat Apr 28 13:40:58 2007
-@@ -9149,8 +9149,8 @@
- 
- fi
- 
--{ echo "$as_me:$LINENO: checking for /usr/include/asterisk/channel.h" >&5
--echo $ECHO_N "checking for /usr/include/asterisk/channel.h... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: checking for /usr/local/include/asterisk/channel.h" >&5
-+echo $ECHO_N "checking for /usr/local/include/asterisk/channel.h... $ECHO_C" >&6; }
- if test "${ac_cv_file__usr_include_asterisk_channel_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -9158,7 +9158,7 @@
-   { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
- echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-    { (exit 1); exit 1; }; }
--if test -r "/usr/include/asterisk/channel.h"; then
-+if test -r "/usr/local/include/asterisk/channel.h"; then
-   ac_cv_file__usr_include_asterisk_channel_h=yes
- else
-   ac_cv_file__usr_include_asterisk_channel_h=no
diff --git a/net/asterisk16-addons/files/patch-format_mp3-Makefile b/net/asterisk16-addons/files/patch-format_mp3-Makefile
deleted file mode 100644
index b0b4ce26b740..000000000000
--- a/net/asterisk16-addons/files/patch-format_mp3-Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
---- format_mp3/Makefile.orig	Mon Apr  2 22:26:03 2007
-+++ format_mp3/Makefile	Mon Apr  2 22:26:12 2007
-@@ -1,4 +1,4 @@
--INSTALLTO=$(DESTDIR)/usr/lib/asterisk/modules
-+INSTALLTO=/usr/local/lib/asterisk/modules
- MODS=format_mp3.so
- MP3OBJS=common.o dct64_i386.o decode_ntom.o layer3.o tabinit.o interface.o format_mp3.o
-