From d3a86a7bd90d8d639073fc0235fc46acf0766245 Mon Sep 17 00:00:00 2001
From: "Vanilla I. Shu" <vanilla@FreeBSD.org>
Date: Tue, 5 Nov 2013 12:30:46 +0000
Subject: [PATCH] Support STAGEDIR.

---
 comms/p5-Device-Modem/Makefile        | 14 +++-----------
 comms/p5-Device-Modem/pkg-plist       | 16 +++++++++++-----
 comms/p5-Device-SerialPort/Makefile   |  4 ----
 comms/p5-Device-SerialPort/pkg-plist  |  2 ++
 comms/p5-Fax-Hylafax-Client/Makefile  |  5 +----
 comms/p5-Fax-Hylafax-Client/pkg-plist |  5 +++--
 6 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/comms/p5-Device-Modem/Makefile b/comms/p5-Device-Modem/Makefile
index 7059603377a6..928b43f64b5d 100644
--- a/comms/p5-Device-Modem/Makefile
+++ b/comms/p5-Device-Modem/Makefile
@@ -11,24 +11,16 @@ MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl class to interface generic modems (AT-compliant)
 
 BUILD_DEPENDS=	p5-Device-SerialPort>=0:${PORTSDIR}/comms/p5-Device-SerialPort
-RUN_DEPENDS=	p5-Device-SerialPort>=0:${PORTSDIR}/comms/p5-Device-SerialPort
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Device::Modem.3 \
-		Device::Modem::FAQ.3 \
-		Device::Modem::Log::File.3 \
-		Device::Modem::Log::Syslog.3 \
-		Device::Modem::Protocol::Xmodem.3 \
-		Device::Modem::UsRobotics.3
-
-NO_STAGE=	yes
 post-install:
 .ifndef(NOPORTEXAMPLES)
 	@${ECHO_MSG} "===>   Installing examples for ${PKGNAME}"
-	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/examples/*.pl ${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/examples/*.pl ${STAGEDIR}${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/comms/p5-Device-Modem/pkg-plist b/comms/p5-Device-Modem/pkg-plist
index c6f35a1efd78..eb5e4b086ee9 100644
--- a/comms/p5-Device-Modem/pkg-plist
+++ b/comms/p5-Device-Modem/pkg-plist
@@ -1,9 +1,15 @@
+%%PERL5_MAN3%%/Device::Modem.3.gz
+%%PERL5_MAN3%%/Device::Modem::FAQ.3.gz
+%%PERL5_MAN3%%/Device::Modem::Log::File.3.gz
+%%PERL5_MAN3%%/Device::Modem::Log::Syslog.3.gz
+%%PERL5_MAN3%%/Device::Modem::Protocol::Xmodem.3.gz
+%%PERL5_MAN3%%/Device::Modem::UsRobotics.3.gz
+%%SITE_PERL%%/Device/Modem.pm
 %%SITE_PERL%%/Device/Modem/FAQ.pod
 %%SITE_PERL%%/Device/Modem/Log/File.pm
 %%SITE_PERL%%/Device/Modem/Log/Syslog.pm
 %%SITE_PERL%%/Device/Modem/Protocol/Xmodem.pm
 %%SITE_PERL%%/Device/Modem/UsRobotics.pm
-%%SITE_PERL%%/Device/Modem.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Device/Modem/.packlist
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/active.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/caller-id.pl
@@ -11,9 +17,9 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/shell.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/xmodem.pl
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Device/Modem
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Device/Modem
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Device
-@dirrm %%SITE_PERL%%/Device/Modem/Protocol
-@dirrm %%SITE_PERL%%/Device/Modem/Log
-@dirrm %%SITE_PERL%%/Device/Modem
+@dirrmtry %%SITE_PERL%%/Device/Modem/Protocol
+@dirrmtry %%SITE_PERL%%/Device/Modem/Log
+@dirrmtry %%SITE_PERL%%/Device/Modem
 @dirrmtry %%SITE_PERL%%/Device
diff --git a/comms/p5-Device-SerialPort/Makefile b/comms/p5-Device-SerialPort/Makefile
index ca8fe67c9bd7..08cfca4ebae7 100644
--- a/comms/p5-Device-SerialPort/Makefile
+++ b/comms/p5-Device-SerialPort/Makefile
@@ -14,8 +14,4 @@ COMMENT=	Perl5 module for simple serial port control
 USES=		perl5
 USE_PERL5=	configure
 
-MAN1=		modemtest.1
-MAN3=		Device::SerialPort.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/comms/p5-Device-SerialPort/pkg-plist b/comms/p5-Device-SerialPort/pkg-plist
index b1980725db19..6989bde87ca2 100644
--- a/comms/p5-Device-SerialPort/pkg-plist
+++ b/comms/p5-Device-SerialPort/pkg-plist
@@ -1,8 +1,10 @@
 bin/modemtest
+%%PERL5_MAN3%%/Device::SerialPort.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/Device/SerialPort.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Device/SerialPort/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Device/SerialPort/SerialPort.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Device/SerialPort/SerialPort.so
+man/man1/modemtest.1.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Device/SerialPort
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Device
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Device
diff --git a/comms/p5-Fax-Hylafax-Client/Makefile b/comms/p5-Fax-Hylafax-Client/Makefile
index a9803bbb86ed..ab43f57dbab4 100644
--- a/comms/p5-Fax-Hylafax-Client/Makefile
+++ b/comms/p5-Fax-Hylafax-Client/Makefile
@@ -11,12 +11,9 @@ MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Simple Perl client for the HylaFAX fax server
 
 BUILD_DEPENDS=	p5-Net>=0:${PORTSDIR}/net/p5-Net
-RUN_DEPENDS=	p5-Net>=0:${PORTSDIR}/net/p5-Net
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Fax::Hylafax::Client.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/comms/p5-Fax-Hylafax-Client/pkg-plist b/comms/p5-Fax-Hylafax-Client/pkg-plist
index 1caa6f69129d..98ebff9b439a 100644
--- a/comms/p5-Fax-Hylafax-Client/pkg-plist
+++ b/comms/p5-Fax-Hylafax-Client/pkg-plist
@@ -1,7 +1,8 @@
+%%PERL5_MAN3%%/Fax::Hylafax::Client.3.gz
 %%SITE_PERL%%/Fax/Hylafax/Client.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Fax/Hylafax/Client/.packlist
-@dirrmtry %%SITE_PERL%%/Fax/Hylafax
-@dirrmtry %%SITE_PERL%%/Fax
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Fax/Hylafax/Client
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Fax/Hylafax
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Fax
+@dirrmtry %%SITE_PERL%%/Fax/Hylafax
+@dirrmtry %%SITE_PERL%%/Fax