Thu Apr 30 17:22:07 2009 UTC ()
Make it build on DragonFly master.


(hasso)
diff -r1.118 -r1.119 pkgsrc/editors/emacs/Makefile
diff -r1.2 -r1.3 pkgsrc/editors/emacs/files/dragonfly.h
diff -r1.36 -r1.37 pkgsrc/editors/emacs20/Makefile
diff -r1.2 -r1.3 pkgsrc/editors/emacs20/files/dragonfly.h
diff -r1.5 -r1.6 pkgsrc/editors/emacs21/Makefile.common
diff -r1.2 -r1.3 pkgsrc/editors/emacs21/files/dragonfly.h
diff -r1.89 -r1.90 pkgsrc/editors/xemacs/Makefile
diff -r1.3 -r1.4 pkgsrc/editors/xemacs/files/dragonfly.h
cvs diff -r1.118 -r1.119 pkgsrc/editors/emacs/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/emacs/Makefile 2008/11/10 17:21:34 1.118
+++ pkgsrc/editors/emacs/Makefile 2009/04/30 17:22:06 1.119
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.118 2008/11/10 17:21:34 wiz Exp $ 1# $NetBSD: Makefile,v 1.119 2009/04/30 17:22:06 hasso Exp $
2 2
3PKGNAME?= ${DISTNAME} 3PKGNAME?= ${DISTNAME}
4COMMENT?= GNU editing macros (editor) 4COMMENT?= GNU editing macros (editor)
5 5
6DISTNAME= emacs-22.3 6DISTNAME= emacs-22.3
7PKGREVISION= 1 7PKGREVISION= 1
8CATEGORIES= editors 8CATEGORIES= editors
9MASTER_SITES= ${MASTER_SITE_GNU:=emacs/} 9MASTER_SITES= ${MASTER_SITE_GNU:=emacs/}
10 10
11MAINTAINER= markd@NetBSD.org 11MAINTAINER= markd@NetBSD.org
12HOMEPAGE= http://www.gnu.org/software/emacs/emacs.html 12HOMEPAGE= http://www.gnu.org/software/emacs/emacs.html
13#LICENSE= gnu-gpl-v3 13#LICENSE= gnu-gpl-v3
14 14
@@ -43,25 +43,25 @@ SUBST_CLASSES+= test_equal @@ -43,25 +43,25 @@ SUBST_CLASSES+= test_equal
43SUBST_STAGE.test_equal= pre-configure 43SUBST_STAGE.test_equal= pre-configure
44SUBST_MESSAGE.test_equal= Fixing bashisms in test(1) usage. 44SUBST_MESSAGE.test_equal= Fixing bashisms in test(1) usage.
45SUBST_FILES.test_equal= mac/make-package 45SUBST_FILES.test_equal= mac/make-package
46SUBST_SED.test_equal= -e 's/ == / = /g' 46SUBST_SED.test_equal= -e 's/ == / = /g'
47 47
48MAKE_DIRS_PERMS+= ${VARBASE}/games/emacs \ 48MAKE_DIRS_PERMS+= ${VARBASE}/games/emacs \
49 ${GAMEOWN:Q} ${GAMEGRP} ${GAMEDIRMODE:Q} 49 ${GAMEOWN:Q} ${GAMEGRP} ${GAMEDIRMODE:Q}
50CONF_FILES_PERMS+= /dev/null ${VARBASE}/games/emacs/snake-scores \ 50CONF_FILES_PERMS+= /dev/null ${VARBASE}/games/emacs/snake-scores \
51 ${GAMEOWN:Q} ${GAMEGRP:Q} ${GAMEDATAMODE:Q} 51 ${GAMEOWN:Q} ${GAMEGRP:Q} ${GAMEDATAMODE:Q}
52CONF_FILES_PERMS+= /dev/null ${VARBASE}/games/emacs/tetris-scores \ 52CONF_FILES_PERMS+= /dev/null ${VARBASE}/games/emacs/tetris-scores \
53 ${GAMEOWN:Q} ${GAMEGRP:Q} ${GAMEDATAMODE:Q} 53 ${GAMEOWN:Q} ${GAMEGRP:Q} ${GAMEDATAMODE:Q}
54SPECIAL_PERMS+= libexec/emacs/${PKGVERSION_NOREV}/${MACHINE_GNU_PLATFORM}/update-game-score ${GAMEOWN:Q} ${GAMEGRP:Q} ${GAMEMODE:Q} 54SPECIAL_PERMS+= libexec/emacs/${PKGVERSION_NOREV}/${MACHINE_GNU_PLATFORM}/update-game-score ${GAMEOWN:Q} ${GAMEGRP:Q} ${GAMEMODE:Q}
55 55
56.if (${OPSYS} == "DragonFly") && exists(/usr/lib/crtbegin.o) 56.if (${OPSYS} == "DragonFly") && exists(/usr/lib/crtn.o)
57CPPFLAGS+= -DDFLY_PRE_17_CRT 57CPPFLAGS+= -DDFLY_CRT_USRLIB
58.endif 58.endif
59 59
60post-extract: 60post-extract:
61 cp ${FILESDIR}/site-init.el ${WRKSRC}/lisp 61 cp ${FILESDIR}/site-init.el ${WRKSRC}/lisp
62 cp ${FILESDIR}/dragonfly.h ${WRKSRC}/src/s 62 cp ${FILESDIR}/dragonfly.h ${WRKSRC}/src/s
63 63
64.include "../../mk/oss.buildlink3.mk" 64.include "../../mk/oss.buildlink3.mk"
65.include "../../mk/termcap.buildlink3.mk" 65.include "../../mk/termcap.buildlink3.mk"
66 66
67.include "../../mk/bsd.pkg.mk" 67.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/editors/emacs/files/Attic/dragonfly.h (expand / switch to unified diff)

--- pkgsrc/editors/emacs/files/Attic/dragonfly.h 2008/06/02 21:15:42 1.2
+++ pkgsrc/editors/emacs/files/Attic/dragonfly.h 2009/04/30 17:22:06 1.3
@@ -31,39 +31,32 @@ Boston, MA 02111-1307, USA. */ @@ -31,39 +31,32 @@ Boston, MA 02111-1307, USA. */
31#undef KERNEL_FILE 31#undef KERNEL_FILE
32#undef LDAV_SYMBOL 32#undef LDAV_SYMBOL
33 33
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 SYSV_SYSTEM_DIR 38#define SYSV_SYSTEM_DIR
39 39
40/* freebsd has POSIX-style pgrp behavior. */ 40/* freebsd has POSIX-style pgrp behavior. */
41#undef BSD_PGRPS 41#undef BSD_PGRPS
42#define GETPGRP_NO_ARG 42#define GETPGRP_NO_ARG
43 43
44#if defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ == 4 44#ifdef DFLY_CRT_USRLIB
45# ifndef DFLY_PRE_17_CRT 45#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/gcc41/crtbegin.o
46#define START_FILES pre-crt0.o /usr/lib/gcc34/crt1.o /usr/lib/gcc34/crti.o /usr/lib/gcc34/crtbegin.o 46#define LIB_STANDARD -L/usr/lib/gcc41 -lgcc -lc -lgcc /usr/lib/gcc41/crtend.o /usr/lib/crtn.o
47#define LIB_STANDARD -L/usr/lib/gcc34 -lgcc -lc -lgcc /usr/lib/gcc34/crtend.o /usr/lib/gcc34/crtn.o 47#else
48# else 
49#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/crtbegin.o 
50#define LIB_STANDARD -L/usr/lib/gcc34 -lgcc -lc -lgcc /usr/lib/crtend.o /usr/lib/crtn.o 
51# endif 
52#elif defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ == 1 
53#define START_FILES pre-crt0.o /usr/lib/gcc41/crt1.o /usr/lib/gcc41/crti.o /usr/lib/gcc41/crtbegin.o 48#define START_FILES pre-crt0.o /usr/lib/gcc41/crt1.o /usr/lib/gcc41/crti.o /usr/lib/gcc41/crtbegin.o
54#define LIB_STANDARD -L/usr/lib/gcc41 -lgcc -lc -lgcc /usr/lib/gcc41/crtend.o /usr/lib/gcc41/crtn.o 49#define LIB_STANDARD -L/usr/lib/gcc41 -lgcc -lc -lgcc /usr/lib/gcc41/crtend.o /usr/lib/gcc41/crtn.o
55#else 
56#error "Add compiler version magic" 
57#endif 50#endif
58 51
59#define LD_SWITCH_SYSTEM_1 52#define LD_SWITCH_SYSTEM_1
60#define UNEXEC unexelf.o 53#define UNEXEC unexelf.o
61#undef LIB_GCC 54#undef LIB_GCC
62#define LIB_GCC 55#define LIB_GCC
63 56
64#define HAVE_WAIT_HEADER 57#define HAVE_WAIT_HEADER
65#define HAVE_GETLOADAVG 1 58#define HAVE_GETLOADAVG 1
66#define HAVE_TERMIOS 59#define HAVE_TERMIOS
67#define NO_TERMIO 60#define NO_TERMIO
68#define DECLARE_GETPWUID_WITH_UID_T 61#define DECLARE_GETPWUID_WITH_UID_T
69 62
cvs diff -r1.36 -r1.37 pkgsrc/editors/emacs20/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/emacs20/Makefile 2008/11/10 17:21:34 1.36
+++ pkgsrc/editors/emacs20/Makefile 2009/04/30 17:22:06 1.37
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.36 2008/11/10 17:21:34 wiz Exp $ 1# $NetBSD: Makefile,v 1.37 2009/04/30 17:22:06 hasso Exp $
2 2
3DISTNAME= emacs-20.7 3DISTNAME= emacs-20.7
4PKGREVISION= 12 4PKGREVISION= 12
5CATEGORIES= editors 5CATEGORIES= editors
6MASTER_SITES= http://ftp.gnu.org/pub/old-gnu/emacs/ \ 6MASTER_SITES= http://ftp.gnu.org/pub/old-gnu/emacs/ \
7 ftp://ftp.gnu.org/pub/old-gnu/emacs 7 ftp://ftp.gnu.org/pub/old-gnu/emacs
8DISTFILES= ${DISTNAME}${EXTRACT_SUFX} 8DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
9DISTFILES+= ${DISTNAME}-mule-4.1b-elc${EXTRACT_SUFX} 9DISTFILES+= ${DISTNAME}-mule-4.1b-elc${EXTRACT_SUFX}
10SITES.${DISTNAME}-mule-4.1b-elc.tar.gz= ${MASTER_SITE_LOCAL} 10SITES.${DISTNAME}-mule-4.1b-elc.tar.gz= ${MASTER_SITE_LOCAL}
11 11
12# Mule enhancement (back port) patch by Satoshi Yatagawa 12# Mule enhancement (back port) patch by Satoshi Yatagawa
13SITES.emacs-20.7-mule-4.1b.patch= \ 13SITES.emacs-20.7-mule-4.1b.patch= \
14 http://www.teu.ac.jp/nsit/~yatagawa/comp/emacs/ 14 http://www.teu.ac.jp/nsit/~yatagawa/comp/emacs/
@@ -41,28 +41,28 @@ CHECK_WRKREF_SKIP+= bin/emacs-20.7 @@ -41,28 +41,28 @@ CHECK_WRKREF_SKIP+= bin/emacs-20.7
41.if (${OPSYS} == "NetBSD" && \ 41.if (${OPSYS} == "NetBSD" && \
42 (empty(OS_VERSION:M1.[0-5]*) && \ 42 (empty(OS_VERSION:M1.[0-5]*) && \
43 empty(OS_VERSION:M1.6_*) && \ 43 empty(OS_VERSION:M1.6_*) && \
44 empty(OS_VERSION:M1.6) && \ 44 empty(OS_VERSION:M1.6) && \
45 empty(OS_VERSION:M1.6.[0-9]*) && \ 45 empty(OS_VERSION:M1.6.[0-9]*) && \
46 empty(OS_VERSION:M1.6[A-P]*))) || \ 46 empty(OS_VERSION:M1.6[A-P]*))) || \
47 (${OPSYS} == "DragonFly") 47 (${OPSYS} == "DragonFly")
48# If using GNU ld 2.13.2.1 or later, avoid creating combined reloc 48# If using GNU ld 2.13.2.1 or later, avoid creating combined reloc
49# sections and .data reloc sections, both of which Emacs can't handle 49# sections and .data reloc sections, both of which Emacs can't handle
50# properly. Analyzed by Stephen Ma. 50# properly. Analyzed by Stephen Ma.
51LDFLAGS+= -Wl,-z,nocombreloc 51LDFLAGS+= -Wl,-z,nocombreloc
52.endif 52.endif
53 53
54.if ${OPSYS} == "DragonFly" && exists(/usr/lib/crtbegin.o) 54.if (${OPSYS} == "DragonFly") && exists(/usr/lib/crtn.o)
55CPPFLAGS+= -DDFLY_PRE_17_CRT 55CPPFLAGS+= -DDFLY_CRT_USRLIB
56.endif 56.endif
57 57
58.include "options.mk" 58.include "options.mk"
59 59
60MAKE_ENV+= INSTALL_STRIP=${_STRIPFLAG_INSTALL:Q} 60MAKE_ENV+= INSTALL_STRIP=${_STRIPFLAG_INSTALL:Q}
61 61
62.include "../../mk/compiler.mk" 62.include "../../mk/compiler.mk"
63.if !empty(CC_VERSION:Mgcc-3.*) 63.if !empty(CC_VERSION:Mgcc-3.*)
64CFLAGS+= -fno-zero-initialized-in-bss 64CFLAGS+= -fno-zero-initialized-in-bss
65.endif 65.endif
66 66
67INFO_FILES= # PLIST 67INFO_FILES= # PLIST
68 68
cvs diff -r1.2 -r1.3 pkgsrc/editors/emacs20/files/dragonfly.h (expand / switch to unified diff)

--- pkgsrc/editors/emacs20/files/dragonfly.h 2008/07/01 13:22:06 1.2
+++ pkgsrc/editors/emacs20/files/dragonfly.h 2009/04/30 17:22:06 1.3
@@ -31,39 +31,32 @@ Boston, MA 02111-1307, USA. */ @@ -31,39 +31,32 @@ Boston, MA 02111-1307, USA. */
31#undef KERNEL_FILE 31#undef KERNEL_FILE
32#undef LDAV_SYMBOL 32#undef LDAV_SYMBOL
33 33
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 SYSV_SYSTEM_DIR 38#define SYSV_SYSTEM_DIR
39 39
40/* freebsd has POSIX-style pgrp behavior. */ 40/* freebsd has POSIX-style pgrp behavior. */
41#undef BSD_PGRPS 41#undef BSD_PGRPS
42#define GETPGRP_NO_ARG 42#define GETPGRP_NO_ARG
43 43
44#if defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ == 4 44#ifdef DFLY_CRT_USRLIB
45# ifndef DFLY_PRE_17_CRT 45#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/gcc41/crtbegin.o
46#define START_FILES pre-crt0.o /usr/lib/gcc34/crt1.o /usr/lib/gcc34/crti.o /usr/lib/gcc34/crtbegin.o 46#define LIB_STANDARD -L/usr/lib/gcc41 -lgcc -lc -lgcc /usr/lib/gcc41/crtend.o /usr/lib/crtn.o
47#define LIB_STANDARD -L/usr/lib/gcc34 -lgcc -lc -lgcc /usr/lib/gcc34/crtend.o /usr/lib/gcc34/crtn.o 47#else
48# else 
49#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/crtbegin.o 
50#define LIB_STANDARD -L/usr/lib/gcc34 -lgcc -lc -lgcc /usr/lib/crtend.o /usr/lib/crtn.o 
51# endif 
52#elif defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ == 1 
53#define START_FILES pre-crt0.o /usr/lib/gcc41/crt1.o /usr/lib/gcc41/crti.o /usr/lib/gcc41/crtbegin.o 48#define START_FILES pre-crt0.o /usr/lib/gcc41/crt1.o /usr/lib/gcc41/crti.o /usr/lib/gcc41/crtbegin.o
54#define LIB_STANDARD -L/usr/lib/gcc41 -lgcc -lc -lgcc /usr/lib/gcc41/crtend.o /usr/lib/gcc41/crtn.o 49#define LIB_STANDARD -L/usr/lib/gcc41 -lgcc -lc -lgcc /usr/lib/gcc41/crtend.o /usr/lib/gcc41/crtn.o
55#else 
56#error "Add compiler version magic" 
57#endif 50#endif
58 51
59#define LD_SWITCH_SYSTEM_1 52#define LD_SWITCH_SYSTEM_1
60#define UNEXEC unexelf.o 53#define UNEXEC unexelf.o
61#undef LIB_GCC 54#undef LIB_GCC
62#define LIB_GCC 55#define LIB_GCC
63 56
64#define HAVE_WAIT_HEADER 57#define HAVE_WAIT_HEADER
65#define HAVE_GETLOADAVG 1 58#define HAVE_GETLOADAVG 1
66#define HAVE_TERMIOS 59#define HAVE_TERMIOS
67#define NO_TERMIO 60#define NO_TERMIO
68#define NO_MATHERR 61#define NO_MATHERR
69#define DECLARE_GETPWUID_WITH_UID_T 62#define DECLARE_GETPWUID_WITH_UID_T
cvs diff -r1.5 -r1.6 pkgsrc/editors/emacs21/Makefile.common (expand / switch to unified diff)

--- pkgsrc/editors/emacs21/Makefile.common 2008/06/03 22:17:00 1.5
+++ pkgsrc/editors/emacs21/Makefile.common 2009/04/30 17:22:06 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.5 2008/06/03 22:17:00 markd Exp $ 1# $NetBSD: Makefile.common,v 1.6 2009/04/30 17:22:06 hasso Exp $
2 2
3DISTNAME= emacs-${EMACSVERSION}a 3DISTNAME= emacs-${EMACSVERSION}a
4 4
5MASTER_SITES= ${MASTER_SITE_GNU:=emacs/} 5MASTER_SITES= ${MASTER_SITE_GNU:=emacs/}
6MAINTAINER= pkgsrc-users@NetBSD.org 6MAINTAINER= pkgsrc-users@NetBSD.org
7HOMEPAGE= http://www.gnu.org/software/emacs/emacs.html 7HOMEPAGE= http://www.gnu.org/software/emacs/emacs.html
8 8
9CONFLICTS= mule-[0-9]* 9CONFLICTS= mule-[0-9]*
10 10
11USE_TOOLS+= gmake perl:run 11USE_TOOLS+= gmake perl:run
12GNU_CONFIGURE= yes 12GNU_CONFIGURE= yes
13 13
14PATCHDIR= ${.CURDIR}/../../editors/emacs21/patches 14PATCHDIR= ${.CURDIR}/../../editors/emacs21/patches
@@ -35,28 +35,28 @@ CONFIGURE_ARGS+= --srcdir=${WRKSRC:Q} @@ -35,28 +35,28 @@ CONFIGURE_ARGS+= --srcdir=${WRKSRC:Q}
35.if (${OPSYS} == "NetBSD" && \ 35.if (${OPSYS} == "NetBSD" && \
36 (empty(OS_VERSION:M1.[0-5]*) && \ 36 (empty(OS_VERSION:M1.[0-5]*) && \
37 empty(OS_VERSION:M1.6_*) && \ 37 empty(OS_VERSION:M1.6_*) && \
38 empty(OS_VERSION:M1.6) && \ 38 empty(OS_VERSION:M1.6) && \
39 empty(OS_VERSION:M1.6.[0-9]*) && \ 39 empty(OS_VERSION:M1.6.[0-9]*) && \
40 empty(OS_VERSION:M1.6[A-P]*))) || \ 40 empty(OS_VERSION:M1.6[A-P]*))) || \
41 ${OPSYS} == "DragonFly" 41 ${OPSYS} == "DragonFly"
42# If using GNU ld 2.13.2.1 or later, avoid creating combined reloc 42# If using GNU ld 2.13.2.1 or later, avoid creating combined reloc
43# sections and .data reloc sections, both of which Emacs can't handle 43# sections and .data reloc sections, both of which Emacs can't handle
44# properly. Analyzed by Stephen Ma. 44# properly. Analyzed by Stephen Ma.
45LDFLAGS+= -Wl,-z,nocombreloc 45LDFLAGS+= -Wl,-z,nocombreloc
46.endif 46.endif
47 47
48.if ${OPSYS} == "DragonFly" && exists(/usr/lib/crtbegin.o) 48.if (${OPSYS} == "DragonFly") && exists(/usr/lib/crtn.o)
49CPPFLAGS+= -DDFLY_PRE_17_CRT 49CPPFLAGS+= -DDFLY_CRT_USRLIB
50.endif 50.endif
51 51
52PLIST_VARS+= fns.el 52PLIST_VARS+= fns.el
53.if ${OPSYS} == "Darwin" 53.if ${OPSYS} == "Darwin"
54PLIST_SUBST+= DOCTAIL="" 54PLIST_SUBST+= DOCTAIL=""
55.else 55.else
56PLIST.fns.el= yes 56PLIST.fns.el= yes
57PLIST_SUBST+= DOCTAIL="-${EMACSVERSION}.1" 57PLIST_SUBST+= DOCTAIL="-${EMACSVERSION}.1"
58.endif 58.endif
59 59
60# Disable W^X. 60# Disable W^X.
61.if ${OPSYS} == "OpenBSD" 61.if ${OPSYS} == "OpenBSD"
62LDFLAGS+= -Z 62LDFLAGS+= -Z
cvs diff -r1.2 -r1.3 pkgsrc/editors/emacs21/files/dragonfly.h (expand / switch to unified diff)

--- pkgsrc/editors/emacs21/files/dragonfly.h 2008/06/03 22:20:35 1.2
+++ pkgsrc/editors/emacs21/files/dragonfly.h 2009/04/30 17:22:07 1.3
@@ -31,39 +31,32 @@ Boston, MA 02111-1307, USA. */ @@ -31,39 +31,32 @@ Boston, MA 02111-1307, USA. */
31#undef KERNEL_FILE 31#undef KERNEL_FILE
32#undef LDAV_SYMBOL 32#undef LDAV_SYMBOL
33 33
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 SYSV_SYSTEM_DIR 38#define SYSV_SYSTEM_DIR
39 39
40/* freebsd has POSIX-style pgrp behavior. */ 40/* freebsd has POSIX-style pgrp behavior. */
41#undef BSD_PGRPS 41#undef BSD_PGRPS
42#define GETPGRP_NO_ARG 42#define GETPGRP_NO_ARG
43 43
44#if defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ == 4 44#ifdef DFLY_CRT_USRLIB
45# ifndef DFLY_PRE_17_CRT 45#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/gcc41/crtbegin.o
46#define START_FILES pre-crt0.o /usr/lib/gcc34/crt1.o /usr/lib/gcc34/crti.o /usr/lib/gcc34/crtbegin.o 46#define LIB_STANDARD -L/usr/lib/gcc41 -lgcc -lc -lgcc /usr/lib/gcc41/crtend.o /usr/lib/crtn.o
47#define LIB_STANDARD -L/usr/lib/gcc34 -lgcc -lc -lgcc /usr/lib/gcc34/crtend.o /usr/lib/gcc34/crtn.o 47#else
48# else 
49#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/crtbegin.o 
50#define LIB_STANDARD -L/usr/lib/gcc34 -lgcc -lc -lgcc /usr/lib/crtend.o /usr/lib/crtn.o 
51# endif 
52#elif defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ == 1 
53#define START_FILES pre-crt0.o /usr/lib/gcc41/crt1.o /usr/lib/gcc41/crti.o /usr/lib/gcc41/crtbegin.o 48#define START_FILES pre-crt0.o /usr/lib/gcc41/crt1.o /usr/lib/gcc41/crti.o /usr/lib/gcc41/crtbegin.o
54#define LIB_STANDARD -L/usr/lib/gcc41 -lgcc -lc -lgcc /usr/lib/gcc41/crtend.o /usr/lib/gcc41/crtn.o 49#define LIB_STANDARD -L/usr/lib/gcc41 -lgcc -lc -lgcc /usr/lib/gcc41/crtend.o /usr/lib/gcc41/crtn.o
55#else 
56#error "Add compiler version magic" 
57#endif 50#endif
58 51
59#define LD_SWITCH_SYSTEM_1 52#define LD_SWITCH_SYSTEM_1
60#define UNEXEC unexelf.o 53#define UNEXEC unexelf.o
61#undef LIB_GCC 54#undef LIB_GCC
62#define LIB_GCC 55#define LIB_GCC
63 56
64#define HAVE_WAIT_HEADER 57#define HAVE_WAIT_HEADER
65#define HAVE_GETLOADAVG 1 58#define HAVE_GETLOADAVG 1
66#define HAVE_TERMIOS 59#define HAVE_TERMIOS
67#define NO_TERMIO 60#define NO_TERMIO
68#define DECLARE_GETPWUID_WITH_UID_T 61#define DECLARE_GETPWUID_WITH_UID_T
69 62
cvs diff -r1.89 -r1.90 pkgsrc/editors/xemacs/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/xemacs/Makefile 2008/11/10 17:21:34 1.89
+++ pkgsrc/editors/xemacs/Makefile 2009/04/30 17:22:07 1.90
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.89 2008/11/10 17:21:34 wiz Exp $ 1# $NetBSD: Makefile,v 1.90 2009/04/30 17:22:07 hasso Exp $
2 2
3PKGNAME?= ${DISTNAME} 3PKGNAME?= ${DISTNAME}
4COMMENT?= XEmacs text editor version 21 4COMMENT?= XEmacs text editor version 21
5 5
6DISTNAME= xemacs-21.4.17 6DISTNAME= xemacs-21.4.17
7PKGREVISION= 6 7PKGREVISION= 6
8CATEGORIES= editors 8CATEGORIES= editors
9MASTER_SITES= ${MASTER_SITE_XEMACS:=${DISTNAME:C/[.][^.]*$//}/} 9MASTER_SITES= ${MASTER_SITE_XEMACS:=${DISTNAME:C/[.][^.]*$//}/}
10DISTFILES= ${DISTNAME}.tar.gz ${DISTNAME}-elc.tar.gz \ 10DISTFILES= ${DISTNAME}.tar.gz ${DISTNAME}-elc.tar.gz \
11 ${DISTNAME}-info.tar.gz 11 ${DISTNAME}-info.tar.gz
12 12
13MAINTAINER= uebayasi@NetBSD.org 13MAINTAINER= uebayasi@NetBSD.org
14HOMEPAGE= http://www.xemacs.org/ 14HOMEPAGE= http://www.xemacs.org/
@@ -43,28 +43,28 @@ CFLAGS+= -Dunix @@ -43,28 +43,28 @@ CFLAGS+= -Dunix
43INFOPATH= ${PREFIX}/${PKGINFODIR}:${X11BASE}/${PKGINFODIR}:${LOCALBASE}/${PKGINFODIR} 43INFOPATH= ${PREFIX}/${PKGINFODIR}:${X11BASE}/${PKGINFODIR}:${LOCALBASE}/${PKGINFODIR}
44.else 44.else
45INFOPATH= ${PREFIX}/${PKGINFODIR}:${LOCALBASE}/${PKGINFODIR} 45INFOPATH= ${PREFIX}/${PKGINFODIR}:${LOCALBASE}/${PKGINFODIR}
46.endif 46.endif
47CONFIGURE_ARGS+= --infopath=${INFOPATH:Q} 47CONFIGURE_ARGS+= --infopath=${INFOPATH:Q}
48 48
49.if ${OPSYS} == "SunOS" 49.if ${OPSYS} == "SunOS"
50. if !exists(/usr/demo/SOUND/libaudio.a) && \ 50. if !exists(/usr/demo/SOUND/libaudio.a) && \
51 !exists(/usr/demo/SOUND/lib/libaudio.a) 51 !exists(/usr/demo/SOUND/lib/libaudio.a)
52CONFIGURE_ARGS+= --with_sound=none 52CONFIGURE_ARGS+= --with_sound=none
53. endif 53. endif
54.endif 54.endif
55 55
56.if (${OPSYS} == "DragonFly") && exists(/usr/lib/crtbegin.o) 56.if (${OPSYS} == "DragonFly") && exists(/usr/lib/crtn.o)
57CPPFLAGS+= -DDFLY_PRE_17_CRT 57CPPFLAGS+= -DDFLY_CRT_USRLIB
58.endif 58.endif
59 59
60CHECK_WRKREF_SKIP= bin/xemacs* 60CHECK_WRKREF_SKIP= bin/xemacs*
61REPLACE_SH= etc/check_cygwin_setup.sh 61REPLACE_SH= etc/check_cygwin_setup.sh
62 62
63LIBDIR= ${PREFIX}/lib/${DISTNAME} 63LIBDIR= ${PREFIX}/lib/${DISTNAME}
64ARCHLIBDIR= ${LIBDIR}/${MACHINE_GNU_PLATFORM} 64ARCHLIBDIR= ${LIBDIR}/${MACHINE_GNU_PLATFORM}
65 65
66# This list overrides variables used in the source Makefiles at install 66# This list overrides variables used in the source Makefiles at install
67# time to allow for ${DESTDIR}-style installation. This variables list 67# time to allow for ${DESTDIR}-style installation. This variables list
68# is pulled from the ``mkdir'' target of Makefile.in.in. 68# is pulled from the ``mkdir'' target of Makefile.in.in.
69# 69#
70INSTALL_MAKE_FLAGS+= archlibdir=${DESTDIR}${ARCHLIBDIR} 70INSTALL_MAKE_FLAGS+= archlibdir=${DESTDIR}${ARCHLIBDIR}
cvs diff -r1.3 -r1.4 pkgsrc/editors/xemacs/files/dragonfly.h (expand / switch to unified diff)

--- pkgsrc/editors/xemacs/files/dragonfly.h 2008/07/01 13:24:34 1.3
+++ pkgsrc/editors/xemacs/files/dragonfly.h 2009/04/30 17:22:07 1.4
@@ -24,39 +24,32 @@ @@ -24,39 +24,32 @@
24#undef BSD 24#undef BSD
25#endif 25#endif
26#include <sys/param.h> 26#include <sys/param.h>
27/* Kludge to work around setlocale(LC_ALL,...) not working after 01/1997 */ 27/* Kludge to work around setlocale(LC_ALL,...) not working after 01/1997 */
28#endif /* C code */ 28#endif /* C code */
29 29
30#define LIBS_TERMCAP "-ltermcap" 30#define LIBS_TERMCAP "-ltermcap"
31 31
32#ifndef NOT_C_CODE 32#ifndef NOT_C_CODE
33#include <stddef.h> 33#include <stddef.h>
34#endif 34#endif
35#define LD_SWITCH_SYSTEM 35#define LD_SWITCH_SYSTEM
36 36
37#if defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ == 4 37#ifdef DFLY_CRT_USRLIB
38# ifndef DFLY_PRE_17_CRT 38#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/gcc41/crtbegin.o
39#define START_FILES pre-crt0.o /usr/lib/gcc34/crt1.o /usr/lib/gcc34/crti.o /usr/lib/gcc34/crtbegin.o 39#define LIB_STANDARD -L/usr/lib/gcc41 -lgcc -lc -lgcc /usr/lib/gcc41/crtend.o /usr/lib/crtn.o
40#define LIB_STANDARD -L/usr/lib/gcc34 -lgcc -lc -lgcc /usr/lib/gcc34/crtend.o /usr/lib/gcc34/crtn.o 40#else
41# else 
42#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/crtbegin.o 
43#define LIB_STANDARD -L/usr/lib/gcc34 -lgcc -lc -lgcc /usr/lib/crtend.o /usr/lib/crtn.o 
44# endif 
45#elif defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ == 1 
46#define START_FILES pre-crt0.o /usr/lib/gcc41/crt1.o /usr/lib/gcc41/crti.o /usr/lib/gcc41/crtbegin.o 41#define START_FILES pre-crt0.o /usr/lib/gcc41/crt1.o /usr/lib/gcc41/crti.o /usr/lib/gcc41/crtbegin.o
47#define LIB_STANDARD -L/usr/lib/gcc41 -lgcc -lc -lgcc /usr/lib/gcc41/crtend.o /usr/lib/gcc41/crtn.o 42#define LIB_STANDARD -L/usr/lib/gcc41 -lgcc -lc -lgcc /usr/lib/gcc41/crtend.o /usr/lib/gcc41/crtn.o
48#else 
49#error "Add compiler version magic" 
50#endif 43#endif
51 44
52#define UNEXEC "unexelf.o" 45#define UNEXEC "unexelf.o"
53#define LINKER "$(CC) -nostdlib" 46#define LINKER "$(CC) -nostdlib"
54#undef LIB_GCC 47#undef LIB_GCC
55#define LIB_GCC 48#define LIB_GCC
56 49
57/* #define NO_TERMIO */ /* detected in configure */ 50/* #define NO_TERMIO */ /* detected in configure */
58#define DECLARE_GETPWUID_WITH_UID_T 51#define DECLARE_GETPWUID_WITH_UID_T
59 52
60/* freebsd uses OXTABS instead of the expected TAB3. */ 53/* freebsd uses OXTABS instead of the expected TAB3. */
61#define TABDLY OXTABS 54#define TABDLY OXTABS
62#define TAB3 OXTABS 55#define TAB3 OXTABS