ports/128513: [PATCH] Fixed editors/emacs-devel for non-GTK support

[Ashish Shukla]

>Number:         128513
>Category:       ports
>Synopsis:       [PATCH] Fixed editors/emacs-devel for non-GTK support
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Nov 01 05:10:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Ashish Shukla
>Release:        FreeBSD 7.1-PRERELEASE amd64
>Organization:
N/A
>Environment:
System: FreeBSD chateau.d.lf 7.1-PRERELEASE FreeBSD 7.1-PRERELEASE #7: Sat Nov 1 06:58:27 IST 2008 root at chateau.d.lf:/usr/obj/usr/src/sys/ULE amd64

>Description:
The editors/emacs-devel port doesn't get built without GTK support if WITHOUT_GTK=1 
is defined. This diff fixes this issue. If I'm not mistaken, the snapshot of the emacs-devel port 
is dated 'Jun 6, 2008', so I think the version no. of the port needs to be incremented, which is 
not present in the attached diff.
>How-To-Repeat:

1. Make sure GTK+ libraries are installed.
2. Now execute following command on root shell.
   make -C /usr/ports/editors/emacs-devel configure WITHOUT_GTK=1
3. In the last few lines of the output, following can be seen:

  Should Emacs use mmap(2) for buffer allocation?         yes
  What window system should Emacs use?                    x11
  What toolkit should Emacs use?                          GTK
  Where do we find X Windows header files?                /usr/local/include
  Where do we find X Windows libraries?                   /usr/local/lib
  Does Emacs use -lXaw3d?                                 no
  Does Emacs use -lXpm?                                   yes

As clear from the above output that GTK toolkit is being used for building Emacs despite 
WITHOUT_GTK=1 defined.
>Fix:
diff -urN /usr/ports/editors/emacs-devel/Makefile emacs-devel/Makefile
--- /usr/ports/editors/emacs-devel/Makefile     2008-06-21 00:03:04.000000000 +0530
+++ emacs-devel/Makefile        2008-11-01 09:39:18.000000000 +0530
@@ -7,7 +7,7 @@
 
 PORTNAME=      emacs
 PORTVERSION=   ${EMACS_VER}.${SNAPSHOT}
-PORTREVISION=  1
+PORTREVISION=  2
 CATEGORIES=    editors ipv6
 MASTER_SITES=  ${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=    keramida
@@ -19,7 +19,8 @@
 .if !defined(WITHOUT_X11)
 USE_XORG=      x11
 .if defined(WITHOUT_GTK)
-USE_XORG+=     xaw xft xpm
+USE_XORG+=     xft xpm
+LIB_DEPENDS+=  Xaw3d.8:${PORTSDIR}/x11-toolkits/Xaw3d
 .else
 USE_GNOME=     gtk20
 .endif
@@ -49,9 +50,11 @@
 CONFIGURE_ARGS=                --with-x=no
 .else
 .if !defined(WITHOUT_GTK)
-CONFIGURE_ARGS=                --with-gtk
+CONFIGURE_ARGS=                --with-x-toolkit=gtk
+.else
+CONFIGURE_ARGS=                --with-x-toolkit=athena
 .endif
-CONFIGURE_ARGS=                --enable-font-backend
+CONFIGURE_ARGS+=               --enable-font-backend
 LIB_DEPENDS+=          freetype.9:${PORTSDIR}/print/freetype2 \
                        m17n.3:${PORTSDIR}/devel/m17n-lib
 # also libotf, which is pulled in by m17n

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