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.249
retrieving revision 1.324
diff -u -p -r1.249 -r1.324
--- pkgsrc/pkgtools/pkglint/Makefile	2005/09/09 12:16:29	1.249
+++ pkgsrc/pkgtools/pkglint/Makefile	2006/01/20 13:46:04	1.324
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.249 2005/09/09 12:16:29 rillig Exp $
+# $NetBSD: Makefile,v 1.324 2006/01/20 13:46:04 rillig Exp $
 #
 
-DISTNAME=	pkglint-4.21
-CATEGORIES=	pkgtools devel
+DISTNAME=	pkglint-4.54
+CATEGORIES=	pkgtools
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 
@@ -11,6 +11,7 @@ HOMEPAGE=	http://www.netbsd.org/Document
 COMMENT=	Verifier for NetBSD packages and complete pkgsrc tree
 
 DEPENDS+=	digest>=20010101:../../pkgtools/digest
+DEPENDS+=	p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
@@ -18,7 +19,6 @@ USE_TOOLS+=	perl:run
 
 WRKSRC=		${WRKDIR}
 NO_CHECKSUM=	yes
-NO_TOOLS=	yes
 NO_BUILD=	yes
 USE_LANGUAGES=	# empty
 
@@ -29,8 +29,12 @@ 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
-SUBST_SED.pkglint+=	-e 's|@PREFIX@|${PREFIX}|g'
+.if defined(BATCH)
+SUBST_SED.pkglint+=	-e 's|@PKGSRCDIR@|/usr/pkgsrc|g'
+.else
 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'
@@ -38,29 +42,23 @@ SUBST_SED.pkglint+=	-e 's|@DATADIR@|${PR
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "AIX" || ${OPSYS} == "SunOS"
-MANINSTALL=		catinstall
-.endif
-
 do-extract:
-.for f in ${SUBST_FILES.pkglint}
-	@${CP} ${FILESDIR}/${f} ${WRKSRC}/${f}
-.endfor
+	cd ${FILESDIR:Q} && ${CP} lintpkgsrc.0 lintpkgsrc.1 lintpkgsrc.pl pkglint.0 pkglint.1 pkglint.pl plist-clash.pl ${WRKSRC:Q}
 
 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_SCRIPT} ${WRKSRC:Q}/pkglint.pl ${PREFIX:Q}/bin/pkglint
+	${INSTALL_SCRIPT} ${WRKSRC:Q}/lintpkgsrc.pl ${PREFIX:Q}/bin/lintpkgsrc
+	${INSTALL_SCRIPT} ${WRKSRC:Q}/plist-clash.pl ${PREFIX:Q}/bin/plist-clash
+	${INSTALL_MAN} ${WRKSRC:Q}/lintpkgsrc.0 ${PREFIX:Q}/man/cat1
 .if !empty(MANINSTALL:Mmaninstall)
-	${INSTALL_MAN} ${WRKSRC}/lintpkgsrc.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/pkglint.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC:Q}/lintpkgsrc.1 ${PREFIX:Q}/man/man1
+	${INSTALL_MAN} ${WRKSRC:Q}/pkglint.1 ${PREFIX:Q}/man/man1
 .endif
-	${INSTALL_MAN} ${WRKSRC}/pkglint.0 ${PREFIX}/man/cat1
-	${INSTALL_DATA} ${FILESDIR}/makevars.map ${PREFIX}/share/pkglint/
-	${INSTALL_DATA} ${FILESDIR}/deprecated.map ${PREFIX}/share/pkglint/
+	${INSTALL_MAN} ${WRKSRC:Q}/pkglint.0 ${PREFIX:Q}/man/cat1
+	${INSTALL_DATA} ${FILESDIR:Q}/makevars.map ${PREFIX:Q}/share/pkglint/
+	${INSTALL_DATA} ${FILESDIR:Q}/deprecated.map ${PREFIX:Q}/share/pkglint/
 
 post-install:
-	${PREFIX}/bin/pkglint -q -Wno-workdir
+	${PREFIX:Q}/bin/pkglint -q 1>&2
 
 .include "../../mk/bsd.pkg.mk"