diff options
| author | ashish <ashish@FreeBSD.org> | 2011-08-08 22:24:40 +0800 |
|---|---|---|
| committer | ashish <ashish@FreeBSD.org> | 2011-08-08 22:24:40 +0800 |
| commit | 7dce10413ffd04c8cd734e87565abe986151327b (patch) | |
| tree | dbba40669010dbde9fd6d2d5c940df762cbf5b04 | |
| parent | f2eda336cb3e4e29a9ab40ef5a34f5613badb12e (diff) | |
| download | freebsd-ports-gnome-7dce10413ffd04c8cd734e87565abe986151327b.tar.gz freebsd-ports-gnome-7dce10413ffd04c8cd734e87565abe986151327b.tar.zst freebsd-ports-gnome-7dce10413ffd04c8cd734e87565abe986151327b.zip | |
- Apply INSTALLS_ICONS fix to prevent editors/emacs from installing X11
when WITHOUT_X11 is defined
PR: ports/159594, ports/159530
Submitted by: olgeni (via private email)
| -rw-r--r-- | editors/emacs/Makefile | 3 | ||||
| -rw-r--r-- | editors/emacs23/Makefile | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index 871e6db130cf..4838cf6773d1 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -23,8 +23,6 @@ CONFLICTS= emacs-19.* emacs-21.* emacs-22.* emacs-24.* \ 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 @@ -81,6 +79,7 @@ DBUS_PTHREAD_LIBS= ${CC} -dumpspecs | ${GREP} -m 1 pthread: | ${SED} -e 's|^.*%{ CONFIGURE_ARGS+= --without-x .else +INSTALLS_ICONS= yes USE_XORG= x11 USE_GNOME= diff --git a/editors/emacs23/Makefile b/editors/emacs23/Makefile index 871e6db130cf..4838cf6773d1 100644 --- a/editors/emacs23/Makefile +++ b/editors/emacs23/Makefile @@ -23,8 +23,6 @@ CONFLICTS= emacs-19.* emacs-21.* emacs-22.* emacs-24.* \ 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 @@ -81,6 +79,7 @@ DBUS_PTHREAD_LIBS= ${CC} -dumpspecs | ${GREP} -m 1 pthread: | ${SED} -e 's|^.*%{ CONFIGURE_ARGS+= --without-x .else +INSTALLS_ICONS= yes USE_XORG= x11 USE_GNOME= |