diff options
| author | Ashish SHUKLA <ashish@FreeBSD.org> | 2011-08-08 14:24:40 +0000 |
|---|---|---|
| committer | Ashish SHUKLA <ashish@FreeBSD.org> | 2011-08-08 14:24:40 +0000 |
| commit | c42b97ae3d2bc858071fb268ae212a059bc4573b (patch) | |
| tree | 63b83c1291cab2d004f74892ac7a28755c09cf4a | |
| parent | - Update MASTER_SITES and WWW: line (diff) | |
- 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)
Notes
Notes:
svn path=/head/; revision=279236
| -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= |