From e14907be36a0be82d474e37d32ad2c3a86a77fed Mon Sep 17 00:00:00 2001
From: rillig <rillig@pkgsrc.org>
Date: Thu, 4 Aug 2005 10:32:01 +0000
Subject: Re-added the glib12 PKG_OPTION. Currently I need it for a SuSE 9.1
 system.

---
 sysutils/mc/Makefile   |  7 +++----
 sysutils/mc/options.mk | 11 ++++++++++-
 2 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'sysutils/mc')

diff --git a/sysutils/mc/Makefile b/sysutils/mc/Makefile
index 04486a65c4a..0197dbc3738 100644
--- a/sysutils/mc/Makefile
+++ b/sysutils/mc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2005/08/04 10:17:13 rillig Exp $
+# $NetBSD: Makefile,v 1.61 2005/08/04 10:32:01 rillig Exp $
 
 DISTNAME=	mc-4.6.1
 CATEGORIES=	sysutils
@@ -14,8 +14,8 @@ USE_PKGLOCALEDIR=	YES
 
 # see options.mk for an explanation of these options
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mc
-PKG_SUPPORTED_OPTIONS=	charset edit ncurses samba slang subshell vfs x11
-PKG_SUGGESTED_OPTIONS=	charset edit               slang subshell vfs
+PKG_SUPPORTED_OPTIONS=	charset edit glib12 ncurses samba slang subshell vfs x11
+PKG_SUGGESTED_OPTIONS=	charset edit glib12               slang subshell vfs
 
 .include "../../mk/bsd.prefs.mk"
 .include "../../mk/bsd.options.mk"
@@ -38,7 +38,6 @@ PLIST_SRC+=  	${PKGDIR}/PLIST
 
 PLIST_SRC+=	${PKGDIR}/PLIST.end
 
-.include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/pkg-config/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/mc/options.mk b/sysutils/mc/options.mk
index b7caeb9c704..910e048b711 100644
--- a/sysutils/mc/options.mk
+++ b/sysutils/mc/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2005/08/04 10:17:13 rillig Exp $
+# $NetBSD: options.mk,v 1.5 2005/08/04 10:32:01 rillig Exp $
 #
 
 ### The charset option enables input/display support for various 8-bit
@@ -19,6 +19,15 @@ PLIST_SRC+=		${PKGDIR}/PLIST.mcedit
 CONFIGURE_ARGS+=	--without-edit
 .endif
 
+### On some systems where glib-2.0 does not build, glib-1.2 can be used
+### instead.
+.if !empty(PKG_OPTIONS:Mglib12)
+CONFIGURE_ARGS+=	--with-glib12
+.include "../../devel/glib/buildlink3.mk"
+.else
+.include "../../devel/glib2/buildlink3.mk"
+.endif
+
 ### Enable the Samba virtual file system. You can connect to Windows
 ### file servers or Samba servers in your network.
 .if !empty(PKG_OPTIONS:Msamba)
-- 
cgit v1.2.3