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.136
retrieving revision 1.199
diff -u -p -r1.136 -r1.199
--- pkgsrc/pkgtools/pkglint/Makefile	2002/09/22 16:00:37	1.136
+++ pkgsrc/pkgtools/pkglint/Makefile	2004/07/09 00:18:28	1.199
@@ -1,59 +1,64 @@
-# $NetBSD: Makefile,v 1.136 2002/09/22 16:00:37 atatat Exp $
+# $NetBSD: Makefile,v 1.199 2004/07/09 00:18:28 hubertf Exp $
 #
 
-DISTNAME=	pkglint-3.32
+DISTNAME=	pkglint-3.86
 CATEGORIES=	pkgtools devel
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 
-MAINTAINER=	hubertf@netbsd.org
-HOMEPAGE=	ftp://ftp.netbsd.org/pub/NetBSD/packages/pkgsrc/Packages.txt
+MAINTAINER=	hubertf@NetBSD.org
+HOMEPAGE=	ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/Packages.txt
 COMMENT=	Verifier for NetBSD packages and complete pkgsrc tree
 
-DEPENDS+=	digest-2001*:../../pkgtools/digest
+DEPENDS+=	digest>=20010101:../../pkgtools/digest
 
-USE_PERL5=	YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_PERL5=	yes
 
-EXTRACT_ONLY=	# empty
 WRKSRC=		${WRKDIR}
+NO_BUILDLINK=	yes
 NO_CHECKSUM=	yes
-NO_PATCH=	yes
 NO_CONFIGURE=	yes
+USE_LANGUAGES=	# empty
 
-MAKE_ENV=	PKGSRCDIR=${_PKGSRCDIR}
+MAKE_ENV=	PKGSRCDIR=${_PKGSRCDIR:Q}
 
 DISTVER=	${DISTNAME:S/pkglint-//}
 
+INSTALLATION_DIRS=	bin man/cat1 man/man1
+
+SUBST_FILES=	lintpkgsrc.0 lintpkgsrc.1 lintpkgsrc.pl pkglint.1 pkglint.0
+SUBST_FILES+=	pkglint.pl plist-clash.pl
+
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "SunOS"
-# This doesn't create readable manual pages. "mandoc" should be added
-# to zoularis.
-NROFF=		nroff -man
-.else
-NROFF=		nroff -mandoc
-.endif
+do-extract:
+	@${MKDIR} ${WRKSRC}/src
+.for FILE in ${SUBST_FILES}
+	${CP} ${FILESDIR}/${FILE} ${WRKSRC}/src/${FILE}
+.endfor
 
 do-build:
-.for FILE in pkglint lintpkgsrc plist-clash
+.for FILE in ${SUBST_FILES}
 	${SED} -e 's|@PREFIX@|${PREFIX}|g'		\
 		-e 's|@PORTSDIR@|${_PKGSRCDIR}|g'	\
 		-e 's|@DISTVER@|${DISTVER}|g'		\
-		< ${FILESDIR}/${FILE}.pl 		\
-		> ${WRKSRC}/${FILE}
-.endfor
-.for FILE in pkglint lintpkgsrc
-	${SED} -e 's|@PREFIX@|${PREFIX}|g'		\
-		-e 's|@PORTSDIR@|${_PKGSRCDIR}|g'	\
-		< ${FILESDIR}/${FILE}.1			\
-		> ${WRKSRC}/${FILE}.1
-	${NROFF} ${WRKSRC}/${FILE}.1 >${WRKSRC}/${FILE}.0
+		-e 's|@MAKE@|${MAKE}|g'			\
+		-e 's|@PERL@|${PERL5}|g'		\
+		${WRKSRC}/src/${FILE} > ${WRKSRC}/${FILE}
 .endfor
+.if ${OPSYS} == "SunOS" || ${OPSYS} == "AIX"
+   # the pre-generated man-pages are 'mandoc';  these OS need 'man'
+.  for FILE in lintpkgsrc pkglint
+	nroff -man ${WRKSRC}/${FILE}.1 > ${WRKSRC}/${FILE}.0
+.  endfor
+.endif
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/pkglint ${PREFIX}/bin/pkglint
-	${INSTALL_SCRIPT} ${WRKSRC}/lintpkgsrc ${PREFIX}/bin/lintpkgsrc
-	${INSTALL_SCRIPT} ${WRKSRC}/plist-clash ${PREFIX}/bin/plist-clash
+	${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.1 ${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/pkglint.0 ${PREFIX}/man/cat1