As the sources are now in ${FILESDIR}, there's no distfile to fetch,

and the "do-extract" target copies the sources into ${WRKSRC}. We
automagically determine VERSION by inspecting ${FILESDIR}/lib/version.h.

Thanks to autoconf, all the patches and almost all of the cruftulent
${OPSYS}-specific stuff in the Makefile are gone.

1 files changed, 24 insertions, 52 deletions

diff --git a/pkgtools/pkg_install/Makefile b/pkgtools/pkg_install/Makefile
index f8a910cfabb..84a2137245c 100644
--- a/pkgtools/pkg_install/Makefile
+++ b/pkgtools/pkg_install/Makefile
@@ -1,77 +1,49 @@
-# $NetBSD: Makefile,v 1.57 2002/12/12 01:50:47 hubertf Exp $
+# $NetBSD: Makefile,v 1.58 2002/12/20 18:15:52 schmonz Exp $
 
-# Note to package maintainers:
+# Notes to package maintainers:
 #
-# To update the distfile of this pkg, cd to /usr/src/usr.sbin,
-# edit PKGTOOLS_VERSION in lib/version.h to `date +%Y%m%d`, do
-# "tar pzvcf pkg_install-`date +%Y%m%d`.tar.gz pkg_install" and upload
-# that file to ${MASTER_SITE_LOCAL}.
+# To update this package, import from src/usr.sbin/pkg_install.
 #
-# XXX Modify PKGTOOLS_REQD value in pkgsrc/mk/bsd.pkg.mk to the new
-# value ONLY(!) if there is a critical change in the pkg_* tools that
-# bsd.pkg.mk and friends rely on.
+# Updating this package does not automatically necessitate bumping
+# PKGTOOLS_REQD in bsd.pkg.mk. Do so if and only if there is a critical
+# change in the pkg_* tools that pkgsrc relies on for proper operation.
 
-DISTNAME=		pkg_install-20021123
+DISTNAME=		pkg_install-${VERSION}
 CATEGORIES=		pkgtools
-MASTER_SITES=		${MASTER_SITE_LOCAL}
+MASTER_SITES=		# empty
+DISTFILES=		# empty
 
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.netbsd.org/
 COMMENT=		NetBSD-current's pkg_* tools
 
-# No special options needed for IPv6 support
 WRKSRC=			${WRKDIR}/pkg_install
-MAKE_ENV+=		BINDIR=/usr/sbin MANDIR=/usr/share/man NOLINT=1
-NO_CONFIGURE=		yes
-NO_MTREE=		yes
-NO_PKG_REGISTER=	yes
-NO_PACKAGE=		No package registration is done
-MANCOMPRESSED_IF_MANZ=	yes
+
+GNU_CONFIGURE=		# defined
+CONFIGURE_ARGS+=	--with-pkgdbdir=${PKG_DBDIR}
+
+NO_CHECKSUM=		# defined
+NO_PATCH=		# defined
+NO_MTREE=		# defined
+NO_PKG_REGISTER=	# defined
+NO_PACKAGE=		Deinstallation is not permitted
+MANCOMPRESSED_IF_MANZ=	# defined
 BUILD_DEFS+=		MANINSTALL
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "SunOS" || ${OPSYS} == "Linux"
-SHLOCK:=	${LOCALBASE}/bin/shlock
-.endif
+VERSION!=		${AWK} -F '"' '/PKGTOOLS_VERSION/ {print $$2}' \
+			${FILESDIR}/lib/version.h
 
-LOCALBASE:=	${PKG_TOOLS_BIN:C|/[^/]?bin$||}
+LOCALBASE:=		${PKG_TOOLS_BIN:C|/[^/]?bin$||}
 PKG_DBDIR?=		/var/db/pkg
 
 .if ${OPSYS} == "NetBSD" && !exists(/usr/share/tmac/tmac.andoc)
 PKG_FAIL_REASON+= "You need to have the 'text' set installed to build this package!"
 .endif
 
-.if ${OPSYS} == "SunOS"
-MAKEFLAGS+=	NETBSD_COMPATIBLE=YES
-MANINSTALL=
-MAKE_ENV+=	MANINSTALL= MKMAN=no NOMAN=YES
-MAKE_ENV+=	ZOULARISBASE=${ZOULARISBASE}
-.endif
-
-.if ${OPSYS} == "OpenBSD"
-CPPFLAGS+=		-D__COPYRIGHT\(x\)=\; -D__RCSID\(x\)=\;
-MAKE_ENV+=		BINGRP=${BINGRP} BINOWN=${BINOWN}
-MAKE_ENV+=		BINDIR=${PKG_TOOLS_BIN}
-MAKE_ENV+=		MANDIR=${PKG_TOOLS_BIN}/../man
-.endif
-
-.if ${OPSYS} == "Linux"
-MAKE_ENV+=		DIGESTDIR=${.CURDIR}/../digest/files
-CPPFLAGS+=		-I${DIGESTDIR} -I${DIGESTDIR}
-CPPFLAGS+=		-D__COPYRIGHT\(x\)=\; -D__RCSID\(x\)=\;
-MAKE_ENV+=		BINGRP=${BINGRP} BINOWN=${BINOWN}
-MAKE_ENV+=		BINDIR=${PKG_TOOLS_BIN}
-MAKE_ENV+=		MANDIR=${PKG_TOOLS_BIN}/../man
-.endif
-
-.if ${OPSYS} == "Darwin"
-MAKE_ENV+= 		DIGESTDIR=${.CURDIR}/../digest/files
-CPPFLAGS+=		-I${DIGESTDIR} -I${DIGESTDIR}
-MAKE_ENV+=		BINGRP=${BINGRP} BINOWN=${BINOWN}
-MAKE_ENV+=		BINDIR=${PKG_TOOLS_BIN}
-MAKE_ENV+=		MANDIR=${PKG_TOOLS_BIN}/../man
-.endif
+do-extract:
+	@${CP} -Rp ${FILESDIR} ${WRKSRC}
 
 post-install:
 	if [ ! -f ${PKG_DBDIR}/pkgdb.byfile.db ]; then \