Index: head/editors/emacs20/files/patch-cb
===================================================================
--- head/editors/emacs20/files/patch-cb	(revision 74462)
+++ head/editors/emacs20/files/patch-cb	(revision 74463)
@@ -1,20 +1,24 @@
 --- src/s/freebsd.h.orig	Tue May  2 21:29:10 2000
-+++ src/s/freebsd.h	Sun Sep 23 05:30:49 2001
-@@ -56,9 +56,16 @@
++++ src/s/freebsd.h	Sun Jan 12 01:06:02 2003
+@@ -56,9 +56,20 @@
  #ifdef __ELF__
  
  #define LD_SWITCH_SYSTEM
++
++#if __FreeBSD_version >= 500000
++#define LD_SWITCH_SYSTEM_TEMACS -znocombreloc
++#endif
 +
 +#ifdef __alpha__
 +#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crtbegin.o
 +#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o
 +#else
  #define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/crtbegin.o
 -#define UNEXEC unexelf.o
  #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o /usr/lib/crtn.o
 +#endif
 +
 +#define UNEXEC unexelf.o
  #undef LIB_GCC
  #define LIB_GCC
  

Property changes on: head/editors/emacs20/files/patch-cb
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.6
\ No newline at end of property
+1.7
\ No newline at end of property
Index: head/editors/emacs20-dl/files/patch-cb
===================================================================
--- head/editors/emacs20-dl/files/patch-cb	(revision 74462)
+++ head/editors/emacs20-dl/files/patch-cb	(revision 74463)
@@ -1,40 +1,44 @@
---- src/s/freebsd.h.orig	Tue May  2 21:29:10 2000
-+++ src/s/freebsd.h	Sat Jul  1 20:17:45 2000
+--- src/s/freebsd.h.orig	Mon Jan 13 03:08:43 2003
++++ src/s/freebsd.h	Mon Jan 13 03:10:05 2003
 @@ -41,8 +41,18 @@
  
  #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
  
 +/* Use XPG4 Library for FreeBSD */
 +#define LIBS_XPG
 +#if (__FreeBSD_version >= 220000 && __FreeBSD_version < 400020) \
 +    || (__FreeBSD_version >= 500000 && __FreeBSD_version < 500005)
 +#ifdef USE_XPG
 +#undef LIBS_XPG
 +#define LIBS_XPG -lxpg4
 +#endif
 +#endif
 +
  #define LIBS_DEBUG
 -#define LIBS_SYSTEM -lutil
 +#define LIBS_SYSTEM -lutil LIBS_XPG
  #if __FreeBSD_version < 400000
  #define LIBS_TERMCAP -ltermcap
  #endif
-@@ -56,9 +66,16 @@
+@@ -56,9 +66,20 @@
  #ifdef __ELF__
  
  #define LD_SWITCH_SYSTEM
++
++#if __FreeBSD_version >= 500000
++#define LD_SWITCH_SYSTEM_TEMACS -znocombreloc
++#endif
 +
 +#ifdef __alpha__
 +#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crtbegin.o
 +#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o
 +#else
  #define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/crtbegin.o
 -#define UNEXEC unexelf.o
  #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o /usr/lib/crtn.o
 +#endif
 +
 +#define UNEXEC unexelf.o
  #undef LIB_GCC
  #define LIB_GCC
  

Property changes on: head/editors/emacs20-dl/files/patch-cb
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/editors/emacs20-mule-devel/files/patch-cb
===================================================================
--- head/editors/emacs20-mule-devel/files/patch-cb	(revision 74462)
+++ head/editors/emacs20-mule-devel/files/patch-cb	(revision 74463)
@@ -1,40 +1,44 @@
---- src/s/freebsd.h.orig	Tue May  2 21:29:10 2000
-+++ src/s/freebsd.h	Sat Jul  1 20:17:45 2000
+--- src/s/freebsd.h.orig	Mon Jan 13 03:08:43 2003
++++ src/s/freebsd.h	Mon Jan 13 03:10:05 2003
 @@ -41,8 +41,18 @@
  
  #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
  
 +/* Use XPG4 Library for FreeBSD */
 +#define LIBS_XPG
 +#if (__FreeBSD_version >= 220000 && __FreeBSD_version < 400020) \
 +    || (__FreeBSD_version >= 500000 && __FreeBSD_version < 500005)
 +#ifdef USE_XPG
 +#undef LIBS_XPG
 +#define LIBS_XPG -lxpg4
 +#endif
 +#endif
 +
  #define LIBS_DEBUG
 -#define LIBS_SYSTEM -lutil
 +#define LIBS_SYSTEM -lutil LIBS_XPG
  #if __FreeBSD_version < 400000
  #define LIBS_TERMCAP -ltermcap
  #endif
-@@ -56,9 +66,16 @@
+@@ -56,9 +66,20 @@
  #ifdef __ELF__
  
  #define LD_SWITCH_SYSTEM
 +
++#if __FreeBSD_version >= 500000
++#define LD_SWITCH_SYSTEM_TEMACS -znocombreloc
++#endif
++
 +#ifdef __alpha__
 +#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crtbegin.o
 +#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o
 +#else
  #define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/crtbegin.o
 -#define UNEXEC unexelf.o
  #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o /usr/lib/crtn.o
 +#endif
 +
 +#define UNEXEC unexelf.o
  #undef LIB_GCC
  #define LIB_GCC
-
+ 

Property changes on: head/editors/emacs20-mule-devel/files/patch-cb
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property