Fix the upgrade-build case.

15 files changed, 40 insertions, 28 deletions

diff --git a/gnu/usr.bin/perl/Makefile.inc b/gnu/usr.bin/perl/Makefile.inc
index 12b4381..a34520b 100644
--- a/gnu/usr.bin/perl/Makefile.inc
+++ b/gnu/usr.bin/perl/Makefile.inc
@@ -2,6 +2,7 @@
 
 PERL5SRC?= ${.CURDIR}/../../../../contrib/perl5
 PERL5LIBSRC?= ${.CURDIR}/../libperl
+MINIPERL?=	${.OBJDIR}/../miniperl/miniperl
 
 BINDIR?=	/usr/bin
 
@@ -29,6 +30,8 @@ CLEANFILES+= ${.OBJDIR}/${I}
 DEPEND_H+= ${.OBJDIR}/${I}
 .endfor
 
+LDFLAGS+=	-L${.OBJDIR}/../libperl
+
 links: ${DEPEND_H}
 	@for d in ${FARMDIRS} ; do \
 		rm -rf $${d} ;\
@@ -61,7 +64,7 @@ scripts: links
 	@sh cflags.sh
 	@sh writemain.sh
 	@sh myconfig.SH
-	@miniperl -I. ${PERL5SRC}/configpm \
+	@${MINIPERL} ${PERL5SRC}/configpm \
 		Config.pm Porting/Glossary myconfig
 	@ln -sf ../Config.pm lib/Config.pm
 	@touch ${.TARGET}
@@ -81,7 +84,7 @@ FARMDIRS=	lib ext Porting hints
 
 MAKEMAKER_ARGS=	INSTALLDIRS=perl PERL_SRC=${.OBJDIR} \
 		INSTALLMAN3DIR=${DESTDIR}/usr/share/perl/man3 \
-		PERL=miniperl FULLPERL=perl DEFINE=-I${DESTDIR}/usr/include \
+		PERL=${MINIPERL} FULLPERL=perl DEFINE=-I${DESTDIR}/usr/include \
 		DEFINE=-DPERL_CORE
 
 PERL_THREADED?= no
@@ -96,7 +99,7 @@ CFLAGS+=        -DDEBUGGING
 .endif
 
 autosplit: scripts lib/*.pm lib/*/*.pm
-	miniperl -I${.OBJDIR}/lib \
+	${MINIPERL} -I${.OBJDIR}/lib \
 		-e 'use AutoSplit; autosplit_lib_modules(@ARGV)' \
 		lib/*.pm lib/*/*.pm
 	@touch ${.TARGET}
@@ -109,14 +112,14 @@ ${DYNALOADER}:	scripts \
 
 ext/DynaLoader/DynaLoader.pm: scripts ext/DynaLoader/DynaLoader_pm.PL
 	@cd ext/DynaLoader; \
-	miniperl -I${.OBJDIR} -I${.OBJDIR}/lib DynaLoader_pm.PL DynaLoader.pm
+	${MINIPERL} -I${.OBJDIR} -I${.OBJDIR}/lib DynaLoader_pm.PL DynaLoader.pm
 
 ext/DynaLoader/XSLoader.pm: scripts ext/DynaLoader/XSLoader_pm.PL
 	@cd ext/DynaLoader; \
-	miniperl -I${.OBJDIR} -I${.OBJDIR}/lib XSLoader_pm.PL XSLoader.pm
+	${MINIPERL} -I${.OBJDIR} -I${.OBJDIR}/lib XSLoader_pm.PL XSLoader.pm
 
 ext/DynaLoader/Makefile: scripts ext/DynaLoader/Makefile.PL
 	@cd ext/DynaLoader; \
-	miniperl -I${.OBJDIR} -I${.OBJDIR}/lib Makefile.PL ${MAKEMAKER_ARGS} \
+	${MINIPERL} -I${.OBJDIR} -I${.OBJDIR}/lib Makefile.PL ${MAKEMAKER_ARGS} \
 		LINKTYPE=static LIBS="-lperl -lm"; \
 	make -B config PERL_SRC=${.OBJDIR}
diff --git a/gnu/usr.bin/perl/library/Makefile b/gnu/usr.bin/perl/library/Makefile
index 4a33e56..8a5c7e4 100644
--- a/gnu/usr.bin/perl/library/Makefile
+++ b/gnu/usr.bin/perl/library/Makefile
@@ -29,7 +29,7 @@ man3pages: ${DYNALOADER} pod2man
 	for i in `find . -name \*.pm | grep -v Functions.pm` ; do \
 		j=`echo $$i | sed -e 's|./||' -e 's|/|::|g' -e 's|.pm|.3|'` ;\
 		echo Manifying $$j ;\
-		miniperl -I${.OBJDIR}/lib ${.OBJDIR}/pod2man $$i > $$j ;\
+		${MINIPERL} -I${.OBJDIR}/lib ${.OBJDIR}/pod2man $$i > $$j ;\
 		gzip -fn $$j ;\
 	done
 	@cd ${.OBJDIR}/ext ;\
@@ -40,13 +40,13 @@ man3pages: ${DYNALOADER} pod2man
 			-e 's|/|::|g' -e 's|.pm|.3|' -e 's|.pod|.3|'`;\
 		i=`echo $$i | sed -e 's|./||'` ;\
 		echo Manifying $$j ;\
-		miniperl -I${.OBJDIR}/lib ${.OBJDIR}/pod2man $$i > ../lib/$$j ;\
+		${MINIPERL} -I${.OBJDIR}/lib ${.OBJDIR}/pod2man $$i > ../lib/$$j ;\
 		gzip -fn ../lib/$$j ;\
 	done
 	@touch ${.TARGET}
 
 pod2man: scripts autosplit ${PERL5SRC}/pod/pod2man.PL
 	ln -sf ${PERL5SRC}/pod/pod2man.PL 
-	miniperl -I${.OBJDIR}/lib pod2man.PL
+	${MINIPERL} -I${.OBJDIR}/lib pod2man.PL
 
 .PATH:	${PERL5SRC}
diff --git a/gnu/usr.bin/perl/library/Makefile.inc b/gnu/usr.bin/perl/library/Makefile.inc
index 013253a..bbfa36c 100644
--- a/gnu/usr.bin/perl/library/Makefile.inc
+++ b/gnu/usr.bin/perl/library/Makefile.inc
@@ -1,15 +1,18 @@
 # $FreeBSD$
 
-PERL5SRC?= ${.CURDIR}/../../../../../contrib/perl5
-PERL5LIBSRC?= ${.CURDIR}/../../libperl
+PERL5SRC?=	${.CURDIR}/../../../../../contrib/perl5
+PERL5LIBSRC?=	${.CURDIR}/../../libperl
+MINIPERL=	${.OBJDIR}/../../miniperl/miniperl
 
 MODULEDIR?=	${MODULE}
 
 MAKEMAKER_ARGS=	INSTALLDIRS=perl PERL_SRC=${.OBJDIR} \
 		INSTALLMAN3DIR=${DESTDIR}/usr/share/perl/man3 \
-		PERL=miniperl FULLPERL=perl DEFINE=-I${DESTDIR}/usr/include \
+		PERL=${MINIPERL} FULLPERL=perl DEFINE=-I${DESTDIR}/usr/include \
 		DEFINE=-DPERL_CORE
 
+CFLAGS+=	-L${.OBJDIR}/../../libperl
+
 all:	lib/auto/${MODULE}.so
 
 .include "../Makefile.inc"
@@ -20,7 +23,7 @@ lib/auto/${MODULE}.so: ext/${MODULEDIR}/Makefile ${DYNALOADER}
 
 ext/${MODULEDIR}/Makefile: scripts
 	cd ext/${MODULEDIR}; \
-	miniperl -I${.OBJDIR}/lib Makefile.PL ${MAKEMAKER_ARGS} \
+	${MINIPERL} -I${.OBJDIR}/lib Makefile.PL ${MAKEMAKER_ARGS} \
 		LINKTYPE=dynamic LIBS="-lperl -lm" \
 		INST_LIB=${.OBJDIR}/build/${MODULEDIR} \
 		INST_ARCHLIB=${.OBJDIR}/build/${MODULEDIR}; \
diff --git a/gnu/usr.bin/perl/pod/Makefile.inc b/gnu/usr.bin/perl/pod/Makefile.inc
index 1e3cbfe..e4440c7 100644
--- a/gnu/usr.bin/perl/pod/Makefile.inc
+++ b/gnu/usr.bin/perl/pod/Makefile.inc
@@ -4,6 +4,7 @@
 
 PERL5SRC?=	${.CURDIR}/../../../../../contrib/perl5
 MINIPERLOPT?=	-I${.OBJDIR}/../../perl/lib -I${.OBJDIR}/../../perl
+MINIPERL=	${.OBJDIR}/../../miniperl/miniperl
 
 CLEANFILES+=	${PROG}.1 ${PROG}.PL
 
diff --git a/gnu/usr.bin/perl/pod/pod/Makefile b/gnu/usr.bin/perl/pod/pod/Makefile
index 745080d..eca0a43 100644
--- a/gnu/usr.bin/perl/pod/pod/Makefile
+++ b/gnu/usr.bin/perl/pod/pod/Makefile
@@ -74,7 +74,7 @@ ${.OBJDIR}/${I}.pod: ${I}.pod
 	@ln -sf ${.OODATE} ${.TARGET}
 
 ${I}.1: ${I}.pod
-	miniperl ${MINIPERLOPT} ${.OBJDIR}/../pod2man/pod2man ${.OODATE} \
+	${MINIPERL} ${MINIPERLOPT} ${.OBJDIR}/../pod2man/pod2man ${.OODATE} \
 		> ${.TARGET}
 
 MAN1+=	${I}.1
diff --git a/gnu/usr.bin/perl/pod/pod2html/Makefile b/gnu/usr.bin/perl/pod/pod2html/Makefile
index 77e1b1a..e3f3061 100644
--- a/gnu/usr.bin/perl/pod/pod2html/Makefile
+++ b/gnu/usr.bin/perl/pod/pod2html/Makefile
@@ -5,10 +5,10 @@
 PROG=	pod2html
 
 ${PROG}: ${PROG}.PL
-	miniperl ${MINIPERLOPT} ${PROG}.PL
+	${MINIPERL} ${MINIPERLOPT} ${PROG}.PL
 
 ${PROG}.1: ${PROG}.PL
-	miniperl ${MINIPERLOPT} ${.OBJDIR}/../pod2man/pod2man ${PROG}.PL > ${PROG}.1
+	${MINIPERL} ${MINIPERLOPT} ${.OBJDIR}/../pod2man/pod2man ${PROG}.PL > ${PROG}.1
 
 .include <bsd.prog.mk>
 
diff --git a/gnu/usr.bin/perl/pod/pod2latex/Makefile b/gnu/usr.bin/perl/pod/pod2latex/Makefile
index 3b67d00..b2ea8b3 100644
--- a/gnu/usr.bin/perl/pod/pod2latex/Makefile
+++ b/gnu/usr.bin/perl/pod/pod2latex/Makefile
@@ -7,7 +7,7 @@ PROG=	pod2latex
 NOMAN=	true
 
 ${PROG}: ${PROG}.PL
-	miniperl ${MINIPERLOPT} ${PROG}.PL
+	${MINIPERL} ${MINIPERLOPT} ${PROG}.PL
 
 .include <bsd.prog.mk>
 
diff --git a/gnu/usr.bin/perl/pod/pod2man/Makefile b/gnu/usr.bin/perl/pod/pod2man/Makefile
index 99f1ec4..37cc2e6 100644
--- a/gnu/usr.bin/perl/pod/pod2man/Makefile
+++ b/gnu/usr.bin/perl/pod/pod2man/Makefile
@@ -5,10 +5,10 @@
 PROG=	pod2man
 
 ${PROG}: ${PROG}.PL
-	miniperl ${MINIPERLOPT} ${PROG}.PL
+	${MINIPERL} ${MINIPERLOPT} ${PROG}.PL
 
 ${PROG}.1: ${PROG}.PL
-	miniperl ${MINIPERLOPT} ${.OBJDIR}/../pod2man/pod2man ${PROG}.PL \
+	${MINIPERL} ${MINIPERLOPT} ${.OBJDIR}/../pod2man/pod2man ${PROG}.PL \
 		> ${PROG}.1
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/perl/pod/pod2text/Makefile b/gnu/usr.bin/perl/pod/pod2text/Makefile
index 13a425c..80cbb57 100644
--- a/gnu/usr.bin/perl/pod/pod2text/Makefile
+++ b/gnu/usr.bin/perl/pod/pod2text/Makefile
@@ -7,7 +7,7 @@ PROG=	pod2text
 NOMAN=	true
 
 ${PROG}: ${PROG}.PL
-	miniperl ${MINIPERLOPT} ${PROG}.PL
+	${MINIPERL} ${MINIPERLOPT} ${PROG}.PL
 
 .include <bsd.prog.mk>
 
diff --git a/gnu/usr.bin/perl/utils/Makefile.inc b/gnu/usr.bin/perl/utils/Makefile.inc
index 7e8a877..6ab43e2 100644
--- a/gnu/usr.bin/perl/utils/Makefile.inc
+++ b/gnu/usr.bin/perl/utils/Makefile.inc
@@ -4,16 +4,18 @@
 
 PERL5SRC=	${.CURDIR}/../../../../../contrib/perl5
 PERL5LIBSRC=	${.CURDIR}/../../libperl
+MINIPERL=	${.OBJDIR}/../../miniperl/miniperl
 
 .include "../Makefile.inc"
 
 MINIPERLOPT?=	-I${.OBJDIR}/../../perl/lib -I${.OBJDIR}/../../perl -I${PERL5SRC}
 
 ${PROG}: ${PROG}.PL
-	miniperl ${MINIPERLOPT} ${.OODATE}
+	${MINIPERL} ${MINIPERLOPT} ${.OODATE}
 
 ${PROG}.1: ${PROG}.PL
-	miniperl ${MINIPERLOPT} ${.OBJDIR}/../../pod/pod2man/pod2man ${.OODATE} > ${.TARGET}
+	${MINIPERL} ${MINIPERLOPT} \
+		${.OBJDIR}/../../pod/pod2man/pod2man ${.OODATE} > ${.TARGET}
 
 ${PROG}.PL: ${PERL5SRC}/utils/${PROG}.PL
 	ln -sf ${.OODATE} ${.TARGET}
diff --git a/gnu/usr.bin/perl/utils/h2ph/Makefile b/gnu/usr.bin/perl/utils/h2ph/Makefile
index 8b0c2c5..6951a3b 100644
--- a/gnu/usr.bin/perl/utils/h2ph/Makefile
+++ b/gnu/usr.bin/perl/utils/h2ph/Makefile
@@ -10,7 +10,7 @@ beforedepend all:	scripts
 
 afterinstall:
 	cd ${DESTDIR}/usr/include; \
-	miniperl -I${.OBJDIR}/lib ${.OBJDIR}/${PROG} -d \
+	${MINIPERL} -I${.OBJDIR}/lib ${.OBJDIR}/${PROG} -d \
 		${DESTDIR}/usr/libdata/perl/${VERSION}/mach * */*
 
 .PATH:	${PERL5SRC}
diff --git a/gnu/usr.bin/perl/x2p/Makefile.inc b/gnu/usr.bin/perl/x2p/Makefile.inc
index 335ffd7..9653614 100644
--- a/gnu/usr.bin/perl/x2p/Makefile.inc
+++ b/gnu/usr.bin/perl/x2p/Makefile.inc
@@ -5,6 +5,9 @@
 PERL5SRC=	${.CURDIR}/../../../../../contrib/perl5
 PERL5LIBSRC=	${.CURDIR}/../../libperl
 MINIPERLOPT?=	-I${.OBJDIR}/../../perl/lib -I${.OBJDIR}/../../perl
+MINIPERL=	${.OBJDIR}/../../miniperl/miniperl
+
+LDFLAGS+=	-L${.OBJDIR}/../../libperl
 
 STRIP=
 
diff --git a/gnu/usr.bin/perl/x2p/a2pl/Makefile b/gnu/usr.bin/perl/x2p/a2pl/Makefile
index e7ad753..5b8dbaa 100644
--- a/gnu/usr.bin/perl/x2p/a2pl/Makefile
+++ b/gnu/usr.bin/perl/x2p/a2pl/Makefile
@@ -24,4 +24,4 @@ temp:
 .SUFFIXES: .c .h .o
 
 ${PROG}.1: ${PROG}.pod
-	miniperl ${MINIPERLOPT} ${.OBJDIR}/../../pod/pod2man/pod2man ${.OODATE} > ${.TARGET}
+	${MINIPERL} ${MINIPERLOPT} ${.OBJDIR}/../../pod/pod2man/pod2man ${.OODATE} > ${.TARGET}
diff --git a/gnu/usr.bin/perl/x2p/find2pl/Makefile b/gnu/usr.bin/perl/x2p/find2pl/Makefile
index 600aece..5453d5e 100644
--- a/gnu/usr.bin/perl/x2p/find2pl/Makefile
+++ b/gnu/usr.bin/perl/x2p/find2pl/Makefile
@@ -6,10 +6,10 @@ PROG=	find2perl
 NOMAN=	true
 
 ${PROG}: ${PROG}.PL
-	miniperl ${MINIPERLOPT} ${.OODATE}
+	${MINIPERL} ${MINIPERLOPT} ${.OODATE}
 
 ${PROG}.1: ${PROG}.PL
-	miniperl ${MINIPERLOPT} ${.OBJDIR}/../../pod/pod2man/pod2man ${.OODATE} > ${.TARGET}
+	${MINIPERL} ${MINIPERLOPT} ${.OBJDIR}/../../pod/pod2man/pod2man ${.OODATE} > ${.TARGET}
 
 CLEANFILES+=	${PROG}.1 ${PROG}.PL
 
diff --git a/gnu/usr.bin/perl/x2p/s2pl/Makefile b/gnu/usr.bin/perl/x2p/s2pl/Makefile
index 9b1ad97..63e6062 100644
--- a/gnu/usr.bin/perl/x2p/s2pl/Makefile
+++ b/gnu/usr.bin/perl/x2p/s2pl/Makefile
@@ -5,10 +5,10 @@
 PROG=	s2p
 
 ${PROG}: ${PROG}.PL
-	miniperl ${MINIPERLOPT} ${.OODATE}
+	${MINIPERL} ${MINIPERLOPT} ${.OODATE}
 
 ${PROG}.1: ${PROG}.PL
-	miniperl ${MINIPERLOPT} ${.OBJDIR}/../../pod/pod2man/pod2man ${.OODATE} > ${.TARGET}
+	${MINIPERL} ${MINIPERLOPT} ${.OBJDIR}/../../pod/pod2man/pod2man ${.OODATE} > ${.TARGET}
 
 CLEANFILES+=	${PROG}.1 ${PROG}.PL