Attachment 114506 Details for Bug 156167 – patch-emacs-w-nox11

patch-emacs-w-nox11

patch-emacs-w-nox11 (text/plain), 1.21 KB, created by lichray on 2011-04-04 08:00:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lichray

Created: 2011-04-04 08:00:22 UTC

Size: 1.21 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/editors/emacs.orig/Makefile /usr/ports/editors/emacs/Makefile
>--- /usr/ports/editors/emacs.orig/Makefile	2010-09-29 23:38:00.000000000 -0500
>+++ /usr/ports/editors/emacs/Makefile	2011-04-04 01:40:10.937168475 -0500
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	emacs
> PORTVERSION=	${EMACS_VER}
>-PORTREVISION=	4
>+PORTREVISION=	5
> PORTEPOCH=	2
> CATEGORIES=	editors ipv6
> MASTER_SITES=	${MASTER_SITE_GNU}
>@@ -20,8 +20,7 @@
> 
> CONFLICTS=	emacs-19.* emacs-21.* emacs-22.* emacs-24.* \
> 		xemacs-[0-9]* xemacs-devel-[0-9]* \
>-		xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* \
>-		emacs-nox11-[0-9]*
>+		xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]*
> 
> INSTALLS_ICONS=	yes
> 
>@@ -78,10 +77,13 @@
> 
> .if defined(WITHOUT_X11)
> CONFIGURE_ARGS+=	--without-x
>+PKGNAMESUFFIX=	-nox11
>+CONFLICTS+=	emacs-23.*
> 
> .else
> USE_XORG=	x11
> USE_GNOME=
>+CONFLICTS+=	emacs-nox11-[0-9]*
> 
> .if defined(WITHOUT_SVG)
> CONFIGURE_ARGS+=	--without-rsvg
>@@ -223,6 +225,9 @@
> .endif
> 
> post-patch:
>+.if defined(WITHOUT_X11)
>+	${REINPLACE_CMD} -e 's/Terminal=.*$$/Terminal=true/' ${WRKSRC}/etc/emacs.desktop
>+.endif
> 	@${RM} -f ${WRKSRC}/info/*
> 	@${REINPLACE_CMD} -e "s/%%EMACS_VER%%/${EMACS_VER}/g" -e "s/%%DATADIR%%/${DATADIR:C/\//\\\//g}/g" ${WRKSRC}/sources.el

Actions: View

Attachments on bug 156167: 114506