Attachment #100081 for bug #139328

View | Details | Raw Unified | Return to bug 139328
Collapse All | Expand All




# $FreeBSD: ports/palm/synce-hal/Makefile,v 1.4 2009/08/22 00:34:28 amdmi3 Exp $

PORTNAME=	hal
PORTVERSION=	0.14
PORTEPOCH=	1
CATEGORIES=	palm
MASTER_SITES=	SF/synce/SynCE/${PORTVERSION}
PKGNAMEPREFIX=	synce-
DISTNAME=	synce-hal-${PORTVERSION}


USE_ICONV=	yes
USE_PYTHON_RUN=	yes
GNU_CONFIGURE=	yes
CONFIGURE_ARGS+=--with-hal-addon-dir=${PREFIX}/libexec \
			--disable-bluetooth-support

if ${OSVERSION} >= 800074
IGNORE=		requires pppd
.endif
		libexec/hal-synce-serial \
		share/synce-hal/dhclient.conf \
		share/hal/fdi/policy/20thirdparty/10-synce.fdi

PLIST_DIRS=	share/synce-hal
.include <bsd.port.mk>

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (synce-hal-0.13.1.tar.gz) = bf5d36ed73d6db6bdb310410c294a124	1	MD5 (synce-hal-0.14.tar.gz) = 1c3842c2361bbefc92525a431312516f
2	SHA256 (synce-hal-0.13.1.tar.gz) = c80e5db965cf0477e01aa6570c6d487e7840482294c0a4b59850f4da41f8a741	2	SHA256 (synce-hal-0.14.tar.gz) = 891d6ece1a55e1176daff116aabc3912c6296c4bd035ce9335730d70384ae2ab
3	SIZE (synce-hal-0.13.1.tar.gz) = 312987	3	SIZE (synce-hal-0.14.tar.gz) = 321379

Added Link Here

(-)pkg-plist (+11 lines)
1	bin/synce-unlock.py
2	libexec/hal-dccm
3	libexec/synce-serial-chat
4	libexec/hal-synce-rndis
5	libexec/hal-synce-serial
6	share/synce-hal/dhclient.conf
7	share/hal/fdi/policy/20thirdparty/10-synce.fdi
8	etc/dbus-1/system.d/org.freedesktop.Hal.Device.Synce.conf
9	@dirrmtry etc/dbus-1/system.d
10	@dirrmtry etc/dbus-1
11	@dirrm share/synce-hal




--- 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

Return to bug 139328

Lines 5-14 Link Here

(-)Makefile (-10 / +7 lines)
5	# $FreeBSD: ports/palm/synce-hal/Makefile,v 1.4 2009/08/22 00:34:28 amdmi3 Exp $	5	# $FreeBSD: ports/palm/synce-hal/Makefile,v 1.4 2009/08/22 00:34:28 amdmi3 Exp $
6		6
7	PORTNAME= hal	7	PORTNAME= hal
8	PORTVERSION= 0.13.1	8	PORTVERSION= 0.14
9	PORTEPOCH= 1	9	PORTEPOCH= 1
10	CATEGORIES= palm	10	CATEGORIES= palm
11	MASTER_SITES= SF/synce/SynCE/0.13	11	MASTER_SITES= SF/synce/SynCE/${PORTVERSION}
12	PKGNAMEPREFIX= synce-	12	PKGNAMEPREFIX= synce-
13	DISTNAME= synce-hal-${PORTVERSION}	13	DISTNAME= synce-hal-${PORTVERSION}
14		14
Lines 24-37 Link Here
24	USE_ICONV= yes	24	USE_ICONV= yes
25	USE_PYTHON_RUN= yes	25	USE_PYTHON_RUN= yes
26	GNU_CONFIGURE= yes	26	GNU_CONFIGURE= yes
27	CONFIGURE_ARGS+= --with-libiconv-prefix=${LOCALBASE} --with-hal-addon-dir=${PREFIX}/libexec --disable-bluetooth-support	27	CONFIGURE_ARGS+=--with-hal-addon-dir=${PREFIX}/libexec \
		28	--disable-bluetooth-support
28		29
29	PLIST_FILES= libexec/hal-dccm \	30	if ${OSVERSION} >= 800074
30	libexec/synce-serial-chat \	31	IGNORE= requires pppd
31	libexec/hal-synce-rndis \	32	.endif
32	libexec/hal-synce-serial \
33	share/synce-hal/dhclient.conf \
34	share/hal/fdi/policy/20thirdparty/10-synce.fdi
35		33
36	PLIST_DIRS= share/synce-hal
37	.include <bsd.port.mk>	34	.include <bsd.port.mk>

Added Link Here

(-)files/patch-configure (+20 lines)
1	--- configure.orig 2009-10-03 21:00:04.000000000 +1000
2	+++ configure 2009-10-03 21:00:46.000000000 +1000
3	@@ -12270,7 +12270,7 @@
4	if test "x${with_hal_addon_dir}" = "xno"; then
5	hal_addon_dir="`pkg-config --variable=libdir hal`/hal/scripts"
6
7	- hald_test_output=`hald --daemon=no 2>&1 \| grep 'allowed paths' \| grep "$hal_addon_dir"`
8	+ hald_test_output=`echo "$hal_addon_dir"`
9	if test $? -ne 0
10	then
11	{ { $as_echo "$as_me:$LINENO: error: Automatically determined hal script location ${hal_addon_dir} not in allowed paths, use --with-hal-addon-dir" >&5
12	@@ -12282,7 +12282,7 @@
13	else
14	hal_addon_dir="$with_hal_addon_dir"
15
16	- hald_test_output=`hald --daemon=no 2>&1 \| grep 'allowed paths' \| grep "$hal_addon_dir"`
17	+ hald_test_output=`echo "$hal_addon_dir"`
18	if test $? -ne 0
19	then
20	{ $as_echo "$as_me:$LINENO: WARNING: Specified hal script location ${hal_addon_dir} not in allowed paths" >&5