pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/editors Reimport existing emacs packages as emacs21{,-...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b06778988b72
branches:  trunk
changeset: 529852:b06778988b72
user:      markd <markd%pkgsrc.org@localhost>
date:      Mon Jun 11 13:38:24 2007 +0000

description:
Reimport existing emacs packages as emacs21{,-nox11} to allow
subsequent update of emacs packages to version 22.

diffstat:

 editors/emacs21-nox11/DESCR        |    13 +
 editors/emacs21-nox11/Makefile     |    15 +
 editors/emacs21/DESCR              |    13 +
 editors/emacs21/Makefile           |    46 +
 editors/emacs21/Makefile.common    |    89 +
 editors/emacs21/PLIST              |  1795 ++++++++++++++++++++++++++++++++++++
 editors/emacs21/distinfo           |    31 +
 editors/emacs21/files/amd64.h      |   131 ++
 editors/emacs21/files/darwin.h     |   324 ++++++
 editors/emacs21/files/dragonfly.h  |   136 ++
 editors/emacs21/files/powermac.h   |   115 ++
 editors/emacs21/files/sh3el.h      |   107 ++
 editors/emacs21/files/site-init.el |     4 +
 editors/emacs21/files/unexmacosx.c |  1054 +++++++++++++++++++++
 editors/emacs21/patches/patch-aa   |    34 +
 editors/emacs21/patches/patch-ab   |    64 +
 editors/emacs21/patches/patch-ac   |    16 +
 editors/emacs21/patches/patch-ad   |     7 +
 editors/emacs21/patches/patch-ae   |    52 +
 editors/emacs21/patches/patch-af   |    23 +
 editors/emacs21/patches/patch-ag   |    17 +
 editors/emacs21/patches/patch-ah   |    32 +
 editors/emacs21/patches/patch-ai   |    12 +
 editors/emacs21/patches/patch-aj   |    12 +
 editors/emacs21/patches/patch-ak   |    40 +
 editors/emacs21/patches/patch-am   |    13 +
 editors/emacs21/patches/patch-an   |    14 +
 editors/emacs21/patches/patch-ao   |    15 +
 editors/emacs21/patches/patch-ap   |    15 +
 editors/emacs21/patches/patch-aq   |    17 +
 editors/emacs21/patches/patch-ar   |    14 +
 editors/emacs21/patches/patch-as   |    15 +
 editors/emacs21/patches/patch-at   |    14 +
 editors/emacs21/patches/patch-au   |    15 +
 editors/emacs21/patches/patch-av   |    14 +
 editors/emacs21/patches/patch-az   |    13 +
 editors/emacs21/patches/patch-ba   |    13 +
 editors/emacs21/patches/patch-bb   |   853 +++++++++++++++++
 editors/emacs21/patches/patch-bg   |    21 +
 editors/emacs21/patches/patch-xx   |    30 +
 40 files changed, 5258 insertions(+), 0 deletions(-)

diffs (truncated from 5418 to 300 lines):

diff -r 76c5325268b5 -r b06778988b72 editors/emacs21-nox11/DESCR
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/emacs21-nox11/DESCR       Mon Jun 11 13:38:24 2007 +0000
@@ -0,0 +1,13 @@
+GNU Emacs is a self-documenting, customizable, extensible real-time
+display editor.
+
+Users new to Emacs will be able to use basic features fairly rapidly
+by studying the tutorial and using the self-documentation features.
+Emacs also has an extensive interactive manual browser.  It is easily
+extensible since its editing commands are written in Lisp.
+
+GNU Emacs's many special packages handle mail reading (RMail) and
+sending (Mail), outline editing (Outline), compiling (Compile),
+running subshells within Emacs windows (Shell), running a Lisp
+read-eval-print loop (Lisp-Interaction-Mode), automated psychotherapy
+(Doctor :-) and many more.
diff -r 76c5325268b5 -r b06778988b72 editors/emacs21-nox11/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/emacs21-nox11/Makefile    Mon Jun 11 13:38:24 2007 +0000
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.4 2007/06/11 13:38:47 markd Exp $
+
+DISTNAME=      emacs-${EMACSVERSION}a
+PKGNAME=       emacs-nox11-${EMACSVERSION}a
+PKGREVISION=   8
+CATEGORIES=    editors
+COMMENT=       GNU editing macros (editor) - non X11 version
+
+.include "../../editors/emacs21/Makefile.common"
+
+CONFLICTS+=    emacs-[0-9]*
+
+CONFIGURE_ARGS+=--without-x
+
+.include "../../mk/bsd.pkg.mk"
diff -r 76c5325268b5 -r b06778988b72 editors/emacs21/DESCR
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/emacs21/DESCR     Mon Jun 11 13:38:24 2007 +0000
@@ -0,0 +1,13 @@
+GNU Emacs is a self-documenting, customizable, extensible real-time
+display editor.
+
+Users new to Emacs will be able to use basic features fairly rapidly
+by studying the tutorial and using the self-documentation features.
+Emacs also has an extensive interactive manual browser.  It is easily
+extensible since its editing commands are written in Lisp.
+
+GNU Emacs's many special packages handle mail reading (RMail) and
+sending (Mail), outline editing (Outline), compiling (Compile),
+running subshells within Emacs windows (Shell), running a Lisp
+read-eval-print loop (Lisp-Interaction-Mode), automated psychotherapy
+(Doctor :-) and many more.
diff -r 76c5325268b5 -r b06778988b72 editors/emacs21/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/emacs21/Makefile  Mon Jun 11 13:38:24 2007 +0000
@@ -0,0 +1,46 @@
+# $NetBSD: Makefile,v 1.6 2007/06/11 13:38:27 markd Exp $
+
+DISTNAME=      emacs-${EMACSVERSION}a
+PKGREVISION=   10
+CATEGORIES=    editors
+COMMENT=       GNU editing macros (editor)
+
+.include "../../editors/emacs21/Makefile.common"
+
+USE_TOOLS+=    imake
+
+CONFLICTS+=    emacs-nox11-[0-9]*
+
+CONFIGURE_ARGS+=       --with-x
+CONFIGURE_ARGS+=       --srcdir=${WRKSRC:Q}
+
+.include "../../x11/libXpm/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-xpm
+.include "../../graphics/jpeg/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-jpeg
+.include "../../graphics/tiff/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-tiff
+# need 4.1.0b1 or higher (a bug in 4.1.0 can crash Emacs)
+BUILDLINK_API_DEPENDS.libungif+=       libungif>=4.1.0.1
+.include "../../graphics/libungif/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-gif
+.include "../../graphics/png/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-png
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.emacs
+PKG_OPTIONS_OPTIONAL_GROUPS= toolkit
+PKG_OPTIONS_GROUP.toolkit= emacs-xaw3d motif
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mmotif)
+.include "../../mk/motif.buildlink3.mk"
+CONFIGURE_ARGS+=       --with-x-toolkit=motif
+.elif !empty(PKG_OPTIONS:Memacs-xaw3d)
+.include "../../x11/Xaw3d/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-x-toolkit=athena
+.else
+.include "../../x11/libXaw/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-x-toolkit=athena
+.endif
+
+.include "../../mk/bsd.pkg.mk"
diff -r 76c5325268b5 -r b06778988b72 editors/emacs21/Makefile.common
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/emacs21/Makefile.common   Mon Jun 11 13:38:24 2007 +0000
@@ -0,0 +1,89 @@
+# $NetBSD: Makefile.common,v 1.1 2007/06/11 13:38:29 markd Exp $
+
+MASTER_SITES=  ${MASTER_SITE_GNU:=emacs/}
+MAINTAINER=    markd%NetBSD.org@localhost
+HOMEPAGE=      http://www.gnu.org/software/emacs/emacs.html
+
+CONFLICTS=     mule-[0-9]*
+
+USE_TOOLS+=            gmake perl:run
+GNU_CONFIGURE=         yes
+
+PATCHDIR=      ${.CURDIR}/../../editors/emacs21/patches
+FILESDIR=      ${.CURDIR}/../../editors/emacs21/files
+DISTINFO_FILE= ${.CURDIR}/../../editors/emacs21/distinfo
+PLIST_SRC=     ${.CURDIR}/../../editors/emacs21/PLIST
+
+# needed for 21.4a, can probably go away on next update
+EMACSVERSION=  21.4
+WRKSRC=                ${WRKDIR}/emacs-${EMACSVERSION}
+PLIST_SUBST+=  EMACSVERSION=${EMACSVERSION:Q}
+
+MAKEFLAGS+=    EMACSLOADPATH=${WRKSRC}/lisp
+
+# build PATH in the dumped emacs is not a problem
+CHECK_WRKREF_SKIP+=    bin/emacs
+CHECK_WRKREF_SKIP+=    bin/emacs-${EMACSVERSION}
+
+.include "../../mk/bsd.prefs.mk"
+
+# This matches NetBSD <1.7 releases and 1.6A-1.6P, where ld is <2.13.2.1.
+.if (${OPSYS} == "NetBSD" && \
+    (empty(OS_VERSION:M1.[0-5]*) && \
+     empty(OS_VERSION:M1.6_*) && \
+     empty(OS_VERSION:M1.6) && \
+     empty(OS_VERSION:M1.6.[0-9]*) && \
+     empty(OS_VERSION:M1.6[A-P]*))) || \
+    ${OPSYS} == "DragonFly"
+# If using GNU ld 2.13.2.1 or later, avoid creating combined reloc
+# sections and .data reloc sections, both of which Emacs can't handle
+# properly.  Analyzed by Stephen Ma.
+LDFLAGS+=      -Wl,-z,nocombreloc
+.endif
+
+.if ${OPSYS} == "DragonFly" && exists(/usr/lib/crtbegin.o)
+CPPFLAGS+=     -DDFLY_PRE_17_CRT
+.endif
+
+.if ${OPSYS} == "Darwin"
+PLIST_SUBST+=  FNS_EL="@comment "
+PLIST_SUBST+=  DOCTAIL=""
+.else
+PLIST_SUBST+=  FNS_EL=""
+PLIST_SUBST+=  DOCTAIL="-${EMACSVERSION}.1"
+.endif
+
+# Disable W^X.
+.if ${OPSYS} == "OpenBSD"
+LDFLAGS+=      -Z
+.endif
+
+.include "../../mk/compiler.mk"
+.if !empty(CC_VERSION:Mgcc-3.*)
+CFLAGS+=       -fno-zero-initialized-in-bss
+.endif
+
+INFO_FILES=    # PLIST
+REPLACE_PERL=  lib-src/grep-changelog
+
+post-extract:
+       ${CP} ${FILESDIR}/site-init.el ${WRKSRC}/lisp
+       ${CP} ${FILESDIR}/amd64.h ${WRKSRC}/src/m
+       ${CP} ${FILESDIR}/powermac.h ${WRKSRC}/src/m
+       ${CP} ${FILESDIR}/darwin.h ${WRKSRC}/src/s
+       ${CP} ${FILESDIR}/dragonfly.h ${WRKSRC}/src/s
+       ${CP} ${FILESDIR}/unexmacosx.c ${WRKSRC}/src
+       ${CP} ${FILESDIR}/sh3el.h ${WRKSRC}/src/m
+
+# for patch-ba
+post-build:
+       cd ${WRKSRC}/lisp && \
+          rm sort.elc && ${MAKE_PROGRAM} sort.elc && \
+          rm mail/smtpmail.elc && ${MAKE_PROGRAM} mail/smtpmail.elc
+
+pre-install:
+       @${FIND} ${WRKSRC} -type f -name "*.orig" -print | ${XARGS} ${RM} -f
+
+post-install:
+       ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/emacs
+       ${CHMOD} -R go-w ${PREFIX}/share/emacs
diff -r 76c5325268b5 -r b06778988b72 editors/emacs21/PLIST
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/emacs21/PLIST     Mon Jun 11 13:38:24 2007 +0000
@@ -0,0 +1,1795 @@
+@comment $NetBSD: PLIST,v 1.4 2007/06/11 13:38:30 markd Exp $
+bin/emacs
+bin/emacs-${EMACSVERSION}
+bin/emacs-b2m
+bin/emacs-ctags
+bin/emacs-ebrowse
+bin/emacs-etags
+bin/emacs-grep-changelog
+bin/emacs-rcs-checkin
+bin/emacsclient
+libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/cvtmail
+libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/digest-doc
+libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/emacsserver
+libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/fakemail
+${FNS_EL}libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/fns-${EMACSVERSION}.1.el
+libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/hexl
+libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/movemail
+libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/profile
+libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/rcs2log
+libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/sorted-doc
+libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/vcdiff
+libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/yow
+info/ada-mode
+info/autotype
+info/ccmode
+info/cl
+info/dired-x
+info/ebrowse
+info/ediff
+info/efaq
+info/emacs
+info/emacs-mime
+info/eshell
+info/eudc
+info/forms
+info/gnus
+info/idlwave
+info/message
+info/mh-e
+info/pcl-cvs
+info/reftex
+info/sc
+info/speedbar
+info/vip
+info/viper
+info/widget
+info/woman
+man/man1/emacs-ctags.1
+man/man1/emacs-etags.1
+man/man1/emacs-gfdl.1
+man/man1/emacs.1
+@unexec ${RMDIR} %D/share/emacs 2>/dev/null || ${TRUE}
+share/emacs/${EMACSVERSION}/etc/BABYL
+share/emacs/${EMACSVERSION}/etc/CENSORSHIP
+share/emacs/${EMACSVERSION}/etc/COOKIES
+share/emacs/${EMACSVERSION}/etc/COPYING
+share/emacs/${EMACSVERSION}/etc/DEBUG
+share/emacs/${EMACSVERSION}/etc/DISTRIB
+share/emacs/${EMACSVERSION}/etc/DOC${DOCTAIL}
+share/emacs/${EMACSVERSION}/etc/FTP
+share/emacs/${EMACSVERSION}/etc/GNU
+share/emacs/${EMACSVERSION}/etc/HELLO
+share/emacs/${EMACSVERSION}/etc/INTERVIEW
+share/emacs/${EMACSVERSION}/etc/JOKES
+share/emacs/${EMACSVERSION}/etc/LEDIT
+share/emacs/${EMACSVERSION}/etc/LINUX-GNU
+share/emacs/${EMACSVERSION}/etc/LPF
+share/emacs/${EMACSVERSION}/etc/MACHINES
+share/emacs/${EMACSVERSION}/etc/MAILINGLISTS
+share/emacs/${EMACSVERSION}/etc/MH-E-NEWS
+share/emacs/${EMACSVERSION}/etc/MH-E-ONEWS
+share/emacs/${EMACSVERSION}/etc/MORE.STUFF
+share/emacs/${EMACSVERSION}/etc/MOTIVATION
+share/emacs/${EMACSVERSION}/etc/NEWS
+share/emacs/${EMACSVERSION}/etc/ONEWS
+share/emacs/${EMACSVERSION}/etc/ONEWS.1
+share/emacs/${EMACSVERSION}/etc/ONEWS.2
+share/emacs/${EMACSVERSION}/etc/ONEWS.3
+share/emacs/${EMACSVERSION}/etc/ONEWS.4
+share/emacs/${EMACSVERSION}/etc/ORDERS
+share/emacs/${EMACSVERSION}/etc/ORDERS.EUROPE
+share/emacs/${EMACSVERSION}/etc/ORDERS.JAPAN
+share/emacs/${EMACSVERSION}/etc/OTHER.EMACSES
+share/emacs/${EMACSVERSION}/etc/PROBLEMS
+share/emacs/${EMACSVERSION}/etc/README
+share/emacs/${EMACSVERSION}/etc/SERVICE
+share/emacs/${EMACSVERSION}/etc/TERMS
+share/emacs/${EMACSVERSION}/etc/THE-GNU-PROJECT
+share/emacs/${EMACSVERSION}/etc/TODO
+share/emacs/${EMACSVERSION}/etc/TUTORIAL
+share/emacs/${EMACSVERSION}/etc/TUTORIAL.cs
+share/emacs/${EMACSVERSION}/etc/TUTORIAL.de
+share/emacs/${EMACSVERSION}/etc/TUTORIAL.es
+share/emacs/${EMACSVERSION}/etc/TUTORIAL.fr
+share/emacs/${EMACSVERSION}/etc/TUTORIAL.it
+share/emacs/${EMACSVERSION}/etc/TUTORIAL.ja
+share/emacs/${EMACSVERSION}/etc/TUTORIAL.ko
+share/emacs/${EMACSVERSION}/etc/TUTORIAL.nl
+share/emacs/${EMACSVERSION}/etc/TUTORIAL.pl
+share/emacs/${EMACSVERSION}/etc/TUTORIAL.ro



Home | Main Index | Thread Index | Old Index