Add WITHOUT_X11 to allow making these ports without X11 support.

Add WITH_XAW3D for those who like a 3D look.

Otherwise no changes were made to the contents of the ports.

3 files changed, 58 insertions, 14 deletions

diff --git a/editors/xemacs-devel/Makefile b/editors/xemacs-devel/Makefile
index aa02e81df554..4f9022295c4e 100644
--- a/editors/xemacs-devel/Makefile
+++ b/editors/xemacs-devel/Makefile
@@ -17,16 +17,18 @@ DIST_SUBDIR=	xemacs
 MAINTAINER=	gj@FreeBSD.org
 
 RUN_DEPENDS+=	${LOCALBASE}/lib/xemacs/xemacs-packages/etc/enriched.doc:${PORTSDIR}/editors/xemacs-packages
+.if !defined(WITHOUT_X11)
 LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff
+USE_XLIB=	yes
+USE_XPM=	yes
+.endif
 
 XEMACS_REL=	21.4
 XEMACS_VER=	21.4.6
 XEMACS_ARCH=	${CONFIGURE_TARGET}
 
-USE_XLIB=	yes
-USE_XPM=	yes
 STRIP=
 USE_AUTOCONF_VER=213
 CONFIGURE_TARGET=${MACHINE_ARCH}--freebsd
@@ -35,8 +37,6 @@ CONFIGURE_ARGS?=--with-clash-detection \
 		--with-sound=native \
 		--site-includes=${LOCALBASE}/include \
 		--site-libraries=${LOCALBASE}/lib \
-		--with-png=yes \
-		--with-tiff=yes \
 		--with-ldap=no \
 		--with-site-lisp \
 		--with-database=berkdb \
@@ -50,7 +50,8 @@ PLIST_SUB=	XEMACS_VER=${XEMACS_VER} XEMACS_ARCH=${XEMACS_ARCH}
 
 pre-fetch:
 .if !defined(WANT_GTK)
-	@${ECHO_MSG} "If you want to use GTK, please set the environment variable WANT_GTK and recompile."
+	@${ECHO_MSG} "If you want to use GTK, please set the environment variable WANT_GTK "
+	@${ECHO_MSG} "and recompile."
 .endif
 .if defined(HAVE_MOTIF)
 .if !defined(MOTIF_STATIC)
@@ -60,12 +61,25 @@ pre-fetch:
 	@${ECHO_MSG} "In this case, set the environment variable MOTIF_STATIC and recompile, "
 	@${ECHO_MSG} "which will force the use of athena widgets for dialogs."
 .endif
+.if !defined(WITHOUT_X11)
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "Set the environment variable WITHOUT_X11 if you "
+	@${ECHO_MSG} "do not want to use X11."
+CONFIG_ARGS+= --with-png=yes --with-tiff=yes
+.endif
+.if defined(WITHOUT_X11)
+CONFIGURE_ARGS+=	--without-x11
+.endif
 
 # hack to avoid shipping binaries linked with Motif
 .if defined(MOTIF_STATIC)
 WITH_DIALOGS=	--with-dialogs=athena
 .endif
 
+.if defined(WITH_XAW3D)
+LIB_DEPENDS+=	Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
+.endif
+
 .if defined(WANT_GTK)
 WITH_GTK=	--with-gtk=yes \
 		--with-xpm=no
diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index aa02e81df554..4f9022295c4e 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -17,16 +17,18 @@ DIST_SUBDIR=	xemacs
 MAINTAINER=	gj@FreeBSD.org
 
 RUN_DEPENDS+=	${LOCALBASE}/lib/xemacs/xemacs-packages/etc/enriched.doc:${PORTSDIR}/editors/xemacs-packages
+.if !defined(WITHOUT_X11)
 LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff
+USE_XLIB=	yes
+USE_XPM=	yes
+.endif
 
 XEMACS_REL=	21.4
 XEMACS_VER=	21.4.6
 XEMACS_ARCH=	${CONFIGURE_TARGET}
 
-USE_XLIB=	yes
-USE_XPM=	yes
 STRIP=
 USE_AUTOCONF_VER=213
 CONFIGURE_TARGET=${MACHINE_ARCH}--freebsd
@@ -35,8 +37,6 @@ CONFIGURE_ARGS?=--with-clash-detection \
 		--with-sound=native \
 		--site-includes=${LOCALBASE}/include \
 		--site-libraries=${LOCALBASE}/lib \
-		--with-png=yes \
-		--with-tiff=yes \
 		--with-ldap=no \
 		--with-site-lisp \
 		--with-database=berkdb \
@@ -50,7 +50,8 @@ PLIST_SUB=	XEMACS_VER=${XEMACS_VER} XEMACS_ARCH=${XEMACS_ARCH}
 
 pre-fetch:
 .if !defined(WANT_GTK)
-	@${ECHO_MSG} "If you want to use GTK, please set the environment variable WANT_GTK and recompile."
+	@${ECHO_MSG} "If you want to use GTK, please set the environment variable WANT_GTK "
+	@${ECHO_MSG} "and recompile."
 .endif
 .if defined(HAVE_MOTIF)
 .if !defined(MOTIF_STATIC)
@@ -60,12 +61,25 @@ pre-fetch:
 	@${ECHO_MSG} "In this case, set the environment variable MOTIF_STATIC and recompile, "
 	@${ECHO_MSG} "which will force the use of athena widgets for dialogs."
 .endif
+.if !defined(WITHOUT_X11)
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "Set the environment variable WITHOUT_X11 if you "
+	@${ECHO_MSG} "do not want to use X11."
+CONFIG_ARGS+= --with-png=yes --with-tiff=yes
+.endif
+.if defined(WITHOUT_X11)
+CONFIGURE_ARGS+=	--without-x11
+.endif
 
 # hack to avoid shipping binaries linked with Motif
 .if defined(MOTIF_STATIC)
 WITH_DIALOGS=	--with-dialogs=athena
 .endif
 
+.if defined(WITH_XAW3D)
+LIB_DEPENDS+=	Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
+.endif
+
 .if defined(WANT_GTK)
 WITH_GTK=	--with-gtk=yes \
 		--with-xpm=no
diff --git a/editors/xemacs21/Makefile b/editors/xemacs21/Makefile
index 431fa849927c..590af385c26a 100644
--- a/editors/xemacs21/Makefile
+++ b/editors/xemacs21/Makefile
@@ -16,17 +16,19 @@ DIST_SUBDIR=	xemacs
 MAINTAINER?=	gj@FreeBSD.org
 
 RUN_DEPENDS+=	${LOCALBASE}/lib/xemacs/xemacs-packages/etc/enriched.doc:${PORTSDIR}/editors/xemacs-packages
+.if !defined(WITHOUT_X11)
 LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff
+USE_XLIB=	yes
+USE_XPM=	yes
+.endif
 
 XEMACS_REL=	21.1
 XEMACS_VER=	21.1.14
 XEMACS_ARCH=	${CONFIGURE_TARGET}
 
 SLAVEDIRS+=	editors/xemacs21-mule
-USE_XLIB=	yes
-USE_XPM=	yes
 STRIP=
 USE_AUTOCONF_VER=213
 CONFIGURE_TARGET=${MACHINE_ARCH}--freebsd
@@ -38,8 +40,6 @@ CONFIGURE_ARGS?=--with-clash-detection \
 		--site-includes=${LOCALBASE}/include \
 		--site-libraries=${LOCALBASE}/lib \
 		--gung-ho=yes \
-		--with-png=yes \
-		--with-tiff=yes \
 		--with-ldap=no \
 		--with-site-lisp \
 		--with-database=berkdb \
@@ -68,6 +68,21 @@ pre-fetch:
 .endif
 .endif
 
+.if !defined(WITHOUT_X11)
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "Set the environment variable WITHOUT_X11 if you "
+	@${ECHO_MSG} "do not want to use X11."
+CONFIGURE_ARGS+=	--with-png=yes --with-tiff=yes
+.endif
+
+.if defined(WITHOUT_X11)
+CONFIGURE_ARGS+=	--without-x11
+.endif
+
+.if defined(WITH_XAW3D)
+LIB_DEPENDS+=	Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
+.endif
+
 # hack to avoid shipping binaries linked with Motif
 .if defined(MOTIF_STATIC)
 WITH_DIALOGS=	--with-dialogs=athena
@@ -79,6 +94,7 @@ WITH_DIALOGS=	--with-dialogs=athena
 WITH_XFACE?=	--with-xface=no
 WITH_OFFIX?=	--with-offix=no
 .endif
+# the next .endif belongs to !MULE_PORT
 .endif
 
 # fix .so references in a few man pages