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.294 retrieving revision 1.314 diff -u -p -r1.294 -r1.314 --- pkgsrc/pkgtools/pkglint/Makefile 2005/11/14 04:05:22 1.294 +++ pkgsrc/pkgtools/pkglint/Makefile 2005/12/01 13:44:11 1.314 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.294 2005/11/14 04:05:22 rillig Exp $ +# $NetBSD: Makefile,v 1.314 2005/12/01 13:44:11 rillig Exp $ # -DISTNAME= pkglint-4.41 -CATEGORIES= pkgtools devel +DISTNAME= pkglint-4.49 +CATEGORIES= pkgtools MASTER_SITES= # empty DISTFILES= # empty @@ -10,7 +10,7 @@ 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 PKG_INSTALLATION_TYPES= overwrite pkgviews @@ -27,6 +27,11 @@ 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 +.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' @@ -35,10 +40,6 @@ 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 lintpkgsrc.0 lintpkgsrc.1 lintpkgsrc.pl pkglint.0 pkglint.1 pkglint.pl plist-clash.pl @${CP} ${FILESDIR}/${f} ${WRKSRC}/${f} @@ -58,6 +59,6 @@ do-install: ${INSTALL_DATA} ${FILESDIR}/deprecated.map ${PREFIX}/share/pkglint/ post-install: - ${PREFIX}/bin/pkglint -q 1>&2 || ${TRUE} + ${PREFIX}/bin/pkglint -q 1>&2 .include "../../mk/bsd.pkg.mk"