diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-05-05 04:25:34 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-05-05 04:25:34 +0800 |
| commit | a463294e81947bf980d584f258fbf61d1f9c4735 (patch) | |
| tree | 3a9d033c418f4ebaf97ffc0f281ec99723966d30 /sysutils/hal/Makefile | |
| parent | e1f962266e6bba8283c3ac432bedd07c97c3950d (diff) | |
| download | marcuscom-ports-a463294e81947bf980d584f258fbf61d1f9c4735.tar marcuscom-ports-a463294e81947bf980d584f258fbf61d1f9c4735.tar.gz marcuscom-ports-a463294e81947bf980d584f258fbf61d1f9c4735.tar.bz2 marcuscom-ports-a463294e81947bf980d584f258fbf61d1f9c4735.tar.lz marcuscom-ports-a463294e81947bf980d584f258fbf61d1f9c4735.tar.xz marcuscom-ports-a463294e81947bf980d584f258fbf61d1f9c4735.tar.zst marcuscom-ports-a463294e81947bf980d584f258fbf61d1f9c4735.zip | |
Take a stab at the FIXME, and try to preserve the D-BUS hal.conf. It seems
to work okay. After some more testing, this can be ported to policykit as
well.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6217 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'sysutils/hal/Makefile')
| -rw-r--r-- | sysutils/hal/Makefile | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile index e380e0ec4..b35df71b4 100644 --- a/sysutils/hal/Makefile +++ b/sysutils/hal/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/hal/Makefile,v 1.6 2006/05/03 05:59:59 marcus Exp $ +# $MCom: ports/sysutils/hal/Makefile,v 1.7 2006/05/04 19:26:25 jylefort Exp $ # PORTNAME= hal @@ -50,8 +50,6 @@ DESKTOP_ENTRIES="Device Manager" \ "Application;System;" \ true -# FIXME preserve hal.conf changes (same for PolicyKit.conf in policykit) - .include <bsd.port.pre.mk> .if ${ARCH}=="i386" || ${ARCH}=="amd64" || ${ARCH}=="ia64" @@ -66,5 +64,11 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/hald/freebsd/README \ ${DOCSDIR}/README.freebsd .endif + ${INSTALL_DATA} ${WRKSRC}/hal.conf ${DATADIR}/hal.conf.dist + if [ ! -f ${PREFIX}/etc/dbus-1/system.d/hal.conf ]; then \ + ${MKDIR} ${PREFIX}/etc/dbus-1/system.d ; \ + ${INSTALL_DATA} ${WRKSRC}/hal.conf \ + ${PREFIX}/etc/dbus-1/system.d ; \ + fi .include <bsd.port.post.mk> |