6 files changed, 10 insertions, 61 deletions
diff --git a/pkgtools/mtree/Makefile b/pkgtools/mtree/Makefile
index f5c578b8947..98a526259c5 100644
--- a/pkgtools/mtree/Makefile
+++ b/pkgtools/mtree/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2007/04/12 14:36:40 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2007/07/10 15:19:17 joerg Exp $
 #
 # This version of mtree installs into ${PKG_TOOLS_BIN}.
 #
@@ -9,16 +9,5 @@ CATEGORIES=	pkgtools
 
 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 --git a/pkgtools/mtree/Makefile.common b/pkgtools/mtree/Makefile.common
index 7248ac5362e..bf43e82abad 100644
--- a/pkgtools/mtree/Makefile.common
+++ b/pkgtools/mtree/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2006/07/14 20:11:10 jlam Exp $#
+# $NetBSD: Makefile.common,v 1.3 2007/07/10 15:19:18 joerg 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 --git a/pkgtools/pax/Makefile b/pkgtools/pax/Makefile
index 282cb11ca8e..6dd1c401347 100644
--- a/pkgtools/pax/Makefile
+++ b/pkgtools/pax/Makefile
@@ -1,24 +1,14 @@
-# $NetBSD: Makefile,v 1.14 2007/04/12 14:36:40 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2007/07/10 15:19:18 joerg 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 --git a/pkgtools/pkg_install/Makefile b/pkgtools/pkg_install/Makefile
index a14ec5a5d03..635861d4a0e 100644
--- a/pkgtools/pkg_install/Makefile
+++ b/pkgtools/pkg_install/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.130 2007/03/11 22:05:03 joerg Exp $
+# $NetBSD: Makefile,v 1.131 2007/07/10 15:19:18 joerg Exp $
 
 # Notes to package maintainers:
 #
@@ -66,25 +66,9 @@ FILES_SUBST+=		PKG_DBDIR=${PKG_DBDIR:Q}			\
 
 .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 @@ update:
 
 .include "../../pkgtools/libnbcompat/inplace.mk"
 .include "../../mk/bsd.pkg.mk"
-
-PREFIX:=	${PKG_TOOLS_PREFIX}
diff --git a/pkgtools/pkg_install/files/lib/version.h b/pkgtools/pkg_install/files/lib/version.h
index 9ccb5c54437..3f04a865a7b 100644
--- a/pkgtools/pkg_install/files/lib/version.h
+++ b/pkgtools/pkg_install/files/lib/version.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: version.h,v 1.64 2007/04/16 12:55:35 joerg Exp $	*/
+/*	$NetBSD: version.h,v 1.65 2007/07/10 15:19:18 joerg 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 --git a/pkgtools/tnftp/Makefile b/pkgtools/tnftp/Makefile
index 800ebee9827..393eb7f5487 100644
--- a/pkgtools/tnftp/Makefile
+++ b/pkgtools/tnftp/Makefile
@@ -1,28 +1,16 @@
-# $NetBSD: Makefile,v 1.2 2007/04/12 14:36:41 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/07/10 15:19:18 joerg 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}