pkgsrc, joerg's diff and emacs

[Richard Nyberg]

I'm running DF 1.3.5 with pkgsrc from cvs and pkgsrc.diff from Sep 1.
When I apply pkgsrc.diff -- cd /usr/pkgsrc; patch < ~/pkgsrc.diff --
some files are created in the wrong place. Eg. Patches for www/epiphany,
are created under /usr/pkgsrc and not under www/epiphany/patches. This
seem to happen because I don't have the patches subdir in my www/epiphany.
Am I invoking patch(1) the wrong way or is this just a limitation in
diffs.

Besides that, the only problem so far has been editors/emacs. Below
is a patch to make it compile. However, for some reason it only works
in terminal mode; it dumps core in X. Does anyone else have a working
fix for emacs?

Happy hacking!
        -Richard

Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/editors/emacs/distinfo,v
retrieving revision 1.22
diff -u -u -r1.22 distinfo
--- distinfo	26 May 2005 02:10:49 -0000	1.22
+++ distinfo	8 Sep 2005 10:51:16 -0000
@@ -4,10 +4,11 @@
 RMD160 (emacs-21.4a.tar.gz) = c312e739935b56d08783bbfe97992297a363cb8a
 Size (emacs-21.4a.tar.gz) = 20403483 bytes
 SHA1 (patch-aa) = fee6fe91fb9a2f75300903cc5c6e023bb8de6be5
-SHA1 (patch-ab) = fee43adad7fd2c79b5b3176fa9101c35dfd59365
+SHA1 (patch-ab) = 429e31fdd526ce736647d299de0980e0ccd6e4e1
 SHA1 (patch-ad) = 39a11bc214ae3d2f9d634c30b196a46d473ab92f
 SHA1 (patch-ae) = e2b66b23efb90608470aef5ebd0c75e27bcd6b55
 SHA1 (patch-ag) = 3d64c0d53e3a8a737eeb04a6080a92a826b73620
 SHA1 (patch-ak) = c37ecdcb1e0b0211b15baa7100dd43eab3f0830b
 SHA1 (patch-bg) = 567ccce83e2b6d898a87f20763d5ff4b19c30deb
+SHA1 (patch-df) = 20aef51432b33f8d77df685928789014e243c42b
 SHA1 (patch-xx) = cf1cb21e0bd96202622ff54e39d202bdae78c942
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/editors/emacs/patches/patch-ab,v
retrieving revision 1.19
diff -u -u -r1.19 patch-ab
--- patches/patch-ab	26 May 2005 02:10:49 -0000	1.19
+++ patches/patch-ab	8 Sep 2005 10:51:16 -0000
@@ -20,7 +20,7 @@
        *-sysv4.2uw* )	  	opsys=unixware; NON_GNU_CPP=/lib/cpp ;;
        *-386bsd* )	        opsys=386bsd ;;
        *-freebsd* )	        opsys=freebsd ;;
-+      *-dragonfly* )	        opsys=freebsd ;;
++      *-dragonfly* )	        opsys=dragonfly ;;
        *-nextstep* )             opsys=nextstep ;;
        ## Otherwise, we'll fall through to the generic opsys code at the bottom.
      esac
--- patches/patch-df.nosuchfile	1970-01-01 01:00:00.000000000 +0100
+++ patches/patch-df	2005-09-08 12:38:13.000000000 +0200
@@ -0,0 +1,13 @@
+--- src/s/dragonfly.h.nosuchfile	1970-01-01 01:00:00.000000000 +0100
++++ src/s/dragonfly.h	2005-09-07 14:01:14.000000000 +0200
+@@ -0,0 +1,10 @@
++#define __FreeBSD__ 4
++#define __FreeBSD_version_ 480001
++
++#include "freebsd.h"
++
++#undef PENDING_OUTPUT_COUNT
++#define PENDING_OUTPUT_COUNT(FILE) __fpending(FILE)
++
++#undef LIB_STANDARD
++#define LIB_STANDARD /usr/lib/gcc34/libgcc.a -lc /usr/lib/gcc34/libgcc.a /usr/lib/crtend.o /usr/lib/crtn.o