Modular Xorg support.

23 files changed, 64 insertions, 63 deletions

diff --git a/graphics/GMT/Makefile b/graphics/GMT/Makefile
index 5134467b21d..2275fb43b58 100644
--- a/graphics/GMT/Makefile
+++ b/graphics/GMT/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/11/28 18:02:33 wennmach Exp $
+# $NetBSD: Makefile,v 1.31 2007/02/15 14:58:19 joerg Exp $
 
 DISTNAME=	GMT4.1.4
 PKGNAME=	GMT-4.1.4
@@ -40,8 +40,6 @@ CONFIGURE_ARGS+=--disable-mex
 BUILD_TARGET=	all suppl
 INSTALL_TARGET= install-all
 
-.include "../../mk/x11.buildlink3.mk"
-
 post-extract:
 	${MV} -f ${WRKSRC}/www/gmt/doc/pdf ${WRKSRC}
 	${RM} -f ${WRKSRC}/examples/*.bat ${WRKSRC}/examples/*/*.bat
@@ -68,4 +66,6 @@ post-install:
 	cd ${WRKDIR}/share && ${PAX} -rw . ${PREFIX}/share/gmt
 
 .include "../../devel/netcdf/buildlink3.mk"
+.include "../../x11/libXaw/buildlink3.mk"
+.include "../../x11/libXp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/OpenRM/Makefile b/graphics/OpenRM/Makefile
index a9939786a09..64d03d17b49 100644
--- a/graphics/OpenRM/Makefile
+++ b/graphics/OpenRM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/02/05 23:09:27 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/15 14:58:19 joerg Exp $
 #
 
 DISTNAME=		openrm-devel-1.5.2
@@ -21,12 +21,6 @@ REPLACE_PERL=		doc/sortlist.pl doc/source2html.pl
 DOCDIR=			${PREFIX}/share/doc/OpenRM
 INSTALLATION_DIRS=	lib
 
-.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
-
 do-configure:
 	${CHMOD} +x ${WRKSRC}/bin/mklib.libtool
 
@@ -47,4 +41,9 @@ do-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}/images
 	${INSTALL_DATA} ${WRKSRC}/doc/HTML/images/* ${DOCDIR}/images
 
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../x11/libXmu/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/OpenRM/buildlink3.mk b/graphics/OpenRM/buildlink3.mk
index 649d6573cbe..d7b18e6d1b1 100644
--- a/graphics/OpenRM/buildlink3.mk
+++ b/graphics/OpenRM/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:10:50 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2007/02/15 14:58:19 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OPENRM_BUILDLINK3_MK:=	${OPENRM_BUILDLINK3_MK}+
@@ -20,7 +20,7 @@ BUILDLINK_PKGSRCDIR.OpenRM?=	../../graphics/OpenRM
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
+.include "../../x11/libXmu/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/aqsis/Makefile b/graphics/aqsis/Makefile
index e6a448643e8..1ded520a342 100644
--- a/graphics/aqsis/Makefile
+++ b/graphics/aqsis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2006/08/06 05:16:50 kristerw Exp $
+# $NetBSD: Makefile,v 1.29 2007/02/15 14:58:19 joerg Exp $
 #
 
 DISTNAME=		aqsis-0.6.4
@@ -21,6 +21,4 @@ USE_LANGUAGES+=		c c++
 .include "../../graphics/Mesa/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/autotrace/Makefile b/graphics/autotrace/Makefile
index 1623b318148..bc35d22d203 100644
--- a/graphics/autotrace/Makefile
+++ b/graphics/autotrace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2007/01/17 23:47:19 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2007/02/15 14:58:20 joerg Exp $
 #
 
 DISTNAME=	autotrace-0.31.1
@@ -16,5 +16,5 @@ USE_LIBTOOL=		YES
 PKGCONFIG_OVERRIDE=	autotrace.pc.in
 
 .include "../../graphics/ImageMagick/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/cal3d-examples/Makefile b/graphics/cal3d-examples/Makefile
index 08f5d724690..01059fa8d15 100644
--- a/graphics/cal3d-examples/Makefile
+++ b/graphics/cal3d-examples/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/12/06 14:31:17 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/15 14:58:20 joerg Exp $
 #
 
 PKGNAME=		cal3d-examples-${CAL3D_VERSION}
@@ -47,6 +47,4 @@ post-install:
 
 .include "../../graphics/cal3d/buildlink3.mk"
 .include "../../graphics/Mesa/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/dxsamples/Makefile b/graphics/dxsamples/Makefile
index d3583d47151..1e2e50eb21e 100644
--- a/graphics/dxsamples/Makefile
+++ b/graphics/dxsamples/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/10/13 16:40:10 drochner Exp $
+# $NetBSD: Makefile,v 1.25 2007/02/15 14:58:20 joerg Exp $
 
 DISTNAME=	dxsamples-4.4.0
 CATEGORIES=	graphics
@@ -15,5 +15,4 @@ USE_TOOLS+=	gmake makeinfo
 CONFIGURE_ARGS+=	MAKEINFO=${TOOLS_PATH.makeinfo}
 USE_X11BASE=	yes
 
-.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/feh/Makefile b/graphics/feh/Makefile
index e126c1e181e..92da604f21d 100644
--- a/graphics/feh/Makefile
+++ b/graphics/feh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/04/17 13:46:31 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2007/02/15 14:58:20 joerg Exp $
 #
 
 DISTNAME=	feh-1.3.4
@@ -20,6 +20,10 @@ REPLACE_PERL=		cam/cam
 BUILDLINK_API_DEPENDS.giblib+=	giblib>=1.2.4
 BUILDLINK_API_DEPENDS.jpeg+=	jpeg>=6bnb3 # includes jpegint.h
 
+BUILDLINK_DEPMETHOD.libXt?=	build
+
 .include "../../devel/giblib/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXinerama/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/freeglut/Makefile b/graphics/freeglut/Makefile
index 4d5216b4b97..41434c4b7f0 100644
--- a/graphics/freeglut/Makefile
+++ b/graphics/freeglut/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/03/04 21:29:47 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2007/02/15 14:58:20 joerg Exp $
 #
 
 DISTNAME=	freeglut-2.2.0
@@ -18,5 +18,5 @@ CONFIGURE_ARGS+=	--disable-replace-glut
 
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
+.include "../../x11/libXxf86vm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/freetype-utils/Makefile b/graphics/freetype-utils/Makefile
index db18bc48a4a..d4f675ec912 100644
--- a/graphics/freetype-utils/Makefile
+++ b/graphics/freetype-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/06/17 19:41:33 minskim Exp $
+# $NetBSD: Makefile,v 1.21 2007/02/15 14:58:20 joerg Exp $
 
 .include "../../graphics/freetype-lib/Makefile.common"
 
@@ -12,7 +12,8 @@ CONFIGURE_ARGS+=	--with-x
 BUILD_TARGET=		tttest
 INSTALL_TARGET=		install-tttest
 
-.include "../../graphics/freetype-lib/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
+BUILDLINK_DEPMETHOD.libXt?=	build
 
+.include "../../graphics/freetype-lib/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/g2/Makefile b/graphics/g2/Makefile
index f575734d462..3ee36125f54 100644
--- a/graphics/g2/Makefile
+++ b/graphics/g2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/10/04 22:22:37 rillig Exp $
+# $NetBSD: Makefile,v 1.26 2007/02/15 14:58:20 joerg Exp $
 
 DISTNAME=		g2-0.50
 CATEGORIES=		graphics
@@ -30,5 +30,5 @@ post-install:
 
 .include "../../graphics/gd/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
-.include "../../mk/x11.buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/glew/Makefile b/graphics/glew/Makefile
index cb5c3aead34..0bf410931ea 100644
--- a/graphics/glew/Makefile
+++ b/graphics/glew/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/08/15 15:21:27 abs Exp $
+# $NetBSD: Makefile,v 1.2 2007/02/15 14:58:20 joerg Exp $
 #
 
 PKGNAME=	glew-1.3.4
@@ -18,7 +18,11 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://glew.sourceforge.net/
 COMMENT=	OpenGL Extension Wrangler Library
 
+post-extract:
+	${LN} -s Makefile.netbsdelf ${WRKSRC}/config/Makefile.dragonfly
+
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
+.include "../../x11/libXi/buildlink3.mk"
+.include "../../x11/libXmu/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gri/Makefile b/graphics/gri/Makefile
index d205c5c578a..7e490e12450 100644
--- a/graphics/gri/Makefile
+++ b/graphics/gri/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2007/01/31 00:04:11 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2007/02/15 14:58:21 joerg Exp $
 
 DISTNAME=		gri-2.12.5
 PKGREVISION=	3
@@ -22,5 +22,4 @@ INFO_FILES=		# PLIST
 INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} INFO_DIR=${PREFIX:Q}/${PKGINFODIR:Q}
 
 .include "../../devel/netcdf/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gst-plugins0.8-opengl/Makefile b/graphics/gst-plugins0.8-opengl/Makefile
index 67066b5fb4c..4721d34ab15 100644
--- a/graphics/gst-plugins0.8-opengl/Makefile
+++ b/graphics/gst-plugins0.8-opengl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/04/17 14:52:11 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2007/02/15 14:58:21 joerg Exp $
 #
 
 GST_PLUGINS0.8_NAME=	opengl
@@ -10,4 +10,5 @@ PKGREVISION=	5
 BUILDLINK_API_DEPENDS.gst-plugins0.8+=	gst-plugins0.8>=0.8.7nb1
 
 .include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/hp2xx/Makefile b/graphics/hp2xx/Makefile
index ad74d4381ed..57ed89e4281 100644
--- a/graphics/hp2xx/Makefile
+++ b/graphics/hp2xx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2006/04/17 13:46:33 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2007/02/15 14:58:21 joerg Exp $
 #
 
 DISTNAME=	hp2xx-3.4.4
@@ -20,12 +20,11 @@ INFO_FILES=	# PLIST
 
 INSTALLATION_DIRS=	bin ${PKGINFODIR} ${PKGMANDIR}/man1
 
-.include "../../graphics/tiff/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../print/pdflib/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
-
 post-extract:
 	${CP} ${WRKSRC}/makes/generic.mak ${WRKSRC}/sources/Makefile
 
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../print/pdflib/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/lib3ds/Makefile b/graphics/lib3ds/Makefile
index bd1c0f23e5f..9de4324ec34 100644
--- a/graphics/lib3ds/Makefile
+++ b/graphics/lib3ds/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/04/11 14:47:06 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/15 14:58:21 joerg Exp $
 #
 
 DISTNAME=	lib3ds-1.2.0
@@ -14,11 +14,9 @@ GNU_CONFIGURE=	YES
 USE_LIBTOOL=	YES
 USE_TOOLS=	autoconf automake
 
-.include "../../graphics/Mesa/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
-
 pre-configure:
 	cd ${WRKSRC} && libtoolize --force
 	cd ${WRKSRC} && autoreconf -i --force
 
+.include "../../graphics/Mesa/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/libcaca/options.mk b/graphics/libcaca/options.mk
index d431634030f..c158eb543d8 100644
--- a/graphics/libcaca/options.mk
+++ b/graphics/libcaca/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2005/07/28 19:21:02 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2007/02/15 14:58:21 joerg Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.libcaca
 PKG_SUPPORTED_OPTIONS=		imlib2
@@ -30,8 +30,11 @@ CONFIGURE_ARGS+=	--disable-slang
 .endif
 
 .if !empty(PKG_OPTIONS:Mx11)
-.  include "../../mk/x11.buildlink3.mk"
+.  include "../../x11/libXt/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-x11
+.  if ${X11_TYPE} == "modular"
+CONFIGURE_ARGS+=	--x-libraries=${BUILDLINK_PREFIX.libX11}/lib
+.endif
 .else
 CONFIGURE_ARGS+=	--disable-x11
 .endif
diff --git a/graphics/mgl/Makefile b/graphics/mgl/Makefile
index 2072635e451..79db9daece9 100644
--- a/graphics/mgl/Makefile
+++ b/graphics/mgl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/11/12 08:23:03 obache Exp $
+# $NetBSD: Makefile,v 1.26 2007/02/15 14:58:21 joerg Exp $
 #
 
 DISTNAME=	mgl2-alpha-020
@@ -106,5 +106,7 @@ post-install:
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXtst/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/pgraf/Makefile b/graphics/pgraf/Makefile
index 85a81890016..6e832a1e402 100644
--- a/graphics/pgraf/Makefile
+++ b/graphics/pgraf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2007/01/07 09:13:56 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2007/02/15 14:58:21 joerg Exp $
 
 DISTNAME=		pgraf-20010131
 PKGREVISION=		1
@@ -13,8 +13,6 @@ INSTALLATION_DIRS=	bin include lib ${PKGMANDIR}/man1 ${PKGMANDIR}/man3 ${PKGMAND
 
 CONFLICTS=		pgp5-[0-9]*		# Both have a `pgps' executable
 
-.include "../../mk/x11.buildlink3.mk"
-
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/include/pgraf.h ${PREFIX}/include
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pgraf
@@ -26,4 +24,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/metagens/*.r ${WRKSRC}/tests/*	\
 		${PREFIX}/share/examples/pgraf/
 
+.include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ploticus-examples/Makefile b/graphics/ploticus-examples/Makefile
index e44b30bb94a..5d9b96f92ee 100644
--- a/graphics/ploticus-examples/Makefile
+++ b/graphics/ploticus-examples/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/10/04 21:44:47 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2007/02/15 14:58:22 joerg Exp $
 #
 
 DISTNAME=	plnode141
@@ -18,10 +18,9 @@ NO_BUILD=	YES
 DIST_SUBDIR=	${PKGNAME_NOREV:S/-examples//}
 EXDIR=		${PREFIX}/share/examples/ploticus
 
-.include "../../mk/x11.buildlink3.mk"
-
 do-install:
 	${INSTALL_DATA_DIR} ${EXDIR}
 	cd ${WRKSRC} && ${PAX} -rw -pp doc gallery tabgallery thumbnails thumbpng ${EXDIR}
 
+.include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ploticus/Makefile b/graphics/ploticus/Makefile
index c52a0b42a8d..0fd3a8543bf 100644
--- a/graphics/ploticus/Makefile
+++ b/graphics/ploticus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2007/02/03 04:39:44 obache Exp $
+# $NetBSD: Makefile,v 1.36 2007/02/15 14:58:21 joerg Exp $
 
 DISTNAME=	pl231src
 PKGNAME=	ploticus-2.31pl4
@@ -43,6 +43,5 @@ do-install:
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
-
+.include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/radiance/Makefile b/graphics/radiance/Makefile
index 2b9b125cd62..b936e76abfc 100644
--- a/graphics/radiance/Makefile
+++ b/graphics/radiance/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/04/28 16:55:10 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2007/02/15 14:58:22 joerg Exp $
 #
 
 DISTNAME=	rad3R6P1
@@ -84,5 +84,4 @@ do-install:
 
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ruby-RMagick/Makefile b/graphics/ruby-RMagick/Makefile
index cc81ce148f7..20b085abdb2 100644
--- a/graphics/ruby-RMagick/Makefile
+++ b/graphics/ruby-RMagick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2007/02/04 22:11:07 obache Exp $
+# $NetBSD: Makefile,v 1.31 2007/02/15 14:58:22 joerg Exp $
 
 DISTNAME=	RMagick-1.15.2
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
@@ -16,12 +16,12 @@ RUBY_HAS_ARCHLIB=	yes
 GNU_CONFIGURE=		yes
 
 CONFIGURE_ARGS+=	--with-doc-dir=${RUBY_DOCDIR}/RMagick
+USE_TOOLS+=	gs
 
 post-install:
 	${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/RMagick
 	cd ${WRKSRC}/examples && \
 		${PAX} -rw -pp -pm . ${RUBY_EXAMPLESDIR}/RMagick
 
-.include "../../mk/x11.buildlink3.mk"
 .include "../../lang/ruby/modules.mk"
 .include "../../mk/bsd.pkg.mk"