From 894c751043e4c5a7a10f74fb330d3abe946d5bb8 Mon Sep 17 00:00:00 2001
From: Haoyang Wang <haoyang@esper.com>
Date: Thu, 10 Dec 2015 20:34:20 -0800
Subject: [PATCH] added editsysconf command in macosx.sh

---
 sys/unix/hints/macosx.sh   | 9 +++++++++
 sys/unix/hints/macosx10.10 | 7 +------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/sys/unix/hints/macosx.sh b/sys/unix/hints/macosx.sh
index 753c9b685..c16e9095d 100755
--- a/sys/unix/hints/macosx.sh
+++ b/sys/unix/hints/macosx.sh
@@ -91,6 +91,15 @@ xgroup2)
 	fi
 	;;
 
+xeditsysconf)
+	sed   's/^GDBPATH/#GDBPATH/' $2 \
+	| sed 's/^GREPPATH=\/bin\/grep/GREPPATH=\/usr\/bin\/grep/' \
+	| sed 's/^PANICTRACE_GDB=[12]/PANICTRACE_GDB=0/' \
+	| sed 's/^#OPTIONS=.*/&\
+OPTIONS=!use_darkgray/' \
+	> $3
+	;;
+
 #% dscl localhost -read /Search/Groups/wheel
 # AppleMetaNodeLocation: /Local/Default
 # GeneratedUID: ABCDEFAB-CDEF-ABCD-EFAB-CDEF00000000
diff --git a/sys/unix/hints/macosx10.10 b/sys/unix/hints/macosx10.10
index 880b4989f..6f9a48b06 100644
--- a/sys/unix/hints/macosx10.10
+++ b/sys/unix/hints/macosx10.10
@@ -265,12 +265,7 @@ build_package_root:
 	install -p doc/recover.6 $(PKGROOT_UG)/man/man6
 	install -p doc/Guidebook $(PKGROOT_UG)/doc
 	install -p dat/nhdat $(PKGROOT_UGLN)
-	setnl=`echo 'nl="'; echo '"'`; eval "$$setnl"; \
-	sed 's/^GDBPATH/#GDBPATH/' sys/unix/sysconf \
-	| sed 's/^GREPPATH=\/bin\/grep/GREPPATH=\/usr\/bin\/grep/' \
-	| sed 's/^PANICTRACE_GDB=[12]/PANICTRACE_GDB=0/' \
-	| sed "s/^#OPTIONS=.*/&\\$${nl}OPTIONS=!use_darkgray/" \
-	> $(PKGROOT_UGLN)/sysconf
+	sys/unix/hints/macosx.sh editsysconf sys/unix/sysconf $(PKGROOT_UGLN)/sysconf
 	cd dat; install -p $(DATNODLB) ../$(PKGROOT_UGLN)
 # XXX these files should be somewhere else for good Mac form
 	touch $(PKGROOT_UGLN)/perm $(PKGROOT_UGLN)/record $(PKGROOT_UGLN)/logfile $(PKGROOT_UGLN)/xlogfile
-- 
2.40.0