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

- Update emacs.desktop to launch Emacs in Terminal when WITHOUT_X11 is

Browse Source 
defined.[1]
- Emacs picks up giflib if available instead of libungif. Account for
  this.[2]
- Include 'alloca' fix.[2]

PR:		ports/156167[1]
Submitted by:	Zhihao Yuan <lichray@gmail.com>[1]
	  	Herbert J. Skuhra <h.skuhra@gmail.com>[2] (via private email)
This commit is contained in:
Ashish SHUKLA 2011-05-16 12:27:12 +00:00
parent f52bbae2a9
commit 623a0a78f1
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=274180
4 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
editors/emacs/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= emacs
PORTVERSION= ${EMACS_VER}
PORTREVISION= 1
PORTEPOCH= 2
CATEGORIES= editors ipv6
MASTER_SITES= ${MASTER_SITE_GNU}
@ -139,7 +140,11 @@ LIB_DEPENDS+= tiff.4:${PORTSDIR}/graphics/tiff
.if defined(WITHOUT_GIF)
CONFIGURE_ARGS+= --without-gif
.else
. if exists(${LOCALBASE}/lib/libgif.so)
LIB_DEPENDS+= gif.5:${PORTSDIR}/graphics/giflib
. else
LIB_DEPENDS+= ungif.5:${PORTSDIR}/graphics/libungif
. endif
.endif
.if defined(WITHOUT_PNG)
@ -225,6 +230,9 @@ BROKEN= Emacs 23.X does not currently build on ia64
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(WITHOUT_X11)
@${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/' ${WRKSRC}/etc/emacs.desktop
.endif
post-configure:
@${REINPLACE_CMD} -e "s/^\(DBUS_LIBS.*\)-pthread\(.*\)$$/\1$$(${DBUS_PTHREAD_LIBS})\2/" ${WRKSRC}/src/Makefile

14
editors/emacs/files/patch-src_config.in Normal file
View File

@ -0,0 +1,14 @@
$FreeBSD$
--- src/config.in.orig
+++ src/config.in
@@ -1183,6 +1183,8 @@
#endif
#ifdef HAVE_ALLOCA_H
# include <alloca.h>
+#elif defined __FreeBSD__
+#include <stdlib.h>
#elif defined __GNUC__
# define alloca __builtin_alloca
#elif defined _AIX

8
editors/emacs23/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= emacs
PORTVERSION= ${EMACS_VER}
PORTREVISION= 1
PORTEPOCH= 2
CATEGORIES= editors ipv6
MASTER_SITES= ${MASTER_SITE_GNU}
@ -139,7 +140,11 @@ LIB_DEPENDS+= tiff.4:${PORTSDIR}/graphics/tiff
.if defined(WITHOUT_GIF)
CONFIGURE_ARGS+= --without-gif
.else
. if exists(${LOCALBASE}/lib/libgif.so)
LIB_DEPENDS+= gif.5:${PORTSDIR}/graphics/giflib
. else
LIB_DEPENDS+= ungif.5:${PORTSDIR}/graphics/libungif
. endif
.endif
.if defined(WITHOUT_PNG)
@ -225,6 +230,9 @@ BROKEN= Emacs 23.X does not currently build on ia64
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(WITHOUT_X11)
@${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/' ${WRKSRC}/etc/emacs.desktop
.endif
post-configure:
@${REINPLACE_CMD} -e "s/^\(DBUS_LIBS.*\)-pthread\(.*\)$$/\1$$(${DBUS_PTHREAD_LIBS})\2/" ${WRKSRC}/src/Makefile

14
editors/emacs23/files/patch-src_config.in Normal file
View File

@ -0,0 +1,14 @@
$FreeBSD$
--- src/config.in.orig
+++ src/config.in
@@ -1183,6 +1183,8 @@
#endif
#ifdef HAVE_ALLOCA_H
# include <alloca.h>
+#elif defined __FreeBSD__
+#include <stdlib.h>
#elif defined __GNUC__
# define alloca __builtin_alloca
#elif defined _AIX