ports/159530: [PATCH] editors/emacs: INSTALL_ICONS breaks WITHOUT_X11 completely

[Philip M. Gollucci]

>Number:         159530
>Category:       ports
>Synopsis:       [PATCH] editors/emacs: INSTALL_ICONS breaks WITHOUT_X11 completely
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Aug 05 16:00:17 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Philip M. Gollucci
>Release:        FreeBSD 9.0-CURRENT amd64
>Organization:
RideCharge Inc / TaxiMagic
>Environment:
System: FreeBSD frieza.p6m7g8.net 9.0-CURRENT FreeBSD 9.0-CURRENT #0: Tue Oct 12 00:51:25 UTC 2010
>Description:

Port maintainer (ashish at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- emacs-23.3_2,2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/editors/emacs/Makefile,v
retrieving revision 1.102
diff -u -u -r1.102 Makefile
--- Makefile	16 May 2011 12:27:12 -0000	1.102
+++ Makefile	5 Aug 2011 15:29:15 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	emacs
 PORTVERSION=	${EMACS_VER}
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	editors ipv6
 MASTER_SITES=	${MASTER_SITE_GNU}
@@ -23,8 +23,6 @@
 		xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* \
 		emacs-nox11-[0-9]*
 
-INSTALLS_ICONS=	yes
-
 EMACS_VER=	23.3
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -71,7 +69,8 @@
 		SCROLLBARS	"Without toolkit scroll-bars"			ON \
 		XFT	"Freetype fonts support"	ON \
 		XIM	"X Input Method support"	ON \
-		XPM	"XPM images support"		ON
+		XPM	"XPM images support"		ON \
+		X11 "X11 Support"				ON
 
 .include <bsd.port.options.mk>
 
@@ -81,6 +80,7 @@
 CONFIGURE_ARGS+=	--without-x
 
 .else
+INSTALLS_ICONS=	yes
 USE_XORG=	x11
 USE_GNOME=
 
@@ -209,7 +209,7 @@
 LIB_DEPENDS+=		canna.1:${PORTSDIR}/japanese/canna-lib
 .endif
 
-.endif
+.endif ## WITH_X11
 
 .if defined(WITHOUT_SOUND)
 CONFIGURE_ARGS+=	--without-sound
--- emacs-23.3_2,2.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: