pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/editors/xemacs editors/xemacs: Fix all non-NetBSD plat...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8d00dce51c05
branches:  trunk
changeset: 596569:8d00dce51c05
user:      marino <marino%pkgsrc.org@localhost>
date:      Thu Dec 08 20:43:28 2011 +0000

description:
editors/xemacs: Fix all non-NetBSD platforms

The previous change to PLIST broke all platforms not NetBSD if built under
PKG_DEVELOPER=yes.  The netbsd.h header will be present on all platforms,
so it needs to have a dedicated entry in PLIST (as it used to).  The
LOWER_OPSYS variable is just wrong in this case.

Secondly, the dragonfly.h file was updated for the default compiler,
allowing this version of xemacs to build again.

diffstat:

 editors/xemacs/PLIST             |  4 ++--
 editors/xemacs/files/dragonfly.h |  3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diffs (31 lines):

diff -r 6b0e8a1970f2 -r 8d00dce51c05 editors/xemacs/PLIST
--- a/editors/xemacs/PLIST      Thu Dec 08 20:41:47 2011 +0000
+++ b/editors/xemacs/PLIST      Thu Dec 08 20:43:28 2011 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2010/12/16 17:45:12 hauke Exp $
+@comment $NetBSD: PLIST,v 1.20 2011/12/08 20:43:28 marino Exp $
 bin/${DISTNAME}
 bin/ellcc
 bin/gnuattach
@@ -675,7 +675,7 @@
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/s/linux.h
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/s/mach-bsd4-3.h
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/s/mingw32.h
-lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/s/${LOWER_OPSYS}.h
+lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/s/netbsd.h
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/s/newsos5.h
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/s/nextstep.h
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/s/openbsd.h
diff -r 6b0e8a1970f2 -r 8d00dce51c05 editors/xemacs/files/dragonfly.h
--- a/editors/xemacs/files/dragonfly.h  Thu Dec 08 20:41:47 2011 +0000
+++ b/editors/xemacs/files/dragonfly.h  Thu Dec 08 20:43:28 2011 +0000
@@ -35,8 +35,7 @@
 #define LD_SWITCH_SYSTEM
 
 #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
+#define ORDINARY_LINK
 #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



Home | Main Index | Thread Index | Old Index