freeswitch-core: Update patches. - Replaced configure scripts patches for configure.ac patches. - Removed unnecessary compiler conditional for pre-configure stage actions.

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: freeswitch-core: Update patches. - Replaced configure scripts patches for configure.ac patches. - Removed unnecessary compiler conditional for pre-configure stage actions.
From: Angel M. Adames <angelmadames%gmail.com@localhost>
Date: Wed, 10 Jan 2018 18:37:53 +0000
Module Name:	pkgsrc-wip
Committed By:	Angel M. Adames <angelmadames%gmail.com@localhost>
Pushed By:	angelmadames
Date:		Wed Jan 10 18:37:53 2018 +0000
Changeset:	7c95af8fbc0133af4b9a53aa9e8a0110baa4a40f

Modified Files:
	freeswitch-core/Makefile
	freeswitch-core/distinfo
	freeswitch-core/patches/patch-libs_spandsp_unpack__gsm0610__data.sh
Added Files:
	freeswitch-core/patches/patch-configure.ac
	freeswitch-core/patches/patch-libs_spandsp_configure.ac
	freeswitch-core/patches/patch-libs_unimrcp_configure.ac
Removed Files:
	freeswitch-core/patches/patch-configure
	freeswitch-core/patches/patch-libs_spandsp_configure
	freeswitch-core/patches/patch-libs_unimrcp_configure

Log Message:
freeswitch-core: Update patches.
	- Replaced configure scripts patches for configure.ac patches.
	- Removed unnecessary compiler conditional for pre-configure stage actions.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=7c95af8fbc0133af4b9a53aa9e8a0110baa4a40f

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 freeswitch-core/Makefile                           |  4 ++--
 freeswitch-core/distinfo                           |  9 ++++----
 freeswitch-core/patches/patch-configure            | 15 ------------
 freeswitch-core/patches/patch-configure.ac         | 18 +++++++++++++++
 .../patches/patch-libs_spandsp_configure           | 24 -------------------
 .../patches/patch-libs_spandsp_configure.ac        | 27 ++++++++++++++++++++++
 .../patch-libs_spandsp_unpack__gsm0610__data.sh    |  5 +++-
 .../patches/patch-libs_unimrcp_configure           | 15 ------------
 .../patches/patch-libs_unimrcp_configure.ac        | 18 +++++++++++++++
 9 files changed, 73 insertions(+), 62 deletions(-)

diffs:
diff --git a/freeswitch-core/Makefile b/freeswitch-core/Makefile
index d907bf34fb..ba4ad56cec 100644
--- a/freeswitch-core/Makefile
+++ b/freeswitch-core/Makefile
@@ -213,10 +213,10 @@ PKG_SYSCONFDIR_PERMS=	${FS_USER} ${FS_GROUP} 0755
 
 #############################################################
 
-.if !empty(PKGSRC_COMPILER:Mgcc)
+#.if !empty(PKGSRC_COMPILER:Mgcc)
 pre-configure:
 	cd ${WRKSRC} && ${SH} rebootstrap.sh -j
-.endif
+#.endif
 
 post-install:
 	${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/libs/srtp/libsrtp.la ${DESTDIR}${PREFIX}/lib
diff --git a/freeswitch-core/distinfo b/freeswitch-core/distinfo
index f06858cf2a..f333f7f958 100644
--- a/freeswitch-core/distinfo
+++ b/freeswitch-core/distinfo
@@ -4,9 +4,8 @@ SHA1 (freeswitch-1.6.19.tar.xz) = 2a48f1f5ca0b24854f93e49a4728f79517a95a24
 RMD160 (freeswitch-1.6.19.tar.xz) = 2e6514bb3f67cf7f464dd924541e95e1baab283f
 SHA512 (freeswitch-1.6.19.tar.xz) = 2cf678b7035e17d05f3745921dccafd2fb874cf927fdde5bd274cc07a42e372e941bedaa9569c59d09882eed02de9e874661a64a165e3de860fa6be7adc365ae
 Size (freeswitch-1.6.19.tar.xz) = 33497296 bytes
-SHA1 (patch-configure) = 76661c5bd14857de5fcea046d58f2ec46c04d767
+SHA1 (patch-configure.ac) = 1a9b952148da180d53075cd6ccfae2c6cf51cd3c
 SHA1 (patch-libs_libzrtp_third__party_bnlib_configure.ac) = dfda65d9e1302c74d9074139f10fde2e5d92bdca
-SHA1 (patch-libs_spandsp_configure) = ace14e1f5ed3318c2f3a0ec7f47bbdf6308a2f34
-SHA1 (patch-libs_spandsp_unpack__gsm0610__data.sh) = facfda4025aeb36f9277b088dace41442417ec9c
-SHA1 (patch-libs_unimrcp_configure) = d4ce12c4bc47e89ac60675c9fc9d67dd546061ba
-SHA1 (patch-modules.conf) = 8c59f28a9f3247f996debf8d8547c9f8de50b7ed
+SHA1 (patch-libs_spandsp_configure.ac) = 210174c8bc9342e091855e92eb2e4053e72ef82d
+SHA1 (patch-libs_spandsp_unpack__gsm0610__data.sh) = 1225884c0476dd18b798a04263db66246c9025ef
+SHA1 (patch-libs_unimrcp_configure.ac) = 316ce3ea1950a509ef5f161401e38bd0e2ff5d8c
diff --git a/freeswitch-core/patches/patch-configure b/freeswitch-core/patches/patch-configure
deleted file mode 100644
index 28d82df856..0000000000
--- a/freeswitch-core/patches/patch-configure
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Fix portability issues.
-
---- configure.orig	2017-04-30 00:54:20.670300000 +0000
-+++ configure
-@@ -36856,7 +36856,7 @@ if test "$with_ldap" = "yes"; then
-    OPENLDAP_LIBS="${OPENLDAP_LIBS} -lldap"
- fi
- 
-- if test "x$with_ldap" == "xyes"; then
-+ if test "x$with_ldap" = "xyes"; then
-   HAVE_LDAP_TRUE=
-   HAVE_LDAP_FALSE='#'
- else
diff --git a/freeswitch-core/patches/patch-configure.ac b/freeswitch-core/patches/patch-configure.ac
new file mode 100644
index 0000000000..828828c23e
--- /dev/null
+++ b/freeswitch-core/patches/patch-configure.ac
@@ -0,0 +1,18 @@
+$NetBSD$
+
+Fix portability issues for non-bash interpreters, this was
+identified by the check_portability.awk script used when
+PKG_DEVELOPER is set to ~yes~. Patches for source files were
+submitted to upstream, their revision and integration is pending.
+
+--- configure.ac.orig	2018-01-10 17:47:06.752411000 +0000
++++ configure.ac
+@@ -1499,7 +1499,7 @@ if test "$with_ldap" = "yes"; then
+    OPENLDAP_LIBS="${OPENLDAP_LIBS} -lldap"
+ fi
+ 
+-AM_CONDITIONAL([HAVE_LDAP],[test "x$with_ldap" == "xyes"])
++AM_CONDITIONAL([HAVE_LDAP],[test "x$with_ldap" = "xyes"])
+ 
+ AC_SUBST(OPENLDAP_LIBS)
+ 
diff --git a/freeswitch-core/patches/patch-libs_spandsp_configure b/freeswitch-core/patches/patch-libs_spandsp_configure
deleted file mode 100644
index bd29e883e9..0000000000
--- a/freeswitch-core/patches/patch-libs_spandsp_configure
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
-Fix portability issues.
-
---- libs/spandsp/configure.orig	2017-04-19 13:12:06.824318000 +0000
-+++ libs/spandsp/configure
-@@ -24108,7 +24108,7 @@ done
-     ;;
- esac
- 
--if test "${build}" == "${host}"
-+if test "${build}" = "${host}"
- then
- 
- for ac_header in X11/X.h
-@@ -25692,7 +25692,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- 
--if test "${build}" == "${host}"
-+if test "${build}" = "${host}"
- then
-     case "${host}" in
-     x86_64-*)
diff --git a/freeswitch-core/patches/patch-libs_spandsp_configure.ac b/freeswitch-core/patches/patch-libs_spandsp_configure.ac
new file mode 100644
index 0000000000..50cfbceaed
--- /dev/null
+++ b/freeswitch-core/patches/patch-libs_spandsp_configure.ac
@@ -0,0 +1,27 @@
+$NetBSD$
+
+Fix portability issues for non-bash interpreters, this was
+identified by the check_portability.awk script used when
+PKG_DEVELOPER is set to ~yes~. Patches for source files were
+submitted to upstream, their revision and integration is pending.
+
+--- libs/spandsp/configure.ac.orig	2018-01-10 17:40:15.463405000 +0000
++++ libs/spandsp/configure.ac
+@@ -231,7 +231,7 @@ case "$host" in
+     ;;
+ esac
+ 
+-if test "${build}" == "${host}"
++if test "${build}" = "${host}"
+ then
+     AC_CHECK_HEADERS([X11/X.h])
+ fi
+@@ -275,7 +275,7 @@ AC_CHECK_HEADERS([FL/Fl_Audio_Meter.H])
+ 
+ AC_LANG([C])
+ 
+-if test "${build}" == "${host}"
++if test "${build}" = "${host}"
+ then
+     case "${host}" in
+     x86_64-*)
diff --git a/freeswitch-core/patches/patch-libs_spandsp_unpack__gsm0610__data.sh b/freeswitch-core/patches/patch-libs_spandsp_unpack__gsm0610__data.sh
index 4d9527dc95..fea06546eb 100644
--- a/freeswitch-core/patches/patch-libs_spandsp_unpack__gsm0610__data.sh
+++ b/freeswitch-core/patches/patch-libs_spandsp_unpack__gsm0610__data.sh
@@ -1,6 +1,9 @@
 $NetBSD$
 
-Fix portability issues.
+Fix portability issues for non-bash interpreters, this was
+identified by the check_portability.awk script used when
+PKG_DEVELOPER is set to ~yes~. Patches for source files were
+submitted to upstream, their revision and integration is pending.
 
 --- libs/spandsp/unpack_gsm0610_data.sh.orig	2017-04-19 13:14:01.304432000 +0000
 +++ libs/spandsp/unpack_gsm0610_data.sh
diff --git a/freeswitch-core/patches/patch-libs_unimrcp_configure b/freeswitch-core/patches/patch-libs_unimrcp_configure
deleted file mode 100644
index 03efc0d169..0000000000
--- a/freeswitch-core/patches/patch-libs_unimrcp_configure
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Fix portability issues.
-
---- libs/unimrcp/configure.orig	2017-04-19 13:12:50.546788000 +0000
-+++ libs/unimrcp/configure
-@@ -18033,7 +18033,7 @@ fi
- 
- { $as_echo "$as_me:$LINENO: enable inter-library dependencies: $enable_interlib_deps" >&5
- $as_echo "$as_me: enable inter-library dependencies: $enable_interlib_deps" >&6;}
--if test "${enable_interlib_deps}" == "yes"; then
-+if test "${enable_interlib_deps}" = "yes"; then
-     link_all_deplibs=yes
-     link_all_deplibs_CXX=yes
- else
diff --git a/freeswitch-core/patches/patch-libs_unimrcp_configure.ac b/freeswitch-core/patches/patch-libs_unimrcp_configure.ac
new file mode 100644
index 0000000000..be26437219
--- /dev/null
+++ b/freeswitch-core/patches/patch-libs_unimrcp_configure.ac
@@ -0,0 +1,18 @@
+$NetBSD$
+
+Fix portability issues for non-bash interpreters, this was
+identified by the check_portability.awk script used when
+PKG_DEVELOPER is set to ~yes~. Patches for source files were
+submitted to upstream, their revision and integration is pending.
+
+--- libs/unimrcp/configure.ac.orig	2018-01-10 17:41:09.075109000 +0000
++++ libs/unimrcp/configure.ac
+@@ -92,7 +92,7 @@ AC_ARG_ENABLE(interlib-deps,
+     [enable_interlib_deps="yes"])
+ 
+ AC_MSG_NOTICE([enable inter-library dependencies: $enable_interlib_deps])
+-if test "${enable_interlib_deps}" == "yes"; then
++if test "${enable_interlib_deps}" = "yes"; then
+     link_all_deplibs=yes
+     link_all_deplibs_CXX=yes
+ else
Prev by Date: py-selenium: removed (already in base)
Next by Date: Update Elixir to 1.5.3
Previous by Thread: py-selenium: removed (already in base)
Next by Thread: Update Elixir to 1.5.3
Indexes:
Home | Main Index | Thread Index | Old Index