Move the lock directory to /var/run/emacs/lock per Satoshi's

request.

To avoid conflicts with other emacsen rename xemacs.sh to xemacs20.sh.

5 files changed, 34 insertions, 20 deletions

diff --git a/editors/xemacs-devel/Makefile b/editors/xemacs-devel/Makefile
index bd6dff646396..395b74b9229c 100644
--- a/editors/xemacs-devel/Makefile
+++ b/editors/xemacs-devel/Makefile
@@ -3,7 +3,7 @@
 # Date created:		26 August 1997
 # Whom:			Michael Elbel (me)
 #
-# $Id: Makefile,v 1.21 1998/09/17 00:50:47 asami Exp $
+# $Id: Makefile,v 1.22 1998/10/01 19:29:50 gj Exp $
 #
 
 DISTNAME=	xemacs-20.4
@@ -26,7 +26,7 @@ USE_GMAKE=	yes
 STRIP=
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	i386--freebsd --prefix=${PREFIX} \
-		--statedir=/var/run \
+		--lockdir=/var/run/emacs/lock \
 		--with-sound=native \
 		--site-includes=${PREFIX}/include \
 		--site-libraries=${PREFIX}/lib \
@@ -70,12 +70,12 @@ post-install:
 	strip ${PREFIX}/bin/${file}
 .endfor
 # ``make install'' does not set the permissions like pkg_add does.
-	chmod 1777 /var/run/xemacs/lock
+	chmod 1777 /var/run/emacs/lock
 	chmod 755 ${PREFIX}/lib/xemacs/site-lisp
 	chmod 755 ${PREFIX}/share/emacs/site-lisp
 	${RM} -f ${PREFIX}/bin/send-pr
-# install xemacs.sh into ${PREFIX}/etc/rc.d
+# install xemacs20.sh into ${PREFIX}/etc/rc.d
 	@if [ ! -d ${PREFIX}/etc/rc.d ]; then mkdir -p ${PREFIX}/etc/rc.d; fi
-	${INSTALL_SCRIPT} ${FILESDIR}/xemacs.sh ${PREFIX}/etc/rc.d
+	${INSTALL_SCRIPT} ${FILESDIR}/xemacs20.sh ${PREFIX}/etc/rc.d
 
 .include <bsd.port.mk>
diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index bd6dff646396..395b74b9229c 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -3,7 +3,7 @@
 # Date created:		26 August 1997
 # Whom:			Michael Elbel (me)
 #
-# $Id: Makefile,v 1.21 1998/09/17 00:50:47 asami Exp $
+# $Id: Makefile,v 1.22 1998/10/01 19:29:50 gj Exp $
 #
 
 DISTNAME=	xemacs-20.4
@@ -26,7 +26,7 @@ USE_GMAKE=	yes
 STRIP=
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	i386--freebsd --prefix=${PREFIX} \
-		--statedir=/var/run \
+		--lockdir=/var/run/emacs/lock \
 		--with-sound=native \
 		--site-includes=${PREFIX}/include \
 		--site-libraries=${PREFIX}/lib \
@@ -70,12 +70,12 @@ post-install:
 	strip ${PREFIX}/bin/${file}
 .endfor
 # ``make install'' does not set the permissions like pkg_add does.
-	chmod 1777 /var/run/xemacs/lock
+	chmod 1777 /var/run/emacs/lock
 	chmod 755 ${PREFIX}/lib/xemacs/site-lisp
 	chmod 755 ${PREFIX}/share/emacs/site-lisp
 	${RM} -f ${PREFIX}/bin/send-pr
-# install xemacs.sh into ${PREFIX}/etc/rc.d
+# install xemacs20.sh into ${PREFIX}/etc/rc.d
 	@if [ ! -d ${PREFIX}/etc/rc.d ]; then mkdir -p ${PREFIX}/etc/rc.d; fi
-	${INSTALL_SCRIPT} ${FILESDIR}/xemacs.sh ${PREFIX}/etc/rc.d
+	${INSTALL_SCRIPT} ${FILESDIR}/xemacs20.sh ${PREFIX}/etc/rc.d
 
 .include <bsd.port.mk>
diff --git a/editors/xemacs20/Makefile b/editors/xemacs20/Makefile
index bd6dff646396..395b74b9229c 100644
--- a/editors/xemacs20/Makefile
+++ b/editors/xemacs20/Makefile
@@ -3,7 +3,7 @@
 # Date created:		26 August 1997
 # Whom:			Michael Elbel (me)
 #
-# $Id: Makefile,v 1.21 1998/09/17 00:50:47 asami Exp $
+# $Id: Makefile,v 1.22 1998/10/01 19:29:50 gj Exp $
 #
 
 DISTNAME=	xemacs-20.4
@@ -26,7 +26,7 @@ USE_GMAKE=	yes
 STRIP=
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	i386--freebsd --prefix=${PREFIX} \
-		--statedir=/var/run \
+		--lockdir=/var/run/emacs/lock \
 		--with-sound=native \
 		--site-includes=${PREFIX}/include \
 		--site-libraries=${PREFIX}/lib \
@@ -70,12 +70,12 @@ post-install:
 	strip ${PREFIX}/bin/${file}
 .endfor
 # ``make install'' does not set the permissions like pkg_add does.
-	chmod 1777 /var/run/xemacs/lock
+	chmod 1777 /var/run/emacs/lock
 	chmod 755 ${PREFIX}/lib/xemacs/site-lisp
 	chmod 755 ${PREFIX}/share/emacs/site-lisp
 	${RM} -f ${PREFIX}/bin/send-pr
-# install xemacs.sh into ${PREFIX}/etc/rc.d
+# install xemacs20.sh into ${PREFIX}/etc/rc.d
 	@if [ ! -d ${PREFIX}/etc/rc.d ]; then mkdir -p ${PREFIX}/etc/rc.d; fi
-	${INSTALL_SCRIPT} ${FILESDIR}/xemacs.sh ${PREFIX}/etc/rc.d
+	${INSTALL_SCRIPT} ${FILESDIR}/xemacs20.sh ${PREFIX}/etc/rc.d
 
 .include <bsd.port.mk>
diff --git a/editors/xemacs20/files/xemacs20.sh b/editors/xemacs20/files/xemacs20.sh
new file mode 100644
index 000000000000..80166e668d5f
--- /dev/null
+++ b/editors/xemacs20/files/xemacs20.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+# script to create the lock directory in case it was
+# removed in /etc/rc
+#echo -n ' Xemacs'
+if [ -d /var/run/emacs/lock ]
+then
+# delete any junk which may have been left around
+	rm -f /var/run/emacs/lock/*
+else
+	mkdir -p /var/run/emacs/lock
+fi
+# can always do this
+chmod 1777 /var/run/emacs/lock
+exit 0
diff --git a/editors/xemacs21/Makefile b/editors/xemacs21/Makefile
index bd6dff646396..395b74b9229c 100644
--- a/editors/xemacs21/Makefile
+++ b/editors/xemacs21/Makefile
@@ -3,7 +3,7 @@
 # Date created:		26 August 1997
 # Whom:			Michael Elbel (me)
 #
-# $Id: Makefile,v 1.21 1998/09/17 00:50:47 asami Exp $
+# $Id: Makefile,v 1.22 1998/10/01 19:29:50 gj Exp $
 #
 
 DISTNAME=	xemacs-20.4
@@ -26,7 +26,7 @@ USE_GMAKE=	yes
 STRIP=
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	i386--freebsd --prefix=${PREFIX} \
-		--statedir=/var/run \
+		--lockdir=/var/run/emacs/lock \
 		--with-sound=native \
 		--site-includes=${PREFIX}/include \
 		--site-libraries=${PREFIX}/lib \
@@ -70,12 +70,12 @@ post-install:
 	strip ${PREFIX}/bin/${file}
 .endfor
 # ``make install'' does not set the permissions like pkg_add does.
-	chmod 1777 /var/run/xemacs/lock
+	chmod 1777 /var/run/emacs/lock
 	chmod 755 ${PREFIX}/lib/xemacs/site-lisp
 	chmod 755 ${PREFIX}/share/emacs/site-lisp
 	${RM} -f ${PREFIX}/bin/send-pr
-# install xemacs.sh into ${PREFIX}/etc/rc.d
+# install xemacs20.sh into ${PREFIX}/etc/rc.d
 	@if [ ! -d ${PREFIX}/etc/rc.d ]; then mkdir -p ${PREFIX}/etc/rc.d; fi
-	${INSTALL_SCRIPT} ${FILESDIR}/xemacs.sh ${PREFIX}/etc/rc.d
+	${INSTALL_SCRIPT} ${FILESDIR}/xemacs20.sh ${PREFIX}/etc/rc.d
 
 .include <bsd.port.mk>