diff options
author | ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-05-19 04:35:37 +0800 |
---|---|---|
committer | ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-05-19 04:35:37 +0800 |
commit | 020a292981ff99af65bd73ef9bfa6e70d20bd3b0 (patch) | |
tree | 1e0d5dadb58b597cbe6231221b4e1b53fec433f4 /sysutils | |
parent | ff41ec67a18972e7063df48c997b69d8a0b389d0 (diff) | |
download | marcuscom-ports-020a292981ff99af65bd73ef9bfa6e70d20bd3b0.tar marcuscom-ports-020a292981ff99af65bd73ef9bfa6e70d20bd3b0.tar.gz marcuscom-ports-020a292981ff99af65bd73ef9bfa6e70d20bd3b0.tar.bz2 marcuscom-ports-020a292981ff99af65bd73ef9bfa6e70d20bd3b0.tar.lz marcuscom-ports-020a292981ff99af65bd73ef9bfa6e70d20bd3b0.tar.xz marcuscom-ports-020a292981ff99af65bd73ef9bfa6e70d20bd3b0.tar.zst marcuscom-ports-020a292981ff99af65bd73ef9bfa6e70d20bd3b0.zip |
- s/SLAVE_PORT/SLAVEPORT/ to fix conflicts in bsd.port.mk with the way it's
setup
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6301 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/hal-device-manager/Makefile | 4 | ||||
-rw-r--r-- | sysutils/hal/Makefile | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sysutils/hal-device-manager/Makefile b/sysutils/hal-device-manager/Makefile index 4680d4c74..9964a45b6 100644 --- a/sysutils/hal-device-manager/Makefile +++ b/sysutils/hal-device-manager/Makefile @@ -3,7 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom$ +# $MCom: ports/sysutils/hal-device-manager/Makefile,v 1.1 2006/05/18 20:19:04 ahze Exp $ PORTREVISION= 0 CATEGORIES= sysutils gnome @@ -12,7 +12,7 @@ PKGNAMESUFFIX= -device-manager MAINTAINER= gnome@FreeBSD.org COMMENT= HAL device manager -SLAVE_PORT= yes +SLAVEPORT= yes MASTERDIR= ${.CURDIR}/../../sysutils/hal PLIST= ${.CURDIR}/pkg-plist diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile index 51c5be92b..3bf418161 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.13 2006/05/18 15:18:22 jylefort Exp $ +# $MCom: ports/sysutils/hal/Makefile,v 1.14 2006/05/18 20:19:04 ahze Exp $ # PORTNAME= hal @@ -15,7 +15,7 @@ MASTER_SITES= http://www.marcuscom.com/downloads/ MAINTAINER= gnome@FreeBSD.org COMMENT?= Hardware Abstraction Layer for simplifying device access -.if !defined(SLAVE_PORT) +.if !defined(SLAVEPORT) LIB_DEPENDS= polkit.0:${PORTSDIR}/sysutils/policykit RUN_DEPENDS= ${LOCALBASE}/share/pci.ids:${PORTSDIR}/sysutils/pciutils \ isoinfo:${PORTSDIR}/sysutils/cdrtools @@ -40,7 +40,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ HALVERSION= 0.5.8 SNAPVERSION= 20060514 -.if !defined(SLAVE_PORT) +.if !defined(SLAVEPORT) USE_RC_SUBR= hald DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${HALVERSION} PLIST_SUB= VERSION=${HALVERSION} @@ -79,12 +79,12 @@ INSTALL_WRKSRC= ${BUILD_WRKSRC} .include <bsd.port.pre.mk> -.if !defined(SLAVE_PORT) && (${ARCH}=="i386" || ${ARCH}=="amd64" || ${ARCH}=="ia64") +.if !defined(SLAVEPORT) && (${ARCH}=="i386" || ${ARCH}=="amd64" || ${ARCH}=="ia64") RUN_DEPENDS+= dmidecode:${PORTSDIR}/sysutils/dmidecode .endif post-patch: -.if !defined(SLAVE_PORT) +.if !defined(SLAVEPORT) @${REINPLACE_CMD} -e 's|device-manager||' \ ${WRKSRC}/tools/Makefile.in .endif @@ -95,7 +95,7 @@ post-patch: ${WRKSRC}/policy/Makefile.in post-install: -.if !defined(SLAVE_PORT) +.if !defined(SLAVEPORT) ${MKDIR} ${DATADIR}/dist ${INSTALL_DATA} ${WRKSRC}/hal.conf ${WRKSRC}/policy/txt/*.privilege \ ${DATADIR}/dist |