summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authormarino <marino@pkgsrc.org>2011-12-09 01:35:08 +0000
committermarino <marino@pkgsrc.org>2011-12-09 01:35:08 +0000
commita64fc23ee42cc7cab7932c685399ba72ba55987d (patch)
tree9f9ec918a3178e7bdf97cca61eb32a31b562d023 /editors
parentee4e55df417989d6302146a780c86ab53846c875 (diff)
downloadpkgsrc-a64fc23ee42cc7cab7932c685399ba72ba55987d.tar.gz
editors/emacs-snapshot: Fix DragonFly support
Diffstat (limited to 'editors')
-rw-r--r--editors/emacs-snapshot/distinfo4
-rw-r--r--editors/emacs-snapshot/files/dragonfly.h4
-rw-r--r--editors/emacs-snapshot/patches/patch-aa26
3 files changed, 27 insertions, 7 deletions
diff --git a/editors/emacs-snapshot/distinfo b/editors/emacs-snapshot/distinfo
index a4753146550..ccbab20b168 100644
--- a/editors/emacs-snapshot/distinfo
+++ b/editors/emacs-snapshot/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.45 2011/12/06 17:12:09 minskim Exp $
+$NetBSD: distinfo,v 1.46 2011/12/09 01:35:08 marino Exp $
SHA1 (emacs-snapshot_20111206.orig.tar.xz) = c9694ce2570097879f602c2c313a32aae71c9e3e
RMD160 (emacs-snapshot_20111206.orig.tar.xz) = 765f43dcac9f012d23834195a2312d63c97bbdc4
Size (emacs-snapshot_20111206.orig.tar.xz) = 23310260 bytes
-SHA1 (patch-aa) = ecec22478b7e10ea0ed1818043761858b237b545
+SHA1 (patch-aa) = e77be157f2ad3c8002afe6c5483e61ff4769b85d
SHA1 (patch-ac) = 7792cd247bcc40eafb4ec28f98bd0d2d9bd4b0c3
SHA1 (patch-ad) = b8faf958f7ab3effd6c8dbcbf51fe70ddb2ecdae
SHA1 (patch-ae) = 2dfe31015550feeaa47955136d3bbe2aa6790095
diff --git a/editors/emacs-snapshot/files/dragonfly.h b/editors/emacs-snapshot/files/dragonfly.h
index 94650be4dd7..07bc11aca58 100644
--- a/editors/emacs-snapshot/files/dragonfly.h
+++ b/editors/emacs-snapshot/files/dragonfly.h
@@ -44,8 +44,8 @@ Boston, MA 02111-1307, USA. */
#define GETPGRP_NO_ARG
#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
+#define LIB_STANDARD -lc
#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
diff --git a/editors/emacs-snapshot/patches/patch-aa b/editors/emacs-snapshot/patches/patch-aa
index ed35fddcb4a..1841cb8f917 100644
--- a/editors/emacs-snapshot/patches/patch-aa
+++ b/editors/emacs-snapshot/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2011/11/30 04:29:10 minskim Exp $
+$NetBSD: patch-aa,v 1.4 2011/12/09 01:35:08 marino Exp $
---- configure.in.orig 2011-11-28 09:24:08.000000000 +0000
+--- configure.in.orig 2011-12-06 08:31:42.000000000 +0000
+++ configure.in
-@@ -438,6 +438,14 @@ case "${canonical}" in
+@@ -441,6 +441,14 @@ case "${canonical}" in
sparc64-*) machine=sparc ;;
esac
;;
@@ -17,3 +17,23 @@ $NetBSD: patch-aa,v 1.3 2011/11/30 04:29:10 minskim Exp $
## FreeBSD kernel + glibc based userland
*-*-kfreebsd*gnu* )
+@@ -956,6 +964,8 @@ case "$opsys" in
+
+ freebsd) LIBS_SYSTEM="-lutil" ;;
+
++ dragonfly) LIBS_SYSTEM="-ltermlib" ;;
++
+ hpux*) LIBS_SYSTEM="-l:libdld.sl" ;;
+
+ sol2*) LIBS_SYSTEM="-lsocket -lnsl" ;;
+@@ -1010,6 +1020,10 @@ case $opsys in
+ LIB_STANDARD=-lc
+ START_FILES='pre-crt0.o $(CRT_DIR)/crt0.o'
+ ;;
++ dragonfly )
++ LIB_STANDARD=-lc
++ START_FILES='$(CRT_DIR)/crt1.o'
++ ;;
+ dnl NB this may be adjusted below.
+ netbsd | openbsd )
+ LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtend.o'