Sat Dec 15 12:27:45 2012 UTC ()
editors/emacs24: Fix breakage caused by previous commit

The previous commit used openpty on all platforms, yet failed to ensure
it was made available for them.

Add DragonFly to the string of *BSD that require libutil for openpty.
Fixes regression caused by previous commit.


(marino)
diff -r1.7 -r1.8 pkgsrc/editors/emacs24/distinfo
diff -r1.4 -r1.5 pkgsrc/editors/emacs24/patches/patch-aa
diff -r1.4 -r1.5 pkgsrc/editors/emacs24/patches/patch-ab
cvs diff -r1.7 -r1.8 pkgsrc/editors/emacs24/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/editors/emacs24/Attic/distinfo 2012/11/26 16:56:15 1.7
+++ pkgsrc/editors/emacs24/Attic/distinfo 2012/12/15 12:27:45 1.8
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.7 2012/11/26 16:56:15 martin Exp $ 1$NetBSD: distinfo,v 1.8 2012/12/15 12:27:45 marino Exp $
2 2
3SHA1 (emacs-24.2.tar.gz) = 5fc4fe7797f821f2021ac415a81f5f190c52c0b2 3SHA1 (emacs-24.2.tar.gz) = 5fc4fe7797f821f2021ac415a81f5f190c52c0b2
4RMD160 (emacs-24.2.tar.gz) = 26f6c2b671ed7f160875d62e47c89afec085110f 4RMD160 (emacs-24.2.tar.gz) = 26f6c2b671ed7f160875d62e47c89afec085110f
5Size (emacs-24.2.tar.gz) = 51471017 bytes 5Size (emacs-24.2.tar.gz) = 51471017 bytes
6SHA1 (patch-aa) = ea9f7acf0142c7ae169da9674fa16e6492b30479 6SHA1 (patch-aa) = 114549ab6988d5473f2358b17f3229811f7fbba4
7SHA1 (patch-ab) = 8687278fcc8f8ae072c72681ae05ce1f12481cba 7SHA1 (patch-ab) = 44b5a84b440b4e207ae805b075491d7fed7b804b
8SHA1 (patch-ad) = 2dcb0f4b43c599d0c4af83b5f7e1f2797f96bdac 8SHA1 (patch-ad) = 2dcb0f4b43c599d0c4af83b5f7e1f2797f96bdac
9SHA1 (patch-ag) = 3e6ee4774189185af10eada9c935120491318313 9SHA1 (patch-ag) = 3e6ee4774189185af10eada9c935120491318313
10SHA1 (patch-lib-careadlinkat.h) = f236d182e609bf7111c70e83e10806a75a220c29 10SHA1 (patch-lib-careadlinkat.h) = f236d182e609bf7111c70e83e10806a75a220c29
11SHA1 (patch-src-s-bsd--common.h) = bea4405e7cbe0a71b41f8ea52030eeb629d95a40 11SHA1 (patch-src-s-bsd--common.h) = bea4405e7cbe0a71b41f8ea52030eeb629d95a40
cvs diff -r1.4 -r1.5 pkgsrc/editors/emacs24/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/editors/emacs24/patches/Attic/patch-aa 2012/11/26 16:56:16 1.4
+++ pkgsrc/editors/emacs24/patches/Attic/patch-aa 2012/12/15 12:27:45 1.5
@@ -1,40 +1,40 @@ @@ -1,40 +1,40 @@
1$NetBSD: patch-aa,v 1.4 2012/11/26 16:56:16 martin Exp $ 1$NetBSD: patch-aa,v 1.5 2012/12/15 12:27:45 marino Exp $
2 2
3Add DragonFly 3Add DragonFly
4 4
5--- configure.in.orig 2012-08-23 05:33:42.000000000 +0000 5--- configure.in.orig 2012-08-23 05:33:42.000000000 +0000
6+++ configure.in 6+++ configure.in
7@@ -469,6 +469,14 @@ case "${canonical}" in 7@@ -469,6 +469,14 @@ case "${canonical}" in
8 vax-*) machine=vax ;; 8 vax-*) machine=vax ;;
9 esac 9 esac
10 ;; 10 ;;
11+ ## DragonFly ports 11+ ## DragonFly ports
12+ *-*-dragonfly*) 12+ *-*-dragonfly*)
13+ opsys=dragonfly 13+ opsys=dragonfly
14+ case "${canonical}" in 14+ case "${canonical}" in
15+ i[3456]86-*-dragonfly*) machine=intel386 ;; 15+ i[3456]86-*-dragonfly*) machine=intel386 ;;
16+ amd64-*-dragonfly*|x86_64-*-dragonfly*) machine=amdx86-64 ;; 16+ amd64-*-dragonfly*|x86_64-*-dragonfly*) machine=amdx86-64 ;;
17+ esac 17+ esac
18+ ;; 18+ ;;
19  19
20 ## OpenBSD ports 20 ## OpenBSD ports
21 *-*-openbsd* ) 21 *-*-openbsd* )
22@@ -955,7 +955,7 @@ 22@@ -955,7 +955,7 @@
23 ## IBM's X11R5 uses -lIM and -liconv in AIX 3.2.2. 23 ## IBM's X11R5 uses -lIM and -liconv in AIX 3.2.2.
24 aix4-2) LIBS_SYSTEM="-lrts -lIM -liconv" ;; 24 aix4-2) LIBS_SYSTEM="-lrts -lIM -liconv" ;;
25  25
26- freebsd) LIBS_SYSTEM="-lutil" ;; 26- freebsd) LIBS_SYSTEM="-lutil" ;;
27+ freebsd|netbsd|openbsd) LIBS_SYSTEM="-lutil" ;; 27+ freebsd|netbsd|openbsd|dragonfly) LIBS_SYSTEM="-lutil" ;;
28  28
29 hpux*) LIBS_SYSTEM="-l:libdld.sl" ;; 29 hpux*) LIBS_SYSTEM="-l:libdld.sl" ;;
30  30
31@@ -999,6 +1007,11 @@ case $opsys in 31@@ -999,6 +1007,11 @@ case $opsys in
32 LIB_MATH= 32 LIB_MATH=
33 START_FILES='pre-crt0.o' 33 START_FILES='pre-crt0.o'
34 ;; 34 ;;
35+ dragonfly ) 35+ dragonfly )
36+ # This base version is appended below 36+ # This base version is appended below
37+ LIB_STANDARD='-lc $(CRT_DIR)/crtn.o' 37+ LIB_STANDARD='-lc $(CRT_DIR)/crtn.o'
38+ START_FILES='$(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o' 38+ START_FILES='$(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o'
39+ ;; 39+ ;;
40 freebsd ) 40 freebsd )
cvs diff -r1.4 -r1.5 pkgsrc/editors/emacs24/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/editors/emacs24/patches/Attic/patch-ab 2012/11/26 16:56:16 1.4
+++ pkgsrc/editors/emacs24/patches/Attic/patch-ab 2012/12/15 12:27:45 1.5
@@ -1,41 +1,41 @@ @@ -1,41 +1,41 @@
1$NetBSD: patch-ab,v 1.4 2012/11/26 16:56:16 martin Exp $ 1$NetBSD: patch-ab,v 1.5 2012/12/15 12:27:45 marino Exp $
2 2
3Add DragonFly 3Add DragonFly
4 4
5--- configure.orig 2012-08-23 06:37:10.000000000 +0000 5--- configure.orig 2012-08-23 06:37:10.000000000 +0000
6+++ configure 6+++ configure
7@@ -4476,6 +4476,15 @@ case "${canonical}" in 7@@ -4476,6 +4476,15 @@ case "${canonical}" in
8 esac 8 esac
9 ;; 9 ;;
10  10
11+ ## DragonFly ports 11+ ## DragonFly ports
12+ *-*-dragonfly*) 12+ *-*-dragonfly*)
13+ opsys=dragonfly 13+ opsys=dragonfly
14+ case "${canonical}" in 14+ case "${canonical}" in
15+ i[3456]86-*-dragonfly*) machine=intel386 ;; 15+ i[3456]86-*-dragonfly*) machine=intel386 ;;
16+ amd64-*-dragonfly*|x86_64-*-dragonfly*) machine=amdx86-64 ;; 16+ amd64-*-dragonfly*|x86_64-*-dragonfly*) machine=amdx86-64 ;;
17+ esac 17+ esac
18+ ;; 18+ ;;
19+ 19+
20 ## OpenBSD ports 20 ## OpenBSD ports
21 *-*-openbsd* ) 21 *-*-openbsd* )
22 opsys=openbsd 22 opsys=openbsd
23@@ -7854,7 +7854,7 @@ 23@@ -7854,7 +7854,7 @@
24 ## IBM's X11R5 uses -lIM and -liconv in AIX 3.2.2. 24 ## IBM's X11R5 uses -lIM and -liconv in AIX 3.2.2.
25 aix4-2) LIBS_SYSTEM="-lrts -lIM -liconv" ;; 25 aix4-2) LIBS_SYSTEM="-lrts -lIM -liconv" ;;
26  26
27- freebsd) LIBS_SYSTEM="-lutil" ;; 27- freebsd) LIBS_SYSTEM="-lutil" ;;
28+ freebsd|netbsd|openbsd) LIBS_SYSTEM="-lutil" ;; 28+ freebsd|netbsd|openbsd|dragonfly) LIBS_SYSTEM="-lutil" ;;
29  29
30 hpux*) LIBS_SYSTEM="-l:libdld.sl" ;; 30 hpux*) LIBS_SYSTEM="-l:libdld.sl" ;;
31  31
32@@ -8095,6 +8104,11 @@ case $opsys in 32@@ -8095,6 +8104,11 @@ case $opsys in
33 LIB_MATH= 33 LIB_MATH=
34 START_FILES='pre-crt0.o' 34 START_FILES='pre-crt0.o'
35 ;; 35 ;;
36+ dragonfly ) 36+ dragonfly )
37+ # This base version is appended below 37+ # This base version is appended below
38+ LIB_STANDARD='-lc $(CRT_DIR)/crtn.o' 38+ LIB_STANDARD='-lc $(CRT_DIR)/crtn.o'
39+ START_FILES='$(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o' 39+ START_FILES='$(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o'
40+ ;; 40+ ;;
41 freebsd ) 41 freebsd )