summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjlam <jlam>2002-09-23 08:45:40 +0000
committerjlam <jlam>2002-09-23 08:45:40 +0000
commit695e517a1a6eb9fc1713d456b50b179744c5983e (patch)
tree2e5e09469e81c65d3035b2145efdc3810d89e70f /mk
parentede24bb643359e0ae20d93ab01e088359057e048 (diff)
downloadpkgsrc-695e517a1a6eb9fc1713d456b50b179744c5983e.tar.gz
* buildlink1 -> buildlink2
* Replace ELK_USE_{X11,MOTIF} with ELK_GUI, which is either "none" or is some combination of "xaw" and/or "motif". * Reenable Motif -- it seems to build properly with OpenMotif-2.0.x. * Modernize this package a bit and clean up how linker flags are passed to the build process by using the new variables available.
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.defaults.mk10
-rw-r--r--mk/bsd.pkg.obsolete.mk5
2 files changed, 9 insertions, 6 deletions
diff --git a/mk/bsd.pkg.defaults.mk b/mk/bsd.pkg.defaults.mk
index 0f2a6d6e1a3..931da930ff0 100644
--- a/mk/bsd.pkg.defaults.mk
+++ b/mk/bsd.pkg.defaults.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.defaults.mk,v 1.87 2002/09/18 19:51:53 tron Exp $
+# $NetBSD: bsd.pkg.defaults.mk,v 1.88 2002/09/23 08:45:40 jlam Exp $
#
# A file providing defaults for pkgsrc and the packages collection.
@@ -526,10 +526,10 @@ DT_LAYOUT?= US
# Possible: US, FI, FR, GER, DV
# Default: FI
-#ELK_USE_X11=
-# Used by elk to determine if X11 module is enabled or not.
-# Possible: defined, not defined
-# Default: not defined
+ELK_GUI?= none
+# Used by elk to determine which GUI API modules are enabled.
+# Possible: none, or some combination of xaw and/or motif
+# Default: none
EMACS_USE_POP?= yes
# Used by emacs package to determine whether pop support is enabled or not.
diff --git a/mk/bsd.pkg.obsolete.mk b/mk/bsd.pkg.obsolete.mk
index 096956b66df..fab1dc2cabc 100644
--- a/mk/bsd.pkg.obsolete.mk
+++ b/mk/bsd.pkg.obsolete.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.obsolete.mk,v 1.10 2002/08/29 10:16:44 wiz Exp $
+# $NetBSD: bsd.pkg.obsolete.mk,v 1.11 2002/09/23 08:45:41 jlam Exp $
#
# This file holds make(1) logic to allow obsolete or deprecated variables
# still to be used. These may eventually disappear over time as the contents
@@ -46,3 +46,6 @@ USE_CUPS= YES
PKG_SYSCONFDIR.squid?= ${SQUID_SYSCONFDIR}
.endif
+.if defined(ELK_USE_X11)
+ELK_GUI= xaw
+.endif