[pkgsrc/trunk]: pkgsrc/sysutils/mc Re-added the glib12 PKG_OPTION. Currently ...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6266e3180785
branches:  trunk
changeset: 497768:6266e3180785
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Thu Aug 04 10:32:01 2005 +0000

description:
Re-added the glib12 PKG_OPTION. Currently I need it for a SuSE 9.1 system.

diffstat:

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

diffs (53 lines):

diff -r 247a051ff7fa -r 6266e3180785 sysutils/mc/Makefile
--- a/sysutils/mc/Makefile      Thu Aug 04 10:22:21 2005 +0000
+++ b/sysutils/mc/Makefile      Thu Aug 04 10:32:01 2005 +0000
@@ -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 @@
 
 # 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.end
 
-.include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/pkg-config/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 247a051ff7fa -r 6266e3180785 sysutils/mc/options.mk
--- a/sysutils/mc/options.mk    Thu Aug 04 10:22:21 2005 +0000
+++ b/sysutils/mc/options.mk    Thu Aug 04 10:32:01 2005 +0000
@@ -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 @@
 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)