Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/pkgsrc/pkgtools/pkglint/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/pkgtools/pkglint/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.309
retrieving revision 1.337
diff -u -p -r1.309 -r1.337
--- pkgsrc/pkgtools/pkglint/Makefile	2005/11/24 10:16:54	1.309
+++ pkgsrc/pkgtools/pkglint/Makefile	2006/04/21 10:37:51	1.337
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.309 2005/11/24 10:16:54 rillig Exp $
+# $NetBSD: Makefile,v 1.337 2006/04/21 10:37:51 rillig Exp $
 #
 
-DISTNAME=	pkglint-4.46
+DISTNAME=	pkglint-4.60
 CATEGORIES=	pkgtools
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -10,7 +10,9 @@ MAINTAINER=	rillig@NetBSD.org
 HOMEPAGE=	http://www.netbsd.org/Documentation/pkgsrc/
 COMMENT=	Verifier for NetBSD packages and complete pkgsrc tree
 
+DEPENDS+=	digest>=20010101:../../pkgtools/digest
 DEPENDS+=	p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1
+DEPENDS+=	p5-pkgsrc-Dewey>=1.0:../../pkgtools/p5-pkgsrc-Dewey
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
@@ -21,40 +23,46 @@ NO_CHECKSUM=	yes
 NO_BUILD=	yes
 USE_LANGUAGES=	# empty
 
-INSTALLATION_DIRS=	bin man/cat1 man/man1 share/pkglint
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1 share/pkglint
 
 SUBST_CLASSES+=		pkglint
 SUBST_STAGE.pkglint=	post-configure
 SUBST_FILES.pkglint+=	lintpkgsrc.0 lintpkgsrc.1 lintpkgsrc.pl
 SUBST_FILES.pkglint+=	pkglint.0 pkglint.1 pkglint.pl
+SUBST_FILES.pkglint+=	plist-clash.pl
 .if defined(BATCH)
-SUBST_SED.pkglint+=	-e 's|@PKGSRCDIR@|/usr/pkgsrc|g'
+SUBST_SED.pkglint+=	-e s\|@PKGSRCDIR@\|/usr/pkgsrc\|g
 .else
-SUBST_SED.pkglint+=	-e 's|@PKGSRCDIR@|${PKGSRCDIR}|g'
+SUBST_SED.pkglint+=	-e s\|@PKGSRCDIR@\|${PKGSRCDIR}\|g
 .endif
-SUBST_SED.pkglint+=	-e 's|@PREFIX@|${PREFIX}|g'
-SUBST_SED.pkglint+=	-e 's|@DISTVER@|${DISTNAME:S/pkglint-//}|g'
-SUBST_SED.pkglint+=	-e 's|@MAKE@|${MAKE}|g'
-SUBST_SED.pkglint+=	-e 's|@PERL@|${PERL5}|g'
-SUBST_SED.pkglint+=	-e 's|@DATADIR@|${PREFIX}/share/pkglint|g'
+SUBST_SED.pkglint+=	-e s\|@PREFIX@\|${PREFIX}\|g
+SUBST_SED.pkglint+=	-e s\|@DISTVER@\|${DISTNAME:S/pkglint-//:Q}\|g
+SUBST_SED.pkglint+=	-e s\|@MAKE@\|${MAKE:Q}\|g
+SUBST_SED.pkglint+=	-e s\|@PERL@\|${PERL5:Q}\|g
+SUBST_SED.pkglint+=	-e s\|@DATADIR@\|${PREFIX}/share/pkglint\|g
 
 .include "../../mk/bsd.prefs.mk"
 
+# Note: This target is only intended for use by the pkglint author.
+.PHONY: quick-install
+quick-install:
+	${RM} -rf ${WRKSRC}
+	${MKDIR} ${WRKSRC}
+	${MAKE} do-extract subst-pkglint do-install post-install
+
 do-extract:
-.for f in lintpkgsrc.0 lintpkgsrc.1 lintpkgsrc.pl pkglint.0 pkglint.1 pkglint.pl plist-clash.pl
-	@${CP} ${FILESDIR}/${f} ${WRKSRC}/${f}
-.endfor
+	cd ${FILESDIR} && ${CP} lintpkgsrc.0 lintpkgsrc.1 lintpkgsrc.pl pkglint.0 pkglint.1 pkglint.pl plist-clash.pl ${WRKSRC}
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/pkglint.pl ${PREFIX}/bin/pkglint
 	${INSTALL_SCRIPT} ${WRKSRC}/lintpkgsrc.pl ${PREFIX}/bin/lintpkgsrc
 	${INSTALL_SCRIPT} ${WRKSRC}/plist-clash.pl ${PREFIX}/bin/plist-clash
-	${INSTALL_MAN} ${WRKSRC}/lintpkgsrc.0 ${PREFIX}/man/cat1
+	${INSTALL_MAN} ${WRKSRC}/lintpkgsrc.0 ${PREFIX}/${PKGMANDIR}/cat1
 .if !empty(MANINSTALL:Mmaninstall)
-	${INSTALL_MAN} ${WRKSRC}/lintpkgsrc.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/pkglint.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/lintpkgsrc.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/pkglint.1 ${PREFIX}/${PKGMANDIR}/man1
 .endif
-	${INSTALL_MAN} ${WRKSRC}/pkglint.0 ${PREFIX}/man/cat1
+	${INSTALL_MAN} ${WRKSRC}/pkglint.0 ${PREFIX}/${PKGMANDIR}/cat1
 	${INSTALL_DATA} ${FILESDIR}/makevars.map ${PREFIX}/share/pkglint/
 	${INSTALL_DATA} ${FILESDIR}/deprecated.map ${PREFIX}/share/pkglint/