pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk Remove Motif 1.2 functionality.
details: https://anonhg.NetBSD.org/pkgsrc/rev/238eb1c2afaf
branches: trunk
changeset: 476665:238eb1c2afaf
user: kristerw <kristerw%pkgsrc.org@localhost>
date: Fri Jun 18 11:22:41 2004 +0000
description:
Remove Motif 1.2 functionality.
diffstat:
mk/bsd.pkg.defaults.mk | 23 +-----------
mk/defs.AIX.mk | 3 +-
mk/defs.BSDOS.mk | 3 +-
mk/defs.Darwin.mk | 3 +-
mk/defs.FreeBSD.mk | 3 +-
mk/defs.IRIX.mk | 3 +-
mk/defs.Interix.mk | 3 +-
mk/defs.Linux.mk | 3 +-
mk/defs.NetBSD.mk | 3 +-
mk/defs.OpenBSD.mk | 3 +-
mk/defs.SunOS.mk | 3 +-
mk/defs.UnixWare.mk | 3 +-
mk/motif.buildlink3.mk | 92 +++++++++----------------------------------------
13 files changed, 29 insertions(+), 119 deletions(-)
diffs (truncated from 389 to 300 lines):
diff -r 673beeeff95e -r 238eb1c2afaf mk/bsd.pkg.defaults.mk
--- a/mk/bsd.pkg.defaults.mk Fri Jun 18 02:42:09 2004 +0000
+++ b/mk/bsd.pkg.defaults.mk Fri Jun 18 11:22:41 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.defaults.mk,v 1.249 2004/06/06 22:04:55 minskim Exp $
+# $NetBSD: bsd.pkg.defaults.mk,v 1.250 2004/06/18 11:22:41 kristerw Exp $
#
# A file providing defaults for pkgsrc and the packages collection.
@@ -166,12 +166,6 @@
# Possible: any path
# Default: ${X11PREFIX} or where openmotif or lesstif is installed
-#MOTIF12BASE?= /usr/X11R6
-# Where Motif-1.2-compatible headers and libraries are installed
-# on the system.
-# Possible: any path
-# Default: ${X11PREFIX} or where lesstif12 is installed
-
USE_XPKGWEDGE?= yes
# Whether we should use xpkgwedge or not to install all packages into
# ${LOCALBASE}.
@@ -1536,21 +1530,6 @@
# Possible: openmotif, lesstif, dt (Irix and Solaris only)
# Default: openmotif, or dt (Irix and Solaris only)
-#MOTIF12_TYPE?= lesstif12
-# Used by motif.buildlink2.mk to choose which Motif-1.2-compatible
-# installation to use. This value is also automatically set by
-# motif.buildlink2.mk to whichever Motif-1.2 installation represented by
-# the possible values below is already installed, but defaults to
-# ${MOTIF12_TYPE_DEFAULT}. This value is ignored if MOTIF12BASE is
-# explicitly set.
-# Possible: lesstif12, dt (Irix and Solaris only)
-# Default: ${MOTIF12_TYPE_DEFAULT}
-
-#MOTIF12_TYPE_DEFAULT?= lesstif12
-# Used by motif.buildlink2.mk as the final default value for MOTIF12_TYPE.
-# Possible: lesstif12, dt (Irix and Solaris only)
-# Default: lesstif12, or dt (Irix and Solaris only)
-
#MPG123_ARM_FIXED64=YES
# Used by mpg123 and mpg123-esound to enable ARM to use 64bit fixedpoint
# Possible: not defined, YES
diff -r 673beeeff95e -r 238eb1c2afaf mk/defs.AIX.mk
--- a/mk/defs.AIX.mk Fri Jun 18 02:42:09 2004 +0000
+++ b/mk/defs.AIX.mk Fri Jun 18 11:22:41 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defs.AIX.mk,v 1.10 2004/05/31 16:47:00 jschauma Exp $
+# $NetBSD: defs.AIX.mk,v 1.11 2004/06/18 11:22:41 kristerw Exp $
#
# Variable definitions for the AIX operating system.
@@ -122,7 +122,6 @@
DEF_UMASK?= 0022
EXPORT_SYMBOLS_LDFLAGS?=-Wl,-E # add symbols to the dynamic symbol table
MOTIF_TYPE_DEFAULT?= openmotif # default 2.0 compatible libs type
-MOTIF12_TYPE_DEFAULT?= lesstif12 # default 1.2 compatible libs type
NOLOGIN?= /sbin/nologin
PKG_TOOLS_BIN?= ${LOCALBASE}/sbin
ROOT_CMD?= ${SU} - root -c
diff -r 673beeeff95e -r 238eb1c2afaf mk/defs.BSDOS.mk
--- a/mk/defs.BSDOS.mk Fri Jun 18 02:42:09 2004 +0000
+++ b/mk/defs.BSDOS.mk Fri Jun 18 11:22:41 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defs.BSDOS.mk,v 1.10 2004/05/31 16:47:00 jschauma Exp $
+# $NetBSD: defs.BSDOS.mk,v 1.11 2004/06/18 11:22:41 kristerw Exp $
#
# Variable definitions for the BSD/OS operating system.
@@ -106,7 +106,6 @@
EXPORT_SYMBOLS_LDFLAGS?=-Wl,--export-dynamic
.endif
MOTIF_TYPE_DEFAULT?= openmotif # default 2.0 compatible libs type
-MOTIF12_TYPE_DEFAULT?= lesstif12 # default 1.2 compatible libs type
NOLOGIN?= /sbin/nologin
PKG_TOOLS_BIN?= ${LOCALBASE}/sbin
ROOT_CMD?= ${SU} - root -c
diff -r 673beeeff95e -r 238eb1c2afaf mk/defs.Darwin.mk
--- a/mk/defs.Darwin.mk Fri Jun 18 02:42:09 2004 +0000
+++ b/mk/defs.Darwin.mk Fri Jun 18 11:22:41 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Darwin.mk,v 1.76 2004/05/31 16:47:00 jschauma Exp $
+# $NetBSD: defs.Darwin.mk,v 1.77 2004/06/18 11:22:41 kristerw Exp $
#
# Variable definitions for the Darwin operating system.
@@ -89,7 +89,6 @@
DEFAULT_SERIAL_DEVICE?= /dev/null
EXPORT_SYMBOLS_LDFLAGS?= # Don't add symbols to the dynamic symbol table
MOTIF_TYPE_DEFAULT?= openmotif # default 2.0 compatible libs type
-MOTIF12_TYPE_DEFAULT?= lesstif12 # default 1.2 compatible libs type
NOLOGIN?= ${FALSE}
PKG_TOOLS_BIN?= ${LOCALBASE}/sbin
ROOT_CMD?= sudo sh -c
diff -r 673beeeff95e -r 238eb1c2afaf mk/defs.FreeBSD.mk
--- a/mk/defs.FreeBSD.mk Fri Jun 18 02:42:09 2004 +0000
+++ b/mk/defs.FreeBSD.mk Fri Jun 18 11:22:41 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defs.FreeBSD.mk,v 1.41 2004/06/03 22:07:35 xtraeme Exp $
+# $NetBSD: defs.FreeBSD.mk,v 1.42 2004/06/18 11:22:41 kristerw Exp $
#
# Variable definitions for the FreeBSD operating system.
@@ -106,7 +106,6 @@
EXPORT_SYMBOLS_LDFLAGS?=-Wl,--export-dynamic
.endif
MOTIF_TYPE_DEFAULT?= openmotif # default 2.0 compatible libs type
-MOTIF12_TYPE_DEFAULT?= lesstif12 # default 1.2 compatible libs type
NOLOGIN?= /sbin/nologin
PKG_TOOLS_BIN?= ${LOCALBASE}/sbin
ROOT_CMD?= ${SU} - root -c
diff -r 673beeeff95e -r 238eb1c2afaf mk/defs.IRIX.mk
--- a/mk/defs.IRIX.mk Fri Jun 18 02:42:09 2004 +0000
+++ b/mk/defs.IRIX.mk Fri Jun 18 11:22:41 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defs.IRIX.mk,v 1.52 2004/05/31 16:47:00 jschauma Exp $
+# $NetBSD: defs.IRIX.mk,v 1.53 2004/06/18 11:22:41 kristerw Exp $
#
# Variable definitions for the IRIX operating system.
@@ -97,7 +97,6 @@
EXPORT_SYMBOLS_LDFLAGS?= # Don't add symbols to the dynamic symbol table
GROUPADD?= ${FALSE}
MOTIF_TYPE_DEFAULT?= dt # default 2.0 compatible libs type
-MOTIF12_TYPE_DEFAULT?= dt # default 1.2 compatible libs type
NOLOGIN?= ${FALSE}
ROOT_CMD?= ${SU} - root -c
ROOT_GROUP?= sys
diff -r 673beeeff95e -r 238eb1c2afaf mk/defs.Interix.mk
--- a/mk/defs.Interix.mk Fri Jun 18 02:42:09 2004 +0000
+++ b/mk/defs.Interix.mk Fri Jun 18 11:22:41 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Interix.mk,v 1.24 2004/05/31 16:47:00 jschauma Exp $
+# $NetBSD: defs.Interix.mk,v 1.25 2004/06/18 11:22:41 kristerw Exp $
#
# Variable definitions for the Interix operating system.
@@ -92,7 +92,6 @@
EXPORT_SYMBOLS_LDFLAGS?=-Wl,-E # add symbols to the dynamic symbol table
MOTIF_TYPE_DEFAULT?= openmotif # default 2.0 compatible libs type
-MOTIF12_TYPE_DEFAULT?= lesstif12 # default 1.2 compatible libs type
NOLOGIN?= /bin/false
PKG_TOOLS_BIN?= ${LOCALBASE}/sbin
PKGDIRMODE?= 775
diff -r 673beeeff95e -r 238eb1c2afaf mk/defs.Linux.mk
--- a/mk/defs.Linux.mk Fri Jun 18 02:42:09 2004 +0000
+++ b/mk/defs.Linux.mk Fri Jun 18 11:22:41 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Linux.mk,v 1.72 2004/05/31 16:47:00 jschauma Exp $
+# $NetBSD: defs.Linux.mk,v 1.73 2004/06/18 11:22:41 kristerw Exp $
#
# Variable definitions for the Linux operating system.
@@ -139,7 +139,6 @@
EXPORT_SYMBOLS_LDFLAGS?= # Don't add symbols to the dynamic symbol table
GROUPADD?= /usr/sbin/groupadd
MOTIF_TYPE_DEFAULT?= openmotif # default 2.0 compatible libs type
-MOTIF12_TYPE_DEFAULT?= lesstif12 # default 1.2 compatible libs type
NOLOGIN?= ${FALSE}
PKG_TOOLS_BIN?= ${LOCALBASE}/sbin
ROOT_CMD?= ${SU} - root -c
diff -r 673beeeff95e -r 238eb1c2afaf mk/defs.NetBSD.mk
--- a/mk/defs.NetBSD.mk Fri Jun 18 02:42:09 2004 +0000
+++ b/mk/defs.NetBSD.mk Fri Jun 18 11:22:41 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defs.NetBSD.mk,v 1.67 2004/05/31 16:47:00 jschauma Exp $
+# $NetBSD: defs.NetBSD.mk,v 1.68 2004/06/18 11:22:41 kristerw Exp $
#
# Variable definitions for the NetBSD operating system.
@@ -99,7 +99,6 @@
EXPORT_SYMBOLS_LDFLAGS?=-Wl,--export-dynamic
.endif
MOTIF_TYPE_DEFAULT?= openmotif # default 2.0 compatible libs type
-MOTIF12_TYPE_DEFAULT?= lesstif12 # default 1.2 compatible libs type
NOLOGIN?= /sbin/nologin
.if exists(${LOCALBASE}/sbin/pkg_info)
PKG_TOOLS_BIN?= ${LOCALBASE}/sbin
diff -r 673beeeff95e -r 238eb1c2afaf mk/defs.OpenBSD.mk
--- a/mk/defs.OpenBSD.mk Fri Jun 18 02:42:09 2004 +0000
+++ b/mk/defs.OpenBSD.mk Fri Jun 18 11:22:41 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defs.OpenBSD.mk,v 1.34 2004/05/31 16:47:00 jschauma Exp $
+# $NetBSD: defs.OpenBSD.mk,v 1.35 2004/06/18 11:22:41 kristerw Exp $
#
# Variable definitions for the OpenBSD operating system.
@@ -97,7 +97,6 @@
EXPORT_SYMBOLS_LDFLAGS?=-Wl,--export-dynamic
.endif
MOTIF_TYPE_DEFAULT?= openmotif # default 2.0 compatible libs type
-MOTIF12_TYPE_DEFAULT?= lesstif12 # default 1.2 compatible libs type
NOLOGIN?= /sbin/nologin
PKG_TOOLS_BIN?= ${LOCALBASE}/sbin
ROOT_CMD?= ${SU} - root -c
diff -r 673beeeff95e -r 238eb1c2afaf mk/defs.SunOS.mk
--- a/mk/defs.SunOS.mk Fri Jun 18 02:42:09 2004 +0000
+++ b/mk/defs.SunOS.mk Fri Jun 18 11:22:41 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defs.SunOS.mk,v 1.86 2004/05/31 16:47:00 jschauma Exp $
+# $NetBSD: defs.SunOS.mk,v 1.87 2004/06/18 11:22:41 kristerw Exp $
#
# Variable definitions for the SunOS/Solaris operating system.
@@ -96,7 +96,6 @@
EXPORT_SYMBOLS_LDFLAGS?= # Don't add symbols to the dynamic symbol table
GROUPADD?= /usr/sbin/groupadd
MOTIF_TYPE_DEFAULT?= dt # default 2.0 compatible libs type
-MOTIF12_TYPE_DEFAULT?= dt # default 1.2 compatible libs type
NOLOGIN?= ${FALSE}
ROOT_CMD?= ${SU} - root -c
ROOT_GROUP?= root
diff -r 673beeeff95e -r 238eb1c2afaf mk/defs.UnixWare.mk
--- a/mk/defs.UnixWare.mk Fri Jun 18 02:42:09 2004 +0000
+++ b/mk/defs.UnixWare.mk Fri Jun 18 11:22:41 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defs.UnixWare.mk,v 1.4 2004/05/31 16:47:00 jschauma Exp $
+# $NetBSD: defs.UnixWare.mk,v 1.5 2004/06/18 11:22:41 kristerw Exp $
#
# Variable definitions for the UnixWare 7 operating system.
@@ -92,7 +92,6 @@
EXPORT_SYMBOLS_LDFLAGS?= # Don't add symbols to the dynamic symbol table
GROUPADD?= /usr/sbin/groupadd
MOTIF_TYPE_DEFAULT?= dt # default 2.0 compatible libs type
-MOTIF12_TYPE_DEFAULT?= dt # default 1.2 compatible libs type
NOLOGIN?= ${FALSE}
ROOT_CMD?= ${SU} - root -c
ROOT_GROUP?= root
diff -r 673beeeff95e -r 238eb1c2afaf mk/motif.buildlink3.mk
--- a/mk/motif.buildlink3.mk Fri Jun 18 02:42:09 2004 +0000
+++ b/mk/motif.buildlink3.mk Fri Jun 18 11:22:41 2004 +0000
@@ -1,110 +1,62 @@
-# $NetBSD: motif.buildlink3.mk,v 1.3 2004/06/14 01:18:16 grant Exp $
-#
-# USE_MOTIF12
-# use a Motif-1.2-compatible installation, otherwise, assume
-# we want a Motif-2.0-compatible installation
+# $NetBSD: motif.buildlink3.mk,v 1.4 2004/06/18 11:22:41 kristerw Exp $
#
-# MOTIFBASE, MOTIF12BASE
-# choose the Motif-2.0 or Motif-1.2-compatible installation at the
-# named location
+# MOTIFBASE
+# choose the Motif-2.0 installation at the named location.
#
-# MOTIF_TYPE, MOTIF12_TYPE
-# choose a specific Motif-2.0 or Motif-1.2-compatible package.
+# MOTIF_TYPE
+# choose a specific Motif-2.0 package.
.if !defined(MOTIF_BUILDLINK3_MK)
MOTIF_BUILDLINK3_MK= # defined
.include "../../mk/bsd.prefs.mk"
-.if defined(USE_MOTIF12)
-#
-# If /usr/dt is a valid Motif-1.2 installation, then use it. Otherwise,
-# if ${X11BASE} is valid, then use it. Otherwise, use the Motif-1.2
-# specified by ${MOTIF12_TYPE_DEFAULT}.
-#
-. if exists(/usr/dt/include/Xm/Xm.h) && \
- !exists(/usr/dt/include/Xm/Gadget.h)
-_MOTIF_TYPE= dt
-. elif exists(${X11BASE}/include/Xm/Xm.h) && \
- !exists(${X11BASE}/include/Xm/Gadget.h)
-_MOTIF_TYPE= none
-. else
-_MOTIF_TYPE= ${MOTIF12_TYPE_DEFAULT}
-. endif
-.else
#
# If /usr/dt is a valid Motif-2.0 installation, then use it. Otherwise,
# check to see if a pkgsrc Motif-2.0 is installed and valid, then use it.
# Otherwise, if ${X11BASE} is valid, then use it. Otherwise, use the
# Motif-2.0 specified by ${MOTIF_TYPE_DEFAULT}.
#
-. if exists(/usr/dt/include/Xm/Xm.h) && \
+.if exists(/usr/dt/include/Xm/Xm.h) && \
exists(/usr/dt/include/Xm/Gadget.h)
_MOTIF_TYPE= dt
-. elif exists(${X11BASE}/lib/X11/config/OpenMotif.tmpl) || \
+.elif exists(${X11BASE}/lib/X11/config/OpenMotif.tmpl) || \
exists(${LOCALBASE}/lib/X11/config/OpenMotif.tmpl)
_MOTIF_TYPE= openmotif
-. elif exists(${X11BASE}/lib/X11/config/LessTif.tmpl) || \
+.elif exists(${X11BASE}/lib/X11/config/LessTif.tmpl) || \
exists(${LOCALBASE}/lib/X11/config/LessTif.tmpl)
_MOTIF_TYPE= lesstif
-. elif exists(${X11BASE}/include/Xm.h) && \
+.elif exists(${X11BASE}/include/Xm.h) && \
exists(${X11BASE}/include/Xm/Gadget.h)
_MOTIF_TYPE= none
-. else
+.else
_MOTIF_TYPE= ${MOTIF_TYPE_DEFAULT}
-. endif
Home |
Main Index |
Thread Index |
Old Index