ports/139328: [PATCH] palm/synce-hal: update to 0.14

[Alexander Logvinov]

>Number:         139328
>Category:       ports
>Synopsis:       [PATCH] palm/synce-hal: update to 0.14
>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:   Sat Oct 03 11:50:02 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Alexander Logvinov
>Release:        7.2-STABLE i386
>Organization:
>Environment:
>Description:
Update to 0.14.
Mark IGNORE on OSVERSION >= 800074.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/palm/synce-hal/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile	22 Aug 2009 00:34:28 -0000	1.4
+++ Makefile	3 Oct 2009 11:35:10 -0000
@@ -5,10 +5,10 @@
 # $FreeBSD: ports/palm/synce-hal/Makefile,v 1.4 2009/08/22 00:34:28 amdmi3 Exp $
 
 PORTNAME=	hal
-PORTVERSION=	0.13.1
+PORTVERSION=	0.14
 PORTEPOCH=	1
 CATEGORIES=	palm
-MASTER_SITES=	SF/synce/SynCE/0.13
+MASTER_SITES=	SF/synce/SynCE/${PORTVERSION}
 PKGNAMEPREFIX=	synce-
 DISTNAME=	synce-hal-${PORTVERSION}
 
@@ -24,14 +24,11 @@
 USE_ICONV=	yes
 USE_PYTHON_RUN=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--with-libiconv-prefix=${LOCALBASE} --with-hal-addon-dir=${PREFIX}/libexec --disable-bluetooth-support
+CONFIGURE_ARGS+=--with-hal-addon-dir=${PREFIX}/libexec \
+			--disable-bluetooth-support
 
-PLIST_FILES=	libexec/hal-dccm \
-		libexec/synce-serial-chat \
-		libexec/hal-synce-rndis \
-		libexec/hal-synce-serial \
-		share/synce-hal/dhclient.conf \
-		share/hal/fdi/policy/20thirdparty/10-synce.fdi
+if ${OSVERSION} >= 800074
+IGNORE=		requires pppd
+.endif
 
-PLIST_DIRS=	share/synce-hal
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/palm/synce-hal/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo	20 Mar 2009 23:20:50 -0000	1.2
+++ distinfo	3 Oct 2009 11:35:10 -0000
@@ -1,3 +1,3 @@
-MD5 (synce-hal-0.13.1.tar.gz) = bf5d36ed73d6db6bdb310410c294a124
-SHA256 (synce-hal-0.13.1.tar.gz) = c80e5db965cf0477e01aa6570c6d487e7840482294c0a4b59850f4da41f8a741
-SIZE (synce-hal-0.13.1.tar.gz) = 312987
+MD5 (synce-hal-0.14.tar.gz) = 1c3842c2361bbefc92525a431312516f
+SHA256 (synce-hal-0.14.tar.gz) = 891d6ece1a55e1176daff116aabc3912c6296c4bd035ce9335730d70384ae2ab
+SIZE (synce-hal-0.14.tar.gz) = 321379
Index: pkg-plist
===================================================================
RCS file: pkg-plist
diff -N pkg-plist
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ pkg-plist	3 Oct 2009 11:35:10 -0000
@@ -0,0 +1,11 @@
+bin/synce-unlock.py
+libexec/hal-dccm
+libexec/synce-serial-chat
+libexec/hal-synce-rndis
+libexec/hal-synce-serial
+share/synce-hal/dhclient.conf
+share/hal/fdi/policy/20thirdparty/10-synce.fdi
+etc/dbus-1/system.d/org.freedesktop.Hal.Device.Synce.conf
+ at dirrmtry etc/dbus-1/system.d
+ at dirrmtry etc/dbus-1
+ at dirrm share/synce-hal
Index: files/patch-configure
===================================================================
RCS file: files/patch-configure
diff -N files/patch-configure
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-configure	3 Oct 2009 11:35:10 -0000
@@ -0,0 +1,20 @@
+--- configure.orig	2009-10-03 21:00:04.000000000 +1000
++++ configure	2009-10-03 21:00:46.000000000 +1000
+@@ -12270,7 +12270,7 @@
+ if test "x${with_hal_addon_dir}" = "xno"; then
+     hal_addon_dir="`pkg-config --variable=libdir hal`/hal/scripts"
+ 
+-    hald_test_output=`hald --daemon=no 2>&1 | grep 'allowed paths' | grep "$hal_addon_dir"`
++    hald_test_output=`echo "$hal_addon_dir"`
+     if test $? -ne 0
+     then
+         { { $as_echo "$as_me:$LINENO: error: Automatically determined hal script location ${hal_addon_dir} not in allowed paths, use --with-hal-addon-dir" >&5
+@@ -12282,7 +12282,7 @@
+ else
+     hal_addon_dir="$with_hal_addon_dir"
+ 
+-    hald_test_output=`hald --daemon=no 2>&1 | grep 'allowed paths' | grep "$hal_addon_dir"`
++    hald_test_output=`echo "$hal_addon_dir"`
+     if test $? -ne 0
+     then
+         { $as_echo "$as_me:$LINENO: WARNING: Specified hal script location ${hal_addon_dir} not in allowed paths" >&5


>Release-Note:
>Audit-Trail:
>Unformatted: