Add a mkdir -p for share/emacs/site-lisp, just in case. Reverse the

order of the search for site-lisp (lib/mule is searched before
share/emacs now).

10 files changed, 38 insertions, 17 deletions

diff --git a/editors/mule-common/Makefile b/editors/mule-common/Makefile
index 017342ecf631..8064b2f6f5f9 100644
--- a/editors/mule-common/Makefile
+++ b/editors/mule-common/Makefile
@@ -3,7 +3,7 @@
 # Date created:		22 November 1994
 # Whom:			Satoshi Asami (asami)
 #
-# $Id: Makefile,v 1.18 1995/04/23 10:33:33 asami Exp $
+# $Id: Makefile,v 1.19 1995/06/27 10:45:31 asami Exp $
 #
 
 DISTNAME=	mule-2.2
@@ -25,7 +25,7 @@ HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	i386--freebsd --prefix=${PREFIX} --with-x-toolkit \
 		--terminal-face \
-		--locallisppath=${PREFIX}/share/emacs/site-lisp:${PREFIX}/lib/mule/site-lisp
+		--locallisppath=${PREFIX}/lib/mule/site-lisp:${PREFIX}/share/emacs/site-lisp
 
 STRIP=
 
@@ -41,5 +41,8 @@ post-install:
 	gzip -9nf ${PREFIX}/man/man1/coco.1
 	gzip -9nf ${PREFIX}/man/man1/m2ps.1
 	gzip -9nf ${PREFIX}/man/man1/mule.1
+	if [ ! -d ${PREFIX}/share/emacs/site-lisp ]; then \
+	  mkdir -p ${PREFIX}/share/emacs/site-lisp; \
+	fi
 
 .include <bsd.port.mk>
diff --git a/editors/mule-common/pkg-plist b/editors/mule-common/pkg-plist
index a329e4a41d5f..9d7f9ba8a9cb 100644
--- a/editors/mule-common/pkg-plist
+++ b/editors/mule-common/pkg-plist
@@ -1,4 +1,4 @@
-@cwd /usr/local
+@exec mkdir -p %D/share/emacs/site-lisp
 @exec mkdir -p %D/lib/mule/site-lisp
 @exec mkdir -p %D/lib/mule/lock
 @exec chmod 777 %D/lib/mule/lock
diff --git a/editors/mule/Makefile b/editors/mule/Makefile
index 017342ecf631..8064b2f6f5f9 100644
--- a/editors/mule/Makefile
+++ b/editors/mule/Makefile
@@ -3,7 +3,7 @@
 # Date created:		22 November 1994
 # Whom:			Satoshi Asami (asami)
 #
-# $Id: Makefile,v 1.18 1995/04/23 10:33:33 asami Exp $
+# $Id: Makefile,v 1.19 1995/06/27 10:45:31 asami Exp $
 #
 
 DISTNAME=	mule-2.2
@@ -25,7 +25,7 @@ HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	i386--freebsd --prefix=${PREFIX} --with-x-toolkit \
 		--terminal-face \
-		--locallisppath=${PREFIX}/share/emacs/site-lisp:${PREFIX}/lib/mule/site-lisp
+		--locallisppath=${PREFIX}/lib/mule/site-lisp:${PREFIX}/share/emacs/site-lisp
 
 STRIP=
 
@@ -41,5 +41,8 @@ post-install:
 	gzip -9nf ${PREFIX}/man/man1/coco.1
 	gzip -9nf ${PREFIX}/man/man1/m2ps.1
 	gzip -9nf ${PREFIX}/man/man1/mule.1
+	if [ ! -d ${PREFIX}/share/emacs/site-lisp ]; then \
+	  mkdir -p ${PREFIX}/share/emacs/site-lisp; \
+	fi
 
 .include <bsd.port.mk>
diff --git a/editors/mule/pkg-plist b/editors/mule/pkg-plist
index a329e4a41d5f..9d7f9ba8a9cb 100644
--- a/editors/mule/pkg-plist
+++ b/editors/mule/pkg-plist
@@ -1,4 +1,4 @@
-@cwd /usr/local
+@exec mkdir -p %D/share/emacs/site-lisp
 @exec mkdir -p %D/lib/mule/site-lisp
 @exec mkdir -p %D/lib/mule/lock
 @exec chmod 777 %D/lib/mule/lock
diff --git a/japanese/mule-canna/Makefile b/japanese/mule-canna/Makefile
index 7212ca8e6cde..32fde06cf248 100644
--- a/japanese/mule-canna/Makefile
+++ b/japanese/mule-canna/Makefile
@@ -3,7 +3,7 @@
 # Date created:		22 November 1994
 # Whom:			Satoshi Asami (asami)
 #
-# $Id: Makefile,v 1.18 1995/04/23 10:35:20 asami Exp $
+# $Id: Makefile,v 1.19 1995/06/27 10:45:39 asami Exp $
 #
 
 DISTNAME=	mule-2.2
@@ -28,7 +28,7 @@ USE_GMAKE=	yes
 CONFIGURE_ARGS=        i386--freebsd --prefix=${PREFIX} --with-x-toolkit \
 		--canna --canna-libraries=/usr/local/lib \
 		--canna-includes=/usr/local/canna/include --terminal-face \
-		--locallisppath=${PREFIX}/share/emacs/site-lisp:${PREFIX}/lib/mule/site-lisp
+		--locallisppath=${PREFIX}/lib/mule/site-lisp:${PREFIX}/share/emacs/site-lisp
 STRIP=
 
 pre-build:
@@ -47,5 +47,8 @@ post-install:
 	gzip -9nf ${PREFIX}/man/man1/etags.1
 	gzip -9nf ${PREFIX}/man/man1/m2ps.1
 	gzip -9nf ${PREFIX}/man/man1/mule.1
+	if [ ! -d ${PREFIX}/share/emacs/site-lisp ]; then \
+	  mkdir -p ${PREFIX}/share/emacs/site-lisp; \
+	fi
 
 .include <bsd.port.mk>
diff --git a/japanese/mule-freewnn/Makefile b/japanese/mule-freewnn/Makefile
index f20670cbcdd2..5d4373c9a183 100644
--- a/japanese/mule-freewnn/Makefile
+++ b/japanese/mule-freewnn/Makefile
@@ -3,7 +3,7 @@
 # Date created:		22 November 1994
 # Whom:			Satoshi Asami (asami)
 #
-# $Id: Makefile,v 1.18 1995/04/23 10:35:30 asami Exp $
+# $Id: Makefile,v 1.19 1995/06/27 10:45:42 asami Exp $
 #
 
 DISTNAME=	mule-2.2
@@ -30,7 +30,7 @@ USE_GMAKE=	yes
 CONFIGURE_ARGS=	i386--freebsd --prefix=${PREFIX} --with-x-toolkit \
 		--wnn --wnn-libraries=/usr/X11R6/lib \
 		--wnn-includes=/usr/X11R6/include/wnn --terminal-face \
-		--locallisppath=${PREFIX}/share/emacs/site-lisp:${PREFIX}/lib/mule/site-lisp
+		--locallisppath=${PREFIX}/lib/mule/site-lisp:${PREFIX}/share/emacs/site-lisp
 STRIP=
 
 pre-build:
@@ -49,5 +49,8 @@ post-install:
 	gzip -9nf ${PREFIX}/man/man1/etags.1
 	gzip -9nf ${PREFIX}/man/man1/m2ps.1
 	gzip -9nf ${PREFIX}/man/man1/mule.1
+	if [ ! -d ${PREFIX}/share/emacs/site-lisp ]; then \
+	  mkdir -p ${PREFIX}/share/emacs/site-lisp ]; \
+	fi
 
 .include <bsd.port.mk>
diff --git a/japanese/mule-wnn6/Makefile b/japanese/mule-wnn6/Makefile
index f20670cbcdd2..5d4373c9a183 100644
--- a/japanese/mule-wnn6/Makefile
+++ b/japanese/mule-wnn6/Makefile
@@ -3,7 +3,7 @@
 # Date created:		22 November 1994
 # Whom:			Satoshi Asami (asami)
 #
-# $Id: Makefile,v 1.18 1995/04/23 10:35:30 asami Exp $
+# $Id: Makefile,v 1.19 1995/06/27 10:45:42 asami Exp $
 #
 
 DISTNAME=	mule-2.2
@@ -30,7 +30,7 @@ USE_GMAKE=	yes
 CONFIGURE_ARGS=	i386--freebsd --prefix=${PREFIX} --with-x-toolkit \
 		--wnn --wnn-libraries=/usr/X11R6/lib \
 		--wnn-includes=/usr/X11R6/include/wnn --terminal-face \
-		--locallisppath=${PREFIX}/share/emacs/site-lisp:${PREFIX}/lib/mule/site-lisp
+		--locallisppath=${PREFIX}/lib/mule/site-lisp:${PREFIX}/share/emacs/site-lisp
 STRIP=
 
 pre-build:
@@ -49,5 +49,8 @@ post-install:
 	gzip -9nf ${PREFIX}/man/man1/etags.1
 	gzip -9nf ${PREFIX}/man/man1/m2ps.1
 	gzip -9nf ${PREFIX}/man/man1/mule.1
+	if [ ! -d ${PREFIX}/share/emacs/site-lisp ]; then \
+	  mkdir -p ${PREFIX}/share/emacs/site-lisp ]; \
+	fi
 
 .include <bsd.port.mk>
diff --git a/japanese/mule-wnn7/Makefile b/japanese/mule-wnn7/Makefile
index f20670cbcdd2..5d4373c9a183 100644
--- a/japanese/mule-wnn7/Makefile
+++ b/japanese/mule-wnn7/Makefile
@@ -3,7 +3,7 @@
 # Date created:		22 November 1994
 # Whom:			Satoshi Asami (asami)
 #
-# $Id: Makefile,v 1.18 1995/04/23 10:35:30 asami Exp $
+# $Id: Makefile,v 1.19 1995/06/27 10:45:42 asami Exp $
 #
 
 DISTNAME=	mule-2.2
@@ -30,7 +30,7 @@ USE_GMAKE=	yes
 CONFIGURE_ARGS=	i386--freebsd --prefix=${PREFIX} --with-x-toolkit \
 		--wnn --wnn-libraries=/usr/X11R6/lib \
 		--wnn-includes=/usr/X11R6/include/wnn --terminal-face \
-		--locallisppath=${PREFIX}/share/emacs/site-lisp:${PREFIX}/lib/mule/site-lisp
+		--locallisppath=${PREFIX}/lib/mule/site-lisp:${PREFIX}/share/emacs/site-lisp
 STRIP=
 
 pre-build:
@@ -49,5 +49,8 @@ post-install:
 	gzip -9nf ${PREFIX}/man/man1/etags.1
 	gzip -9nf ${PREFIX}/man/man1/m2ps.1
 	gzip -9nf ${PREFIX}/man/man1/mule.1
+	if [ ! -d ${PREFIX}/share/emacs/site-lisp ]; then \
+	  mkdir -p ${PREFIX}/share/emacs/site-lisp ]; \
+	fi
 
 .include <bsd.port.mk>
diff --git a/textproc/coco/Makefile b/textproc/coco/Makefile
index 017342ecf631..8064b2f6f5f9 100644
--- a/textproc/coco/Makefile
+++ b/textproc/coco/Makefile
@@ -3,7 +3,7 @@
 # Date created:		22 November 1994
 # Whom:			Satoshi Asami (asami)
 #
-# $Id: Makefile,v 1.18 1995/04/23 10:33:33 asami Exp $
+# $Id: Makefile,v 1.19 1995/06/27 10:45:31 asami Exp $
 #
 
 DISTNAME=	mule-2.2
@@ -25,7 +25,7 @@ HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	i386--freebsd --prefix=${PREFIX} --with-x-toolkit \
 		--terminal-face \
-		--locallisppath=${PREFIX}/share/emacs/site-lisp:${PREFIX}/lib/mule/site-lisp
+		--locallisppath=${PREFIX}/lib/mule/site-lisp:${PREFIX}/share/emacs/site-lisp
 
 STRIP=
 
@@ -41,5 +41,8 @@ post-install:
 	gzip -9nf ${PREFIX}/man/man1/coco.1
 	gzip -9nf ${PREFIX}/man/man1/m2ps.1
 	gzip -9nf ${PREFIX}/man/man1/mule.1
+	if [ ! -d ${PREFIX}/share/emacs/site-lisp ]; then \
+	  mkdir -p ${PREFIX}/share/emacs/site-lisp; \
+	fi
 
 .include <bsd.port.mk>
diff --git a/textproc/coco/pkg-plist b/textproc/coco/pkg-plist
index a329e4a41d5f..9d7f9ba8a9cb 100644
--- a/textproc/coco/pkg-plist
+++ b/textproc/coco/pkg-plist
@@ -1,4 +1,4 @@
-@cwd /usr/local
+@exec mkdir -p %D/share/emacs/site-lisp
 @exec mkdir -p %D/lib/mule/site-lisp
 @exec mkdir -p %D/lib/mule/lock
 @exec chmod 777 %D/lib/mule/lock