mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-26 00:55:14 +00:00
Code Issues Releases Activity

. backout previous commit (revert editors/emacs to version 22.3)

Browse Source 
since the commit broke dependencies and the ports infrastructure
  was not fully prepared (a new emacs/editors22 port is needed
  for compatibility reasons);
. bump PORTEPOCH.

Reported by:	Jan Henrik Sylvester <me at janh.de>, kostik
Pointy hat to:	bsam (me)
This commit is contained in:
Boris Samorodov 2009-09-08 11:36:21 +00:00
parent 2a84b57346
commit bb2e6e9dcd
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=241034
39 changed files with 1053 additions and 3396 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
editors/emacs/Makefile
View File

@ -7,6 +7,8 @@
PORTNAME= emacs
PORTVERSION= ${EMACS_VER}
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= editors ipv6
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ${PORTNAME}
@ -15,12 +17,8 @@ MAINTAINER= keramida@ceid.upatras.gr
COMMENT= GNU editing macros
.if !defined(WITHOUT_X11)
USE_XORG= x11
USE_GNOME= librsvg2
.if defined(WITHOUT_GTK)
USE_XORG= xaw xft xpm
.else
USE_GNOME+= gtk20
LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
.endif
LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff \
@ -28,66 +26,48 @@ LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png
.endif
MAKE_JOBS_UNSAFE= yes
CONFLICTS= emacs-19.* emacs-21.* emacs-22.* \
CONFLICTS= emacs-19.* emacs-21.* \
xemacs-[0-9]* xemacs-devel-[0-9]* \
xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]*
INSTALLS_ICONS= yes
EMACS_VER= 23.1
EMACS_VER= 22.3
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_BZIP2= yes
.if !defined(WITHOUT_X11)
.if !defined(WITHOUT_GTK)
USE_GNOME= gtk20
.else
USE_XORG= x11
.endif
USE_XORG= xpm xft
.endif
.if defined(WITHOUT_X11)
CONFIGURE_ARGS= --with-x=no
.else
.if !defined(WITHOUT_GTK)
CONFIGURE_ARGS= --with-x-toolkit=gtk
.else
CONFIGURE_ARGS= --with-x-toolkit=athena
CONFIGURE_ARGS= --with-gtk
.endif
LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2 \
m17n.3:${PORTSDIR}/devel/m17n-lib
# also libotf, which is pulled in by m17n
# m17n depends on libintl.so too
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -lintl"
USE_GETTEXT= yes
.endif
.if defined(WITHOUT_XIM)
CONFIGURE_ARGS+= --without-xim
.endif
MAN1= b2m.1 ctags.1 ebrowse.1 emacs.1 emacsclient.1 etags.1 \
grep-changelog.1 rcs-checkin.1
MAN1= ctags.1 emacs.1 emacsclient.1 etags.1
PLIST_SUB= EMACS_VER=${EMACS_VER} EMACS_ARCH=${CONFIGURE_TARGET}
MAKE_ENV= LC_ALL=C
INFO= ada-mode auth autotype calc ccmode cl dbus dired-x \
ebrowse ediff efaq eintr elisp emacs-mime emacs epa \
erc eshell eudc flymake forms gnus idlwave info \
mairix-el message mh-e newsticker nxml-mode \
org pcl-cvs pgg rcirc reftex remember sasl sc ses sieve \
smtpmail speedbar tramp url vip viper widget woman
LATEST_LINK= emacs23
OPTIONS= SOURCES "Install source code" ON
INFO= ada-mode autotype calc ccmode cl dired-x ebrowse ediff \
efaq eintr elisp emacs-mime emacs erc eshell eudc \
flymake forms gnus idlwave info message mh-e newsticker \
org pcl-cvs pgg rcirc reftex sc ses sieve smtpmail speedbar \
tramp url vip viper widget woman
.include <bsd.port.pre.mk>
.if defined(WITH_SOURCES)
PLIST_SUB+= SOURCES=""
.else
PLIST_SUB+= SOURCES="@comment "
.endif
.if ${ARCH} == "ia64"
BROKEN= Emacs 22.X does not currently build on ia64
.endif
@ -106,13 +86,5 @@ pre-everything::
post-patch:
@${RM} -f ${WRKSRC}/info/*
@${REINPLACE_CMD} -e "s/%%EMACS_VER%%/${EMACS_VER}/g" -e "s/%%DATADIR%%/${DATADIR:C/\//\\\//g}/g" ${WRKSRC}/sources.el
.if defined(WITH_SOURCES)
post-install:
@${MKDIR} ${DATADIR}/${EMACS_VER}/src
@${INSTALL_DATA} ${WRKSRC}/src/*.[ch] ${DATADIR}/${EMACS_VER}/src
@${INSTALL_DATA} ${WRKSRC}/sources.el ${DATADIR}/${EMACS_VER}/site-lisp/site-start.el
.endif
.include <bsd.port.post.mk>

6
editors/emacs/distinfo
View File

@ -1,3 +1,3 @@
MD5 (emacs-23.1.tar.bz2) = 17f7f0ba68a0432d58fa69d05a2225be
SHA256 (emacs-23.1.tar.bz2) = 2b35f4457c7a0ee9f9185579cc2890b43f129a112cf22500233489db7a24cb1c
SIZE (emacs-23.1.tar.bz2) = 34382732
MD5 (emacs-22.3.tar.gz) = aa8ba34f548cd78b35914ae5a7bb87eb
SHA256 (emacs-22.3.tar.gz) = 7bd9b719db8ee20c75ee0d256737f7fd2c0e2ea30a285a3afbfc32c856420d16
SIZE (emacs-22.3.tar.gz) = 39587396

18
editors/emacs/files/patch-Makefile.in
View File

@ -1,8 +1,8 @@
--- Makefile.in.orig Tue Jun 23 07:41:36 2009 +0300
+++ Makefile.in Tue Jun 23 07:39:33 2009 +0300
@@ -461,14 +461,6 @@
install-arch-indep: mkdir info install-etc
--- Makefile.in.orig 2008-09-07 05:23:59.000000000 +0300
+++ Makefile.in 2008-09-07 05:23:59.000000000 +0300
@@ -419,14 +419,6 @@
## That flag is also used in leim/Makefile.in
install-arch-indep: mkdir info
-set ${COPYDESTS} ; \
- unset CDPATH; \
- for dir in ${COPYDIR} ; do \
@ -15,10 +15,10 @@
mkdir ${COPYDESTS} ; \
chmod ugo+rx ${COPYDESTS} ; \
unset CDPATH; \
@@ -570,9 +562,9 @@
@@ -513,9 +505,9 @@
fi; \
cd ${srcdir}/info ; \
for elt in $(INFO_FILES); do \
test "$(MAKEINFO)" = "off" && ! test -e $$elt && continue; \
- for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \
- ${INSTALL_DATA} $$f $(DESTDIR)${infodir}/$$f; \
- chmod a+r $(DESTDIR)${infodir}/$$f; \
@ -28,9 +28,9 @@
done; \
done); \
else true; fi
@@ -583,7 +575,7 @@
@@ -525,7 +517,7 @@
then \
for elt in $(INFO_FILES); do \
test "$(MAKEINFO)" = "off" && ! test -e $$elt && continue; \
(cd $${thisdir}; \
- ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
+ ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt.info); \

20
editors/emacs/files/patch-doc-emacs-Makefile.in
View File

@ -1,20 +0,0 @@
--- doc/emacs/Makefile.in.orig 2008-12-09 19:27:59.000000000 +0200
+++ doc/emacs/Makefile.in 2008-12-09 19:25:19.000000000 +0200
@@ -34,7 +34,7 @@
# The makeinfo program is part of the Texinfo distribution.
# Use --force so that it generates output even if there are errors.
-MAKEINFO = makeinfo --force
+MAKEINFO = makeinfo --force --no-split
INFO_TARGETS = $(infodir)/emacs
DVI_TARGETS = emacs.dvi
@@ -144,7 +144,7 @@
# rm -f Makefile
maintainer-clean: distclean
- for file in $(INFO_TARGETS); do rm -f $${file}*; done
+ for file in $(INFO_TARGETS); do rm -f $${file}; done
# Formerly this directory had texindex.c and getopt.c in it

20
editors/emacs/files/patch-doc-lispintro-Makefile.in
View File

@ -1,20 +0,0 @@
--- doc/lispintro/Makefile.in.orig 2008-12-09 19:27:59.000000000 +0200
+++ doc/lispintro/Makefile.in 2008-12-09 19:25:20.000000000 +0200
@@ -33,7 +33,7 @@
INFO_TARGETS = ${infodir}/eintr
DVI_TARGETS = emacs-lisp-intro.dvi
-MAKEINFO = makeinfo
+MAKEINFO = makeinfo --no-split
TEXI2DVI = texi2dvi
DVIPS = dvips
@@ -65,7 +65,7 @@
maintainer-clean: distclean
rm -f *.aux *.cps *.fns *.kys *.pgs *.vrs *.toc
- cd $(infodir); rm -f eintr eintr-[1-9]
+ cd $(infodir); rm -f eintr
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.

11
editors/emacs/files/patch-doc-lispref-Makefile.in
View File

@ -1,11 +0,0 @@
--- doc/lispref/Makefile.in.orig 2008-12-09 19:27:59.000000000 +0200
+++ doc/lispref/Makefile.in 2008-12-09 19:25:20.000000000 +0200
@@ -32,7 +32,7 @@
TEXI2DVI = texi2dvi
SHELL = /bin/sh
INSTALL_INFO = install-info
-MAKEINFO = makeinfo --force
+MAKEINFO = makeinfo --force --no-split
# List of all the texinfo files in the manual:

11
editors/emacs/files/patch-doc-misc-Makefile.in
View File

@ -1,11 +0,0 @@
--- doc/misc/Makefile.in.orig Tue Jun 23 07:39:39 2009 +0300
+++ doc/misc/Makefile.in Tue Jun 23 07:39:41 2009 +0300
@@ -34,7 +34,7 @@
# The makeinfo program is part of the Texinfo distribution.
# Use --force so that it generates output even if there are errors.
-MAKEINFO = makeinfo --force
+MAKEINFO = makeinfo --force --no-split
# Also add new entries to INFO_FILES in the top-level Makefile.in.
INFO_TARGETS = \

11
editors/emacs/files/patch-lispintro-Makefile.in
View File

@ -0,0 +1,11 @@
--- lispintro/Makefile.in.orig 2008-09-07 05:24:38.000000000 +0300
+++ lispintro/Makefile.in 2008-09-07 05:24:38.000000000 +0300
@@ -34,7 +34,7 @@
INFO_TARGETS = ${infodir}/eintr
DVI_TARGETS = emacs-lisp-intro.dvi
-MAKEINFO = makeinfo
+MAKEINFO = makeinfo --no-split
TEXI2DVI = texi2dvi
DVIPS = dvips

38
editors/emacs/files/patch-lispref-Makefile.in
View File

@ -0,0 +1,38 @@
--- lispref/Makefile.in.orig 2008-09-07 05:24:57.000000000 +0300
+++ lispref/Makefile.in 2008-09-07 05:24:57.000000000 +0300
@@ -33,7 +33,7 @@
TEXI2DVI = texi2dvi
SHELL = /bin/sh
INSTALL_INFO = install-info
-MAKEINFO = makeinfo --force
+MAKEINFO = makeinfo --force --no-split
# The name of the manual:
VERSION=2.9
@@ -110,7 +110,7 @@
# This is for use in a separate distro of the Emacs Lisp manual.
install: elisp
$(srcdir)/mkinstalldirs $(infodir)
- cp elisp elisp-[1-9] elisp-[1-9][0-9] $(infodir)
+ cp elisp $(infodir)
${INSTALL_INFO} --info-dir=${infodir} ${infodir}/elisp
# This is for use in a separate distro of the Emacs Lisp manual.
@@ -126,7 +126,7 @@
maintainer-clean: clean
rm -f elisp.dvi elisp.oaux
- cd $(infodir); rm -f elisp elisp-[1-9] elisp-[1-9][0-9]
+ cd $(infodir); rm -f elisp
dist: $(infodir)/elisp elisp.dvi
-rm -rf temp
@@ -136,7 +136,7 @@
$(srcdir)/Makefile.in $(srcs) \
$(srcdir)/../man/texinfo.tex \
elisp.dvi elisp.aux elisp.??s \
- $(infodir)/elisp $(infodir)/elisp-[1-9] $(infodir)/elisp-[1-9][0-9] \
+ $(infodir)/elisp \
temp/$(manual)
-(cd temp/$(manual); rm -f mkinstalldirs)
cp $(srcdir)/mkinstalldirs temp/$(manual)

11
editors/emacs/files/patch-man-Makefile.in
View File

@ -0,0 +1,11 @@
--- ./man/Makefile.in.orig Sat May 6 18:54:21 2006
+++ ./man/Makefile.in Fri Sep 1 21:10:08 2006
@@ -32,7 +32,7 @@
# The makeinfo program is part of the Texinfo distribution.
# Use --force so that it generates output even if there are errors.
-MAKEINFO = makeinfo --force
+MAKEINFO = makeinfo --force --no-split
INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl \
../info/dired-x ../info/ediff ../info/forms ../info/gnus \
../info/message ../info/sieve ../info/pgg ../info/emacs-mime \

10
editors/emacs/files/patch-sources.el
View File

@ -1,10 +0,0 @@
$FreeBSD: /tmp/pcvs/ports/editors/emacs/files/patch-sources.el,v 1.1 2009-09-07 19:33:30 bsam Exp $
--- /dev/null
+++ sources.el
@@ -0,0 +1,4 @@
+;;; Path to Emacs C Sources.
+(when (string-match (regexp-quote "%%EMACS_VER%%") emacs-version)
+ (setq find-function-C-source-directory
+ "%%DATADIR%%/%%EMACS_VER%%/src"))

15
editors/emacs/files/patch-src__alloc.c
View File

@ -0,0 +1,15 @@
--- src/alloc.c.orig 2008-09-07 05:25:27.000000000 +0300
+++ src/alloc.c 2008-09-07 05:25:27.000000000 +0300
@@ -4573,8 +4573,12 @@
needed on ia64 too. See mach_dep.c, where it also says inline
assembler doesn't work with relevant proprietary compilers. */
#ifdef __sparc__
+#ifdef __sparc64__
+ asm ("flushw");
+#else
asm ("ta 3");
#endif
+#endif
/* Save registers that we need to see on the stack. We need to see
registers used to hold register variables and registers used to

1242
editors/emacs/pkg-plist
View File

File diff suppressed because it is too large Load Diff

70
editors/emacs22/Makefile
View File

@ -7,6 +7,8 @@
PORTNAME= emacs
PORTVERSION= ${EMACS_VER}
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= editors ipv6
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ${PORTNAME}
@ -15,12 +17,8 @@ MAINTAINER= keramida@ceid.upatras.gr
COMMENT= GNU editing macros
.if !defined(WITHOUT_X11)
USE_XORG= x11
USE_GNOME= librsvg2
.if defined(WITHOUT_GTK)
USE_XORG= xaw xft xpm
.else
USE_GNOME+= gtk20
LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
.endif
LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff \
@ -28,66 +26,48 @@ LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png
.endif
MAKE_JOBS_UNSAFE= yes
CONFLICTS= emacs-19.* emacs-21.* emacs-22.* \
CONFLICTS= emacs-19.* emacs-21.* \
xemacs-[0-9]* xemacs-devel-[0-9]* \
xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]*
INSTALLS_ICONS= yes
EMACS_VER= 23.1
EMACS_VER= 22.3
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_BZIP2= yes
.if !defined(WITHOUT_X11)
.if !defined(WITHOUT_GTK)
USE_GNOME= gtk20
.else
USE_XORG= x11
.endif
USE_XORG= xpm xft
.endif
.if defined(WITHOUT_X11)
CONFIGURE_ARGS= --with-x=no
.else
.if !defined(WITHOUT_GTK)
CONFIGURE_ARGS= --with-x-toolkit=gtk
.else
CONFIGURE_ARGS= --with-x-toolkit=athena
CONFIGURE_ARGS= --with-gtk
.endif
LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2 \
m17n.3:${PORTSDIR}/devel/m17n-lib
# also libotf, which is pulled in by m17n
# m17n depends on libintl.so too
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -lintl"
USE_GETTEXT= yes
.endif
.if defined(WITHOUT_XIM)
CONFIGURE_ARGS+= --without-xim
.endif
MAN1= b2m.1 ctags.1 ebrowse.1 emacs.1 emacsclient.1 etags.1 \
grep-changelog.1 rcs-checkin.1
MAN1= ctags.1 emacs.1 emacsclient.1 etags.1
PLIST_SUB= EMACS_VER=${EMACS_VER} EMACS_ARCH=${CONFIGURE_TARGET}
MAKE_ENV= LC_ALL=C
INFO= ada-mode auth autotype calc ccmode cl dbus dired-x \
ebrowse ediff efaq eintr elisp emacs-mime emacs epa \
erc eshell eudc flymake forms gnus idlwave info \
mairix-el message mh-e newsticker nxml-mode \
org pcl-cvs pgg rcirc reftex remember sasl sc ses sieve \
smtpmail speedbar tramp url vip viper widget woman
LATEST_LINK= emacs23
OPTIONS= SOURCES "Install source code" ON
INFO= ada-mode autotype calc ccmode cl dired-x ebrowse ediff \
efaq eintr elisp emacs-mime emacs erc eshell eudc \
flymake forms gnus idlwave info message mh-e newsticker \
org pcl-cvs pgg rcirc reftex sc ses sieve smtpmail speedbar \
tramp url vip viper widget woman
.include <bsd.port.pre.mk>
.if defined(WITH_SOURCES)
PLIST_SUB+= SOURCES=""
.else
PLIST_SUB+= SOURCES="@comment "
.endif
.if ${ARCH} == "ia64"
BROKEN= Emacs 22.X does not currently build on ia64
.endif
@ -106,13 +86,5 @@ pre-everything::
post-patch:
@${RM} -f ${WRKSRC}/info/*
@${REINPLACE_CMD} -e "s/%%EMACS_VER%%/${EMACS_VER}/g" -e "s/%%DATADIR%%/${DATADIR:C/\//\\\//g}/g" ${WRKSRC}/sources.el
.if defined(WITH_SOURCES)
post-install:
@${MKDIR} ${DATADIR}/${EMACS_VER}/src
@${INSTALL_DATA} ${WRKSRC}/src/*.[ch] ${DATADIR}/${EMACS_VER}/src
@${INSTALL_DATA} ${WRKSRC}/sources.el ${DATADIR}/${EMACS_VER}/site-lisp/site-start.el
.endif
.include <bsd.port.post.mk>

6
editors/emacs22/distinfo
View File

@ -1,3 +1,3 @@
MD5 (emacs-23.1.tar.bz2) = 17f7f0ba68a0432d58fa69d05a2225be
SHA256 (emacs-23.1.tar.bz2) = 2b35f4457c7a0ee9f9185579cc2890b43f129a112cf22500233489db7a24cb1c
SIZE (emacs-23.1.tar.bz2) = 34382732
MD5 (emacs-22.3.tar.gz) = aa8ba34f548cd78b35914ae5a7bb87eb
SHA256 (emacs-22.3.tar.gz) = 7bd9b719db8ee20c75ee0d256737f7fd2c0e2ea30a285a3afbfc32c856420d16
SIZE (emacs-22.3.tar.gz) = 39587396

18
editors/emacs22/files/patch-Makefile.in
View File

@ -1,8 +1,8 @@
--- Makefile.in.orig Tue Jun 23 07:41:36 2009 +0300
+++ Makefile.in Tue Jun 23 07:39:33 2009 +0300
@@ -461,14 +461,6 @@
install-arch-indep: mkdir info install-etc
--- Makefile.in.orig 2008-09-07 05:23:59.000000000 +0300
+++ Makefile.in 2008-09-07 05:23:59.000000000 +0300
@@ -419,14 +419,6 @@
## That flag is also used in leim/Makefile.in
install-arch-indep: mkdir info
-set ${COPYDESTS} ; \
- unset CDPATH; \
- for dir in ${COPYDIR} ; do \
@ -15,10 +15,10 @@
mkdir ${COPYDESTS} ; \
chmod ugo+rx ${COPYDESTS} ; \
unset CDPATH; \
@@ -570,9 +562,9 @@
@@ -513,9 +505,9 @@
fi; \
cd ${srcdir}/info ; \
for elt in $(INFO_FILES); do \
test "$(MAKEINFO)" = "off" && ! test -e $$elt && continue; \
- for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \
- ${INSTALL_DATA} $$f $(DESTDIR)${infodir}/$$f; \
- chmod a+r $(DESTDIR)${infodir}/$$f; \
@ -28,9 +28,9 @@
done; \
done); \
else true; fi
@@ -583,7 +575,7 @@
@@ -525,7 +517,7 @@
then \
for elt in $(INFO_FILES); do \
test "$(MAKEINFO)" = "off" && ! test -e $$elt && continue; \
(cd $${thisdir}; \
- ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
+ ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt.info); \

20
editors/emacs22/files/patch-doc-emacs-Makefile.in
View File

@ -1,20 +0,0 @@
--- doc/emacs/Makefile.in.orig 2008-12-09 19:27:59.000000000 +0200
+++ doc/emacs/Makefile.in 2008-12-09 19:25:19.000000000 +0200
@@ -34,7 +34,7 @@
# The makeinfo program is part of the Texinfo distribution.
# Use --force so that it generates output even if there are errors.
-MAKEINFO = makeinfo --force
+MAKEINFO = makeinfo --force --no-split
INFO_TARGETS = $(infodir)/emacs
DVI_TARGETS = emacs.dvi
@@ -144,7 +144,7 @@
# rm -f Makefile
maintainer-clean: distclean
- for file in $(INFO_TARGETS); do rm -f $${file}*; done
+ for file in $(INFO_TARGETS); do rm -f $${file}; done
# Formerly this directory had texindex.c and getopt.c in it

20
editors/emacs22/files/patch-doc-lispintro-Makefile.in
View File

@ -1,20 +0,0 @@
--- doc/lispintro/Makefile.in.orig 2008-12-09 19:27:59.000000000 +0200
+++ doc/lispintro/Makefile.in 2008-12-09 19:25:20.000000000 +0200
@@ -33,7 +33,7 @@
INFO_TARGETS = ${infodir}/eintr
DVI_TARGETS = emacs-lisp-intro.dvi
-MAKEINFO = makeinfo
+MAKEINFO = makeinfo --no-split
TEXI2DVI = texi2dvi
DVIPS = dvips
@@ -65,7 +65,7 @@
maintainer-clean: distclean
rm -f *.aux *.cps *.fns *.kys *.pgs *.vrs *.toc
- cd $(infodir); rm -f eintr eintr-[1-9]
+ cd $(infodir); rm -f eintr
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.

11
editors/emacs22/files/patch-doc-lispref-Makefile.in
View File

@ -1,11 +0,0 @@
--- doc/lispref/Makefile.in.orig 2008-12-09 19:27:59.000000000 +0200
+++ doc/lispref/Makefile.in 2008-12-09 19:25:20.000000000 +0200
@@ -32,7 +32,7 @@
TEXI2DVI = texi2dvi
SHELL = /bin/sh
INSTALL_INFO = install-info
-MAKEINFO = makeinfo --force
+MAKEINFO = makeinfo --force --no-split
# List of all the texinfo files in the manual:

11
editors/emacs22/files/patch-doc-misc-Makefile.in
View File

@ -1,11 +0,0 @@
--- doc/misc/Makefile.in.orig Tue Jun 23 07:39:39 2009 +0300
+++ doc/misc/Makefile.in Tue Jun 23 07:39:41 2009 +0300
@@ -34,7 +34,7 @@
# The makeinfo program is part of the Texinfo distribution.
# Use --force so that it generates output even if there are errors.
-MAKEINFO = makeinfo --force
+MAKEINFO = makeinfo --force --no-split
# Also add new entries to INFO_FILES in the top-level Makefile.in.
INFO_TARGETS = \

11
editors/emacs22/files/patch-lispintro-Makefile.in
View File

@ -0,0 +1,11 @@
--- lispintro/Makefile.in.orig 2008-09-07 05:24:38.000000000 +0300
+++ lispintro/Makefile.in 2008-09-07 05:24:38.000000000 +0300
@@ -34,7 +34,7 @@
INFO_TARGETS = ${infodir}/eintr
DVI_TARGETS = emacs-lisp-intro.dvi
-MAKEINFO = makeinfo
+MAKEINFO = makeinfo --no-split
TEXI2DVI = texi2dvi
DVIPS = dvips

38
editors/emacs22/files/patch-lispref-Makefile.in
View File

@ -0,0 +1,38 @@
--- lispref/Makefile.in.orig 2008-09-07 05:24:57.000000000 +0300
+++ lispref/Makefile.in 2008-09-07 05:24:57.000000000 +0300
@@ -33,7 +33,7 @@
TEXI2DVI = texi2dvi
SHELL = /bin/sh
INSTALL_INFO = install-info
-MAKEINFO = makeinfo --force
+MAKEINFO = makeinfo --force --no-split
# The name of the manual:
VERSION=2.9
@@ -110,7 +110,7 @@
# This is for use in a separate distro of the Emacs Lisp manual.
install: elisp
$(srcdir)/mkinstalldirs $(infodir)
- cp elisp elisp-[1-9] elisp-[1-9][0-9] $(infodir)
+ cp elisp $(infodir)
${INSTALL_INFO} --info-dir=${infodir} ${infodir}/elisp
# This is for use in a separate distro of the Emacs Lisp manual.
@@ -126,7 +126,7 @@
maintainer-clean: clean
rm -f elisp.dvi elisp.oaux
- cd $(infodir); rm -f elisp elisp-[1-9] elisp-[1-9][0-9]
+ cd $(infodir); rm -f elisp
dist: $(infodir)/elisp elisp.dvi
-rm -rf temp
@@ -136,7 +136,7 @@
$(srcdir)/Makefile.in $(srcs) \
$(srcdir)/../man/texinfo.tex \
elisp.dvi elisp.aux elisp.??s \
- $(infodir)/elisp $(infodir)/elisp-[1-9] $(infodir)/elisp-[1-9][0-9] \
+ $(infodir)/elisp \
temp/$(manual)
-(cd temp/$(manual); rm -f mkinstalldirs)
cp $(srcdir)/mkinstalldirs temp/$(manual)

11
editors/emacs22/files/patch-man-Makefile.in
View File

@ -0,0 +1,11 @@
--- ./man/Makefile.in.orig Sat May 6 18:54:21 2006
+++ ./man/Makefile.in Fri Sep 1 21:10:08 2006
@@ -32,7 +32,7 @@
# The makeinfo program is part of the Texinfo distribution.
# Use --force so that it generates output even if there are errors.
-MAKEINFO = makeinfo --force
+MAKEINFO = makeinfo --force --no-split
INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl \
../info/dired-x ../info/ediff ../info/forms ../info/gnus \
../info/message ../info/sieve ../info/pgg ../info/emacs-mime \

10
editors/emacs22/files/patch-sources.el
View File

@ -1,10 +0,0 @@
$FreeBSD: /tmp/pcvs/ports/editors/emacs22/files/Attic/patch-sources.el,v 1.1 2009-09-07 19:33:30 bsam Exp $
--- /dev/null
+++ sources.el
@@ -0,0 +1,4 @@
+;;; Path to Emacs C Sources.
+(when (string-match (regexp-quote "%%EMACS_VER%%") emacs-version)
+ (setq find-function-C-source-directory
+ "%%DATADIR%%/%%EMACS_VER%%/src"))

15
editors/emacs22/files/patch-src__alloc.c
View File

@ -0,0 +1,15 @@
--- src/alloc.c.orig 2008-09-07 05:25:27.000000000 +0300
+++ src/alloc.c 2008-09-07 05:25:27.000000000 +0300
@@ -4573,8 +4573,12 @@
needed on ia64 too. See mach_dep.c, where it also says inline
assembler doesn't work with relevant proprietary compilers. */
#ifdef __sparc__
+#ifdef __sparc64__
+ asm ("flushw");
+#else
asm ("ta 3");
#endif
+#endif
/* Save registers that we need to see on the stack. We need to see
registers used to hold register variables and registers used to

1242
editors/emacs22/pkg-plist
View File

File diff suppressed because it is too large Load Diff

70
editors/emacs23/Makefile
View File

@ -7,6 +7,8 @@
PORTNAME= emacs
PORTVERSION= ${EMACS_VER}
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= editors ipv6
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ${PORTNAME}
@ -15,12 +17,8 @@ MAINTAINER= keramida@ceid.upatras.gr
COMMENT= GNU editing macros
.if !defined(WITHOUT_X11)
USE_XORG= x11
USE_GNOME= librsvg2
.if defined(WITHOUT_GTK)
USE_XORG= xaw xft xpm
.else
USE_GNOME+= gtk20
LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
.endif
LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff \
@ -28,66 +26,48 @@ LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png
.endif
MAKE_JOBS_UNSAFE= yes
CONFLICTS= emacs-19.* emacs-21.* emacs-22.* \
CONFLICTS= emacs-19.* emacs-21.* \
xemacs-[0-9]* xemacs-devel-[0-9]* \
xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]*
INSTALLS_ICONS= yes
EMACS_VER= 23.1
EMACS_VER= 22.3
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_BZIP2= yes
.if !defined(WITHOUT_X11)
.if !defined(WITHOUT_GTK)
USE_GNOME= gtk20
.else
USE_XORG= x11
.endif
USE_XORG= xpm xft
.endif
.if defined(WITHOUT_X11)
CONFIGURE_ARGS= --with-x=no
.else
.if !defined(WITHOUT_GTK)
CONFIGURE_ARGS= --with-x-toolkit=gtk
.else
CONFIGURE_ARGS= --with-x-toolkit=athena
CONFIGURE_ARGS= --with-gtk
.endif
LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2 \
m17n.3:${PORTSDIR}/devel/m17n-lib
# also libotf, which is pulled in by m17n
# m17n depends on libintl.so too
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -lintl"
USE_GETTEXT= yes
.endif
.if defined(WITHOUT_XIM)
CONFIGURE_ARGS+= --without-xim
.endif
MAN1= b2m.1 ctags.1 ebrowse.1 emacs.1 emacsclient.1 etags.1 \
grep-changelog.1 rcs-checkin.1
MAN1= ctags.1 emacs.1 emacsclient.1 etags.1
PLIST_SUB= EMACS_VER=${EMACS_VER} EMACS_ARCH=${CONFIGURE_TARGET}
MAKE_ENV= LC_ALL=C
INFO= ada-mode auth autotype calc ccmode cl dbus dired-x \
ebrowse ediff efaq eintr elisp emacs-mime emacs epa \
erc eshell eudc flymake forms gnus idlwave info \
mairix-el message mh-e newsticker nxml-mode \
org pcl-cvs pgg rcirc reftex remember sasl sc ses sieve \
smtpmail speedbar tramp url vip viper widget woman
LATEST_LINK= emacs23
OPTIONS= SOURCES "Install source code" ON
INFO= ada-mode autotype calc ccmode cl dired-x ebrowse ediff \
efaq eintr elisp emacs-mime emacs erc eshell eudc \
flymake forms gnus idlwave info message mh-e newsticker \
org pcl-cvs pgg rcirc reftex sc ses sieve smtpmail speedbar \
tramp url vip viper widget woman
.include <bsd.port.pre.mk>
.if defined(WITH_SOURCES)
PLIST_SUB+= SOURCES=""
.else
PLIST_SUB+= SOURCES="@comment "
.endif
.if ${ARCH} == "ia64"
BROKEN= Emacs 22.X does not currently build on ia64
.endif
@ -106,13 +86,5 @@ pre-everything::
post-patch:
@${RM} -f ${WRKSRC}/info/*
@${REINPLACE_CMD} -e "s/%%EMACS_VER%%/${EMACS_VER}/g" -e "s/%%DATADIR%%/${DATADIR:C/\//\\\//g}/g" ${WRKSRC}/sources.el
.if defined(WITH_SOURCES)
post-install:
@${MKDIR} ${DATADIR}/${EMACS_VER}/src
@${INSTALL_DATA} ${WRKSRC}/src/*.[ch] ${DATADIR}/${EMACS_VER}/src
@${INSTALL_DATA} ${WRKSRC}/sources.el ${DATADIR}/${EMACS_VER}/site-lisp/site-start.el
.endif
.include <bsd.port.post.mk>

6
editors/emacs23/distinfo
View File

@ -1,3 +1,3 @@
MD5 (emacs-23.1.tar.bz2) = 17f7f0ba68a0432d58fa69d05a2225be
SHA256 (emacs-23.1.tar.bz2) = 2b35f4457c7a0ee9f9185579cc2890b43f129a112cf22500233489db7a24cb1c
SIZE (emacs-23.1.tar.bz2) = 34382732
MD5 (emacs-22.3.tar.gz) = aa8ba34f548cd78b35914ae5a7bb87eb
SHA256 (emacs-22.3.tar.gz) = 7bd9b719db8ee20c75ee0d256737f7fd2c0e2ea30a285a3afbfc32c856420d16
SIZE (emacs-22.3.tar.gz) = 39587396

18
editors/emacs23/files/patch-Makefile.in
View File

@ -1,8 +1,8 @@
--- Makefile.in.orig Tue Jun 23 07:41:36 2009 +0300
+++ Makefile.in Tue Jun 23 07:39:33 2009 +0300
@@ -461,14 +461,6 @@
install-arch-indep: mkdir info install-etc
--- Makefile.in.orig 2008-09-07 05:23:59.000000000 +0300
+++ Makefile.in 2008-09-07 05:23:59.000000000 +0300
@@ -419,14 +419,6 @@
## That flag is also used in leim/Makefile.in
install-arch-indep: mkdir info
-set ${COPYDESTS} ; \
- unset CDPATH; \
- for dir in ${COPYDIR} ; do \
@ -15,10 +15,10 @@
mkdir ${COPYDESTS} ; \
chmod ugo+rx ${COPYDESTS} ; \
unset CDPATH; \
@@ -570,9 +562,9 @@
@@ -513,9 +505,9 @@
fi; \
cd ${srcdir}/info ; \
for elt in $(INFO_FILES); do \
test "$(MAKEINFO)" = "off" && ! test -e $$elt && continue; \
- for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \
- ${INSTALL_DATA} $$f $(DESTDIR)${infodir}/$$f; \
- chmod a+r $(DESTDIR)${infodir}/$$f; \
@ -28,9 +28,9 @@
done; \
done); \
else true; fi
@@ -583,7 +575,7 @@
@@ -525,7 +517,7 @@
then \
for elt in $(INFO_FILES); do \
test "$(MAKEINFO)" = "off" && ! test -e $$elt && continue; \
(cd $${thisdir}; \
- ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
+ ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt.info); \

20
editors/emacs23/files/patch-doc-emacs-Makefile.in
View File

@ -1,20 +0,0 @@
--- doc/emacs/Makefile.in.orig 2008-12-09 19:27:59.000000000 +0200
+++ doc/emacs/Makefile.in 2008-12-09 19:25:19.000000000 +0200
@@ -34,7 +34,7 @@
# The makeinfo program is part of the Texinfo distribution.
# Use --force so that it generates output even if there are errors.
-MAKEINFO = makeinfo --force
+MAKEINFO = makeinfo --force --no-split
INFO_TARGETS = $(infodir)/emacs
DVI_TARGETS = emacs.dvi
@@ -144,7 +144,7 @@
# rm -f Makefile
maintainer-clean: distclean
- for file in $(INFO_TARGETS); do rm -f $${file}*; done
+ for file in $(INFO_TARGETS); do rm -f $${file}; done
# Formerly this directory had texindex.c and getopt.c in it

20
editors/emacs23/files/patch-doc-lispintro-Makefile.in
View File

@ -1,20 +0,0 @@
--- doc/lispintro/Makefile.in.orig 2008-12-09 19:27:59.000000000 +0200
+++ doc/lispintro/Makefile.in 2008-12-09 19:25:20.000000000 +0200
@@ -33,7 +33,7 @@
INFO_TARGETS = ${infodir}/eintr
DVI_TARGETS = emacs-lisp-intro.dvi
-MAKEINFO = makeinfo
+MAKEINFO = makeinfo --no-split
TEXI2DVI = texi2dvi
DVIPS = dvips
@@ -65,7 +65,7 @@
maintainer-clean: distclean
rm -f *.aux *.cps *.fns *.kys *.pgs *.vrs *.toc
- cd $(infodir); rm -f eintr eintr-[1-9]
+ cd $(infodir); rm -f eintr
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.

11
editors/emacs23/files/patch-doc-lispref-Makefile.in
View File

@ -1,11 +0,0 @@
--- doc/lispref/Makefile.in.orig 2008-12-09 19:27:59.000000000 +0200
+++ doc/lispref/Makefile.in 2008-12-09 19:25:20.000000000 +0200
@@ -32,7 +32,7 @@
TEXI2DVI = texi2dvi
SHELL = /bin/sh
INSTALL_INFO = install-info
-MAKEINFO = makeinfo --force
+MAKEINFO = makeinfo --force --no-split
# List of all the texinfo files in the manual:

11
editors/emacs23/files/patch-doc-misc-Makefile.in
View File

@ -1,11 +0,0 @@
--- doc/misc/Makefile.in.orig Tue Jun 23 07:39:39 2009 +0300
+++ doc/misc/Makefile.in Tue Jun 23 07:39:41 2009 +0300
@@ -34,7 +34,7 @@
# The makeinfo program is part of the Texinfo distribution.
# Use --force so that it generates output even if there are errors.
-MAKEINFO = makeinfo --force
+MAKEINFO = makeinfo --force --no-split
# Also add new entries to INFO_FILES in the top-level Makefile.in.
INFO_TARGETS = \

11
editors/emacs23/files/patch-lispintro-Makefile.in
View File

@ -0,0 +1,11 @@
--- lispintro/Makefile.in.orig 2008-09-07 05:24:38.000000000 +0300
+++ lispintro/Makefile.in 2008-09-07 05:24:38.000000000 +0300
@@ -34,7 +34,7 @@
INFO_TARGETS = ${infodir}/eintr
DVI_TARGETS = emacs-lisp-intro.dvi
-MAKEINFO = makeinfo
+MAKEINFO = makeinfo --no-split
TEXI2DVI = texi2dvi
DVIPS = dvips

38
editors/emacs23/files/patch-lispref-Makefile.in
View File

@ -0,0 +1,38 @@
--- lispref/Makefile.in.orig 2008-09-07 05:24:57.000000000 +0300
+++ lispref/Makefile.in 2008-09-07 05:24:57.000000000 +0300
@@ -33,7 +33,7 @@
TEXI2DVI = texi2dvi
SHELL = /bin/sh
INSTALL_INFO = install-info
-MAKEINFO = makeinfo --force
+MAKEINFO = makeinfo --force --no-split
# The name of the manual:
VERSION=2.9
@@ -110,7 +110,7 @@
# This is for use in a separate distro of the Emacs Lisp manual.
install: elisp
$(srcdir)/mkinstalldirs $(infodir)
- cp elisp elisp-[1-9] elisp-[1-9][0-9] $(infodir)
+ cp elisp $(infodir)
${INSTALL_INFO} --info-dir=${infodir} ${infodir}/elisp
# This is for use in a separate distro of the Emacs Lisp manual.
@@ -126,7 +126,7 @@
maintainer-clean: clean
rm -f elisp.dvi elisp.oaux
- cd $(infodir); rm -f elisp elisp-[1-9] elisp-[1-9][0-9]
+ cd $(infodir); rm -f elisp
dist: $(infodir)/elisp elisp.dvi
-rm -rf temp
@@ -136,7 +136,7 @@
$(srcdir)/Makefile.in $(srcs) \
$(srcdir)/../man/texinfo.tex \
elisp.dvi elisp.aux elisp.??s \
- $(infodir)/elisp $(infodir)/elisp-[1-9] $(infodir)/elisp-[1-9][0-9] \
+ $(infodir)/elisp \
temp/$(manual)
-(cd temp/$(manual); rm -f mkinstalldirs)
cp $(srcdir)/mkinstalldirs temp/$(manual)

11
editors/emacs23/files/patch-man-Makefile.in
View File

@ -0,0 +1,11 @@
--- ./man/Makefile.in.orig Sat May 6 18:54:21 2006
+++ ./man/Makefile.in Fri Sep 1 21:10:08 2006
@@ -32,7 +32,7 @@
# The makeinfo program is part of the Texinfo distribution.
# Use --force so that it generates output even if there are errors.
-MAKEINFO = makeinfo --force
+MAKEINFO = makeinfo --force --no-split
INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl \
../info/dired-x ../info/ediff ../info/forms ../info/gnus \
../info/message ../info/sieve ../info/pgg ../info/emacs-mime \

10
editors/emacs23/files/patch-sources.el
View File

@ -1,10 +0,0 @@
$FreeBSD: /tmp/pcvs/ports/editors/emacs23/files/patch-sources.el,v 1.1 2009-09-07 19:33:30 bsam Exp $
--- /dev/null
+++ sources.el
@@ -0,0 +1,4 @@
+;;; Path to Emacs C Sources.
+(when (string-match (regexp-quote "%%EMACS_VER%%") emacs-version)
+ (setq find-function-C-source-directory
+ "%%DATADIR%%/%%EMACS_VER%%/src"))

15
editors/emacs23/files/patch-src__alloc.c
View File

@ -0,0 +1,15 @@
--- src/alloc.c.orig 2008-09-07 05:25:27.000000000 +0300
+++ src/alloc.c 2008-09-07 05:25:27.000000000 +0300
@@ -4573,8 +4573,12 @@
needed on ia64 too. See mach_dep.c, where it also says inline
assembler doesn't work with relevant proprietary compilers. */
#ifdef __sparc__
+#ifdef __sparc64__
+ asm ("flushw");
+#else
asm ("ta 3");
#endif
+#endif
/* Save registers that we need to see on the stack. We need to see
registers used to hold register variables and registers used to

1242
editors/emacs23/pkg-plist
View File

File diff suppressed because it is too large Load Diff