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/lang/perl5/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/lang/perl5/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- pkgsrc/lang/perl5/Makefile	2006/01/15 07:40:30	1.115
+++ pkgsrc/lang/perl5/Makefile	2006/01/19 02:09:09	1.116
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.115 2006/01/15 07:40:30 jlam Exp $
+# $NetBSD: Makefile,v 1.116 2006/01/19 02:09:09 joerg Exp $
 
 DISTNAME=	perl-5.8.7
 PKGREVISION=	8
@@ -251,10 +251,17 @@ SUBST_FILES.dirmode=	installhtml install
 			lib/ExtUtils/Install.pm
 SUBST_SED.dirmode=	-e "s/755/${PKGDIRMODE}/g;/umask(/d"
 
+SUBST_CLASSES+=		paths
+SUBST_FILES.paths=	${WRKDIR}/perllink
+SUBST_SED.paths+=	-e 's,@PERL5@,${PERL5},g'
+SUBST_SED.paths+=	-e 's,@SH@,${SH},g'
+SUBST_STAGE.paths=	post-patch
+
 # Replace the base Sys-Syslog module with the fixed version.
 post-extract:
 	${RM} -fr ${WRKSRC}/ext/Sys/Syslog
 	${CP} -r ${WRKDIR}/${SYS_SYSLOG} ${WRKSRC}/ext/Sys/Syslog
+	${CP} ${FILESDIR}/perllink.in ${WRKDIR}/perllink
 
 # It's tough to guess which hints file will be used, so add our modifications
 # to all of them:
@@ -321,10 +328,6 @@ FILES_SUBST+=		PERL5_COMMENT=\#
 FILES_SUBST+=		PERL5_PACKLIST=
 PLIST_SRC=		${WRKDIR}/.PLIST_SRC
 
-post-build:
-	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/perllink.in		\
-		> ${WRKDIR}/perllink
-
 post-install: perl5-post-install
 
 perl5-post-install: