Date: Sun, 17 Jun 2007 18:44:11 -0700 (PDT) From: Andrew Pilloud <ampmouse+freebsd@ampmouse.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: fgast@only640k.org Subject: ports/113806: [PATCH] net/asterisk-addons: patched file stoping build, updated to use prefix Message-ID: <200706180144.l5I1iB7X070737@srv0.ampmouse.net> Resent-Message-ID: <200706180210.l5I2A4Tr072226@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 113806
>Category: ports
>Synopsis: [PATCH] net/asterisk-addons: patched file stoping build, updated to use prefix
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon Jun 18 02:10:04 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Andrew Pilloud <ampmouse+freebsd@ampmouse.net>
>Release: FreeBSD 6.2-RELEASE i386
>Organization:
>Environment:
System: FreeBSD srv0.ampmouse.net 6.2-RELEASE FreeBSD 6.2-RELEASE #2: Mon Jan 15 12:58:49 PST 2007 ampmouse@srv0.ampmouse.net:/usr/obj/usr/src/sys/SRV0 i386
>Description:
Added patch for asterisk-ooh323c/configure.in:
Build failed after asterisk-ooh323c/configure was updated by automake
Updated patches to use ${PREFIX} rather than /usr/local
>How-To-Repeat:
>Fix:
--- asterisk-addons.prefix.patch begins here ---
diff -ruN asterisk-addons.orig/files/patch-Makefile asterisk-addons/files/patch-Makefile
--- asterisk-addons.orig/files/patch-Makefile Wed Jun 6 19:17:26 2007
+++ asterisk-addons/files/patch-Makefile Sun Jun 17 17:41:35 2007
@@ -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 -ruN asterisk-addons.orig/files/patch-asterisk-ooh323c-Makefile.in asterisk-addons/files/patch-asterisk-ooh323c-Makefile.in
--- asterisk-addons.orig/files/patch-asterisk-ooh323c-Makefile.in Wed Jun 6 19:17:26 2007
+++ asterisk-addons/files/patch-asterisk-ooh323c-Makefile.in Sun Jun 17 17:42:15 2007
@@ -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 -ruN asterisk-addons.orig/files/patch-asterisk-ooh323c-configure asterisk-addons/files/patch-asterisk-ooh323c-configure
--- asterisk-addons.orig/files/patch-asterisk-ooh323c-configure Wed Jun 6 19:17:26 2007
+++ asterisk-addons/files/patch-asterisk-ooh323c-configure Sun Jun 17 17:42:25 2007
@@ -16,7 +16,7 @@
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
++if test -r "${PREFIX}/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 -ruN asterisk-addons.orig/files/patch-asterisk-ooh323c-configure.in asterisk-addons/files/patch-asterisk-ooh323c-configure.in
--- asterisk-addons.orig/files/patch-asterisk-ooh323c-configure.in Wed Dec 31 16:00:00 1969
+++ asterisk-addons/files/patch-asterisk-ooh323c-configure.in Sun Jun 17 17:41:15 2007
@@ -0,0 +1,11 @@
+--- asterisk-ooh323c/configure.in.orig Sun Jun 17 16:27:55 2007
++++ asterisk-ooh323c/configure.in Sun Jun 17 16:28:14 2007
+@@ -34,7 +34,7 @@
+
+ dnl not required as using libtool AC_PROG_RANLIB
+ AC_HEADER_STDC
+-AC_CHECK_FILE(/usr/include/asterisk/channel.h,, AC_MSG_ERROR([No asterisk installation found]))
++AC_CHECK_FILE(${PREFIX}/include/asterisk/channel.h,, AC_MSG_ERROR([No asterisk installation found]))
+ AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h netdb.h netinet/in.h stddef.h stdlib.h string.h sys/socket.h unistd.h sys/ioctl.h])
+
+
diff -ruN asterisk-addons.orig/files/patch-format_mp3-Makefile asterisk-addons/files/patch-format_mp3-Makefile
--- asterisk-addons.orig/files/patch-format_mp3-Makefile Wed Jun 6 19:17:26 2007
+++ asterisk-addons/files/patch-format_mp3-Makefile Sun Jun 17 17:42:34 2007
@@ -2,7 +2,7 @@
+++ 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
++INSTALLTO=${PREFIX}/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
--- asterisk-addons.prefix.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200706180144.l5I1iB7X070737>