pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2007Q2]: pkgsrc/pkgtools Pullup ticket 2142 - requested by joerg
details: https://anonhg.NetBSD.org/pkgsrc/rev/688062f8794f
branches: pkgsrc-2007Q2
changeset: 530469:688062f8794f
user: salo <salo%pkgsrc.org@localhost>
date: Sat Jul 21 01:19:08 2007 +0000
description:
Pullup ticket 2142 - requested by joerg
remove PKG_TOOLS_PREFIX handling from bootstrap tools
Revisions pulled up:
- pkgsrc/pkgtools/mtree/Makefile 1.22
- pkgsrc/pkgtools/mtree/Makefile.common 1.3
- pkgsrc/pkgtools/pax/Makefile 1.15
- pkgsrc/pkgtools/pkg_install/Makefile 1.131
- pkgsrc/pkgtools/pkg_install/files/lib/version.h 1.65
- pkgsrc/pkgtools/tnftp/Makefile 1.3
Module Name: pkgsrc
Committed By: joerg
Date: Tue Jul 10 15:19:18 UTC 2007
Modified Files:
pkgsrc/pkgtools/mtree: Makefile Makefile.common
pkgsrc/pkgtools/pax: Makefile
pkgsrc/pkgtools/pkg_install: Makefile
pkgsrc/pkgtools/pkg_install/files/lib: version.h
pkgsrc/pkgtools/tnftp: Makefile
Log Message:
Remove PKG_TOOLS_PREFIX handling for mtree, pax, pkg_install and
tnftp. Modifying files and possibly removing them from the base system
is doing more harm than use. Bump revision or version of each
package.
diffstat:
pkgtools/mtree/Makefile | 13 +------------
pkgtools/mtree/Makefile.common | 4 ++--
pkgtools/pax/Makefile | 14 ++------------
pkgtools/pkg_install/Makefile | 20 +-------------------
pkgtools/pkg_install/files/lib/version.h | 4 ++--
pkgtools/tnftp/Makefile | 16 ++--------------
6 files changed, 10 insertions(+), 61 deletions(-)
diffs (166 lines):
diff -r ec6ca1591928 -r 688062f8794f pkgtools/mtree/Makefile
--- a/pkgtools/mtree/Makefile Tue Jul 10 12:16:04 2007 +0000
+++ b/pkgtools/mtree/Makefile Sat Jul 21 01:19:08 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2007/04/12 14:36:40 joerg Exp $
+# $NetBSD: Makefile,v 1.21.2.1 2007/07/21 01:19:08 salo Exp $
#
# This version of mtree installs into ${PKG_TOOLS_BIN}.
#
@@ -9,16 +9,5 @@
NO_PKGTOOLS_REQD_CHECK= # defined
-PKG_TOOLS_PREFIX= ${PKG_TOOLS_BIN:C|/[^/]?bin$||}
-
-# XXX This breaks for those who set their own LOCALBASE to "/usr" and also
-# XXX set PKGMANDIR to be other than "share/man".
-# XXX
-.if !empty(PKG_TOOLS_PREFIX:M/usr)
-PKGMANDIR= share/man
-.endif
-
.include "../../pkgtools/libnbcompat/inplace.mk"
.include "../../mk/bsd.pkg.mk"
-
-PREFIX:= ${PKG_TOOLS_PREFIX}
diff -r ec6ca1591928 -r 688062f8794f pkgtools/mtree/Makefile.common
--- a/pkgtools/mtree/Makefile.common Tue Jul 10 12:16:04 2007 +0000
+++ b/pkgtools/mtree/Makefile.common Sat Jul 21 01:19:08 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2006/07/14 20:11:10 jlam Exp $#
+# $NetBSD: Makefile.common,v 1.2.8.1 2007/07/21 01:19:08 salo Exp $#
#
# This Makefile fragment is included by:
#
@@ -6,7 +6,7 @@
# pkgsrc/sysutils/mtree/Makefile
#
-DISTNAME= mtree-20040722
+DISTNAME= mtree-20070710
MASTER_SITES= # empty
DISTFILES= # empty
diff -r ec6ca1591928 -r 688062f8794f pkgtools/pax/Makefile
--- a/pkgtools/pax/Makefile Tue Jul 10 12:16:04 2007 +0000
+++ b/pkgtools/pax/Makefile Sat Jul 21 01:19:08 2007 +0000
@@ -1,24 +1,14 @@
-# $NetBSD: Makefile,v 1.14 2007/04/12 14:36:40 joerg Exp $
+# $NetBSD: Makefile,v 1.14.2.1 2007/07/21 01:19:08 salo Exp $
#
# This version of pax installs into ${PKG_TOOLS_BIN}.
#
.include "../../archivers/pax/Makefile.common"
+PKGREVISION= 1
CATEGORIES= pkgtools
NO_PKGTOOLS_REQD_CHECK= yes
-PKG_TOOLS_PREFIX= ${PKG_TOOLS_BIN:C|/[^/]?bin$||}
-
-# XXX This breaks for those who set their own LOCALBASE to "/usr" and also
-# XXX set PKGMANDIR to be other than "share/man".
-# XXX
-.if !empty(PKG_TOOLS_PREFIX:M/usr)
-PKGMANDIR= share/man
-.endif
-
.include "../../pkgtools/libnbcompat/inplace.mk"
.include "../../mk/bsd.pkg.mk"
-
-PREFIX:= ${PKG_TOOLS_PREFIX}
diff -r ec6ca1591928 -r 688062f8794f pkgtools/pkg_install/Makefile
--- a/pkgtools/pkg_install/Makefile Tue Jul 10 12:16:04 2007 +0000
+++ b/pkgtools/pkg_install/Makefile Sat Jul 21 01:19:08 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.130 2007/03/11 22:05:03 joerg Exp $
+# $NetBSD: Makefile,v 1.130.4.1 2007/07/21 01:19:08 salo Exp $
# Notes to package maintainers:
#
@@ -66,25 +66,9 @@
.include "../../mk/bsd.prefs.mk"
-PKG_TOOLS_PREFIX= ${PKG_TOOLS_BIN:C|/[^/]?bin$||}
VERSION!= ${AWK} -F '"' '/PKGTOOLS_VERSION/ {print $$2}' \
${FILESDIR}/lib/version.h
-# XXX This breaks for those who set their own LOCALBASE to "/usr" and also
-# XXX set PKGMANDIR to be other than "share/man".
-# XXX
-.if !empty(PKG_TOOLS_PREFIX:M/usr)
-PKGMANDIR= share/man
-.endif
-
-# If ${PKG_TOOLS_PREFIX} doesn't match ${LOCALBASE}, then don't run
-# check-files since it's likely ${PKG_TOOLS_PREFIX} contains directories
-# that shouldn't be checked.
-#
-.if ${PKG_TOOLS_PREFIX} != ${LOCALBASE}
-CHECK_FILES_SUPPORTED= no
-.endif
-
do-extract:
@${CP} -R ${FILESDIR} ${WRKSRC}
@@ -99,5 +83,3 @@
.include "../../pkgtools/libnbcompat/inplace.mk"
.include "../../mk/bsd.pkg.mk"
-
-PREFIX:= ${PKG_TOOLS_PREFIX}
diff -r ec6ca1591928 -r 688062f8794f pkgtools/pkg_install/files/lib/version.h
--- a/pkgtools/pkg_install/files/lib/version.h Tue Jul 10 12:16:04 2007 +0000
+++ b/pkgtools/pkg_install/files/lib/version.h Sat Jul 21 01:19:08 2007 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: version.h,v 1.64 2007/04/16 12:55:35 joerg Exp $ */
+/* $NetBSD: version.h,v 1.64.2.1 2007/07/21 01:19:08 salo Exp $ */
/*
* Copyright (c) 2001 Thomas Klausner. All rights reserved.
@@ -33,6 +33,6 @@
#ifndef _INST_LIB_VERSION_H_
#define _INST_LIB_VERSION_H_
-#define PKGTOOLS_VERSION "20070416"
+#define PKGTOOLS_VERSION "20070710"
#endif /* _INST_LIB_VERSION_H_ */
diff -r ec6ca1591928 -r 688062f8794f pkgtools/tnftp/Makefile
--- a/pkgtools/tnftp/Makefile Tue Jul 10 12:16:04 2007 +0000
+++ b/pkgtools/tnftp/Makefile Sat Jul 21 01:19:08 2007 +0000
@@ -1,28 +1,16 @@
-# $NetBSD: Makefile,v 1.2 2007/04/12 14:36:41 joerg Exp $
+# $NetBSD: Makefile,v 1.2.2.1 2007/07/21 01:19:09 salo Exp $
#
# This version of tnftp installs into ${PKG_TOOLS_BIN}.
#
.include "../../net/tnftp/Makefile.common"
+PKGREVISION= 1
CATEGORIES= pkgtools
NO_PKGTOOLS_REQD_CHECK= yes
-PKG_TOOLS_PREFIX= ${PKG_TOOLS_BIN:C|/[^/]?bin$||}
-
-# XXX This breaks for those who set their own LOCALBASE to "/usr" and also
-# XXX set PKGMANDIR to be other than "share/man".
-# XXX
-.if !empty(PKG_TOOLS_PREFIX:M/usr)
-PKGMANDIR= share/man
-.endif
-
-.if ${PKG_TOOLS_PREFIX} == ${LOCALBASE}
CONFLICTS+= kth-krb4-[0-9]*
CONFLICTS+= lukemftp-[0-9]*
-.endif
.include "../../mk/bsd.pkg.mk"
-
-PREFIX:= ${PKG_TOOLS_PREFIX}
Home |
Main Index |
Thread Index |
Old Index