11 files changed, 35 insertions, 12 deletions

diff --git a/lang/ruby-devel/Makefile b/lang/ruby-devel/Makefile
index b25a2b6ce04f..1bdc49abbe42 100644
--- a/lang/ruby-devel/Makefile
+++ b/lang/ruby-devel/Makefile
@@ -104,10 +104,12 @@ post-install:
 		-e ' end;' \
 		-e 'end' \
 		${IRB_WITH_SUFFIX}
-	${MKDIR} ${LOCALBASE}/lib/xemacs/site-lisp
 	${MKDIR} ${RUBY_ELISPDIR}
+	${TOUCH} ${RUBY_ELISPDIR}/.keep_me
 	${MKDIR} ${RUBY_EXAMPLESDIR}
+	${TOUCH} ${RUBY_EXAMPLESDIR}/.keep_me
 	${MKDIR} ${RUBY_DOCDIR}
+	${TOUCH} ${RUBY_DOCDIR}/.keep_me
 .if !defined(NOPORTDOCS)
 	${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_EXAMPLESDIR}
 	${MKDIR} ${RUBY_EXAMPLESDIR}/curses
diff --git a/lang/ruby-devel/pkg-plist b/lang/ruby-devel/pkg-plist
index bcbfe76c0975..6585b19a3cc5 100644
--- a/lang/ruby-devel/pkg-plist
+++ b/lang/ruby-devel/pkg-plist
@@ -134,7 +134,8 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/shell
 %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%
 @unexec rmdir -p %D/lib/xemacs/site-lisp 2>/dev/null || true
-@dirrm %%RUBY_ELISPDIR%%
+%%RUBY_ELISPDIR%%/.keep_me
+@unexec rmdir %D/%%RUBY_ELISPDIR%% 2>/dev/null || true
 @unexec rmdir %D/lib/ruby 2>/dev/null || true
 %%PORTDOCS%%%%RUBY_DOCDIR%%/README
 %%PORTDOCS%%%%RUBY_DOCDIR%%/README.jp
@@ -164,6 +165,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/pty
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/readline
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/sha1
+%%RUBY_DOCDIR%%/.keep_me
 @unexec rmdir %D/%%RUBY_DOCDIR%% 2>/dev/null || true
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/README
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/biorhythm.rb
@@ -223,4 +225,5 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/pty/shl.rb
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/curses
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/pty
-@dirrm %%RUBY_EXAMPLESDIR%%
+%%RUBY_EXAMPLESDIR%%/.keep_me
+@unexec rmdir %D/%%RUBY_EXAMPLESDIR%% 2>/dev/null || true
diff --git a/lang/ruby-mode.el/Makefile b/lang/ruby-mode.el/Makefile
index 796faaa2aee7..406d005bfd4b 100644
--- a/lang/ruby-mode.el/Makefile
+++ b/lang/ruby-mode.el/Makefile
@@ -32,6 +32,7 @@ do-extract:
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/* ${RUBY_ELISPDIR}/
+	${MKDIR} ${XEMACSLISPDIR}
 .for f in ${ELISP_FILES}
 	${LN} -sf ${RUBY_ELISPDIR}/${f} ${EMACSLISPDIR}/
 	${LN} -sf ${RUBY_ELISPDIR}/${f} ${XEMACSLISPDIR}/
diff --git a/lang/ruby-ri/Makefile b/lang/ruby-ri/Makefile
index 2bd59b6e845a..3dc8bb33aab9 100644
--- a/lang/ruby-ri/Makefile
+++ b/lang/ruby-ri/Makefile
@@ -36,6 +36,7 @@ post-patch:
 do-install:
 	cd ${WRKSRC} && ${RUBY} install.rb
 	${INSTALL_DATA} ${WRKSRC}/contrib/dblack/emacs/Emacs.rb ${RUBY_SITELIBDIR}/${PORTNAME}/op/
+	${MKDIR} ${XEMACSLISPDIR}
 .for f in ${ELISP_FILES}
 	${INSTALL_DATA} ${WRKSRC}/contrib/dblack/emacs/${f} ${RUBY_ELISPDIR}/
 	${LN} -sf ${RUBY_ELISPDIR}/${f} ${EMACSLISPDIR}/
diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile
index 2cf767ba6893..416f639eb850 100644
--- a/lang/ruby/Makefile
+++ b/lang/ruby/Makefile
@@ -102,10 +102,12 @@ post-install:
 		-e ' end;' \
 		-e 'end' \
 		${IRB_WITH_SUFFIX}
-	${MKDIR} ${LOCALBASE}/lib/xemacs/site-lisp
 	${MKDIR} ${RUBY_ELISPDIR}
+	${TOUCH} ${RUBY_ELISPDIR}/.keep_me
 	${MKDIR} ${RUBY_EXAMPLESDIR}
+	${TOUCH} ${RUBY_EXAMPLESDIR}/.keep_me
 	${MKDIR} ${RUBY_DOCDIR}
+	${TOUCH} ${RUBY_DOCDIR}/.keep_me
 .if !defined(NOPORTDOCS)
 	${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_EXAMPLESDIR}
 	${MKDIR} ${RUBY_EXAMPLESDIR}/curses
diff --git a/lang/ruby/pkg-plist b/lang/ruby/pkg-plist
index 7aaab5fc1563..a29eac98b2f7 100644
--- a/lang/ruby/pkg-plist
+++ b/lang/ruby/pkg-plist
@@ -131,7 +131,8 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/shell
 %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%
 @unexec rmdir -p %D/lib/xemacs/site-lisp 2>/dev/null || true
-@dirrm %%RUBY_ELISPDIR%%
+%%RUBY_ELISPDIR%%/.keep_me
+@unexec rmdir %D/%%RUBY_ELISPDIR%% 2>/dev/null || true
 @unexec rmdir %D/lib/ruby 2>/dev/null || true
 %%PORTDOCS%%%%RUBY_DOCDIR%%/NEWS
 %%PORTDOCS%%%%RUBY_DOCDIR%%/README
@@ -159,6 +160,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/md5
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/pty
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/readline
+%%RUBY_DOCDIR%%/.keep_me
 @unexec rmdir %D/%%RUBY_DOCDIR%% 2>/dev/null || true
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/README
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/biorhythm.rb
@@ -218,4 +220,5 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/pty/shl.rb
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/curses
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/pty
-@dirrm %%RUBY_EXAMPLESDIR%%
+%%RUBY_EXAMPLESDIR%%/.keep_me
+@unexec rmdir %D/%%RUBY_EXAMPLESDIR%% 2>/dev/null || true
diff --git a/lang/ruby16/Makefile b/lang/ruby16/Makefile
index 2cf767ba6893..416f639eb850 100644
--- a/lang/ruby16/Makefile
+++ b/lang/ruby16/Makefile
@@ -102,10 +102,12 @@ post-install:
 		-e ' end;' \
 		-e 'end' \
 		${IRB_WITH_SUFFIX}
-	${MKDIR} ${LOCALBASE}/lib/xemacs/site-lisp
 	${MKDIR} ${RUBY_ELISPDIR}
+	${TOUCH} ${RUBY_ELISPDIR}/.keep_me
 	${MKDIR} ${RUBY_EXAMPLESDIR}
+	${TOUCH} ${RUBY_EXAMPLESDIR}/.keep_me
 	${MKDIR} ${RUBY_DOCDIR}
+	${TOUCH} ${RUBY_DOCDIR}/.keep_me
 .if !defined(NOPORTDOCS)
 	${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_EXAMPLESDIR}
 	${MKDIR} ${RUBY_EXAMPLESDIR}/curses
diff --git a/lang/ruby16/pkg-plist b/lang/ruby16/pkg-plist
index 7aaab5fc1563..a29eac98b2f7 100644
--- a/lang/ruby16/pkg-plist
+++ b/lang/ruby16/pkg-plist
@@ -131,7 +131,8 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/shell
 %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%
 @unexec rmdir -p %D/lib/xemacs/site-lisp 2>/dev/null || true
-@dirrm %%RUBY_ELISPDIR%%
+%%RUBY_ELISPDIR%%/.keep_me
+@unexec rmdir %D/%%RUBY_ELISPDIR%% 2>/dev/null || true
 @unexec rmdir %D/lib/ruby 2>/dev/null || true
 %%PORTDOCS%%%%RUBY_DOCDIR%%/NEWS
 %%PORTDOCS%%%%RUBY_DOCDIR%%/README
@@ -159,6 +160,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/md5
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/pty
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/readline
+%%RUBY_DOCDIR%%/.keep_me
 @unexec rmdir %D/%%RUBY_DOCDIR%% 2>/dev/null || true
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/README
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/biorhythm.rb
@@ -218,4 +220,5 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/pty/shl.rb
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/curses
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/pty
-@dirrm %%RUBY_EXAMPLESDIR%%
+%%RUBY_EXAMPLESDIR%%/.keep_me
+@unexec rmdir %D/%%RUBY_EXAMPLESDIR%% 2>/dev/null || true
diff --git a/lang/ruby18/Makefile b/lang/ruby18/Makefile
index b25a2b6ce04f..1bdc49abbe42 100644
--- a/lang/ruby18/Makefile
+++ b/lang/ruby18/Makefile
@@ -104,10 +104,12 @@ post-install:
 		-e ' end;' \
 		-e 'end' \
 		${IRB_WITH_SUFFIX}
-	${MKDIR} ${LOCALBASE}/lib/xemacs/site-lisp
 	${MKDIR} ${RUBY_ELISPDIR}
+	${TOUCH} ${RUBY_ELISPDIR}/.keep_me
 	${MKDIR} ${RUBY_EXAMPLESDIR}
+	${TOUCH} ${RUBY_EXAMPLESDIR}/.keep_me
 	${MKDIR} ${RUBY_DOCDIR}
+	${TOUCH} ${RUBY_DOCDIR}/.keep_me
 .if !defined(NOPORTDOCS)
 	${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_EXAMPLESDIR}
 	${MKDIR} ${RUBY_EXAMPLESDIR}/curses
diff --git a/lang/ruby18/pkg-plist b/lang/ruby18/pkg-plist
index bcbfe76c0975..6585b19a3cc5 100644
--- a/lang/ruby18/pkg-plist
+++ b/lang/ruby18/pkg-plist
@@ -134,7 +134,8 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/shell
 %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%
 @unexec rmdir -p %D/lib/xemacs/site-lisp 2>/dev/null || true
-@dirrm %%RUBY_ELISPDIR%%
+%%RUBY_ELISPDIR%%/.keep_me
+@unexec rmdir %D/%%RUBY_ELISPDIR%% 2>/dev/null || true
 @unexec rmdir %D/lib/ruby 2>/dev/null || true
 %%PORTDOCS%%%%RUBY_DOCDIR%%/README
 %%PORTDOCS%%%%RUBY_DOCDIR%%/README.jp
@@ -164,6 +165,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/pty
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/readline
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/sha1
+%%RUBY_DOCDIR%%/.keep_me
 @unexec rmdir %D/%%RUBY_DOCDIR%% 2>/dev/null || true
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/README
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/biorhythm.rb
@@ -223,4 +225,5 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/pty/shl.rb
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/curses
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/pty
-@dirrm %%RUBY_EXAMPLESDIR%%
+%%RUBY_EXAMPLESDIR%%/.keep_me
+@unexec rmdir %D/%%RUBY_EXAMPLESDIR%% 2>/dev/null || true
diff --git a/textproc/ruby-rd-mode.el/Makefile b/textproc/ruby-rd-mode.el/Makefile
index a7dba0878f19..c2d916da5199 100644
--- a/textproc/ruby-rd-mode.el/Makefile
+++ b/textproc/ruby-rd-mode.el/Makefile
@@ -31,6 +31,7 @@ do-extract:
 	${LN} -sf `cd ${.CURDIR}/../ruby-rdtool && ${MAKE} -V WRKSRC`/utils ${WRKSRC}
 
 do-install:
+	${MKDIR} ${XEMACSLISPDIR}/
 .for f in ${ELISP_FILES}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_ELISPDIR}/
 	${LN} -sf ${RUBY_ELISPDIR}/${f} ${EMACSLISPDIR}/