3 files changed, 52 insertions, 47 deletions

diff --git a/net/p5-Net-Amazon-MechanicalTurk/Makefile b/net/p5-Net-Amazon-MechanicalTurk/Makefile
index 1083a8775e95..8444eeebde3b 100644
--- a/net/p5-Net-Amazon-MechanicalTurk/Makefile
+++ b/net/p5-Net-Amazon-MechanicalTurk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Net-Amazon-MechanicalTurk
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -39,9 +40,11 @@ SUB_LIST+=	HOME=${HOME} EXAMPLESDIR=${EXAMPLESDIR}
 SUB_FILES=	pkg-message
 
 post-install:
-	@${MKDIR} ${EXAMPLESDIR}
-	cd ${WRKSRC}/samples && ${FIND} . -type d -exec ${MKDIR} ${EXAMPLESDIR}/{} \;
-	cd ${WRKSRC}/samples && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${EXAMPLESDIR}/{} \;
+.if !defined(NOPORTEXAMPLES)
+	@${INSTALL} -d ${EXAMPLESDIR}
+	@cd ${WRKSRC}/samples && ${FIND} . -type d -exec ${INSTALL} -d ${EXAMPLESDIR}/{} \;
+	@cd ${WRKSRC}/samples && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${EXAMPLESDIR}/{} \;
+.endif
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/net/p5-Net-Amazon-MechanicalTurk/files/pkg-message.in b/net/p5-Net-Amazon-MechanicalTurk/files/pkg-message.in
index 12929c3b64e3..78d61a2863cd 100644
--- a/net/p5-Net-Amazon-MechanicalTurk/files/pkg-message.in
+++ b/net/p5-Net-Amazon-MechanicalTurk/files/pkg-message.in
@@ -11,7 +11,7 @@ You need to do some things before you can use the Amazon Mechanical Turk:
    %%HOME%%/.aws/auth.
 
 3) Try out the samples in %%EXAMPLESDIR%%,
-   if you like.
+   if you installed them.
 
 4) Use the MTurk Sandbox to create HITs in a development environment for
    free. This Perl module uses the sandbox by default.
diff --git a/net/p5-Net-Amazon-MechanicalTurk/pkg-plist b/net/p5-Net-Amazon-MechanicalTurk/pkg-plist
index 30cdf223dc2e..fbe7037bca91 100644
--- a/net/p5-Net-Amazon-MechanicalTurk/pkg-plist
+++ b/net/p5-Net-Amazon-MechanicalTurk/pkg-plist
@@ -39,54 +39,56 @@
 %%SITE_PERL%%/Net/Amazon/MechanicalTurk/Transport/RESTTransport.pm
 %%SITE_PERL%%/Net/Amazon/MechanicalTurk/XMLParser.pm
 %%SITE_PERL%%/Net/Amazon/mturk_install.pl
-%%EXAMPLESDIR%%/accountBalance/README.txt
-%%EXAMPLESDIR%%/accountBalance/accountbalance.pl
-%%EXAMPLESDIR%%/best_image/BestImage.pl
-%%EXAMPLESDIR%%/best_image/README.txt
-%%EXAMPLESDIR%%/best_image/best_image.properties
-%%EXAMPLESDIR%%/best_image/best_image.question
-%%EXAMPLESDIR%%/helloworld/README.txt
-%%EXAMPLESDIR%%/helloworld/helloworld-answer.pl
-%%EXAMPLESDIR%%/helloworld/helloworld-create.pl
-%%EXAMPLESDIR%%/listHITs/README.txt
-%%EXAMPLESDIR%%/listHITs/listHITs.pl
-%%EXAMPLESDIR%%/loadHITs/README.txt
-%%EXAMPLESDIR%%/loadHITs/approveRemaining.pl
-%%EXAMPLESDIR%%/loadHITs/getresults.pl
-%%EXAMPLESDIR%%/loadHITs/loadhits-input.csv
-%%EXAMPLESDIR%%/loadHITs/loadhits.pl
-%%EXAMPLESDIR%%/loadHITs/reject.pl
-%%EXAMPLESDIR%%/loadHITs/removehits.pl
-%%EXAMPLESDIR%%/loadHITsFromCustomCode/README.txt
-%%EXAMPLESDIR%%/loadHITsFromCustomCode/cities.xml
-%%EXAMPLESDIR%%/loadHITsFromCustomCode/loadhits.pl
-%%EXAMPLESDIR%%/loadHITsFromCustomCode/loadhits2.pl
-%%EXAMPLESDIR%%/loadHITsFromDB/README.txt
-%%EXAMPLESDIR%%/loadHITsFromDB/createdb.pl
-%%EXAMPLESDIR%%/loadHITsFromDB/dumptables.pl
-%%EXAMPLESDIR%%/loadHITsFromDB/loadhits.pl
-%%EXAMPLESDIR%%/removeAllHITs/README.txt
-%%EXAMPLESDIR%%/removeAllHITs/removeAllHITs.pl
-%%EXAMPLESDIR%%/simple_survey/README.txt
-%%EXAMPLESDIR%%/simple_survey/SimpleSurvey.pl
-%%EXAMPLESDIR%%/simple_survey/simple_survey.question
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/accountBalance/README.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/accountBalance/accountbalance.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/best_image/BestImage.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/best_image/README.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/best_image/best_image.properties
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/best_image/best_image.question
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/helloworld/README.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/helloworld/helloworld-answer.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/helloworld/helloworld-create.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/listHITs/README.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/listHITs/listHITs.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/loadHITs/README.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/loadHITs/approveRemaining.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/loadHITs/getresults.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/loadHITs/loadhits-input.csv
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/loadHITs/loadhits.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/loadHITs/reject.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/loadHITs/removehits.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/loadHITsFromCustomCode/README.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/loadHITsFromCustomCode/cities.xml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/loadHITsFromCustomCode/loadhits.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/loadHITsFromCustomCode/loadhits2.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/loadHITsFromDB/README.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/loadHITsFromDB/createdb.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/loadHITsFromDB/dumptables.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/loadHITsFromDB/loadhits.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/removeAllHITs/README.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/removeAllHITs/removeAllHITs.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple_survey/README.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple_survey/SimpleSurvey.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple_survey/simple_survey.question
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Amazon/MechanicalTurk/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Amazon/MechanicalTurk
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Amazon
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Amazon
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
 @dirrm %%SITE_PERL%%/Net/Amazon/MechanicalTurk/Transport
 @dirrm %%SITE_PERL%%/Net/Amazon/MechanicalTurk/Template
 @dirrm %%SITE_PERL%%/Net/Amazon/MechanicalTurk/RowData
 @dirrm %%SITE_PERL%%/Net/Amazon/MechanicalTurk/QAPValidator
 @dirrm %%SITE_PERL%%/Net/Amazon/MechanicalTurk/Command
 @dirrm %%SITE_PERL%%/Net/Amazon/MechanicalTurk
-@dirrm %%SITE_PERL%%/Net/Amazon
-@dirrm %%EXAMPLESDIR%%/simple_survey
-@dirrm %%EXAMPLESDIR%%/removeAllHITs
-@dirrm %%EXAMPLESDIR%%/loadHITsFromDB
-@dirrm %%EXAMPLESDIR%%/loadHITsFromCustomCode
-@dirrm %%EXAMPLESDIR%%/loadHITs
-@dirrm %%EXAMPLESDIR%%/listHITs
-@dirrm %%EXAMPLESDIR%%/helloworld
-@dirrm %%EXAMPLESDIR%%/best_image
-@dirrm %%EXAMPLESDIR%%/accountBalance
-@dirrm %%EXAMPLESDIR%%
+@dirrmtry %%SITE_PERL%%/Net/Amazon
+@dirrmtry %%SITE_PERL%%/Net
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/simple_survey
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/removeAllHITs
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/loadHITsFromDB
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/loadHITsFromCustomCode
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/loadHITs
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/listHITs
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/helloworld
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/best_image
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/accountBalance
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%