Use COPYTREE_SHARE.

Set DATADIR to make the process simpler.
No PORTREVISION bump, as no change to final product.

2 files changed, 91 insertions, 94 deletions

diff --git a/irc/insub/Makefile b/irc/insub/Makefile
index 9668663dc5a9..60fb32cc5526 100644
--- a/irc/insub/Makefile
+++ b/irc/insub/Makefile
@@ -1,33 +1,30 @@
 # Created by: Alfred Perlstein <alfred@FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=	insub
+PORTNAME=		insub
 PORTVERSION=	15.1
-CATEGORIES=	irc
+CATEGORIES=		irc
 MASTER_SITES=	http://cloud.github.com/downloads/cjones/insub/
 
-MAINTAINER=	adamw@FreeBSD.org
-COMMENT=	Some scripts for expressing how you feel on IRC and the web
+MAINTAINER=		adamw@FreeBSD.org
+COMMENT=		Some scripts for expressing how you feel on IRC and the web
 
 RUN_DEPENDS=	cowsay:${PORTSDIR}/games/cowsay \
-		figlet:${PORTSDIR}/misc/figlet
+				figlet:${PORTSDIR}/misc/figlet
 
-USES=	perl5
+USES=		perl5 tar:bzip2
 USE_PERL5=	run
 
-USE_BZIP2=	yes
-
 NO_BUILD=	yes
-
-SCRIPT=	${PORTNAME}.pl
+SCRIPT=		${PORTNAME}.pl
+DATADIR=	${PREFIX}/share/cows
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${SCRIPT} ${STAGEDIR}${PREFIX}/bin/${SCRIPT:R}
-	${MKDIR} ${STAGEDIR}${PREFIX}/share/irssi/scripts/
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/irssi/scripts/
 	${INSTALL_DATA} ${WRKSRC}/${SCRIPT} \
 		${STAGEDIR}${PREFIX}/share/irssi/scripts/${SCRIPT}
-	${MKDIR} ${STAGEDIR}${PREFIX}/share/cows/
-	cd ${WRKSRC} && \
-		${FIND} cows | ${CPIO} -pdmu ${STAGEDIR}${PREFIX}/share/
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	(cd ${WRKSRC}/cows && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
 
 .include <bsd.port.mk>
diff --git a/irc/insub/pkg-plist b/irc/insub/pkg-plist
index de8faa2f695f..006d723977fc 100644
--- a/irc/insub/pkg-plist
+++ b/irc/insub/pkg-plist
@@ -1,84 +1,84 @@
 bin/insub
-share/cows/2bear.cow
-share/cows/ahnold.cow
-share/cows/apple.cow
-share/cows/ass.cow
-share/cows/baa.cow
-share/cows/bendover.cow
-share/cows/bendover2.cow
-share/cows/bigcow.cow
-share/cows/blam.cow
-share/cows/cack.cow
-share/cows/cake.cow
-share/cows/canada.cow
-share/cows/chick1.cow
-share/cows/chocobo.cow
-share/cows/clippy.cow
-share/cows/clover.cow
-share/cows/cockasaur.cow
-share/cows/copter.cow
-share/cows/dance.cow
-share/cows/dick.cow
-share/cows/doggies.cow
-share/cows/duck.cow
-share/cows/erect.cow
-share/cows/ferret.cow
-share/cows/fish.cow
-share/cows/flag.cow
-share/cows/flagasaur.cow
-share/cows/goatse.cow
-share/cows/gobble.cow
-share/cows/heart.cow
-share/cows/invdragon.cow
-share/cows/ipedo.cow
-share/cows/jesus.cow
-share/cows/limp.cow
-share/cows/lobster.cow
-share/cows/missle.cow
-share/cows/nascar.cow
-share/cows/nuke.cow
-share/cows/nuke2.cow
-share/cows/pedo.cow
-share/cows/peek.cow
-share/cows/peepees.cow
-share/cows/penii.cow
-share/cows/penis.cow
-share/cows/penisbird.cow
-share/cows/pez.cow
-share/cows/pig.cow
-share/cows/pman.cow
-share/cows/point.cow
-share/cows/poland.cow
-share/cows/pr8.cow
-share/cows/psyduck.cow
-share/cows/puffy.cow
-share/cows/pumpkin.cow
-share/cows/puppy.cow
-share/cows/retard.cow
-share/cows/santa.cow
-share/cows/santa2.cow
-share/cows/saq.cow
-share/cows/satan.cow
-share/cows/shark.cow
-share/cows/shlong.cow
-share/cows/smpez.cow
-share/cows/spam.cow
-share/cows/spider.cow
-share/cows/standtall.cow
-share/cows/stud1.cow
-share/cows/stud2.cow
-share/cows/tampon.cow
-share/cows/turkey-penis.cow
-share/cows/urinal.cow
-share/cows/usa.cow
-share/cows/wang.cow
-share/cows/weed.cow
-share/cows/wtc.cow
-share/cows/wtf-pony.cow
-share/cows/wtf.cow
-share/cows/wtf2.cow
-share/cows/zig.cow
-@dirrmtry share/cows
+%%DATADIR%%/2bear.cow
+%%DATADIR%%/ahnold.cow
+%%DATADIR%%/apple.cow
+%%DATADIR%%/ass.cow
+%%DATADIR%%/baa.cow
+%%DATADIR%%/bendover.cow
+%%DATADIR%%/bendover2.cow
+%%DATADIR%%/bigcow.cow
+%%DATADIR%%/blam.cow
+%%DATADIR%%/cack.cow
+%%DATADIR%%/cake.cow
+%%DATADIR%%/canada.cow
+%%DATADIR%%/chick1.cow
+%%DATADIR%%/chocobo.cow
+%%DATADIR%%/clippy.cow
+%%DATADIR%%/clover.cow
+%%DATADIR%%/cockasaur.cow
+%%DATADIR%%/copter.cow
+%%DATADIR%%/dance.cow
+%%DATADIR%%/dick.cow
+%%DATADIR%%/doggies.cow
+%%DATADIR%%/duck.cow
+%%DATADIR%%/erect.cow
+%%DATADIR%%/ferret.cow
+%%DATADIR%%/fish.cow
+%%DATADIR%%/flag.cow
+%%DATADIR%%/flagasaur.cow
+%%DATADIR%%/goatse.cow
+%%DATADIR%%/gobble.cow
+%%DATADIR%%/heart.cow
+%%DATADIR%%/invdragon.cow
+%%DATADIR%%/ipedo.cow
+%%DATADIR%%/jesus.cow
+%%DATADIR%%/limp.cow
+%%DATADIR%%/lobster.cow
+%%DATADIR%%/missle.cow
+%%DATADIR%%/nascar.cow
+%%DATADIR%%/nuke.cow
+%%DATADIR%%/nuke2.cow
+%%DATADIR%%/pedo.cow
+%%DATADIR%%/peek.cow
+%%DATADIR%%/peepees.cow
+%%DATADIR%%/penii.cow
+%%DATADIR%%/penis.cow
+%%DATADIR%%/penisbird.cow
+%%DATADIR%%/pez.cow
+%%DATADIR%%/pig.cow
+%%DATADIR%%/pman.cow
+%%DATADIR%%/point.cow
+%%DATADIR%%/poland.cow
+%%DATADIR%%/pr8.cow
+%%DATADIR%%/psyduck.cow
+%%DATADIR%%/puffy.cow
+%%DATADIR%%/pumpkin.cow
+%%DATADIR%%/puppy.cow
+%%DATADIR%%/retard.cow
+%%DATADIR%%/santa.cow
+%%DATADIR%%/santa2.cow
+%%DATADIR%%/saq.cow
+%%DATADIR%%/satan.cow
+%%DATADIR%%/shark.cow
+%%DATADIR%%/shlong.cow
+%%DATADIR%%/smpez.cow
+%%DATADIR%%/spam.cow
+%%DATADIR%%/spider.cow
+%%DATADIR%%/standtall.cow
+%%DATADIR%%/stud1.cow
+%%DATADIR%%/stud2.cow
+%%DATADIR%%/tampon.cow
+%%DATADIR%%/turkey-penis.cow
+%%DATADIR%%/urinal.cow
+%%DATADIR%%/usa.cow
+%%DATADIR%%/wang.cow
+%%DATADIR%%/weed.cow
+%%DATADIR%%/wtc.cow
+%%DATADIR%%/wtf-pony.cow
+%%DATADIR%%/wtf.cow
+%%DATADIR%%/wtf2.cow
+%%DATADIR%%/zig.cow
+@dirrmtry %%DATADIR%%
 share/irssi/scripts/insub.pl
 @dirrmtry share/irssi/scripts
 @dirrmtry share/irssi