Fri Dec 9 01:35:09 2011 UTC ()
editors/emacs-snapshot: Fix DragonFly support


(marino)
diff -r1.45 -r1.46 pkgsrc/editors/emacs-snapshot/distinfo
diff -r1.1 -r1.2 pkgsrc/editors/emacs-snapshot/files/dragonfly.h
diff -r1.3 -r1.4 pkgsrc/editors/emacs-snapshot/patches/patch-aa
cvs diff -r1.45 -r1.46 pkgsrc/editors/emacs-snapshot/distinfo (expand / switch to unified diff)

--- pkgsrc/editors/emacs-snapshot/distinfo 2011/12/06 17:12:09 1.45
+++ pkgsrc/editors/emacs-snapshot/distinfo 2011/12/09 01:35:08 1.46
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.45 2011/12/06 17:12:09 minskim Exp $ 1$NetBSD: distinfo,v 1.46 2011/12/09 01:35:08 marino Exp $
2 2
3SHA1 (emacs-snapshot_20111206.orig.tar.xz) = c9694ce2570097879f602c2c313a32aae71c9e3e 3SHA1 (emacs-snapshot_20111206.orig.tar.xz) = c9694ce2570097879f602c2c313a32aae71c9e3e
4RMD160 (emacs-snapshot_20111206.orig.tar.xz) = 765f43dcac9f012d23834195a2312d63c97bbdc4 4RMD160 (emacs-snapshot_20111206.orig.tar.xz) = 765f43dcac9f012d23834195a2312d63c97bbdc4
5Size (emacs-snapshot_20111206.orig.tar.xz) = 23310260 bytes 5Size (emacs-snapshot_20111206.orig.tar.xz) = 23310260 bytes
6SHA1 (patch-aa) = ecec22478b7e10ea0ed1818043761858b237b545 6SHA1 (patch-aa) = e77be157f2ad3c8002afe6c5483e61ff4769b85d
7SHA1 (patch-ac) = 7792cd247bcc40eafb4ec28f98bd0d2d9bd4b0c3 7SHA1 (patch-ac) = 7792cd247bcc40eafb4ec28f98bd0d2d9bd4b0c3
8SHA1 (patch-ad) = b8faf958f7ab3effd6c8dbcbf51fe70ddb2ecdae 8SHA1 (patch-ad) = b8faf958f7ab3effd6c8dbcbf51fe70ddb2ecdae
9SHA1 (patch-ae) = 2dfe31015550feeaa47955136d3bbe2aa6790095 9SHA1 (patch-ae) = 2dfe31015550feeaa47955136d3bbe2aa6790095
10SHA1 (patch-ag) = 2fc1d3fd953e595eb0ed1f3f5289a70a754e1aed 10SHA1 (patch-ag) = 2fc1d3fd953e595eb0ed1f3f5289a70a754e1aed
cvs diff -r1.1 -r1.2 pkgsrc/editors/emacs-snapshot/files/dragonfly.h (expand / switch to unified diff)

--- pkgsrc/editors/emacs-snapshot/files/dragonfly.h 2009/06/07 20:12:06 1.1
+++ pkgsrc/editors/emacs-snapshot/files/dragonfly.h 2011/12/09 01:35:08 1.2
@@ -34,28 +34,28 @@ Boston, MA 02111-1307, USA. */ @@ -34,28 +34,28 @@ Boston, MA 02111-1307, USA. */
34#define PENDING_OUTPUT_COUNT(FILE) __fpending(FILE) 34#define PENDING_OUTPUT_COUNT(FILE) __fpending(FILE)
35 35
36#define LIBS_DEBUG 36#define LIBS_DEBUG
37#define LIBS_SYSTEM -lutil 37#define LIBS_SYSTEM -lutil
38#define TERMINFO 38#define TERMINFO
39#define LIBS_TERMCAP -lncurses 39#define LIBS_TERMCAP -lncurses
40#define SYSV_SYSTEM_DIR 40#define SYSV_SYSTEM_DIR
41 41
42/* freebsd has POSIX-style pgrp behavior. */ 42/* freebsd has POSIX-style pgrp behavior. */
43#undef BSD_PGRPS 43#undef BSD_PGRPS
44#define GETPGRP_NO_ARG 44#define GETPGRP_NO_ARG
45 45
46#ifdef DFLY_CRT_USRLIB 46#ifdef DFLY_CRT_USRLIB
47#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/gcc41/crtbegin.o 47#define ORDINARY_LINK
48#define LIB_STANDARD -L/usr/lib/gcc41 -lgcc -lc -lgcc /usr/lib/gcc41/crtend.o /usr/lib/crtn.o 48#define LIB_STANDARD -lc
49#else 49#else
50#define START_FILES pre-crt0.o /usr/lib/gcc41/crt1.o /usr/lib/gcc41/crti.o /usr/lib/gcc41/crtbegin.o 50#define START_FILES pre-crt0.o /usr/lib/gcc41/crt1.o /usr/lib/gcc41/crti.o /usr/lib/gcc41/crtbegin.o
51#define LIB_STANDARD -L/usr/lib/gcc41 -lgcc -lc -lgcc /usr/lib/gcc41/crtend.o /usr/lib/gcc41/crtn.o 51#define LIB_STANDARD -L/usr/lib/gcc41 -lgcc -lc -lgcc /usr/lib/gcc41/crtend.o /usr/lib/gcc41/crtn.o
52#endif 52#endif
53 53
54#define LD_SWITCH_SYSTEM_1 54#define LD_SWITCH_SYSTEM_1
55#define UNEXEC unexelf.o 55#define UNEXEC unexelf.o
56#undef LIB_GCC 56#undef LIB_GCC
57#define LIB_GCC 57#define LIB_GCC
58 58
59#define HAVE_WAIT_HEADER 59#define HAVE_WAIT_HEADER
60#define HAVE_GETLOADAVG 1 60#define HAVE_GETLOADAVG 1
61#define HAVE_TERMIOS 61#define HAVE_TERMIOS
cvs diff -r1.3 -r1.4 pkgsrc/editors/emacs-snapshot/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/editors/emacs-snapshot/patches/Attic/patch-aa 2011/11/30 04:29:10 1.3
+++ pkgsrc/editors/emacs-snapshot/patches/Attic/patch-aa 2011/12/09 01:35:08 1.4
@@ -1,19 +1,39 @@ @@ -1,19 +1,39 @@
1$NetBSD: patch-aa,v 1.3 2011/11/30 04:29:10 minskim Exp $ 1$NetBSD: patch-aa,v 1.4 2011/12/09 01:35:08 marino Exp $
2 2
3--- configure.in.orig 2011-11-28 09:24:08.000000000 +0000 3--- configure.in.orig 2011-12-06 08:31:42.000000000 +0000
4+++ configure.in 4+++ configure.in
5@@ -438,6 +438,14 @@ case "${canonical}" in 5@@ -441,6 +441,14 @@ case "${canonical}" in
6 sparc64-*) machine=sparc ;; 6 sparc64-*) machine=sparc ;;
7 esac 7 esac
8 ;; 8 ;;
9+ ## DragonFly ports 9+ ## DragonFly ports
10+ *-*-dragonfly*) 10+ *-*-dragonfly*)
11+ opsys=dragonfly 11+ opsys=dragonfly
12+ case "${canonical}" in 12+ case "${canonical}" in
13+ i[3456]86-*-dragonfly*) machine=intel386 ;; 13+ i[3456]86-*-dragonfly*) machine=intel386 ;;
14+ amd64-*-dragonfly*|x86_64-*-dragonfly*) machine=amdx86-64 ;; 14+ amd64-*-dragonfly*|x86_64-*-dragonfly*) machine=amdx86-64 ;;
15+ esac 15+ esac
16+ ;; 16+ ;;
17  17
18 ## FreeBSD kernel + glibc based userland 18 ## FreeBSD kernel + glibc based userland
19 *-*-kfreebsd*gnu* ) 19 *-*-kfreebsd*gnu* )
 20@@ -956,6 +964,8 @@ case "$opsys" in
 21
 22 freebsd) LIBS_SYSTEM="-lutil" ;;
 23
 24+ dragonfly) LIBS_SYSTEM="-ltermlib" ;;
 25+
 26 hpux*) LIBS_SYSTEM="-l:libdld.sl" ;;
 27
 28 sol2*) LIBS_SYSTEM="-lsocket -lnsl" ;;
 29@@ -1010,6 +1020,10 @@ case $opsys in
 30 LIB_STANDARD=-lc
 31 START_FILES='pre-crt0.o $(CRT_DIR)/crt0.o'
 32 ;;
 33+ dragonfly )
 34+ LIB_STANDARD=-lc
 35+ START_FILES='$(CRT_DIR)/crt1.o'
 36+ ;;
 37 dnl NB this may be adjusted below.
 38 netbsd | openbsd )
 39 LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtend.o'