pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Remove the old tools framework and references to _USE_...
details: https://anonhg.NetBSD.org/pkgsrc/rev/2886ff974083
branches: trunk
changeset: 494286:2886ff974083
user: jlam <jlam%pkgsrc.org@localhost>
date: Sun May 22 19:11:12 2005 +0000
description:
Remove the old tools framework and references to _USE_NEW_TOOLS.
diffstat:
cad/fastcap/Makefile | 10 +-
devel/libtool-base/Makefile | 4 +-
devel/patch/Makefile | 9 +-
lang/nawk/Makefile | 8 +-
lang/perl5/buildlink3.mk | 9 +-
mk/autoconf.mk | 48 +----
mk/automake.mk | 24 +--
mk/bsd.pkg.extract.mk | 34 +---
mk/bsd.pkg.mk | 19 +-
mk/bsd.pkg.patch.mk | 13 +-
mk/bsd.pkg.use.mk | 28 +--
mk/bsd.prefs.mk | 15 +-
mk/platform/AIX.mk | 102 +---------
mk/platform/BSDOS.mk | 81 +-------
mk/platform/Darwin.mk | 71 +------
mk/platform/DragonFly.mk | 79 +-------
mk/platform/FreeBSD.mk | 80 +-------
mk/platform/IRIX.mk | 84 +--------
mk/platform/Interix.mk | 72 +------
mk/platform/Linux.mk | 124 +------------
mk/platform/NetBSD.mk | 74 +-------
mk/platform/OSF1.mk | 71 +------
mk/platform/OpenBSD.mk | 70 +------
mk/platform/SunOS.mk | 81 +-------
mk/platform/UnixWare.mk | 77 +-------
mk/tools.mk | 450 --------------------------------------------
security/aide/Makefile | 7 +-
security/aide06/Makefile | 7 +-
security/mit-krb5/Makefile | 9 +-
29 files changed, 30 insertions(+), 1730 deletions(-)
diffs (truncated from 2195 to 300 lines):
diff -r 8085e5be4c90 -r 2886ff974083 cad/fastcap/Makefile
--- a/cad/fastcap/Makefile Sun May 22 18:41:44 2005 +0000
+++ b/cad/fastcap/Makefile Sun May 22 19:11:12 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/05/20 01:57:44 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2005/05/22 19:11:12 jlam Exp $
#
DISTNAME= fastcap-2.0-18Sep92
@@ -14,13 +14,7 @@
BUILD_DEPENDS+= teTeX>=1.0.7:../../print/teTeX
EXTRACT_USING= gtar # cannot be extracted with pax as tar
-.include "../../mk/bsd.prefs.mk"
-.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-BUILD_DEPENDS+= gtar-base-[0-9]*:../../archivers/gtar-base
-GTAR= ${PREFIX}/bin/${GNU_PROGRAM_PREFIX}tar
-.endif
-
-WRKSRC= ${WRKDIR}
+WRKSRC= ${WRKDIR}
HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= ./config
CONFIGURE_ARGS= 4
diff -r 8085e5be4c90 -r 2886ff974083 devel/libtool-base/Makefile
--- a/devel/libtool-base/Makefile Sun May 22 18:41:44 2005 +0000
+++ b/devel/libtool-base/Makefile Sun May 22 19:11:12 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2005/05/22 05:35:32 jlam Exp $
+# $NetBSD: Makefile,v 1.67 2005/05/22 19:11:12 jlam Exp $
###########################################################################
###########################################################################
@@ -66,9 +66,7 @@
USE_LANGUAGES= c c++ fortran
CONFIGURE_ARGS+= --with-tags=CXX,F77,GCJ
-.if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
USE_TOOLS+= echo
-.endif
.PHONY: fix-libtool
fix-libtool:
diff -r 8085e5be4c90 -r 2886ff974083 devel/patch/Makefile
--- a/devel/patch/Makefile Sun May 22 18:41:44 2005 +0000
+++ b/devel/patch/Makefile Sun May 22 19:11:12 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/05/16 20:04:12 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2005/05/22 19:11:12 jlam Exp $
#
DISTNAME= patch-2.5.4
@@ -51,10 +51,3 @@
.endif
.include "../../mk/bsd.pkg.mk"
-
-.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-# Needed for bootstrapping pkgsrc!
-.if !exists(${GTAR})
-GTAR= /usr/bin/tar # Solaris
-.endif
-.endif
diff -r 8085e5be4c90 -r 2886ff974083 lang/nawk/Makefile
--- a/lang/nawk/Makefile Sun May 22 18:41:44 2005 +0000
+++ b/lang/nawk/Makefile Sun May 22 19:11:12 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/05/19 19:45:45 dillo Exp $
+# $NetBSD: Makefile,v 1.25 2005/05/22 19:11:12 jlam Exp $
#
DISTNAME= awk
@@ -18,13 +18,7 @@
DIST_SUBDIR= ${PKGNAME}
PKG_INSTALLATION_TYPES= overwrite pkgviews
-.include "../../mk/bsd.prefs.mk"
-.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-USE_GNU_TOOLS+= yacc
-.else
USE_TOOLS+= yacc
-.endif
-
WRKSRC= ${WRKDIR}
CFLAGS+= ${CPPFLAGS}
MAKE_FLAGS+= CC=${CC:Q} YACC=${YACC:Q} CFLAGS=${CFLAGS:Q}
diff -r 8085e5be4c90 -r 2886ff974083 lang/perl5/buildlink3.mk
--- a/lang/perl5/buildlink3.mk Sun May 22 18:41:44 2005 +0000
+++ b/lang/perl5/buildlink3.mk Sun May 22 19:11:12 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2005/05/19 05:01:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2005/05/22 19:11:12 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PERL5_BUILDLINK3_MK:= ${PERL5_BUILDLINK3_MK}+
@@ -13,12 +13,7 @@
BUILDLINK_PACKAGES+= perl
.if !empty(PERL5_BUILDLINK3_MK:M+)
-. if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-USE_PERL5?= run
-PERL5_REQD+= 5.0
-. endif
-USE_TOOLS+= perl
-
+USE_TOOLS+= perl
TOOLS_DEPENDS.perl= # buildlink3 will handle the dependency
BUILDLINK_DEPENDS.perl+= {perl>=${PERL5_REQD},perl-thread>=${PERL5_REQD}}
BUILDLINK_RECOMMENDED.perl+= perl>=5.8.5nb6
diff -r 8085e5be4c90 -r 2886ff974083 mk/autoconf.mk
--- a/mk/autoconf.mk Sun May 22 18:41:44 2005 +0000
+++ b/mk/autoconf.mk Sun May 22 19:11:12 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: autoconf.mk,v 1.7 2005/05/11 22:17:26 jlam Exp $
+# $NetBSD: autoconf.mk,v 1.8 2005/05/22 19:11:12 jlam Exp $
#
# makefile fragment for packages that use autoconf
# AUTOCONF_REQD can be set to the minimum version required.
@@ -18,55 +18,9 @@
.include "../../mk/bsd.prefs.mk"
.if empty(AUTOCONF_REQD:M2.1[0-9]*)
-. if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
USE_TOOLS+= autoconf
-. else
-BUILD_DEPENDS+= autoconf>=${AUTOCONF_REQD}:../../devel/autoconf
-AUTOCONF= ${LOCALBASE}/bin/autoconf
-AUTORECONF= ${LOCALBASE}/bin/autoreconf
-AUTOHEADER= ${LOCALBASE}/bin/autoheader
-. endif
.else
-. if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
USE_TOOLS+= autoconf213
-. else
-BUILD_DEPENDS+= autoconf213>=${AUTOCONF_REQD}:../../devel/autoconf213
-AUTOCONF= ${LOCALBASE}/bin/autoconf-2.13
-AUTORECONF= ${LOCALBASE}/bin/autoreconf-2.13
-AUTOHEADER= ${LOCALBASE}/bin/autoheader-2.13
-. if defined(USE_LIBTOOL)
-pre-configure: do-libtool-m4-override
-. endif
-. endif
-.endif
-
-.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-# LIBTOOL_M4_OVERRIDE lists the locations where the libtool.m4 symlink
-# will be created. The libtool.m4 is only created if a GNU configure
-# script exists at that location.
-#
-LIBTOOL_M4_OVERRIDE?= libtool.m4 */libtool.m4 */*/libtool.m4
-
-# Symlink the libtool-1.4.m4 file into any directory in which there's a
-# configure script under ${WRKSRC}. The symlink is called "libtool.m4",
-# which is the name expected by the autoconf tools. The symlinking is
-# only done if ${AUTOCONF_REQD} == 2.13 and USE_LIBTOOL is defined. This
-# allows autoconf-2.13, autoreconf-2.13 and aclocal-2.13 to use the older
-# libtool.m4 file when regenerating files. This is okay, because we later
-# override the generated libtool file anyway.
-#
-.PHONY: do-libtool-m4-override
-do-libtool-m4-override:
-.for _pattern_ in ${LIBTOOL_M4_OVERRIDE}
- ${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}; \
- for cfile in ${_pattern_:S/libtool.m4$/configure/}; do \
- if [ -f "$$cfile" ]; then \
- libtool_m4=`${DIRNAME} $$cfile`/libtool.m4; \
- ${LN} -sf ${PKGSRCDIR}/mk/gnu-config/libtool-1.4.m4 \
- $$libtool_m4; \
- fi; \
- done
-.endfor
.endif
.endif # AUTOCONF_MK
diff -r 8085e5be4c90 -r 2886ff974083 mk/automake.mk
--- a/mk/automake.mk Sun May 22 18:41:44 2005 +0000
+++ b/mk/automake.mk Sun May 22 19:11:12 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: automake.mk,v 1.9 2005/05/11 22:17:26 jlam Exp $
+# $NetBSD: automake.mk,v 1.10 2005/05/22 19:11:12 jlam Exp $
#
# makefile fragment for packages that use automake
# AUTOMAKE_REQD can be set to the minimum version required.
@@ -19,31 +19,9 @@
.include "../../mk/bsd.prefs.mk"
.if !empty(AUTOMAKE_REQD:M1.4*)
-. if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
USE_TOOLS+= automake14
-. else
-BUILD_DEPENDS+= automake14>=${AUTOMAKE_REQD}:../../devel/automake14
-_AUTOMAKE_API_VERSION= 1.4
-AUTOCONF_REQD?= 2.13
-. endif
.else
-. if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
USE_TOOLS+= automake
-. else
-BUILD_DEPENDS+= automake>=${AUTOMAKE_REQD}:../../devel/automake
-_AUTOMAKE_API_VERSION= 1.9
-AUTOCONF_REQD?= 2.58
-. endif
.endif
-.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-AUTOMAKE= ${LOCALBASE}/bin/automake-${_AUTOMAKE_API_VERSION}
-ACLOCAL= ${LOCALBASE}/bin/aclocal-${_AUTOMAKE_API_VERSION}
-
-.if defined(BUILD_USES_GETTEXT_M4)
-BUILD_DEPENDS+= {gettext-0.10.35nb1,gettext-m4-[0-9]*}:../../devel/gettext-m4
-.endif
-
-.include "../mk/autoconf.mk"
-.endif
.endif # AUTOMAKE_MK
diff -r 8085e5be4c90 -r 2886ff974083 mk/bsd.pkg.extract.mk
--- a/mk/bsd.pkg.extract.mk Sun May 22 18:41:44 2005 +0000
+++ b/mk/bsd.pkg.extract.mk Sun May 22 19:11:12 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.extract.mk,v 1.8 2005/05/17 22:11:14 jlam Exp $
+# $NetBSD: bsd.pkg.extract.mk,v 1.9 2005/05/22 19:11:12 jlam Exp $
#
# This Makefile fragment is included to bsd.pkg.mk and defines the
# relevant variables and targets for the "extract" phase.
@@ -64,57 +64,25 @@
.endif
.if !empty(EXTRACT_ONLY:M*.bz2) || !empty(EXTRACT_ONLY:M*.tbz) || \
!empty(EXTRACT_SUFX:M*.bz2) || !empty(EXTRACT_SUFX:M*.tbz)
-. if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
PKGSRC_USE_TOOLS+= bzcat
-. elif exists(/usr/bin/bzcat)
-BZCAT= /usr/bin/bzcat <
-. else
-BUILD_DEPENDS+= bzip2>=0.9.0b:../../archivers/bzip2
-BZCAT= ${LOCALBASE}/bin/bzcat
-. endif
.endif
.if !empty(EXTRACT_ONLY:M*.zip) || !empty(EXTRACT_SUFX:M*.zip)
-. if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
PKGSRC_USE_TOOLS+= unzip
-. else
-BUILD_DEPENDS+= unzip-[0-9]*:../../archivers/unzip
-UNZIP= ${LOCALBASE}/bin/unzip
-. endif
.endif
.if !empty(EXTRACT_ONLY:M*.lzh) || !empty(EXTRACT_ONLY:M*.lha) || \
!empty(EXTRACT_SUFX:M*.lzh) || !empty(EXTRACT_SUFX:M*.lha)
-. if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
PKGSRC_USE_TOOLS+= lha
-. else
-BUILD_DEPENDS+= lha>=114.9:../../archivers/lha
-LHA= ${LOCALBASE}/bin/lha
-. endif
.endif
.if !empty(EXTRACT_ONLY:M*.gz) || !empty(EXTRACT_ONLY:M*.tgz) || \
!empty(EXTRACT_SUFX:M*.gz) || !empty(EXTRACT_SUFX:M*.tgz) || \
!empty(EXTRACT_ONLY:M*.Z) || !empty(EXTRACT_SUFX:M*.Z)
-. if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
PKGSRC_USE_TOOLS+= gzcat
-. elif !defined(GZCAT)
-BUILD_DEPENDS+= gzip-base>=1.2.4b:../../archivers/gzip-base
-GZCAT= ${LOCALBASE}/bin/zcat
-. endif
.endif
.if !empty(EXTRACT_ONLY:M*.zoo) || !empty(EXTRACT_SUFX:M*.zoo)
-. if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
PKGSRC_USE_TOOLS+= unzoo
-. else
-BUILD_DEPENDS+= unzoo-[0-9]*:../../archivers/unzoo
-UNZOO= ${LOCALBASE}/bin/unzoo
-. endif
.endif
.if !empty(EXTRACT_ONLY:M*.rar) || !empty(EXTRACT_SUFX:M*.rar)
-. if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
PKGSRC_USE_TOOLS+= unrar
-. else
-BUILD_DEPENDS+= unrar>=3.3.4:../../archivers/unrar
-UNRAR= ${LOCALBASE}/bin/unrar
-. endif
.endif
DECOMPRESS_CMD.tar.gz?= ${GZCAT}
diff -r 8085e5be4c90 -r 2886ff974083 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk Sun May 22 18:41:44 2005 +0000
+++ b/mk/bsd.pkg.mk Sun May 22 19:11:12 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1675 2005/05/22 15:31:03 rillig Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1676 2005/05/22 19:11:12 jlam Exp $
#
# This file is in the public domain.
#
@@ -382,23 +382,6 @@
.endif
BUILD_DEFS+= _PLIST_IGNORE_FILES
-.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-.if !empty(USE_GNU_TOOLS:Mmake)
-_USE_GMAKE= yes
-.endif
-.if defined(_USE_GMAKE)
Home |
Main Index |
Thread Index |
Old Index