Remove 23.2 patchset.

5 files changed, 0 insertions, 278 deletions

diff --git a/emacs/23.2/01_all_crt-dir.patch b/emacs/23.2/01_all_crt-dir.patch
deleted file mode 100644
index 7ed0ada..0000000
--- a/emacs/23.2/01_all_crt-dir.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-http://bugs.gentoo.org/306831
-http://debbugs.gnu.org/5655
-Patch backported from upstream bzr repo, changesets 100020 and 100022.
-
---- emacs-23.2-orig/configure.in
-+++ emacs-23.2/configure.in
-@@ -169,6 +169,12 @@
-    fi
- fi
- 
-+CRT_DIR=
-+AC_ARG_WITH([crt-dir],dnl
-+[AS_HELP_STRING([--with-crt-dir=DIR],[directory containing crtn.o etc.
-+This option is only used on x86-64 and s390x GNU/Linux architectures.])])
-+CRT_DIR="${with_crt_dir}"
-+
- AC_ARG_WITH([gnustep-conf],dnl
- [AS_HELP_STRING([--with-gnustep-conf=PATH],[path to GNUstep.conf; default $GNUSTEP_CONFIG_FILE, or /etc/GNUstep/GNUstep.conf])])
- test "X${with_gnustep_conf}" != X && test "${with_gnustep_conf}" != yes && \
-@@ -997,17 +1003,31 @@
- AC_SYS_LARGEFILE
- 
- 
--### The standard library on x86-64 and s390x GNU/Linux distributions can
--### be located in either /usr/lib64 or /usr/lib.
--### In some rare cases, /usr/lib64 exists but does not contain the
--### relevant files (bug#1287).  Hence test for crtn.o.
-+## Note: at present CRT_DIR is only used for amdx86-64 and ibms390x.
-+## Other machine types hard-code the location in src/[ms]/*.h.
- case "${canonical}" in
-   x86_64-*-linux-gnu* | s390x-*-linux-gnu* )
--    if test -e /usr/lib64/crtn.o; then
--      AC_DEFINE(HAVE_LIB64_DIR, 1,
--        [Define to 1 if the directory /usr/lib64 exists.])
--fi
-+
-+   ## On x86-64 and s390x GNU/Linux distributions, the standard library
-+   ## can be in a variety of places.  We only try /usr/lib64 and /usr/lib.
-+   ## For anything else (eg /usr/lib32), it is up the user to specify
-+   ## the location (bug#5655).
-+   ## Test for crtn.o, not just the directory, because sometimes the
-+   ## directory exists but does not have the relevant files (bug#1287).
-+   ## If user specified a crt-dir, use that unconditionally.
-+   if test "X$CRT_DIR" = "X"; then
-+     CRT_DIR=/usr/lib
-+     test -e /usr/lib64/crtn.o && CRT_DIR=/usr/lib64
-+   fi
-+
-+   test -e $CRT_DIR/crtn.o || test -e $CRT_DIR/crt0.o || \
-+     AC_MSG_ERROR([crt*.o not found.  Use --with-crt-dir to specify the location.])
-+   ;;
-+
- esac
-+test "X$CRT_DIR" = "X" && CRT_DIR=/usr/lib
-+AC_SUBST(CRT_DIR)
-+
- 
- dnl This function defintion taken from Gnome 2.0
- dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
---- emacs-23.2-orig/src/m/amdx86-64.h
-+++ emacs-23.2/src/m/amdx86-64.h
-@@ -80,7 +80,7 @@
-    a native binary of Emacs on FreeBSD/amd64 we can just point to /usr/lib.  */
- 
- #undef START_FILES
--#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o
-+#define START_FILES pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o
- 
- /* The duplicate -lgcc is intentional in the definition of LIB_STANDARD.
-    The reason is that some functions in libgcc.a call functions from libc.a,
-@@ -88,14 +88,14 @@
-    versions of ld are one-pass linkers, we need to mention -lgcc twice,
-    or else we risk getting unresolved externals.  */
- #undef LIB_STANDARD
--#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o
-+#define LIB_STANDARD -lgcc -lc -lgcc $(CRT_DIR)/crtn.o
- 
- #elif defined(__OpenBSD__)
- 
- #undef START_FILES
--#define START_FILES pre-crt0.o /usr/lib/crt0.o /usr/lib/crtbegin.o
-+#define START_FILES pre-crt0.o $(CRT_DIR)/crt0.o $(CRT_DIR)/crtbegin.o
- #undef LIB_STANDARD
--#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o
-+#define LIB_STANDARD -lgcc -lc -lgcc $(CRT_DIR)/crtend.o
- 
- #elif defined(__NetBSD__)
- 
-@@ -119,13 +119,8 @@
-    or else we risk getting unresolved externals.  */
- #undef START_FILES
- #undef LIB_STANDARD
--#ifdef HAVE_LIB64_DIR
--#define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o
--#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o
--#else
--#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o
--#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o
--#endif
-+#define START_FILES pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o
-+#define LIB_STANDARD -lgcc -lc -lgcc $(CRT_DIR)/crtn.o
- 
- #endif /* __FreeBSD__ */
- #endif /* !i386 */
---- emacs-23.2-orig/src/m/ibms390x.h
-+++ emacs-23.2/src/m/ibms390x.h
-@@ -91,18 +91,10 @@
- #define XPNTR(a) XUINT (a)
- 
- #undef START_FILES
--#ifdef HAVE_LIB64_DIR
--#define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o
--#else
--#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o
--#endif
-+#define START_FILES pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o
- 
- #undef LIB_STANDARD
--#ifdef HAVE_LIB64_DIR
--#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o
--#else
--#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o
--#endif
-+#define LIB_STANDARD -lgcc -lc -lgcc $(CRT_DIR)/crtn.o
- 
- /* arch-tag: 4b87653c-6add-4663-8691-7d9dc17b5519
-    (do not change this comment) */
---- emacs-23.2-orig/src/Makefile.in
-+++ emacs-23.2/src/Makefile.in
-@@ -67,6 +67,9 @@
- 
- OTHER_FILES = @OTHER_FILES@
- 
-+## Only used by amdx86-64 and ibms390x GNU/Linux.
-+CRT_DIR=@CRT_DIR@
-+
- # ========================== start of cpp stuff =======================
- /* From here on, comments must be done in C syntax.  */
- 
diff --git a/emacs/23.2/02_all_gameuser.patch b/emacs/23.2/02_all_gameuser.patch
deleted file mode 100644
index 8e061a0..0000000
--- a/emacs/23.2/02_all_gameuser.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7717
-
---- emacs-23.2-orig/configure.in
-+++ emacs-23.2/configure.in
-@@ -175,6 +175,12 @@
- This option is only used on x86-64 and s390x GNU/Linux architectures.])])
- CRT_DIR="${with_crt_dir}"
- 
-+AC_ARG_WITH(gameuser,dnl
-+[AS_HELP_STRING([--with-gameuser=USER],[user for shared game score files])])
-+test "X${with_gameuser}" != X && test "${with_gameuser}" != yes \
-+  && gameuser="${with_gameuser}"
-+test "X$gameuser" = X && gameuser=games
-+
- AC_ARG_WITH([gnustep-conf],dnl
- [AS_HELP_STRING([--with-gnustep-conf=PATH],[path to GNUstep.conf; default $GNUSTEP_CONFIG_FILE, or /etc/GNUstep/GNUstep.conf])])
- test "X${with_gnustep_conf}" != X && test "${with_gnustep_conf}" != yes && \
diff --git a/emacs/23.2/03_all_gnu-linux-crt-dir.patch b/emacs/23.2/03_all_gnu-linux-crt-dir.patch
deleted file mode 100644
index fb06459..0000000
--- a/emacs/23.2/03_all_gnu-linux-crt-dir.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-http://bugs.gentoo.org/350532
-
---- emacs-23.2-orig/src/s/gnu-linux.h
-+++ emacs-23.2/src/s/gnu-linux.h
-@@ -168,7 +168,7 @@
- /* Ask GCC where to find libgcc.a.  */
- #define LIB_GCC `$(CC) $(C_SWITCH_X_SITE) -print-libgcc-file-name`
- 
--#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o
-+#define START_FILES pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o
- 
- /* Here is how to find X Windows.  LD_SWITCH_X_SITE_AUX gives an -R option
-    says where to find X windows at run time.  */
-@@ -198,7 +198,7 @@
- #define LIBS_DEBUG
- #undef LIB_GCC
- #define LIB_GCC
--#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o
-+#define LIB_STANDARD -lgcc -lc -lgcc $(CRT_DIR)/crtn.o
- 
- /* Don't use -g in test compiles in configure.
-    This is so we will use the same shared libs for that linking
diff --git a/emacs/23.2/04_all_ns-appdirs.patch b/emacs/23.2/04_all_ns-appdirs.patch
deleted file mode 100644
index 07113ff..0000000
--- a/emacs/23.2/04_all_ns-appdirs.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-http://bugs.gentoo.org/268793
-
---- emacs-23.2-orig/configure.in
-+++ emacs-23.2/configure.in
-@@ -1417,10 +1417,10 @@
-   window_system=nextstep
-   with_xft=no
-   # set up packaging dirs
--  exec_prefix=${ns_appbindir}
--  libexecdir=${ns_appbindir}/libexec
-   if test "${EN_NS_SELF_CONTAINED}" = yes; then
-      prefix=${ns_appresdir}
-+     exec_prefix=${ns_appbindir}
-+     libexecdir=${ns_appbindir}/libexec
-   fi
- fi
- CFLAGS="$tmp_CFLAGS"
---- emacs-23.2-orig/leim/Makefile.in
-+++ emacs-23.2/leim/Makefile.in
-@@ -263,11 +263,6 @@
- 	  [ -n "$${installuser}" ] && break ; \
- 	done ; \
- 	find ${INSTALLDIR} -exec chown $${installuser} '{}' ';'
--	if [ "${ns_appresdir}" != "" ]; then \
--	  ( cd ${ns_appresdir} ; \
--	    if test -d share/emacs ; then dir=share/emacs/*/*; $(MV_DIRS); fi;\
--	    rm -fr share ) ; \
--	else true ; fi
- 
- clean mostlyclean:
- 	rm -f ${TIT-MISC} ${TIT-MISC:.elc=.el} \
---- emacs-23.2-orig/Makefile.in
-+++ emacs-23.2/Makefile.in
-@@ -424,16 +424,6 @@
- 	    ${INSTALL_DATA} lib-src/$$f $(DESTDIR)${archlibdir}/$$f; \
- 	  else true; fi ; \
- 	done
--	if test "${ns_appdir}" != ""; then \
--	  ( cd ${ns_appresdir} ; \
--	    if test -d share/emacs ; then dir=share/emacs/*/*; $(MV_DIRS); fi;\
--	    if test -d share/info ; then dir=share/info; $(MV_DIRS) ; fi ; \
--	    rm -fr share ) ; \
--	  ( cd ${ns_appbindir}/libexec ; dir=emacs/*/*/* ; $(MV_DIRS); \
--	    rm -fr emacs ) ; \
--	  ( cd ${ns_appbindir}/bin ; rm -f emacs emacs-23* ; \
--	    ln -sf ../libexec/* .) ; \
--	else true ; fi
- 
- ## http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg01672.html
- ## Needs to be the user running install, so configure can't set it.
diff --git a/emacs/23.2/05_all_info-dir.patch b/emacs/23.2/05_all_info-dir.patch
deleted file mode 100644
index 7e721e9..0000000
--- a/emacs/23.2/05_all_info-dir.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7942
-
---- emacs-23.2-orig/Makefile.in
-+++ emacs-23.2/Makefile.in
-@@ -552,31 +552,26 @@
- 	thisdir=`/bin/pwd`; \
- 	if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd $(DESTDIR)${infodir} && /bin/pwd)` ]; \
- 	then \
--	  (cd $(DESTDIR)${infodir};  \
--	   if [ -f dir ]; then true; \
--	   else	\
--	     (cd $${thisdir}; \
--	      ${INSTALL_DATA} ${srcdir}/info/dir $(DESTDIR)${infodir}/dir; \
--	      chmod a+r $(DESTDIR)${infodir}/dir); \
--	   fi; \
--	   cd ${srcdir}/info ; \
-+	  (cd ${srcdir}/info ; \
- 	   for elt in $(INFO_FILES); do \
- 	      test "$(MAKEINFO)" = "off" && ! test -e $$elt && continue; \
- 	      for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \
- 	        ${INSTALL_DATA} $$f $(DESTDIR)${infodir}/$$f; \
- 	        chmod a+r $(DESTDIR)${infodir}/$$f; \
- 	      done; \
--	   done); \
--	else true; fi
--	-unset CDPATH; \
--	thisdir=`/bin/pwd`; \
--	if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd $(DESTDIR)${infodir} && /bin/pwd)` ]; \
--	then \
--	  for elt in $(INFO_FILES); do \
--	    test "$(MAKEINFO)" = "off" && ! test -e $$elt && continue; \
--	    (cd $${thisdir}; \
--	     ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
--	  done; \
-+	   done; \
-+	   cd $(DESTDIR)${infodir};  \
-+	   if [ -f dir ]; then \
-+	      for elt in $(INFO_FILES); do \
-+		 test "$(MAKEINFO)" = "off" && ! test -e $$elt && continue; \
-+		 (cd $${thisdir}; \
-+		  ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
-+	      done; \
-+	   else	\
-+	     (cd $${thisdir}; \
-+	      ${INSTALL_DATA} ${srcdir}/info/dir $(DESTDIR)${infodir}/dir; \
-+	      chmod a+r $(DESTDIR)${infodir}/dir); \
-+	   fi); \
- 	else true; fi
- 	-chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} ${COPYDESTS}
- 	thisdir=`/bin/pwd`; \