Refactor and make X11 support optional.

Submitted by:	ashish
Feature safe:	yes

6 files changed, 80 insertions, 72 deletions

diff --git a/lang/racket-textual/Makefile b/lang/racket-textual/Makefile
index 81b85286d44d..71a6a1d850f1 100644
--- a/lang/racket-textual/Makefile
+++ b/lang/racket-textual/Makefile
@@ -17,19 +17,35 @@ MASTER_SITES=	http://download.racket-lang.org/installers/${PORTVERSION}/racket/
 DISTFILES=	racket-${PORTVERSION}-src-unix.tgz ${PLTPATCHES}
 DIST_SUBDIR=	racket/${PORTVERSION}
 EXTRACT_ONLY=	racket-${PORTVERSION}-src-unix.tgz
+
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	An interactive, integrated, graphical Scheme programming environment
 
-LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo	\
+OPTIONS=	GRACKET	"Build GUI Racket"		ON
+
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS=		--enable-shared --enable-pthread \
+			--enable-lt=${LIBTOOL}
+CONFIGURE_SCRIPT=	../configure
+
+.include <bsd.port.options.mk>
+
+.if defined(WITHOUT_GRACKET)
+CONFIGURE_ARGS+=	--disable-gracket
+PLIST_SUB+=		GRACKET="@comment "
+.else
+LIB_DEPENDS+=	cairo.2:${PORTSDIR}/graphics/cairo	\
 		jpeg.11:${PORTSDIR}/graphics/jpeg	\
 		png.6:${PORTSDIR}/graphics/png
 
-USE_XORG=	xft x11 xrender xaw
-CONFIGURE_ARGS=	--prefix=${PREFIX} --enable-shared --enable-xft --enable-gl \
-		--enable-xrender --enable-cairo --with-x --enable-pthread \
-		--enable-lt=${LIBTOOL} \
-		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
-		CPPFLAGS="${CPPFLAGS}"
+USE_XORG+=		xft x11 xrender xaw
+USE_GL+=		yes
+CONFIGURE_ARGS+=	--enable-xft --enable-gl --enable-xrender \
+			--enable-cairo --with-x
+PLIST_SUB+=		GRACKET=""
+.endif
+
+CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}"
 
 # Force the "configure" script to look in $LOCALBASE for -lpng and -ljpeg
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -37,7 +53,6 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 
 WRKSRC=		${WRKDIR}/racket-${PORTVERSION}/src/build
 USE_ICONV=	yes
-USE_GL=		yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:env
 
diff --git a/lang/racket-textual/pkg-plist b/lang/racket-textual/pkg-plist
index 96ed59ac455b..04c7b1906f12 100644
--- a/lang/racket-textual/pkg-plist
+++ b/lang/racket-textual/pkg-plist
@@ -1,16 +1,16 @@
-bin/drracket
-bin/drscheme
-bin/gracket
-bin/gracket-text
-bin/mred
-bin/mred-text
+%%GRACKET%%bin/drracket
+%%GRACKET%%bin/drscheme
+%%GRACKET%%bin/gracket
+%%GRACKET%%bin/gracket-text
+%%GRACKET%%bin/mred
+%%GRACKET%%bin/mred-text
 bin/mzc
 bin/mzpp
 bin/mzscheme
 bin/mztext
 bin/pdf-slatex
 bin/planet
-bin/plt-games
+%%GRACKET%%bin/plt-games
 bin/plt-help
 bin/plt-r5rs
 bin/plt-r6rs
@@ -20,7 +20,7 @@ bin/raco
 bin/scribble
 bin/setup-plt
 bin/slatex
-bin/slideshow
+%%GRACKET%%bin/slideshow
 bin/swindle
 bin/tex2page
 include/racket/escheme.h
@@ -40,10 +40,10 @@ include/racket/schvers.h
 include/racket/sconfig.h
 include/racket/stypes.h
 include/racket/uconfig.h
-%%LIB32DIR%%/libgracket3m-5.0.2.so
-%%LIB32DIR%%/libgracket3m.a
-%%LIB32DIR%%/libgracket3m.la
-%%LIB32DIR%%/libgracket3m.so
+%%GRACKET%%%%LIB32DIR%%/libgracket3m-5.0.2.so
+%%GRACKET%%%%LIB32DIR%%/libgracket3m.a
+%%GRACKET%%%%LIB32DIR%%/libgracket3m.la
+%%GRACKET%%%%LIB32DIR%%/libgracket3m.so
 %%LIB32DIR%%/libracket3m-5.0.2.so
 %%LIB32DIR%%/libracket3m.a
 %%LIB32DIR%%/libracket3m.la
@@ -8352,12 +8352,12 @@ include/racket/uconfig.h
 %%LIB32DIR%%/racket/collects/sgl/compiled/info_rkt.zo
 %%LIB32DIR%%/racket/collects/sgl/compiled/main_rkt.dep
 %%LIB32DIR%%/racket/collects/sgl/compiled/main_rkt.zo
-%%LIB32DIR%%/racket/collects/sgl/compiled/make-gl-info-helper_rkt.c
+%%GRACKET%%%%LIB32DIR%%/racket/collects/sgl/compiled/make-gl-info-helper_rkt.c
 %%LIB32DIR%%/racket/collects/sgl/compiled/make-gl-info_rkt.dep
 %%LIB32DIR%%/racket/collects/sgl/compiled/make-gl-info_rkt.zo
 %%LIB32DIR%%/racket/collects/sgl/compiled/makefile_rkt.dep
 %%LIB32DIR%%/racket/collects/sgl/compiled/makefile_rkt.zo
-%%LIB32DIR%%/racket/collects/sgl/compiled/native/%%ARCH%%-freebsd/3m/make-gl-info-helper_rkt.so
+%%GRACKET%%%%LIB32DIR%%/racket/collects/sgl/compiled/native/%%ARCH%%-freebsd/3m/make-gl-info-helper_rkt.so
 %%LIB32DIR%%/racket/collects/sgl/compiled/sgl_rkt.dep
 %%LIB32DIR%%/racket/collects/sgl/compiled/sgl_rkt.zo
 %%LIB32DIR%%/racket/collects/sgl/examples/alpha.rkt
@@ -16878,9 +16878,9 @@ include/racket/uconfig.h
 @dirrm %%LIB32DIR%%/racket/collects/sgl/scribblings/compiled
 @dirrm %%LIB32DIR%%/racket/collects/sgl/scribblings
 @dirrm %%LIB32DIR%%/racket/collects/sgl/examples
-@dirrm %%LIB32DIR%%/racket/collects/sgl/compiled/native/%%ARCH%%-freebsd/3m
-@dirrm %%LIB32DIR%%/racket/collects/sgl/compiled/native/%%ARCH%%-freebsd
-@dirrm %%LIB32DIR%%/racket/collects/sgl/compiled/native
+%%GRACKET%%@dirrm %%LIB32DIR%%/racket/collects/sgl/compiled/native/%%ARCH%%-freebsd/3m
+%%GRACKET%%@dirrm %%LIB32DIR%%/racket/collects/sgl/compiled/native/%%ARCH%%-freebsd
+%%GRACKET%%@dirrm %%LIB32DIR%%/racket/collects/sgl/compiled/native
 @dirrm %%LIB32DIR%%/racket/collects/sgl/compiled
 @dirrm %%LIB32DIR%%/racket/collects/sgl
 @dirrm %%LIB32DIR%%/racket/collects/setup/private/compiled
diff --git a/lang/racket-textual/scripts/configure b/lang/racket-textual/scripts/configure
deleted file mode 100644
index 66d3fa9da6cd..000000000000
--- a/lang/racket-textual/scripts/configure
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-mkdir $WRKSRC
-cd $WRKSRC
-X11BASE=${LOCALBASE}
-../configure	--prefix=${PREFIX} --enable-shared --enable-xft --enable-gl	\
-		--enable-xrender --enable-cairo --with-x --enable-pthread	\
-		--enable-lt=${LIBTOOL}						\
-		--x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib	\
-		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"				\
-		CPPFLAGS="${CPPFLAGS}"						\
-		--mandir=${PREFIX}/man ${ARCH}-portbld-freebsd${OSREL}
diff --git a/lang/racket/Makefile b/lang/racket/Makefile
index 81b85286d44d..71a6a1d850f1 100644
--- a/lang/racket/Makefile
+++ b/lang/racket/Makefile
@@ -17,19 +17,35 @@ MASTER_SITES=	http://download.racket-lang.org/installers/${PORTVERSION}/racket/
 DISTFILES=	racket-${PORTVERSION}-src-unix.tgz ${PLTPATCHES}
 DIST_SUBDIR=	racket/${PORTVERSION}
 EXTRACT_ONLY=	racket-${PORTVERSION}-src-unix.tgz
+
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	An interactive, integrated, graphical Scheme programming environment
 
-LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo	\
+OPTIONS=	GRACKET	"Build GUI Racket"		ON
+
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS=		--enable-shared --enable-pthread \
+			--enable-lt=${LIBTOOL}
+CONFIGURE_SCRIPT=	../configure
+
+.include <bsd.port.options.mk>
+
+.if defined(WITHOUT_GRACKET)
+CONFIGURE_ARGS+=	--disable-gracket
+PLIST_SUB+=		GRACKET="@comment "
+.else
+LIB_DEPENDS+=	cairo.2:${PORTSDIR}/graphics/cairo	\
 		jpeg.11:${PORTSDIR}/graphics/jpeg	\
 		png.6:${PORTSDIR}/graphics/png
 
-USE_XORG=	xft x11 xrender xaw
-CONFIGURE_ARGS=	--prefix=${PREFIX} --enable-shared --enable-xft --enable-gl \
-		--enable-xrender --enable-cairo --with-x --enable-pthread \
-		--enable-lt=${LIBTOOL} \
-		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
-		CPPFLAGS="${CPPFLAGS}"
+USE_XORG+=		xft x11 xrender xaw
+USE_GL+=		yes
+CONFIGURE_ARGS+=	--enable-xft --enable-gl --enable-xrender \
+			--enable-cairo --with-x
+PLIST_SUB+=		GRACKET=""
+.endif
+
+CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}"
 
 # Force the "configure" script to look in $LOCALBASE for -lpng and -ljpeg
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -37,7 +53,6 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 
 WRKSRC=		${WRKDIR}/racket-${PORTVERSION}/src/build
 USE_ICONV=	yes
-USE_GL=		yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:env
 
diff --git a/lang/racket/pkg-plist b/lang/racket/pkg-plist
index 96ed59ac455b..04c7b1906f12 100644
--- a/lang/racket/pkg-plist
+++ b/lang/racket/pkg-plist
@@ -1,16 +1,16 @@
-bin/drracket
-bin/drscheme
-bin/gracket
-bin/gracket-text
-bin/mred
-bin/mred-text
+%%GRACKET%%bin/drracket
+%%GRACKET%%bin/drscheme
+%%GRACKET%%bin/gracket
+%%GRACKET%%bin/gracket-text
+%%GRACKET%%bin/mred
+%%GRACKET%%bin/mred-text
 bin/mzc
 bin/mzpp
 bin/mzscheme
 bin/mztext
 bin/pdf-slatex
 bin/planet
-bin/plt-games
+%%GRACKET%%bin/plt-games
 bin/plt-help
 bin/plt-r5rs
 bin/plt-r6rs
@@ -20,7 +20,7 @@ bin/raco
 bin/scribble
 bin/setup-plt
 bin/slatex
-bin/slideshow
+%%GRACKET%%bin/slideshow
 bin/swindle
 bin/tex2page
 include/racket/escheme.h
@@ -40,10 +40,10 @@ include/racket/schvers.h
 include/racket/sconfig.h
 include/racket/stypes.h
 include/racket/uconfig.h
-%%LIB32DIR%%/libgracket3m-5.0.2.so
-%%LIB32DIR%%/libgracket3m.a
-%%LIB32DIR%%/libgracket3m.la
-%%LIB32DIR%%/libgracket3m.so
+%%GRACKET%%%%LIB32DIR%%/libgracket3m-5.0.2.so
+%%GRACKET%%%%LIB32DIR%%/libgracket3m.a
+%%GRACKET%%%%LIB32DIR%%/libgracket3m.la
+%%GRACKET%%%%LIB32DIR%%/libgracket3m.so
 %%LIB32DIR%%/libracket3m-5.0.2.so
 %%LIB32DIR%%/libracket3m.a
 %%LIB32DIR%%/libracket3m.la
@@ -8352,12 +8352,12 @@ include/racket/uconfig.h
 %%LIB32DIR%%/racket/collects/sgl/compiled/info_rkt.zo
 %%LIB32DIR%%/racket/collects/sgl/compiled/main_rkt.dep
 %%LIB32DIR%%/racket/collects/sgl/compiled/main_rkt.zo
-%%LIB32DIR%%/racket/collects/sgl/compiled/make-gl-info-helper_rkt.c
+%%GRACKET%%%%LIB32DIR%%/racket/collects/sgl/compiled/make-gl-info-helper_rkt.c
 %%LIB32DIR%%/racket/collects/sgl/compiled/make-gl-info_rkt.dep
 %%LIB32DIR%%/racket/collects/sgl/compiled/make-gl-info_rkt.zo
 %%LIB32DIR%%/racket/collects/sgl/compiled/makefile_rkt.dep
 %%LIB32DIR%%/racket/collects/sgl/compiled/makefile_rkt.zo
-%%LIB32DIR%%/racket/collects/sgl/compiled/native/%%ARCH%%-freebsd/3m/make-gl-info-helper_rkt.so
+%%GRACKET%%%%LIB32DIR%%/racket/collects/sgl/compiled/native/%%ARCH%%-freebsd/3m/make-gl-info-helper_rkt.so
 %%LIB32DIR%%/racket/collects/sgl/compiled/sgl_rkt.dep
 %%LIB32DIR%%/racket/collects/sgl/compiled/sgl_rkt.zo
 %%LIB32DIR%%/racket/collects/sgl/examples/alpha.rkt
@@ -16878,9 +16878,9 @@ include/racket/uconfig.h
 @dirrm %%LIB32DIR%%/racket/collects/sgl/scribblings/compiled
 @dirrm %%LIB32DIR%%/racket/collects/sgl/scribblings
 @dirrm %%LIB32DIR%%/racket/collects/sgl/examples
-@dirrm %%LIB32DIR%%/racket/collects/sgl/compiled/native/%%ARCH%%-freebsd/3m
-@dirrm %%LIB32DIR%%/racket/collects/sgl/compiled/native/%%ARCH%%-freebsd
-@dirrm %%LIB32DIR%%/racket/collects/sgl/compiled/native
+%%GRACKET%%@dirrm %%LIB32DIR%%/racket/collects/sgl/compiled/native/%%ARCH%%-freebsd/3m
+%%GRACKET%%@dirrm %%LIB32DIR%%/racket/collects/sgl/compiled/native/%%ARCH%%-freebsd
+%%GRACKET%%@dirrm %%LIB32DIR%%/racket/collects/sgl/compiled/native
 @dirrm %%LIB32DIR%%/racket/collects/sgl/compiled
 @dirrm %%LIB32DIR%%/racket/collects/sgl
 @dirrm %%LIB32DIR%%/racket/collects/setup/private/compiled
diff --git a/lang/racket/scripts/configure b/lang/racket/scripts/configure
deleted file mode 100644
index 66d3fa9da6cd..000000000000
--- a/lang/racket/scripts/configure
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-mkdir $WRKSRC
-cd $WRKSRC
-X11BASE=${LOCALBASE}
-../configure	--prefix=${PREFIX} --enable-shared --enable-xft --enable-gl	\
-		--enable-xrender --enable-cairo --with-x --enable-pthread	\
-		--enable-lt=${LIBTOOL}						\
-		--x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib	\
-		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"				\
-		CPPFLAGS="${CPPFLAGS}"						\
-		--mandir=${PREFIX}/man ${ARCH}-portbld-freebsd${OSREL}