app-pda/pilot-link: fixed m4 patch

2 files changed, 5 insertions, 5 deletions

diff --git a/app-pda/pilot-link/Manifest b/app-pda/pilot-link/Manifest
index f96e0ce..c8dec5d 100644
--- a/app-pda/pilot-link/Manifest
+++ b/app-pda/pilot-link/Manifest
@@ -1,12 +1,12 @@
-AUX pilot-link-0.12.2-build.patch 2809 RMD160 90af4c4f176d3df99cf5210ed4f7749dc458fd02 SHA1 36c4f331a91c966e1214a906a78614dfa2c78fd9 SHA256 5aed1036114e73cf982aab125d0e2ba6047a67e598d4b0af2808ffb15814f637
-MD5 cda93589fe3e5e64b172fac94137ba76 files/pilot-link-0.12.2-build.patch 2809
-RMD160 90af4c4f176d3df99cf5210ed4f7749dc458fd02 files/pilot-link-0.12.2-build.patch 2809
-SHA256 5aed1036114e73cf982aab125d0e2ba6047a67e598d4b0af2808ffb15814f637 files/pilot-link-0.12.2-build.patch 2809
+AUX pilot-link-0.12.2-build.patch 2815 RMD160 a17d316435ed59aa65b0b31760b40f96d8580ef0 SHA1 057f58ce1c755e57ac849759babaca851c642fe0 SHA256 5b0d3bd0ec96c91ea9b654aea0001a6ec84419550bd208c0308395d547c7fdee
+MD5 01cbe947bab232629362d3465f334584 files/pilot-link-0.12.2-build.patch 2815
+RMD160 a17d316435ed59aa65b0b31760b40f96d8580ef0 files/pilot-link-0.12.2-build.patch 2815
+SHA256 5b0d3bd0ec96c91ea9b654aea0001a6ec84419550bd208c0308395d547c7fdee files/pilot-link-0.12.2-build.patch 2815
 DIST pilot-link-0.12.2.tar.bz2 964014 RMD160 3ae19f16b28c33cccb19fa218cdad4353d479875 SHA1 29a2b355ad8b0680e655c7e1ffa1ebef1b2ad5d9 SHA256 809df99a97aae215f93c1a0863644c0d3411462a5bac2d16d4d8941ce9c6d150
 EBUILD pilot-link-0.12.2.ebuild 1690 RMD160 867a8d3d340594d7f918dcce2a064dcf0793d14a SHA1 40fb778e62606e88cb7681e69adcefdd8a9da5df SHA256 5c6ae2364a66e25f639affa5a35500cc47f23e13fc19ab3e1c439e6a4bf30f66
 MD5 9210106d711d2db30de66772d2cd055c pilot-link-0.12.2.ebuild 1690
 RMD160 867a8d3d340594d7f918dcce2a064dcf0793d14a pilot-link-0.12.2.ebuild 1690
 SHA256 5c6ae2364a66e25f639affa5a35500cc47f23e13fc19ab3e1c439e6a4bf30f66 pilot-link-0.12.2.ebuild 1690
 MD5 2d3563e047f94fe8adc2d327ff046b32 files/digest-pilot-link-0.12.2 256
 RMD160 1c7ca253534c3a18eba1c760b3bd71a143fafc23 files/digest-pilot-link-0.12.2 256
 SHA256 8e247afc68e1f741adcff994523248987e858ee23c07b3887ae03cb62d095ace files/digest-pilot-link-0.12.2 256
diff --git a/app-pda/pilot-link/files/pilot-link-0.12.2-build.patch b/app-pda/pilot-link/files/pilot-link-0.12.2-build.patch
index 6d2c67d..d2961b5 100644
--- a/app-pda/pilot-link/files/pilot-link-0.12.2-build.patch
+++ b/app-pda/pilot-link/files/pilot-link-0.12.2-build.patch
@@ -1,89 +1,89 @@
 diff --git a/bindings/Java/Makefile.am b/bindings/Java/Makefile.am
 index a2ead24..1500dcd 100644
 --- a/bindings/Java/Makefile.am
 +++ b/bindings/Java/Makefile.am
 @@ -67,6 +67,8 @@ java_classes= \
  	datebooktst.class	\
  	adrtest.class
  
 +$(java_classes): java_compile
 +
  java_compile: $(java_files)
  	$(JAVAC) -d . $(java_files)
  
 @@ -81,16 +83,16 @@ java_pisock: java_compile java_lib java_jar
  install: all
  	ARCH=""; \
  	for a in i386 amd64 ppc; do \
 -		if [ -e ${JAVABASE}/jre/lib/${a} ]; then \
 -			 ARCH="${a}"; \
 +		if [ -e ${JAVABASE}/jre/lib/$${a} ]; then \
 +			 ARCH="$${a}"; \
  			 break; \
  		fi; \
  	done; \
 -	if [ -n "${ARCH}" ]; then \
 +	if [ -n "$${ARCH}" ]; then \
  		echo "Unknown architecture. Copy lipijsock.so to ${JAVABASE}/jre/lib/ARCH/"; \
  	else \
 -		mkdir -p "$(DESTDIR)${JAVABASE}/jre/lib/${ARCH}" && \
 -		cp libjpisock.so "$(DESTDIR)${JAVABASE}/jre/lib/${ARCH}"; \
 +		mkdir -p "$(DESTDIR)${JAVABASE}/jre/lib/$${ARCH}" && \
 +		cp libjpisock.so "$(DESTDIR)${JAVABASE}/jre/lib/$${ARCH}"; \
  		echo "done."; \
  	fi
   
 diff --git a/configure.ac b/configure.ac
 index 68a05f2..4da0626 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -220,6 +220,7 @@ AC_MSG_RESULT($enable_conduits)
  dnl ******************************
  dnl PNG Support
  dnl ******************************
 +msg_png=no
  if test "x$enable_conduits" != "xno"; then
  	have_png=no
  
 @@ -254,6 +255,7 @@ if test "x$enable_conduits" != "xno"; then
  			if test "$have_png" = yes; then
  				AC_DEFINE(HAVE_PNG, 1, [Define if we have PNG support])
  				have_png=yes
 +				msg_png=yes
  			fi
  		fi
  	fi
 @@ -351,12 +353,13 @@ PKG_CHECK_MODULES(BLUEZ, bluez, have_bluez=yes, AC_MSG_RESULT(no))
  AC_MSG_CHECKING([for BlueZ bluetooth support])
  AC_ARG_WITH(bluez,
                  AC_HELP_STRING([--with-bluez],
 -                        [Enable usage of BlueZ]),,
 +                        [Enable usage of BlueZ]),[use_bluez="$withval"],
                  use_bluez=auto)
  if test "x$use_bluez" != "xno"; then
          if test "x$have_bluez" = xno && test "x$use_bluez" = xyes; then
                  AC_MSG_ERROR([BlueZ explicitly requested but no support found])
          fi
 +	use_bluez="$have_bluez"
          if test "x$have_bluez" = xyes; then
                  AC_DEFINE(HAVE_BLUEZ, 1, [Define if we have BlueZ bluetooth support])
                  AC_MSG_RESULT([enabled])
 @@ -366,7 +369,7 @@ if test "x$use_bluez" != "xno"; then
          fi
  fi
  
 -AM_CONDITIONAL(WITH_BLUEZ, test x$have_bluez = "xyes")
 +AM_CONDITIONAL(WITH_BLUEZ, test x$use_bluez != "xno")
  
  
  dnl *********************************
-diff --git a/pilot-link.m4 b/pilot-link.m4
+diff --git a/pilot-link.m4.in b/pilot-link.m4.in
 index 129dfc3..a271c74 100644
 --- a/pilot-link.m4
 +++ b/pilot-link.m4
 @@ -1,5 +1,3 @@
 -AC_DEFUN([IT_PROG_INTLTOOL], [AC_PREREQ([2.50])dnl
 -
  AC_DEFUN([AC_PILOT_LINK_HOOK],
  [
  PILOT_LINK_VERS=0