Merge r787:

Update to 1.7.0 for WITH_NEW_XORG
make HAL an optional dependency, defaulting to on.


git-svn-id: https://trillian.chruetertee.ch/svn/ports/branches/xorg-7.7@798 058c260c-8361-11dd-a0ac-aa2bafec7d09

4 files changed, 51 insertions, 15 deletions

diff --git a/x11-drivers/xf86-input-synaptics/Makefile b/x11-drivers/xf86-input-synaptics/Makefile
index ac81cb0..8c71115 100644
--- a/x11-drivers/xf86-input-synaptics/Makefile
+++ b/x11-drivers/xf86-input-synaptics/Makefile
@@ -1,7 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	xf86-input-synaptics
-PORTVERSION=	1.6.2
+PORTVERSION=	${SYNAPTICS_VERSION}
+PORTREVISION=	${SYNAPTICS_REVISION}
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -9,25 +10,47 @@ COMMENT=	X.Org synaptics input driver
 
 CONFLICTS=	synaptics-[0-9]*
 
-LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
+OPTIONS_DEFINE=	HAL
+OPTIONS_DEFAULT=HAL
+
+.include <bsd.port.options.mk>
 
 USES=		pathfix
-USE_XORG=	x11
+USE_XORG=	x11 xorg-macros
 XORG_CAT=	driver
 
+.if ${PORT_OPTIONS:MHAL}
+PLIST_SUB+=	HAL=""
+LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
+.else
+PLIST_SUB+=	HAL="@comment "
+.endif
+
 MAN1=		syndaemon.1 \
 		synclient.1
 MAN4=		synaptics.4x
 
-post-install:
-	${MKDIR} ${PREFIX}/share/hal/fdi/policy/10osvendor
-	${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \
-		${PREFIX}/share/hal/fdi/policy/10osvendor/
-
 .if defined(WITH_NEW_XORG)
+SYNAPTICS_VERSION=	1.7.0
+SYNAPTICS_REVISION=	0
 PLIST_SUB+=	NEW="" OLD="@comment "
 .else
+SYNAPTICS_VERSION=	1.6.2
+SYNAPTICS_REVISION=	0
 PLIST_SUB+=	NEW="@comment " OLD=""
+EXTRA_PATCHES+=	${PATCHDIR}/extra-Makefile.in
+.endif
+
+post-install:
+.if ${PORT_OPTIONS:MHAL}
+	${MKDIR} ${PREFIX}/share/hal/fdi/policy/10osvendor
+	${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \
+		${PREFIX}/share/hal/fdi/policy/10osvendor/
+.if !defined(WITH_NEW_XORG)
+	${MKDIR} ${PREFIX}/share/hal/fdi/policy/20thirdparty
+	${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \
+		${PREFIX}/share/hal/fdi/policy/20thirdparty/
+.endif
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-synaptics/distinfo b/x11-drivers/xf86-input-synaptics/distinfo
index 0af1595..ba7160b 100644
--- a/x11-drivers/xf86-input-synaptics/distinfo
+++ b/x11-drivers/xf86-input-synaptics/distinfo
@@ -1,2 +1,4 @@
 SHA256 (xorg/driver/xf86-input-synaptics-1.6.2.tar.bz2) = c3f7d6a085d480c352f030aeb43db2e5560d1468ed34be24d44a0fc3fda25920
 SIZE (xorg/driver/xf86-input-synaptics-1.6.2.tar.bz2) = 439313
+SHA256 (xorg/driver/xf86-input-synaptics-1.7.0.tar.bz2) = d6f1ad0b0653dddbe2e2db7e2f06c1860e491045e87a6577b63568d65e5d0f0e
+SIZE (xorg/driver/xf86-input-synaptics-1.7.0.tar.bz2) = 440081
diff --git a/x11-drivers/xf86-input-synaptics/files/extra-Makefile.in b/x11-drivers/xf86-input-synaptics/files/extra-Makefile.in
new file mode 100644
index 0000000..957f9fc
--- /dev/null
+++ b/x11-drivers/xf86-input-synaptics/files/extra-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2013-04-04 14:47:16.881259598 +0200
++++ Makefile.in	2013-04-04 14:47:20.568244417 +0200
+@@ -321,7 +321,7 @@
+ 	--with-sdkdir='$${includedir}/xorg' \
+ 	--with-xorg-conf-dir='$${datadir}/X11/xorg.conf.d'
+ 
+-SUBDIRS = include src man tools conf test
++SUBDIRS = include src man tools test
+ MAINTAINERCLEANFILES = ChangeLog INSTALL
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = xorg-synaptics.pc
diff --git a/x11-drivers/xf86-input-synaptics/pkg-plist b/x11-drivers/xf86-input-synaptics/pkg-plist
index 4d1aec8..3f9ad11 100644
--- a/x11-drivers/xf86-input-synaptics/pkg-plist
+++ b/x11-drivers/xf86-input-synaptics/pkg-plist
@@ -1,18 +1,18 @@
 bin/synclient
 bin/syndaemon
 include/xorg/synaptics-properties.h
-include/xorg/synaptics.h
+%%OLD%%include/xorg/synaptics.h
 lib/xorg/modules/input/synaptics_drv.la
 lib/xorg/modules/input/synaptics_drv.so
 libdata/pkgconfig/xorg-synaptics.pc
 %%NEW%%share/X11/xorg.conf.d/50-synaptics.conf
-share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi
-%%OLD%%share/hal/fdi/policy/20thirdparty/11-x11-synaptics.fdi
+%%HAL%%share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi
+%%HAL%%%%OLD%%share/hal/fdi/policy/20thirdparty/11-x11-synaptics.fdi
 @dirrmtry lib/xorg/modules/input
 @dirrmtry lib/xorg/modules
 @dirrmtry lib/xorg
 @dirrmtry include/xorg
-@dirrmtry share/hal/fdi/policy/10osvendor
-@dirrmtry share/hal/fdi/policy
-@dirrmtry share/hal/fdi
-@dirrmtry share/hal
+%%HAL%%@dirrmtry share/hal/fdi/policy/10osvendor
+%%HAL%%@dirrmtry share/hal/fdi/policy
+%%HAL%%@dirrmtry share/hal/fdi
+%%HAL%%@dirrmtry share/hal