cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
fab9d5c046
freebsd-ports/korean/hanemacs/files/patch-ae
Steve Price 4cd1769255 From maintainer: 
ELF building fix. Many part of fix from editors/emacs.

PR:		9451
Submitted by:	maintainer
1999-01-18 03:21:53 +00:00

216 lines
7.5 KiB
Plaintext
Raw Blame History

diff -uNr hanemacs-19.34-old/Makefile.in Makefile.in
--- Makefile.in.orig Tue Oct 29 07:19:31 1996
+++ Makefile.in Sun Jan 17 13:53:01 1999
@@ -184,7 +184,7 @@
# Subdirectories to make recursively. `lisp' is not included
# because the compiled lisp files are part of the distribution
# and you cannot remake them without installing Emacs first.
-SUBDIR = lib-src src
+SUBDIR = lib-src src man
# The makefiles of the directories in $SUBDIR.
SUBDIR_MAKEFILES = lib-src/Makefile man/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile
@@ -307,11 +307,11 @@
$(MAKE) install $(MFLAGS) prefix=${prefix} \
exec_prefix=${exec_prefix} bindir=${bindir} \
libexecdir=${libexecdir} archlibdir=${archlibdir})
- ${INSTALL_PROGRAM} src/hanemacs ${bindir}/emacs-${version}
+ ${INSTALL_PROGRAM} src/hanemacs ${bindir}/hanemacs-${version}
### hanemacs ###
- -chmod 1755 ${bindir}/emacs-${version}
+ -chmod 1755 ${bindir}/hanemacs-${version}
rm -f ${bindir}/$(EMACS)
- -ln ${bindir}/emacs-${version} ${bindir}/$(EMACS)
+ -ln ${bindir}/hanemacs-${version} ${bindir}/$(EMACS)
### Install the files that are machine-independent.
### Most of them come straight from the distribution;
@@ -355,8 +355,7 @@
if [ `(cd ./etc; /bin/pwd)` != `(cd ${docdir}; /bin/pwd)` ]; \
then \
echo "Copying etc/DOC-* to ${docdir} ..." ; \
- (cd ./etc; tar -cf - DOC*)|(cd ${docdir}; umask 0; tar -xvf - ); \
- (cd $(docdir); chmod a+r DOC*; rm DOC) \
+ (cd $(docdir); rm DOC-${version}*; mv DOC DOC-${version}; chmod a+r DOC*) \
else true; fi
if [ -r ./lisp ] \
&& [ x`(cd ./lisp; /bin/pwd)` != x`(cd ${lispdir}; /bin/pwd)` ] \
@@ -369,14 +368,8 @@
if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \
then \
(cd ${infodir}; \
- if [ -f dir ]; then \
- if [ ! -f dir.old ]; then mv -f dir dir.old; \
- else mv -f dir dir.bak; fi; \
- fi; \
cd ${srcdir}/info ; \
- (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir); \
- (cd $${thisdir}; chmod a+r ${infodir}/dir); \
- for f in ccmode* cl* dired-x* ediff* emacs* forms* gnus* info* message* mh-e* sc* vip*; do \
+ for f in ccmode* cl* dired-x* ediff* emacs* forms* gnus* message* mh-e* sc* vip*; do \
(cd $${thisdir}; \
${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f; \
chmod a+r ${infodir}/$$f); \
@@ -421,15 +414,15 @@
* ) rm -rf $${dir} ;; \
esac ; \
case $${dir} in \
- ${datadir}/emacs/${version}/* ) \
- rm -rf ${datadir}/emacs/${version} \
+ ${datadir}/hanemacs/${version}/* ) \
+ rm -rf ${datadir}/hanemacs/${version} \
;; \
esac ; \
fi ; \
done
- (cd ${infodir} && rm -f cl* dired-x* ediff* emacs* forms* gnus* info* mh-e* sc* vip*)
+ (cd ${infodir} && rm -f cl* dired-x* ediff* emacs* forms* gnus* mh-e* sc* vip*)
(cd ${man1dir} && rm -f emacs.1 etags.1 ctags.1)
- (cd ${bindir} && rm -f emacs-${version} $(EMACS))
+ (cd ${bindir} && rm -f hanemacs-${version} $(EMACS))
FRC:
diff -uNr hanemacs-19.34-old/configure configure
--- hanemacs-19.34-old/configure Tue Oct 29 13:29:53 1996
+++ configure Fri Mar 13 08:25:33 1998
@@ -536,14 +536,14 @@
-lispdir='${datadir}/emacs/${version}/lisp'
-locallisppath='${datadir}/emacs/${version}/site-lisp:'\
-'${datadir}/emacs/site-lisp'
+lispdir='${datadir}/hanemacs/${version}/lisp'
+locallisppath='${datadir}/hanemacs/${version}/site-lisp:'\
+'${datadir}/hanemacs/site-lisp'
lisppath='${locallisppath}:${lispdir}'
-etcdir='${datadir}/emacs/${version}/etc'
-lockdir='${sharedstatedir}/emacs/lock'
-archlibdir='${libexecdir}/emacs/${version}/${configuration}'
-docdir='${datadir}/emacs/${version}/etc'
+etcdir='${datadir}/hanemacs/${version}/etc'
+lockdir='${sharedstatedir}/hanemacs/lock'
+archlibdir='${libexecdir}/hanemacs/${version}/${configuration}'
+docdir='${datadir}/hanemacs/${version}/etc'
# Check whether --with-gcc or --without-gcc was given.
if test "${with_gcc+set}" = set; then
diff -uNr hanemacs-19.34-old/src/Makefile.in src/Makefile.in
--- hanemacs-19.34-old/src/Makefile.in Tue Oct 29 15:29:07 1996
+++ src/Makefile.in Fri Mar 13 08:29:12 1998
@@ -1050,7 +1050,7 @@
rm -f ../etc/DOC
/*** hanemacs ***/
clean: mostlyclean
- rm -f emacs-* hanemacs
+ rm -f emacs-* hanemacs*
/**/# This is used in making a distribution.
/**/# Do not use it on development directories!
distclean: clean
@@ -1060,7 +1060,7 @@
@echo "it deletes files that may require special tools to rebuild."
rm -f TAGS
versionclean:
- -rm -f emacs emacs-* ../etc/DOC*
+ -rm -f emacs hanemacs* emacs-* ../etc/DOC*
extraclean: distclean
-rm -f *~ \#* m/?*~ s/?*~
diff -uNr hanemacs-19.34-old/src/emacs.c src/emacs.c
--- hanemacs-19.34-old/src/emacs.c Tue Oct 29 16:59:06 1996
+++ src/emacs.c Fri Mar 13 08:25:34 1998
@@ -44,6 +44,9 @@
#include "blockinput.h"
#include "syssignal.h"
#include "process.h"
+#include "hangul.h"
+
+int font_ks_mode;
#ifndef O_RDWR
#define O_RDWR 2
@@ -608,7 +611,7 @@
}
#if defined (hanemacs_self_display) && defined (HAVE_X_WINDOWS)
{
- extern int font_ks_mode;
+ font_ks_mode = 1;
if (argmatch (argv, argc, "-ks", "--ks", 3, NULL, &skip_args))
font_ks_mode = 0;
}
diff -uNr hanemacs-19.34-old/src/handisp.c src/handisp.c
--- hanemacs-19.34-old/src/handisp.c Tue Oct 29 15:39:28 1996
+++ src/handisp.c Fri Mar 13 08:25:34 1998
@@ -26,7 +26,6 @@
#include "hangul.h"
int han_johab_font;
-int font_ks_mode = 't';
int
check_hangul_font (font)
@@ -36,10 +35,14 @@
han_johab_font = 1;
else if (strstr (font, "JOHAB"))
han_johab_font = 1;
- else if (strstr (font, "ksc5601.1987"))
+ else if (strstr (font, "ksc5601.1987")){
han_johab_font = 0;
- else if (strstr (font, "KSC5601.1987"))
+ font_ks_mode = 0;
+ }
+ else if (strstr (font, "KSC5601.1987")){
han_johab_font = 0;
+ font_ks_mode = 0;
+ }
else
error ("Hangul Font is not defined.\n");
@@ -286,7 +289,7 @@
{
if (!han_johab_mode)
{
- if (font_ks_mode == 't')
+ if (font_ks_mode == 1)
strcpy ((char *) des, src);
else
{
@@ -305,7 +308,7 @@
{
n = convert_jstring_to_wstring (src, des, len);
- if (font_ks_mode != 't')
+ if (font_ks_mode != 1)
{
int i = n;
XChar2b *ptr = des;
diff -uNr hanemacs-19.34-old/src/hangul.h src/hangul.h
--- hanemacs-19.34-old/src/hangul.h Tue Oct 29 15:39:28 1996
+++ src/hangul.h Fri Mar 13 08:25:34 1998
@@ -62,3 +62,4 @@
extern int han_johab_mode; /* default KSC5601 */
extern int han_kbd_kind; /* default 2 bulsik */
extern int han_kbd_state; /* default English */
+extern int font_ks_mode; /* font type */
diff -uNr hanemacs-19.34-old/src/xfns.c src/xfns.c
--- hanemacs-19.34-old/src/xfns.c Tue Oct 29 18:24:10 1996
+++ src/xfns.c Fri Mar 13 08:25:35 1998
@@ -3245,14 +3245,9 @@
if (STRINGP (hfont))
hfont = x_new_font (f, XSTRING (hfont)->data);
if (!STRINGP (hfont))
- hfont = x_new_font (f, "-kaist-philgi-bold-r-normal--16-160-75-75-c-160-johabsh-1");
+ hfont = x_new_font (f, "-kaist-iyagi-bold-r-normal--16-160-75-75-c-160-johabsh-1");
if (!STRINGP (hfont))
- {
- extern int font_ks_mode;
- hfont = x_new_font (f, "-daewoo-mincho-medium-r-normal--16-120-100-100-c-160-ksc5601.1987-0");
- if (STRINGP (hfont))
- font_ks_mode = 0;
- }
+ hfont = x_new_font (f, "-daewoo-mincho-medium-r-normal--16-120-100-100-c-160-ksc5601.1987-0");
if (!STRINGP (hfont))
hfont = x_new_font (f, "-kaist-philgi-bold-r-normal--16-160-75-75-c-160-johabsh-1");
if (!STRINGP (hfont))
Reference in New Issue View Git Blame Copy Permalink