summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorMasafumi Max NAKANE <max@FreeBSD.org>1998-05-02 21:07:10 +0000
committerMasafumi Max NAKANE <max@FreeBSD.org>1998-05-02 21:07:10 +0000
commit2263897ac8edbad4bda3207331365609600bdab2 (patch)
tree231b9720da5a95b25255355521df48e8bb3fe626 /editors
parentActivate libshhcards. (diff)
Bugfix:
(1) /usr/local/lib/mule/site-lisp/site-start.el is fixed (2) /usr/X11R6/info is added to Info-default-directory-list in site-start.el (3) mule can work on FreeBSD-current (this problem is about new ld.so). PR: 6030 Submitted by: maintainer
Notes
Notes: svn path=/head/; revision=10806
Diffstat (limited to 'editors')
-rw-r--r--editors/mule-common/files/patch-ac5
-rw-r--r--editors/mule-common/files/site-start.el.tmpl5
-rw-r--r--editors/mule/Makefile12
3 files changed, 18 insertions, 4 deletions
diff --git a/editors/mule-common/files/patch-ac b/editors/mule-common/files/patch-ac
index f9d3e07d53be..b302648cb3ff 100644
--- a/editors/mule-common/files/patch-ac
+++ b/editors/mule-common/files/patch-ac
@@ -1,5 +1,5 @@
--- ../mule-2.3.org/src/s/freebsd.h.org Fri Nov 4 03:11:17 1994
-+++ ./src/s/freebsd.h Wed Aug 9 02:29:56 1995
++++ ./src/s/freebsd.h Mon Feb 16 17:29:31 1998
@@ -31,10 +31,10 @@
#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
@@ -13,12 +13,13 @@
/* Reread the time zone on startup. */
#define LOCALTIME_CACHE
-@@ -81,6 +81,8 @@
+@@ -81,6 +81,9 @@
#define BSD 199103
#elif __FreeBSD__ == 2
#define BSD 199306
+#elif __FreeBSD__ == 3
+#define BSD 199506
++#define FREEBSD_NEW_LDSO
#endif
#define WAITTYPE int
diff --git a/editors/mule-common/files/site-start.el.tmpl b/editors/mule-common/files/site-start.el.tmpl
index d5a9dfa4453a..621eb74cd85c 100644
--- a/editors/mule-common/files/site-start.el.tmpl
+++ b/editors/mule-common/files/site-start.el.tmpl
@@ -1,3 +1,5 @@
+;; BEGIN mule-family
+;;
;; Chinese
;;(load "its/erpin")
;;(load "its/zhuyin")
@@ -34,4 +36,7 @@
(setq Info-default-directory-list
(append (list
"/usr/share/info"
+ "/usr/X11R6/info"
) Info-default-directory-list))
+
+;; END mule-family
diff --git a/editors/mule/Makefile b/editors/mule/Makefile
index 859793b5d3fb..fc55ad422c70 100644
--- a/editors/mule/Makefile
+++ b/editors/mule/Makefile
@@ -3,7 +3,7 @@
# Date created: 6 July 1997
# Whom: Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
#
-# $Id: Makefile,v 1.29 1997/06/08 12:54:52 asami Exp $
+# $Id: Makefile,v 1.30 1997/09/10 08:49:29 asami Exp $
#
DISTNAME= mule-2.3
@@ -84,6 +84,15 @@ pre-build:
find ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \;
${RM} -f ${WRKSRC}/etc/DOC* ${WRKSRC}/src/emacs ${WRKSRC}/src/emacs-19.28.*
+# If site-start.el exists, you should run below when you install by
+# this port
+pre-install:
+ @if [ -f ${SITE_START} ]; then \
+ ${MV} ${SITE_START} ${SITE_START}.orig ; \
+ ${SED} -e '/;; BEGIN mule-family/,/;; END mule-family/d' \
+ ${SITE_START}.orig > ${SITE_START}; \
+ fi
+
post-install:
# note that any2ps is a script
.for file in b2m coco ctags emacsclient etags m2ps mule-19.28
@@ -112,4 +121,3 @@ post-package:
@${TOUCH} ${TOUCH_FLAGS} ${PACKAGE_COOKIE}
.include <bsd.port.mk>
-