3 files changed, 20 insertions, 27 deletions

diff --git a/gnu/usr.bin/perl/x2p/Makefile.inc b/gnu/usr.bin/perl/x2p/Makefile.inc
index 7f8371ceb29f..fb78cfff2513 100644
--- a/gnu/usr.bin/perl/x2p/Makefile.inc
+++ b/gnu/usr.bin/perl/x2p/Makefile.inc
@@ -4,10 +4,25 @@
 
 PERL5SRC=	${.CURDIR}/../../../../../contrib/perl5
 PERL5LIBSRC=	${.CURDIR}/../../libperl
+
+.include "../Makefile.inc"
+
 MINIPERLOPT?=	-I${.OBJDIR}/../../perl/lib -I${.OBJDIR}/../../perl
 
-LDFLAGS+=	-L${.OBJDIR}/../../libperl
+.if defined(SCRIPTS)
+.if !defined(NOMAN)
+MAN=	${SCRIPTS}.1
+.endif
 
-STRIP=
+${SCRIPTS}: ${SCRIPTS}.PL
+	${MINIPERL} ${MINIPERLOPT} ${.ALLSRC}
 
-.include "../Makefile.inc"
+${SCRIPTS}.1: ${SCRIPTS}.PL
+	${MINIPERL} ${MINIPERLOPT} \
+		${.OBJDIR}/../../pod/pod2man/pod2man ${.ALLSRC} > ${.TARGET}
+
+${SCRIPTS}.PL: ${PERL5SRC}/x2p/${SCRIPTS}.PL
+	ln -sf ${.ALLSRC} ${.TARGET}
+
+CLEANFILES+=	${SCRIPTS} ${SCRIPTS}.1 ${SCRIPTS}.PL
+.endif
diff --git a/gnu/usr.bin/perl/x2p/find2pl/Makefile b/gnu/usr.bin/perl/x2p/find2pl/Makefile
index 5453d5e6ff73..ff5a1592a458 100644
--- a/gnu/usr.bin/perl/x2p/find2pl/Makefile
+++ b/gnu/usr.bin/perl/x2p/find2pl/Makefile
@@ -2,18 +2,7 @@
 # $FreeBSD$
 #
 
-PROG=	find2perl
+SCRIPTS=find2perl
 NOMAN=	true
 
-${PROG}: ${PROG}.PL
-	${MINIPERL} ${MINIPERLOPT} ${.OODATE}
-
-${PROG}.1: ${PROG}.PL
-	${MINIPERL} ${MINIPERLOPT} ${.OBJDIR}/../../pod/pod2man/pod2man ${.OODATE} > ${.TARGET}
-
-CLEANFILES+=	${PROG}.1 ${PROG}.PL
-
 .include <bsd.prog.mk>
-
-${PROG}.PL: ${PERL5SRC}/x2p/${PROG}.PL
-	@ln -sf ${.OODATE} ${.TARGET}
diff --git a/gnu/usr.bin/perl/x2p/s2pl/Makefile b/gnu/usr.bin/perl/x2p/s2pl/Makefile
index 63e6062f222a..e10e30cd83b3 100644
--- a/gnu/usr.bin/perl/x2p/s2pl/Makefile
+++ b/gnu/usr.bin/perl/x2p/s2pl/Makefile
@@ -2,17 +2,6 @@
 # $FreeBSD$
 #
 
-PROG=	s2p
-
-${PROG}: ${PROG}.PL
-	${MINIPERL} ${MINIPERLOPT} ${.OODATE}
-
-${PROG}.1: ${PROG}.PL
-	${MINIPERL} ${MINIPERLOPT} ${.OBJDIR}/../../pod/pod2man/pod2man ${.OODATE} > ${.TARGET}
-
-CLEANFILES+=	${PROG}.1 ${PROG}.PL
+SCRIPTS=s2p
 
 .include <bsd.prog.mk>
-
-${PROG}.PL: ${PERL5SRC}/x2p/${PROG}.PL
-	@ln -sf ${.OODATE} ${.TARGET}