Make it build on DragonFly master.

8 files changed, 28 insertions, 56 deletions

diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 2ba09d62068..b6147ff0c3b 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -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 @@ CONF_FILES_PERMS+=	/dev/null ${VARBASE}/games/emacs/tetris-scores \
 			${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 --git a/editors/emacs/files/dragonfly.h b/editors/emacs/files/dragonfly.h
index 4f17515b805..fdd9e381545 100644
--- a/editors/emacs/files/dragonfly.h
+++ b/editors/emacs/files/dragonfly.h
@@ -41,19 +41,12 @@ Boston, MA 02111-1307, USA.  */
 #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 --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile
index 8d59aae906d..5f7b39b2b4a 100644
--- a/editors/emacs20/Makefile
+++ b/editors/emacs20/Makefile
@@ -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 @@ CHECK_WRKREF_SKIP+=	bin/emacs-20.7
 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 --git a/editors/emacs20/files/dragonfly.h b/editors/emacs20/files/dragonfly.h
index d79c107993a..5592cc5e15d 100644
--- a/editors/emacs20/files/dragonfly.h
+++ b/editors/emacs20/files/dragonfly.h
@@ -41,19 +41,12 @@ Boston, MA 02111-1307, USA.  */
 #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 --git a/editors/emacs21/Makefile.common b/editors/emacs21/Makefile.common
index e716f92784f..a3956fdb720 100644
--- a/editors/emacs21/Makefile.common
+++ b/editors/emacs21/Makefile.common
@@ -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 @@ CONFIGURE_ARGS+=	--srcdir=${WRKSRC:Q}
 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 --git a/editors/emacs21/files/dragonfly.h b/editors/emacs21/files/dragonfly.h
index 4f17515b805..fdd9e381545 100644
--- a/editors/emacs21/files/dragonfly.h
+++ b/editors/emacs21/files/dragonfly.h
@@ -41,19 +41,12 @@ Boston, MA 02111-1307, USA.  */
 #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 --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index 639ef72edb7..42297511dbc 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -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 @@ CONFIGURE_ARGS+=	--with_sound=none
 .  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 --git a/editors/xemacs/files/dragonfly.h b/editors/xemacs/files/dragonfly.h
index 50f001d3c57..c89f49609b2 100644
--- a/editors/xemacs/files/dragonfly.h
+++ b/editors/xemacs/files/dragonfly.h
@@ -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"