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.173
retrieving revision 1.209
diff -u -p -r1.173 -r1.209
--- pkgsrc/pkgtools/pkglint/Makefile	2003/12/24 09:54:39	1.173
+++ pkgsrc/pkgtools/pkglint/Makefile	2004/11/04 12:37:02	1.209
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.173 2003/12/24 09:54:39 jmmv Exp $
+# $NetBSD: Makefile,v 1.209 2004/11/04 12:37:02 wiz Exp $
 #
 
-DISTNAME=	pkglint-3.66
-WRKSRC=		${WRKDIR}
+DISTNAME=	pkglint-3.95
 CATEGORIES=	pkgtools devel
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -13,53 +12,51 @@ COMMENT=	Verifier for NetBSD packages an
 
 DEPENDS+=	digest>=20010101:../../pkgtools/digest
 
-USE_PERL5=	YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_PERL5=	yes
 
+WRKSRC=		${WRKDIR}
+NO_BUILDLINK=	yes
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
-
-MAKE_ENV=	PKGSRCDIR=${_PKGSRCDIR:Q}
+USE_LANGUAGES=	# empty
 
 DISTVER=	${DISTNAME:S/pkglint-//}
 
-.include "../../mk/bsd.prefs.mk"
+INSTALLATION_DIRS=	bin man/cat1 man/man1
 
-.if ${OPSYS} == "SunOS"
-# This doesn't create readable manual pages. "mandoc" should be added
-# to zoularis.
-NROFF=		nroff -man
-.else
-NROFF=		nroff -mandoc
-.endif
+SUBST_CLASSES+=		pkglint
+SUBST_STAGE.pkglint=	pre-build
+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'
+SUBST_SED.pkglint+=	-e 's|@PKGSRCDIR@|${PKGSRCDIR}|g'
+SUBST_SED.pkglint+=	-e 's|@DISTVER@|${DISTVER}|g'
+SUBST_SED.pkglint+=	-e 's|@MAKE@|${MAKE}|g'
+SUBST_SED.pkglint+=	-e 's|@PERL@|${PERL5}|g'
+
+.include "../../mk/bsd.prefs.mk"
 
 do-extract:
-	@${MKDIR} ${WRKSRC}/src
-.for FILE in lintpkgsrc.1 lintpkgsrc.pl pkglint.1 pkglint.pl plist-clash.pl
-	${CP} ${FILESDIR}/${FILE} ${WRKSRC}/src/${FILE}
+.for _f_ in ${SUBST_FILES.pkglint}
+	@${CP} ${FILESDIR}/${_f_} ${WRKSRC}/${_f_}
 .endfor
 
 do-build:
-.for FILE in pkglint lintpkgsrc plist-clash
-	${SED} -e 's|@PREFIX@|${PREFIX}|g'		\
-		-e 's|@PORTSDIR@|${_PKGSRCDIR}|g'	\
-		-e 's|@DISTVER@|${DISTVER}|g'		\
-		-e 's|@MAKE@|${MAKE}|g'			\
-		< ${WRKSRC}/src/${FILE}.pl 		\
-		> ${WRKSRC}/${FILE}
-.endfor
-.for FILE in pkglint lintpkgsrc
-	${SED} -e 's|@PREFIX@|${PREFIX}|g'		\
-		-e 's|@PORTSDIR@|${_PKGSRCDIR}|g'	\
-		-e 's|@MAKE@|${MAKE}|g'			\
-		< ${WRKSRC}/src/${FILE}.1		\
-		> ${WRKSRC}/${FILE}.1
-	${NROFF} ${WRKSRC}/${FILE}.1 >${WRKSRC}/${FILE}.0
-.endfor
+	@${DO_NADA}
+.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