Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 9 Nov 2014 22:49:20 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r372379 - head/sysutils/hal
Message-ID:  <201411092249.sA9MnKdm055466@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Sun Nov  9 22:49:19 2014
New Revision: 372379
URL: https://svnweb.freebsd.org/changeset/ports/372379
QAT: https://qat.redports.org/buildarchive/r372379/

Log:
  Remove dependency on bash
  No bashism is available on freebsd supported scripts
  Still eradicate bashism on scripts that would never work on freebsd :)

Modified:
  head/sysutils/hal/Makefile

Modified: head/sysutils/hal/Makefile
==============================================================================
--- head/sysutils/hal/Makefile	Sun Nov  9 22:07:25 2014	(r372378)
+++ head/sysutils/hal/Makefile	Sun Nov  9 22:49:19 2014	(r372379)
@@ -4,7 +4,7 @@
 
 PORTNAME=	hal
 DISTVERSION=	0.5.14
-PORTREVISION=	27
+PORTREVISION=	28
 CATEGORIES=	sysutils
 MASTER_SITES=	http://hal.freedesktop.org/releases/
 
@@ -16,8 +16,7 @@ BUILD_DEPENDS=	${LOCALBASE}/include/linu
 LIB_DEPENDS=	libpolkit.so.2:${PORTSDIR}/sysutils/policykit \
 		libvolume_id.so:${PORTSDIR}/devel/libvolume_id \
 		libck-connector.so:${PORTSDIR}/sysutils/consolekit
-RUN_DEPENDS=	${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids \
-		bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids
 
 USES=		gettext gmake libtool:keepla pathfix pkgconfig python shebangfix
 USE_GNOME=	intlhack
@@ -43,6 +42,7 @@ CONFIGURE_ARGS=	--disable-gtk-doc \
 CONFIGURE_ENV=	GTKDOC="false"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+bash_CMD=	${SH}
 SHEBANG_FILES=	tools/hal-*
 
 #HALVERSION=	0.5.10
@@ -81,6 +81,7 @@ PLIST_SUB+=	USB2="@comment "
 .endif
 
 post-patch:
+	@${REINPLACE_CMD} -e 's/==/=/g' ${WRKSRC}/tools/hal-luks*
 	@${REINPLACE_CMD} -e '/^scriptdir = /s|[(]libexecdir[)]/scripts|(libexecdir)/hal/scripts|' \
 		${WRKSRC}/tools/Makefile.in \
 		${WRKSRC}/tools/freebsd/Makefile.in



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411092249.sA9MnKdm055466>