6 files changed, 37 insertions, 87 deletions
diff --git a/extra/ntp/PKGBUILD b/extra/ntp/PKGBUILD
index 5267803d3..2c93a076c 100644
--- a/extra/ntp/PKGBUILD
+++ b/extra/ntp/PKGBUILD
@@ -1,30 +1,24 @@
-# $Id: PKGBUILD 184344 2013-05-06 10:28:53Z bisson $
+# $Id: PKGBUILD 190827 2013-07-18 07:23:31Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: kevin <kevin@archlinux.org>
 
 pkgname=ntp
 pkgver=4.2.6.p5
 _realver=4.2.6p5
-pkgrel=14
+pkgrel=15
 pkgdesc='Network Time Protocol reference implementation'
 url='http://www.ntp.org/'
 license=('custom')
 arch=('i686' 'x86_64')
 makedepends=('perl-html-parser')
 depends=('openssl' 'libcap' 'libedit')
-backup=('etc/ntp.conf' 'etc/conf.d/ntpd.conf')
+backup=('etc/ntp.conf')
 source=("http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${_realver}.tar.gz"
-        'ntpd'
-        'ntpdate'
         'ntp.conf'
-        'ntpd.conf'
         'ntpd.service'
         'ntpdate.service')
 sha1sums=('4a5353a4791b6f4315a66c28d504ec6c7926b192'
-          '4e324e625c1f080b5c028be5092aa71adbf9bd99'
-          '01394b8a952f5edc85d19df8335eeac3980320f4'
-          'f6a2292c26a201d9305669e99463fb54e5603b3f'
-          '4537d1f58b299d463db5048129cb264511474b0b'
+          'd3496dbeb7d531dd6ab071dbce3262c3c9618d8b'
           'ffbabfaab90f1ba4dc769c84fbbfe89c5c01ee95'
           '0cb9dbd285e2e8ac51ff47dee08af69e12a09855'
 )
@@ -50,10 +44,7 @@ package() {
 
 	rmdir "${pkgdir}"/usr/{lib,sbin}
 	install -d -o 87 "${pkgdir}"/var/lib/ntp
-	install -Dm755 ../ntpd "${pkgdir}"/etc/rc.d/ntpd
-	install -Dm755 ../ntpdate "${pkgdir}"/etc/rc.d/ntpdate
 	install -Dm644 ../ntp.conf "${pkgdir}"/etc/ntp.conf
-	install -Dm644 ../ntpd.conf "${pkgdir}"/etc/conf.d/ntpd.conf
 	install -Dm644 ../ntpd.service "${pkgdir}"/usr/lib/systemd/system/ntpd.service
 	install -Dm644 ../ntpdate.service "${pkgdir}"/usr/lib/systemd/system/ntpdate.service
 	install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
diff --git a/extra/ntp/ntp.conf b/extra/ntp/ntp.conf
index 2c0a34571..25135fb3b 100644
--- a/extra/ntp/ntp.conf
+++ b/extra/ntp/ntp.conf
@@ -17,6 +17,3 @@ restrict ::1
 
 # Location of drift file
 driftfile /var/lib/ntp/ntp.drift
-
-# NOTE: If you run dhcpcd and have lines like 'restrict' and 'fudge' appearing
-# here, be sure to add '-Y -N' to the dhcpcd_ethX variables in /etc/conf.d/net
diff --git a/extra/ntp/ntpd b/extra/ntp/ntpd
deleted file mode 100755
index 480fa1088..000000000
--- a/extra/ntp/ntpd
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/ntpd.conf
-
-unset PID
-PIDFILE='/run/ntpd.pid'
-
-if [[ -r ${PIDFILE} ]]; then
-	read -r PID <"${PIDFILE}"
-	if [[ -n ${PID} && ! -d /proc/${PID} ]]; then
-		rm -f "${PIDFILE}"
-		unset PID
-	fi
-fi
-
-case "$1" in
-	start)
-		stat_busy "Starting NTP Daemon"
-		if [[ -z ${PID} ]] && /usr/bin/ntpd ${NTPD_ARGS} -p "${PIDFILE}" &>/dev/null; then 
-			add_daemon ntpd
-			stat_done
-		else
-			stat_fail
-			exit 1
-		fi
-		;;
-	stop)
-		stat_busy "Stopping NTP Daemon"
-		if [[ -n ${PID} ]] && kill "${PID}" &>/dev/null; then
-			rm ${PIDFILE}
-			rm_daemon ntpd
-			stat_done
-		else
-			stat_fail
-			exit 1
-		fi
-		;;
-	restart)
-		$0 stop
-		sleep 1
-		$0 start
-		;;
-	*)
-		echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/extra/ntp/ntpd.conf b/extra/ntp/ntpd.conf
deleted file mode 100644
index 047961fde..000000000
--- a/extra/ntp/ntpd.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# client options for "ntpd -q" - ntpdate equivalent
-NTP_CLIENT_OPTION="-g -u ntp"
-
-# arguments passed to ntpd when started
-NTPD_ARGS="-g -u ntp"
diff --git a/extra/refind-efi/PKGBUILD b/extra/refind-efi/PKGBUILD
index 0617d298d..21188dee0 100644
--- a/extra/refind-efi/PKGBUILD
+++ b/extra/refind-efi/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 190083 2013-07-14 18:32:34Z tpowa $
+# $Id: PKGBUILD 190825 2013-07-18 07:06:20Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Keshav Padram <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
 
@@ -17,7 +17,7 @@ _COMPILER="GCC46"
 
 pkgname="refind-efi"
 pkgver="0.7.1"
-pkgrel="2"
+pkgrel="3"
 pkgdesc="Rod Smith's fork of rEFIt UEFI Boot Manager - built with Tianocore UDK libs"
 url="http://www.rodsbooks.com/refind/index.html"
 arch=('x86_64' 'i686')
@@ -63,10 +63,10 @@ _setup_env_vars() {
 
 _prepare_tianocore_sources() {
 	
-	_setup_env_vars
-	
 	msg "Delete old UDK BUILD dir"
 	rm -rf "${_UDK_DIR}/" || true
+	
+	msg "Create UDK BUILD dir"
 	mkdir -p "${_UDK_DIR}/"
 	
 	for _DIR_ in BaseTools MdePkg MdeModulePkg IntelFrameworkPkg IntelFrameworkModulePkg ; do
@@ -104,10 +104,10 @@ _prepare_tianocore_sources() {
 	sed "s|TOOL_CHAIN_TAG        = MYTOOLS|TOOL_CHAIN_TAG        = ${_COMPILER}|g" -i "${EDK_TOOLS_PATH}/Conf/target.template" || true
 	
 	msg "Fix UDK Target ARCH for rEFInd"
-	sed "s|X64|${_TIANO_ARCH}|g" -i "${_UDK_DIR}/Conf/target.txt" || true
-	sed "s|IA32|${_TIANO_ARCH}|g" -i "${_UDK_DIR}/Conf/target.txt" || true
+	sed "s|X64|${_TIANO_ARCH}|g" -i "${EDK_TOOLS_PATH}/Conf/target.template" || true
+	sed "s|IA32|${_TIANO_ARCH}|g" -i "${EDK_TOOLS_PATH}/Conf/target.template" || true
 	
-	chmod +x "${_UDK_DIR}/BaseTools/BuildEnv"
+	chmod 0755 "${_UDK_DIR}/BaseTools/BuildEnv"
 	
 }
 
@@ -124,6 +124,8 @@ _prepare_refind_sources() {
 
 prepare() {
 	
+	_setup_env_vars
+	
 	msg "Prepare Tianocore Sources"
 	_prepare_tianocore_sources
 	
@@ -192,17 +194,14 @@ package() {
 	
 	msg "Install rEFInd helper scripts"
 	install -d "${pkgdir}/usr/bin/"
-	install -D -m0644 "${srcdir}/refind-${pkgver}/install.sh" "${pkgdir}/usr/bin/refind-install"
-	install -D -m0644 "${srcdir}/refind-${pkgver}/mkrlconf.sh" "${pkgdir}/usr/bin/refind-mkrlconf"
-	install -D -m0644 "${srcdir}/refind-${pkgver}/mvrefind.sh" "${pkgdir}/usr/bin/refind-mvrefind"
+	install -D -m0755 "${srcdir}/refind-${pkgver}/install.sh" "${pkgdir}/usr/bin/refind-install"
+	install -D -m0755 "${srcdir}/refind-${pkgver}/mkrlconf.sh" "${pkgdir}/usr/bin/refind-mkrlconf"
+	install -D -m0755 "${srcdir}/refind-${pkgver}/mvrefind.sh" "${pkgdir}/usr/bin/refind-mvrefind"
 	install -D -m0755 "${srcdir}/refind-${pkgver}/fonts/mkfont.sh" "${pkgdir}/usr/bin/refind-mkfont"
 	
-	sed 's|#!/bin/bash|#!/usr/bin/env bash|g' -i "${pkgdir}/usr/bin"/refind-* || true
-	
-	msg "Install the rEFInd config file"
-	install -d "${pkgdir}/usr/lib/refind/config/"
-	install -D -m0644 "${srcdir}/refind-${pkgver}/refind.conf-sample" "${pkgdir}/usr/lib/refind/config/refind.conf"
-	install -D -m0644 "${srcdir}/refind_linux.conf" "${pkgdir}/usr/lib/refind/config/refind_linux.conf"
+	msg "Install the rEFInd sample config files"
+	install -D -m0644 "${srcdir}/refind-${pkgver}/refind.conf-sample" "${pkgdir}/usr/lib/refind/refind.conf-sample"
+	install -D -m0644 "${srcdir}/refind_linux.conf" "${pkgdir}/usr/lib/refind/refind_linux.conf-sample"
 	
 	msg "Install the rEFInd docs"
 	install -d "${pkgdir}/usr/share/doc/refind/html/"
@@ -234,4 +233,18 @@ package() {
 	install -d "${pkgdir}/usr/share/licenses/refind/"
 	install -D -m0644 "${srcdir}/refind-${pkgver}/LICENSE.txt" "${pkgdir}/usr/share/licenses/refind/LICENSE"
 	
+	msg "Use '#!/usr/bin/env bash' in all scripts"
+	sed 's|#!/bin/bash|#!/usr/bin/env bash|g' -i "${pkgdir}/usr/bin"/refind-* || true
+	
+	msg "Point refind dir paths to /usr/lib/refind/ in refind-install script"
+	sed 's|^ThisDir=.*|ThisDir="/usr/lib/refind/"|g' -i "${pkgdir}/usr/bin/refind-install"
+	sed 's|^RefindDir=.*|RefindDir="/usr/lib/refind/"|g' -i "${pkgdir}/usr/bin/refind-install"
+	sed 's|^ThisScript=.*|ThisScript="/usr/bin/refind-install"|g' -i "${pkgdir}/usr/bin/refind-install"
+	
+	msg "Setup SYMLINKS to refind dirs for the sake of refind-install script"
+	ln -s "/usr/share/refind/fonts" "${pkgdir}/usr/lib/refind/fonts"
+	ln -s "/usr/share/refind/icons" "${pkgdir}/usr/lib/refind/icons"
+	ln -s "/usr/share/refind/keys" "${pkgdir}/usr/lib/refind/keys"
+	ln -s "/usr/share/doc/refind" "${pkgdir}/usr/lib/refind/docs"
+	
 }
diff --git a/extra/refind-efi/refind-efi.install b/extra/refind-efi/refind-efi.install
index 51ac087fe..011552bcd 100644
--- a/extra/refind-efi/refind-efi.install
+++ b/extra/refind-efi/refind-efi.install
@@ -2,15 +2,16 @@ post_install() {
 	
 	cat << EOF 
 
-rEFInd UEFI applications have been installed at /usr/lib/refind/refind_*.efi
+rEFInd UEFI application has been installed at /usr/lib/refind/refind_*.efi
 
 Other UEFI applications have been installed at /usr/lib/refind/tools_*/
 
 UEFI drivers have deen installed at /usr/lib/refind/drivers_*/
 
 Copy the efi application (according to your UEFI ARCH) 
-and /usr/lib/refind/config/refind.conf to a sub-directory of <EFISYS>/EFI/
-and add an entry to firmware boot menu using efibootmgr or mactel-boot (for Macs)
+and /usr/lib/refind/refind.conf-sample to a sub-directory of <EFISYS>/EFI/
+as refind.conf and add an entry to firmware boot menu using efibootmgr
+or mactel-boot (for Macs)
 
 rEFInd Icons have been installed at /usr/share/refind/icons/
 rEFInd Fonts have been installed at /usr/share/refind/fonts/