[pkgsrc/trunk]: pkgsrc/editors Make it build on DragonFly master.

[hasso <hasso%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/92a316ae0c5d
branches:  trunk
changeset: 558202:92a316ae0c5d
user:      hasso <hasso%pkgsrc.org@localhost>
date:      Thu Apr 30 17:22:06 2009 +0000

description:
Make it build on DragonFly master.

diffstat:

 editors/emacs/Makefile            |   6 +++---
 editors/emacs/files/dragonfly.h   |  15 ++++-----------
 editors/emacs20/Makefile          |   6 +++---
 editors/emacs20/files/dragonfly.h |  15 ++++-----------
 editors/emacs21/Makefile.common   |   6 +++---
 editors/emacs21/files/dragonfly.h |  15 ++++-----------
 editors/xemacs/Makefile           |   6 +++---
 editors/xemacs/files/dragonfly.h  |  15 ++++-----------
 8 files changed, 28 insertions(+), 56 deletions(-)

diffs (188 lines):

diff -r 2f7c388395cc -r 92a316ae0c5d editors/emacs/Makefile
--- a/editors/emacs/Makefile    Thu Apr 30 17:11:46 2009 +0000
+++ b/editors/emacs/Makefile    Thu Apr 30 17:22:06 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.118 2008/11/10 17:21:34 wiz Exp $
+# $NetBSD: Makefile,v 1.119 2009/04/30 17:22:06 hasso Exp $
 
 PKGNAME?=      ${DISTNAME}
 COMMENT?=      GNU editing macros (editor)
@@ -53,8 +53,8 @@
                        ${GAMEOWN:Q} ${GAMEGRP:Q} ${GAMEDATAMODE:Q}
 SPECIAL_PERMS+=                libexec/emacs/${PKGVERSION_NOREV}/${MACHINE_GNU_PLATFORM}/update-game-score ${GAMEOWN:Q} ${GAMEGRP:Q} ${GAMEMODE:Q}
 
-.if (${OPSYS} == "DragonFly") && exists(/usr/lib/crtbegin.o)
-CPPFLAGS+=             -DDFLY_PRE_17_CRT
+.if (${OPSYS} == "DragonFly") && exists(/usr/lib/crtn.o)
+CPPFLAGS+=             -DDFLY_CRT_USRLIB
 .endif
 
 post-extract:
diff -r 2f7c388395cc -r 92a316ae0c5d editors/emacs/files/dragonfly.h
--- a/editors/emacs/files/dragonfly.h   Thu Apr 30 17:11:46 2009 +0000
+++ b/editors/emacs/files/dragonfly.h   Thu Apr 30 17:22:06 2009 +0000
@@ -41,19 +41,12 @@
 #undef BSD_PGRPS
 #define GETPGRP_NO_ARG
 
-#if defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ == 4
-#  ifndef DFLY_PRE_17_CRT
-#define START_FILES pre-crt0.o /usr/lib/gcc34/crt1.o /usr/lib/gcc34/crti.o /usr/lib/gcc34/crtbegin.o
-#define LIB_STANDARD -L/usr/lib/gcc34 -lgcc -lc -lgcc /usr/lib/gcc34/crtend.o /usr/lib/gcc34/crtn.o
-#  else
-#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/crtbegin.o
-#define LIB_STANDARD -L/usr/lib/gcc34 -lgcc -lc -lgcc /usr/lib/crtend.o /usr/lib/crtn.o
-#  endif
-#elif defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ == 1
+#ifdef DFLY_CRT_USRLIB
+#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/gcc41/crtbegin.o
+#define LIB_STANDARD -L/usr/lib/gcc41 -lgcc -lc -lgcc /usr/lib/gcc41/crtend.o /usr/lib/crtn.o
+#else
 #define START_FILES pre-crt0.o /usr/lib/gcc41/crt1.o /usr/lib/gcc41/crti.o /usr/lib/gcc41/crtbegin.o
 #define LIB_STANDARD -L/usr/lib/gcc41 -lgcc -lc -lgcc /usr/lib/gcc41/crtend.o /usr/lib/gcc41/crtn.o
-#else
-#error "Add compiler version magic"
 #endif
 
 #define LD_SWITCH_SYSTEM_1
diff -r 2f7c388395cc -r 92a316ae0c5d editors/emacs20/Makefile
--- a/editors/emacs20/Makefile  Thu Apr 30 17:11:46 2009 +0000
+++ b/editors/emacs20/Makefile  Thu Apr 30 17:22:06 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2008/11/10 17:21:34 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2009/04/30 17:22:06 hasso Exp $
 
 DISTNAME=      emacs-20.7
 PKGREVISION=   12
@@ -51,8 +51,8 @@
 LDFLAGS+=      -Wl,-z,nocombreloc
 .endif
 
-.if ${OPSYS} == "DragonFly" && exists(/usr/lib/crtbegin.o)
-CPPFLAGS+=     -DDFLY_PRE_17_CRT
+.if (${OPSYS} == "DragonFly") && exists(/usr/lib/crtn.o)
+CPPFLAGS+=     -DDFLY_CRT_USRLIB
 .endif
 
 .include "options.mk"
diff -r 2f7c388395cc -r 92a316ae0c5d editors/emacs20/files/dragonfly.h
--- a/editors/emacs20/files/dragonfly.h Thu Apr 30 17:11:46 2009 +0000
+++ b/editors/emacs20/files/dragonfly.h Thu Apr 30 17:22:06 2009 +0000
@@ -41,19 +41,12 @@
 #undef BSD_PGRPS
 #define GETPGRP_NO_ARG
 
-#if defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ == 4
-#  ifndef DFLY_PRE_17_CRT
-#define START_FILES pre-crt0.o /usr/lib/gcc34/crt1.o /usr/lib/gcc34/crti.o /usr/lib/gcc34/crtbegin.o
-#define LIB_STANDARD -L/usr/lib/gcc34 -lgcc -lc -lgcc /usr/lib/gcc34/crtend.o /usr/lib/gcc34/crtn.o
-#  else
-#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/crtbegin.o
-#define LIB_STANDARD -L/usr/lib/gcc34 -lgcc -lc -lgcc /usr/lib/crtend.o /usr/lib/crtn.o
-#  endif
-#elif defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ == 1
+#ifdef DFLY_CRT_USRLIB
+#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/gcc41/crtbegin.o
+#define LIB_STANDARD -L/usr/lib/gcc41 -lgcc -lc -lgcc /usr/lib/gcc41/crtend.o /usr/lib/crtn.o
+#else
 #define START_FILES pre-crt0.o /usr/lib/gcc41/crt1.o /usr/lib/gcc41/crti.o /usr/lib/gcc41/crtbegin.o
 #define LIB_STANDARD -L/usr/lib/gcc41 -lgcc -lc -lgcc /usr/lib/gcc41/crtend.o /usr/lib/gcc41/crtn.o
-#else
-#error "Add compiler version magic"
 #endif
 
 #define LD_SWITCH_SYSTEM_1
diff -r 2f7c388395cc -r 92a316ae0c5d editors/emacs21/Makefile.common
--- a/editors/emacs21/Makefile.common   Thu Apr 30 17:11:46 2009 +0000
+++ b/editors/emacs21/Makefile.common   Thu Apr 30 17:22:06 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2008/06/03 22:17:00 markd Exp $
+# $NetBSD: Makefile.common,v 1.6 2009/04/30 17:22:06 hasso Exp $
 
 DISTNAME=      emacs-${EMACSVERSION}a
 
@@ -45,8 +45,8 @@
 LDFLAGS+=      -Wl,-z,nocombreloc
 .endif
 
-.if ${OPSYS} == "DragonFly" && exists(/usr/lib/crtbegin.o)
-CPPFLAGS+=     -DDFLY_PRE_17_CRT
+.if (${OPSYS} == "DragonFly") && exists(/usr/lib/crtn.o)
+CPPFLAGS+=     -DDFLY_CRT_USRLIB
 .endif
 
 PLIST_VARS+=   fns.el
diff -r 2f7c388395cc -r 92a316ae0c5d editors/emacs21/files/dragonfly.h
--- a/editors/emacs21/files/dragonfly.h Thu Apr 30 17:11:46 2009 +0000
+++ b/editors/emacs21/files/dragonfly.h Thu Apr 30 17:22:06 2009 +0000
@@ -41,19 +41,12 @@
 #undef BSD_PGRPS
 #define GETPGRP_NO_ARG
 
-#if defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ == 4
-#  ifndef DFLY_PRE_17_CRT
-#define START_FILES pre-crt0.o /usr/lib/gcc34/crt1.o /usr/lib/gcc34/crti.o /usr/lib/gcc34/crtbegin.o
-#define LIB_STANDARD -L/usr/lib/gcc34 -lgcc -lc -lgcc /usr/lib/gcc34/crtend.o /usr/lib/gcc34/crtn.o
-#  else
-#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/crtbegin.o
-#define LIB_STANDARD -L/usr/lib/gcc34 -lgcc -lc -lgcc /usr/lib/crtend.o /usr/lib/crtn.o
-#  endif
-#elif defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ == 1
+#ifdef DFLY_CRT_USRLIB
+#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/gcc41/crtbegin.o
+#define LIB_STANDARD -L/usr/lib/gcc41 -lgcc -lc -lgcc /usr/lib/gcc41/crtend.o /usr/lib/crtn.o
+#else
 #define START_FILES pre-crt0.o /usr/lib/gcc41/crt1.o /usr/lib/gcc41/crti.o /usr/lib/gcc41/crtbegin.o
 #define LIB_STANDARD -L/usr/lib/gcc41 -lgcc -lc -lgcc /usr/lib/gcc41/crtend.o /usr/lib/gcc41/crtn.o
-#else
-#error "Add compiler version magic"
 #endif
 
 #define LD_SWITCH_SYSTEM_1
diff -r 2f7c388395cc -r 92a316ae0c5d editors/xemacs/Makefile
--- a/editors/xemacs/Makefile   Thu Apr 30 17:11:46 2009 +0000
+++ b/editors/xemacs/Makefile   Thu Apr 30 17:22:06 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.89 2008/11/10 17:21:34 wiz Exp $
+# $NetBSD: Makefile,v 1.90 2009/04/30 17:22:07 hasso Exp $
 
 PKGNAME?=      ${DISTNAME}
 COMMENT?=      XEmacs text editor version 21
@@ -53,8 +53,8 @@
 .  endif
 .endif
 
-.if (${OPSYS} == "DragonFly") && exists(/usr/lib/crtbegin.o)
-CPPFLAGS+=             -DDFLY_PRE_17_CRT
+.if (${OPSYS} == "DragonFly") && exists(/usr/lib/crtn.o)
+CPPFLAGS+=             -DDFLY_CRT_USRLIB
 .endif
 
 CHECK_WRKREF_SKIP=     bin/xemacs*
diff -r 2f7c388395cc -r 92a316ae0c5d editors/xemacs/files/dragonfly.h
--- a/editors/xemacs/files/dragonfly.h  Thu Apr 30 17:11:46 2009 +0000
+++ b/editors/xemacs/files/dragonfly.h  Thu Apr 30 17:22:06 2009 +0000
@@ -34,19 +34,12 @@
 #endif
 #define LD_SWITCH_SYSTEM
 
-#if defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ == 4
-#  ifndef DFLY_PRE_17_CRT
-#define START_FILES pre-crt0.o /usr/lib/gcc34/crt1.o /usr/lib/gcc34/crti.o /usr/lib/gcc34/crtbegin.o
-#define LIB_STANDARD -L/usr/lib/gcc34 -lgcc -lc -lgcc /usr/lib/gcc34/crtend.o /usr/lib/gcc34/crtn.o
-#  else
-#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/crtbegin.o
-#define LIB_STANDARD -L/usr/lib/gcc34 -lgcc -lc -lgcc /usr/lib/crtend.o /usr/lib/crtn.o
-#  endif
-#elif defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ == 1
+#ifdef DFLY_CRT_USRLIB
+#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/gcc41/crtbegin.o
+#define LIB_STANDARD -L/usr/lib/gcc41 -lgcc -lc -lgcc /usr/lib/gcc41/crtend.o /usr/lib/crtn.o
+#else
 #define START_FILES pre-crt0.o /usr/lib/gcc41/crt1.o /usr/lib/gcc41/crti.o /usr/lib/gcc41/crtbegin.o
 #define LIB_STANDARD -L/usr/lib/gcc41 -lgcc -lc -lgcc /usr/lib/gcc41/crtend.o /usr/lib/gcc41/crtn.o
-#else
-#error "Add compiler version magic"
 #endif
 
 #define UNEXEC "unexelf.o"