- Splist hal in to hal-device-manager which includes the pygnome2 interface

  so we can make gnomevfs depend on hal.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6300 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 84 insertions, 49 deletions

diff --git a/sysutils/hal-device-manager/Makefile b/sysutils/hal-device-manager/Makefile
new file mode 100644
index 000000000..4680d4c74
--- /dev/null
+++ b/sysutils/hal-device-manager/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for:	hal-device-manager
+# Date created:		2006-05-18
+# Whom:			Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom$
+
+PORTREVISION=	0
+CATEGORIES=	sysutils gnome
+PKGNAMESUFFIX=	-device-manager
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	HAL device manager
+
+SLAVE_PORT=	yes
+
+MASTERDIR=	${.CURDIR}/../../sysutils/hal
+PLIST=	${.CURDIR}/pkg-plist
+
+.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/hal-device-manager/pkg-plist b/sysutils/hal-device-manager/pkg-plist
new file mode 100644
index 000000000..b00763e2e
--- /dev/null
+++ b/sysutils/hal-device-manager/pkg-plist
@@ -0,0 +1,39 @@
+bin/hal-device-manager
+%%DATADIR%%/device-manager/Const.py
+%%DATADIR%%/device-manager/Const.pyc
+%%DATADIR%%/device-manager/Const.pyo
+%%DATADIR%%/device-manager/Device.py
+%%DATADIR%%/device-manager/Device.pyc
+%%DATADIR%%/device-manager/Device.pyo
+%%DATADIR%%/device-manager/DeviceManager.py
+%%DATADIR%%/device-manager/DeviceManager.pyc
+%%DATADIR%%/device-manager/DeviceManager.pyo
+%%DATADIR%%/device-manager/GtkAttributesFacade.py
+%%DATADIR%%/device-manager/GtkAttributesFacade.pyc
+%%DATADIR%%/device-manager/GtkAttributesFacade.pyo
+%%DATADIR%%/device-manager/LibGladeApplication.py
+%%DATADIR%%/device-manager/LibGladeApplication.pyc
+%%DATADIR%%/device-manager/LibGladeApplication.pyo
+%%DATADIR%%/device-manager/Representation.py
+%%DATADIR%%/device-manager/Representation.pyc
+%%DATADIR%%/device-manager/Representation.pyo
+%%DATADIR%%/device-manager/fdo-logo.png
+%%DATADIR%%/device-manager/hal-abstract.png
+%%DATADIR%%/device-manager/hal-audio.png
+%%DATADIR%%/device-manager/hal-bus-pci.png
+%%DATADIR%%/device-manager/hal-bus-usb.png
+%%DATADIR%%/device-manager/hal-camera.png
+%%DATADIR%%/device-manager/hal-cat-cardbus.png
+%%DATADIR%%/device-manager/hal-cat-keyboard.png
+%%DATADIR%%/device-manager/hal-cat-mouse.png
+%%DATADIR%%/device-manager/hal-cdrom.png
+%%DATADIR%%/device-manager/hal-computer.png
+%%DATADIR%%/device-manager/hal-device-manager.glade
+%%DATADIR%%/device-manager/hal-flash.png
+%%DATADIR%%/device-manager/hal-floppy.png
+%%DATADIR%%/device-manager/hal-harddisk.png
+%%DATADIR%%/device-manager/hal-network.png
+%%DATADIR%%/device-manager/hal-serial-port.png
+%%DATADIR%%/device-manager/hal-unknown.png
+%%DATADIR%%/device-manager/hal-video.png
+@dirrm %%DATADIR%%/device-manager
diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile
index 6c4dac4ec..51c5be92b 100644
--- a/sysutils/hal/Makefile
+++ b/sysutils/hal/Makefile
@@ -3,27 +3,28 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/hal/Makefile,v 1.12 2006/05/14 21:29:01 marcus Exp $
+#   $MCom: ports/sysutils/hal/Makefile,v 1.13 2006/05/18 15:18:22 jylefort Exp $
 #
 
 PORTNAME=	hal
 PORTVERSION=	${HALVERSION}.${SNAPVERSION}
-PORTREVISION=	1
-CATEGORIES=	sysutils gnome
+PORTREVISION?=	2
+CATEGORIES?=	sysutils
 MASTER_SITES=	http://www.marcuscom.com/downloads/
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Hardware Abstraction Layer for simplifying device access
+COMMENT?=	Hardware Abstraction Layer for simplifying device access
 
+.if !defined(SLAVE_PORT)
 LIB_DEPENDS=	polkit.0:${PORTSDIR}/sysutils/policykit
 RUN_DEPENDS=	${LOCALBASE}/share/pci.ids:${PORTSDIR}/sysutils/pciutils \
-		isoinfo:${PORTSDIR}/sysutils/cdrtools \
-		${PYTHON_SITELIBDIR}/dbus.pth:${PORTSDIR}/devel/py-dbus
+		isoinfo:${PORTSDIR}/sysutils/cdrtools
+.endif
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack gnometarget intlhack pygnome2 ltverhack
+USE_GNOME=	gnomehack gnometarget intlhack ltverhack
 USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 USE_PYTHON=	yes
@@ -36,11 +37,11 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		GTKDOC="false"
 
-USE_RC_SUBR=	hald
-
 HALVERSION=	0.5.8
 SNAPVERSION=	20060514
 
+.if !defined(SLAVE_PORT)
+USE_RC_SUBR=	hald
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${HALVERSION}
 PLIST_SUB=	VERSION=${HALVERSION}
 
@@ -60,21 +61,33 @@ PLIST_FILES=	${PRIV_FILES:S|^|%%DATADIR%%/dist/|}
 
 SUB_FILES=	pkg-install pkg-deinstall
 SUB_LIST=	RC_FILES="${RC_FILES}"
+.else # Slave port stuff
+BUILD_DEPENDS+=	${PORTNAME}>=${PKGNAME:S/${PORTNAME}${PKGNAMESUFFIX}-//}:${PORTSDIR}/sysutils/hal
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/dbus.pth:${PORTSDIR}/devel/py-dbus \
+		${PORTNAME}>=${PKGNAME:S/${PORTNAME}${PKGNAMESUFFIX}-//}:${PORTSDIR}/sysutils/hal
 
+USE_GNOME+=	pygnome2
 DESKTOP_ENTRIES="Device Manager" \
 		"Examine your devices" \
 		"${DATADIR}/device-manager/hal-bus-pci.png" \
 		"hal-device-manager" \
 		"Application;System;" \
 		true
+BUILD_WRKSRC=	${WRKSRC}/tools/device-manager
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+.endif
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH}=="i386" || ${ARCH}=="amd64" || ${ARCH}=="ia64"
+.if !defined(SLAVE_PORT) && (${ARCH}=="i386" || ${ARCH}=="amd64" || ${ARCH}=="ia64")
 RUN_DEPENDS+=	dmidecode:${PORTSDIR}/sysutils/dmidecode
 .endif
 
 post-patch:
+.if !defined(SLAVE_PORT)
+	@${REINPLACE_CMD} -e 's|device-manager||' \
+		${WRKSRC}/tools/Makefile.in
+.endif
 	@${REINPLACE_CMD} -e '/^scriptdir = /s|libdir|libexecdir|' \
 		${WRKSRC}/tools/Makefile.in \
 		${WRKSRC}/tools/freebsd/Makefile.in
@@ -82,6 +95,7 @@ post-patch:
 		${WRKSRC}/policy/Makefile.in
 
 post-install:
+.if !defined(SLAVE_PORT)
 	${MKDIR} ${DATADIR}/dist
 	${INSTALL_DATA} ${WRKSRC}/hal.conf ${WRKSRC}/policy/txt/*.privilege \
 		${DATADIR}/dist
@@ -91,5 +105,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/hald/freebsd/README \
 		${DOCSDIR}/README.freebsd
 .endif
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/hal/pkg-plist b/sysutils/hal/pkg-plist
index 1b4807efd..e3a88f4ec 100644
--- a/sysutils/hal/pkg-plist
+++ b/sysutils/hal/pkg-plist
@@ -1,5 +1,4 @@
 bin/hal-device
-bin/hal-device-manager
 bin/hal-find-by-capability
 bin/hal-find-by-property
 bin/hal-get-property
@@ -61,43 +60,6 @@ sbin/hald
 %%DOCSDIR%%/conf/storage-non-fixed.fdi
 %%DOCSDIR%%/conf/storage-policy-examples.fdi
 %%DOCSDIR%%/conf/storage-skip-all.fdi
-%%DATADIR%%/device-manager/Const.py
-%%DATADIR%%/device-manager/Const.pyc
-%%DATADIR%%/device-manager/Const.pyo
-%%DATADIR%%/device-manager/Device.py
-%%DATADIR%%/device-manager/Device.pyc
-%%DATADIR%%/device-manager/Device.pyo
-%%DATADIR%%/device-manager/DeviceManager.py
-%%DATADIR%%/device-manager/DeviceManager.pyc
-%%DATADIR%%/device-manager/DeviceManager.pyo
-%%DATADIR%%/device-manager/GtkAttributesFacade.py
-%%DATADIR%%/device-manager/GtkAttributesFacade.pyc
-%%DATADIR%%/device-manager/GtkAttributesFacade.pyo
-%%DATADIR%%/device-manager/LibGladeApplication.py
-%%DATADIR%%/device-manager/LibGladeApplication.pyc
-%%DATADIR%%/device-manager/LibGladeApplication.pyo
-%%DATADIR%%/device-manager/Representation.py
-%%DATADIR%%/device-manager/Representation.pyc
-%%DATADIR%%/device-manager/Representation.pyo
-%%DATADIR%%/device-manager/fdo-logo.png
-%%DATADIR%%/device-manager/hal-abstract.png
-%%DATADIR%%/device-manager/hal-audio.png
-%%DATADIR%%/device-manager/hal-bus-pci.png
-%%DATADIR%%/device-manager/hal-bus-usb.png
-%%DATADIR%%/device-manager/hal-camera.png
-%%DATADIR%%/device-manager/hal-cat-cardbus.png
-%%DATADIR%%/device-manager/hal-cat-keyboard.png
-%%DATADIR%%/device-manager/hal-cat-mouse.png
-%%DATADIR%%/device-manager/hal-cdrom.png
-%%DATADIR%%/device-manager/hal-computer.png
-%%DATADIR%%/device-manager/hal-device-manager.glade
-%%DATADIR%%/device-manager/hal-flash.png
-%%DATADIR%%/device-manager/hal-floppy.png
-%%DATADIR%%/device-manager/hal-harddisk.png
-%%DATADIR%%/device-manager/hal-network.png
-%%DATADIR%%/device-manager/hal-serial-port.png
-%%DATADIR%%/device-manager/hal-unknown.png
-%%DATADIR%%/device-manager/hal-video.png
 %%DATADIR%%/dist/hal.conf
 %%DATADIR%%/fdi/fdi.dtd
 %%DATADIR%%/fdi/fdi.rng
@@ -173,7 +135,6 @@ share/locale/zh_TW/LC_MESSAGES/hal.mo
 @dirrm %%DATADIR%%/fdi/information
 @dirrm %%DATADIR%%/fdi
 @dirrm %%DATADIR%%/dist
-@dirrm %%DATADIR%%/device-manager
 @dirrm %%DATADIR%%
 @dirrm %%DOCSDIR%%/conf
 @dirrm %%DOCSDIR%%