From bbd76eba0d1036702ee9bbab06f305072d9a9ce0 Mon Sep 17 00:00:00 2001
From: ben <ben>
Date: Sat, 31 Dec 2005 16:28:40 +0000
Subject: > When building on Interix, add Xext to X_EXTRA_LIBS.  The xditview >
 program requires Xaw, which requires the Xlib shape routines, which on >
 Interix are in Xext.  http://www.faqs.org/faqs/x-faq/part6/section-27.html

Move fix from Makefile to options.mk, so it is only used when the x11
option is enabled.
---
 textproc/groff/Makefile   | 6 +-----
 textproc/groff/options.mk | 6 +++++-
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'textproc')

diff --git a/textproc/groff/Makefile b/textproc/groff/Makefile
index 2548d27ae81..e0d2111257c 100644
--- a/textproc/groff/Makefile
+++ b/textproc/groff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2005/12/31 14:40:38 ben Exp $
+# $NetBSD: Makefile,v 1.33 2005/12/31 16:28:40 ben Exp $
 #
 
 DISTNAME=	groff-1.19.2
@@ -24,10 +24,6 @@ INFO_FILES=	groff
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "Interix"
-CONFIGURE_ENV+=		X_EXTRA_LIBS=-lXext
-.endif
-
 .if defined(PAPERSIZE)
 CONFIGURE_ENV+=	PAGE=${PAPERSIZE:Q}
 .endif
diff --git a/textproc/groff/options.mk b/textproc/groff/options.mk
index 1e3598cecec..83cb84301d6 100644
--- a/textproc/groff/options.mk
+++ b/textproc/groff/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2005/12/09 20:40:56 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2005/12/31 16:28:40 ben Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.groff
 PKG_SUPPORTED_OPTIONS=	x11
@@ -12,6 +12,10 @@ CONFIGURE_ARGS+=	--with-appresdir=${PREFIX}/lib/X11/app-defaults
 PLIST_SRC=		PLIST.x11 PLIST
 .include "../../mk/xaw.buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "Interix"
+CONFIGURE_ENV+=         X_EXTRA_LIBS=-lXext
+.endif
 .else
 CONFIGURE_ARGS+=	--without-x
 .endif
-- 
cgit v1.2.3