summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
Diffstat (limited to 'editors')
-rw-r--r--editors/emacs20/distinfo6
-rw-r--r--editors/emacs20/patches/patch-ab42
-rw-r--r--editors/emacs20/patches/patch-bg32
3 files changed, 65 insertions, 15 deletions
diff --git a/editors/emacs20/distinfo b/editors/emacs20/distinfo
index ecdb93ba7f8..a9fcfc21308 100644
--- a/editors/emacs20/distinfo
+++ b/editors/emacs20/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.41 2021/12/29 03:26:32 dholland Exp $
+$NetBSD: distinfo,v 1.42 2021/12/29 03:40:23 dholland Exp $
BLAKE2s (emacs-20.7-mule-4.1b-elc.tar.gz) = 8d3116a8037014bdeece76148aeb0ae72adcb003fd67922650793302197d62bf
SHA512 (emacs-20.7-mule-4.1b-elc.tar.gz) = db4020ef7e428c99dffd3873485ce5d0ee4ad2c2bf87ec3b5f84dbf36fa2c398f3c0e02651cae3565acd2e7cbf504f66507c08b578f91247e9a27280226fb8d4
@@ -16,7 +16,7 @@ BLAKE2s (emacs20-xim-20000713.diff) = 22ddc9c54b5c3535bf9788af7c00dd3eea65fcbb23
SHA512 (emacs20-xim-20000713.diff) = d6d3fb483db830ddcf07f6325901fb7faca1e112129f27036328eb4a6a53851a53318a31830a751525b9e0898256c6c9bfe5c3c333401d44a6dcbad44ba3c7a8
Size (emacs20-xim-20000713.diff) = 21296 bytes
SHA1 (patch-aa) = 3b3fd76c058a0a46e0458338ce4c2327a238fb3d
-SHA1 (patch-ab) = 05849039b43d15a52242ef3688abac5c46b8aca8
+SHA1 (patch-ab) = 16c236c232649cc89ed89131a793e201bccef5f0
SHA1 (patch-ac) = abf5971279a8d875504be4c17b8d36cb8cc24885
SHA1 (patch-ad) = dd21028a6360ccfb442ecced4c67717f60ea78a6
SHA1 (patch-ae) = 465c7aff1fbb23d08ff8100993041291a9502f34
@@ -37,7 +37,7 @@ SHA1 (patch-bb) = 2b5df93c18a2baabed0d2a878242e1fa30647167
SHA1 (patch-bc) = ce6240227e8a7af506c908e0c199e17ce73d7f27
SHA1 (patch-bd) = 01c4490ec36fec09148bcb9c76ba6c8de509c346
SHA1 (patch-bf) = 089ac290cbbe5c060e5300ea3ffacf8cb5ab5254
-SHA1 (patch-bg) = 5115064efe54800923677304161f46ade379b3b0
+SHA1 (patch-bg) = b98608214ea7c1c48905029728ddd7424bc12391
SHA1 (patch-bh) = f59b14cc43d5977a5d80d5d1ab4e246df394d86a
SHA1 (patch-bi) = c0e237bd46de0f9ef137997e59231f119d5f791e
SHA1 (patch-bj) = 6dba88723ee632b67fcf6a2dd2918e69034837e2
diff --git a/editors/emacs20/patches/patch-ab b/editors/emacs20/patches/patch-ab
index 66300cd0d61..c871cccb22d 100644
--- a/editors/emacs20/patches/patch-ab
+++ b/editors/emacs20/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.12 2021/12/25 22:11:51 dholland Exp $
+$NetBSD: patch-ab,v 1.13 2021/12/29 03:40:23 dholland Exp $
Caution: the changes for using a different cpp for munging the
makefiles (search for MAKEFILECPP) are *not* reflected in the pkgsrc
@@ -53,7 +53,15 @@ with autoconf without thinking.
esac
;;
-@@ -1519,6 +1533,7 @@ case "${canonical}" in
+@@ -735,6 +749,7 @@ case "${canonical}" in
+ ns32k-*-openbsd*) machine=ns32000 ;;
+ sparc-*-openbsd*) machine=sparc ;;
+ vax-*-openbsd*) machine=vax ;;
++ x86_64-*-openbsd*) machine=amd64 ;;
+ esac
+ ;;
+
+@@ -1519,11 +1534,23 @@ case "${canonical}" in
*-sysv4.2uw* ) opsys=unixware; NON_GNU_CPP=/lib/cpp ;;
*-386bsd* ) opsys=386bsd ;;
*-freebsd* ) opsys=freebsd ;;
@@ -61,7 +69,23 @@ with autoconf without thinking.
*-nextstep* ) opsys=nextstep ;;
## Otherwise, we'll fall through to the generic opsys code at the bottom.
esac
-@@ -1981,6 +1996,14 @@ else
+ ;;
+
++ ## AMD/Intel x86_64 machines where we don't care about the manufacturer
++ x86_64-*-* )
++ machine=amd64
++ case "${canonical}" in
++ *-linux-gnu* ) opsys=gnu-linux ;;
++ *-freebsd* ) opsys=freebsd ;;
++ *-dragonfly* ) opsys=dragonfly ;;
++ ## Otherwise, we'll fall through to the generic opsys code at the bottom.
++ esac
++ ;;
++
+ ## m68k Linux-based GNU system
+ m68k-*-linux-gnu* )
+ machine=m68k opsys=gnu-linux
+@@ -1981,6 +2008,14 @@ else
fi
echo "$ac_t""$CPP" 1>&6
@@ -76,7 +100,7 @@ with autoconf without thinking.
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
# incompatible versions:
-@@ -3823,6 +3846,53 @@ else
+@@ -3823,6 +3858,53 @@ else
echo "$ac_t""no" 1>&6
fi
@@ -130,7 +154,7 @@ with autoconf without thinking.
LIBS="$OLDLIBS"
fi
-@@ -4906,6 +4976,64 @@ EOF
+@@ -4906,6 +4988,64 @@ EOF
fi
@@ -195,7 +219,7 @@ with autoconf without thinking.
# Set up the CFLAGS for real compilation, so we can substitute it.
CFLAGS="$REAL_CFLAGS"
-@@ -5211,6 +5339,7 @@ s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
+@@ -5211,6 +5351,7 @@ s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
s%@INSTALL_DATA@%$INSTALL_DATA%g
s%@YACC@%$YACC%g
s%@SET_MAKE@%$SET_MAKE%g
@@ -203,7 +227,7 @@ with autoconf without thinking.
s%@ALLOCA@%$ALLOCA%g
s%@version@%$version%g
s%@configuration@%$configuration%g
-@@ -5445,6 +5574,7 @@ fi; done
+@@ -5445,6 +5586,7 @@ fi; done
EOF
cat >> $CONFIG_STATUS <<EOF
CPP="$CPP" CPPFLAGS="$CPPFLAGS"
@@ -211,7 +235,7 @@ with autoconf without thinking.
EOF
cat >> $CONFIG_STATUS <<\EOF
-@@ -5480,7 +5610,7 @@ echo creating lib-src/Makefile
+@@ -5480,7 +5622,7 @@ echo creating lib-src/Makefile
sed -e '1,/start of cpp stuff/d'\
-e 's@/\*\*/#\(.*\)$@/* \1 */@' \
< Makefile.c > junk.c
@@ -220,7 +244,7 @@ with autoconf without thinking.
sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > junk2.c
cat junk1.c junk2.c > Makefile.new
rm -f junk.c junk1.c junk2.c
-@@ -5496,7 +5626,7 @@ echo creating src/Makefile
+@@ -5496,7 +5638,7 @@ echo creating src/Makefile
sed -e '1,/start of cpp stuff/d'\
-e 's@/\*\*/#\(.*\)$@/* \1 */@' \
< Makefile.c > junk.c
diff --git a/editors/emacs20/patches/patch-bg b/editors/emacs20/patches/patch-bg
index 0e737e4d614..69bc12b6801 100644
--- a/editors/emacs20/patches/patch-bg
+++ b/editors/emacs20/patches/patch-bg
@@ -1,4 +1,4 @@
-$NetBSD: patch-bg,v 1.3 2021/12/25 22:11:51 dholland Exp $
+$NetBSD: patch-bg,v 1.4 2021/12/29 03:40:23 dholland Exp $
--- configure.in.orig 2000-06-05 15:42:49.000000000 +0000
+++ configure.in
@@ -35,7 +35,33 @@ $NetBSD: patch-bg,v 1.3 2021/12/25 22:11:51 dholland Exp $
esac
;;
-@@ -1594,6 +1602,14 @@ dnl tranle@intellicorp.com says libXmu.a
+@@ -175,6 +183,7 @@ case "${canonical}" in
+ ns32k-*-openbsd*) machine=ns32000 ;;
+ sparc-*-openbsd*) machine=sparc ;;
+ vax-*-openbsd*) machine=vax ;;
++ x86_64-*-openbsd*) machine=amd64 ;;
+ esac
+ ;;
+
+@@ -964,6 +973,17 @@ case "${canonical}" in
+ esac
+ ;;
+
++ ## AMD/Intel x86_64 machines where we don't care about the manufacturer
++ x86_64-*-* )
++ machine=amd64
++ case "${canonical}" in
++ *-linux-gnu* ) opsys=gnu-linux ;;
++ *-freebsd* ) opsys=freebsd ;;
++ *-dragonfly* ) opsys=dragonfly ;;
++ ## Otherwise, we'll fall through to the generic opsys code at the bottom.
++ esac
++ ;;
++
+ ## m68k Linux-based GNU system
+ m68k-*-linux-gnu* )
+ machine=m68k opsys=gnu-linux
+@@ -1594,6 +1614,14 @@ dnl tranle@intellicorp.com says libXmu.a
LIBS="-lXt $LIBS"
fi
AC_CHECK_LIB(Xmu, XmuConvertStandardSelection)
@@ -50,7 +76,7 @@ $NetBSD: patch-bg,v 1.3 2021/12/25 22:11:51 dholland Exp $
LIBS="$OLDLIBS"
fi
-@@ -1747,6 +1763,10 @@ if test -f /usr/lpp/X11/bin/smt.exp; the
+@@ -1747,6 +1775,10 @@ if test -f /usr/lpp/X11/bin/smt.exp; the
AC_DEFINE(HAVE_AIX_SMT_EXP)
fi
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-24 17:45:31 +0000