Update to 6.6.

Submitted by: Chris Jones <cjones@gruntle.org>

4 files changed, 69 insertions, 173 deletions

diff --git a/irc/insub/Makefile b/irc/insub/Makefile
index 9751e9292803..5b7be1ed0d49 100644
--- a/irc/insub/Makefile
+++ b/irc/insub/Makefile
@@ -6,41 +6,37 @@
 #
 
 PORTNAME=	insub
-PORTVERSION=	6.5
+PORTVERSION=	6.6
 PORTREVISION?=	0
 CATEGORIES?=	irc
-MASTER_SITES=	http://gruntle.org/projects/irssi/gay/
+MASTER_SITES=	http://gruntle.org/projects/irssi/insub/
 
 MAINTAINER?=	alfred@FreeBSD.org
 COMMENT?=	Some scripts for expressing how you really feel on irc
 
-WITH_PERL=	YES
+NO_BUILD=	YES
 
-BUILD_DEPENDS+=	irsii:${PORTSDIR}/irc/irssi
+SCRIPT=		${PORTNAME}.pl
+
+BUILD_DEPENDS+=	irssi:${PORTSDIR}/irc/irssi+perl
 RUN_DEPENDS+=	figlet:${PORTSDIR}/misc/figlet
 BUILD_DEPENDS+=	cowsay:${PORTSDIR}/games/cowsay
 
 .include <bsd.port.pre.mk>
 
-COWS!=sed 's@^@cows/@' < ${FILESDIR}/cows
-SCRIPT=gay-${PORTVERSION}.pl
-INSTSCRIPT=gay.pl
-DISTFILES= ${SCRIPT} ${COWS}
-DIST_SUBDIR?= insub
-NO_BUILD=YES
-EXTRACT_CMD=echo
-DISTCOWS=${COWS:S@^@${DISTDIR}/${DIST_SUBDIR}/@}
-
-pre-extract:
-	[ -d "${WRKDIR}" ] || mkdir ${WRKDIR}
-
-# $PREFIX/share/irssi
+post-install:
+	@${ECHO}
+	@${ECHO} "    insub has been installed in irssi's global script store."
+	@${ECHO} "    To run, you should type '/script load insub' from within"
+	@${ECHO} "    the irssi client."
+	@${ECHO}
 
 do-install:
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${SCRIPT} \
-		${LOCALBASE}/share/irssi/scripts/${INSTSCRIPT}
-	for i in ${DISTCOWS} ; do \
-		${INSTALL_DATA} $$i ${LOCALBASE}/share/cows ;	\
+	${INSTALL_DATA} ${WRKSRC}/${SCRIPT} \
+		${LOCALBASE}/share/irssi/scripts/${SCRIPT}
+	for i in ${WRKSRC}/cows/* ; do \
+		${INSTALL_DATA} $$i ${LOCALBASE}/share/cows; \
 	done
 
+
 .include <bsd.port.post.mk>
diff --git a/irc/insub/distinfo b/irc/insub/distinfo
index 09427d91604f..f3f2258cfc24 100644
--- a/irc/insub/distinfo
+++ b/irc/insub/distinfo
@@ -1,51 +1 @@
-MD5 (insub/gay-6.5.pl) = 5cc3ffdc505b1e9b20d27fe2c9800dd0
-MD5 (insub/cows/2bear.cow) = cb440e6445dcac10fdbff59f2ff684ed
-MD5 (insub/cows/ahnold.cow) = f44903ce42157cee96d20ebb156275a3
-MD5 (insub/cows/apple.cow) = 41658b1213a1882dba2e12ac2de2c000
-MD5 (insub/cows/ass.cow) = bd8bbb8118f6c3e56382d368faf7c8eb
-MD5 (insub/cows/baa.cow) = ec6b16bdf53d133615002d825424ca6c
-MD5 (insub/cows/bendover.cow) = 844557a2ee13e1cfc99ce755e70a4ec5
-MD5 (insub/cows/bigcow.cow) = cd096032d4582cee2f2bdc6ae851895d
-MD5 (insub/cows/blam.cow) = c3fdd66997402ec5869b66d4028121d2
-MD5 (insub/cows/box.cow) = f083ae03151fa3a6dc9b3b8779a40746
-MD5 (insub/cows/cack.cow) = d3b6ac5a3d14ce8f3200fc800937e091
-MD5 (insub/cows/canada.cow) = 1076de16c96ba06ff81fbcbdbbaf7de4
-MD5 (insub/cows/chick1.cow) = e25aae09f021bf04e82f96b7fc678166
-MD5 (insub/cows/cockasaur.cow) = 90151c5d0b871cbfa58cb49b6a1c5365
-MD5 (insub/cows/copter.cow) = eb9a6308a8443b5fa4052a6635c55e93
-MD5 (insub/cows/dance.cow) = b495b33cd342a20e8f46c414fc98566f
-MD5 (insub/cows/dick.cow) = 259369a0e39cc3eecbf5421576ed8477
-MD5 (insub/cows/doggies.cow) = 25952e1280d36097795d22d922a3328a
-MD5 (insub/cows/duck.cow) = b442f19410f1aee2411700c52b04aae3
-MD5 (insub/cows/ferret.cow) = a15c058f7505a7473745389214ad1926
-MD5 (insub/cows/fish.cow) = 7f7cfb705d6e13978e2faca8cb62cfd4
-MD5 (insub/cows/flag.cow) = 4d8c69612f20fe84c858e34639801e21
-MD5 (insub/cows/goatse.cow) = bba86d20d78e9c1f2235a8f008f68947
-MD5 (insub/cows/gobble.cow) = 085ec3d48d417f08bf8c310a5807e706
-MD5 (insub/cows/heart.cow) = 9bf1cfdbb5ea98abf90da4eb35c4c160
-MD5 (insub/cows/invdragon.cow) = e2f0b755d9f2c113d8a33b24af07a07d
-MD5 (insub/cows/jesus.cow) = 33a3181f248acaa5ba92e263f3947845
-MD5 (insub/cows/jkh.cow) = 6b57e2a5121be249831cb3464b35196d
-MD5 (insub/cows/limp.cow) = 07783c7b1228f3d3bb3f2327ff76f5c5
-MD5 (insub/cows/peek.cow) = 8ab24439c37070d8225bd5a23920cff2
-MD5 (insub/cows/peepees.cow) = 6a58f9647fbcf928c33c80707178155c
-MD5 (insub/cows/penis.cow) = 5c73ff67b7b172e89775bd1a97e41323
-MD5 (insub/cows/penisbird.cow) = b879edb241814a5f4b8b6d9543d2b5b3
-MD5 (insub/cows/pman.cow) = 5bbee2eaa37e9fdeb53eac88657d52df
-MD5 (insub/cows/point.cow) = ace3fdf97c7929fd890d5450a2746378
-MD5 (insub/cows/pr8.cow) = 3690930b2fcc88b388639c0139508f47
-MD5 (insub/cows/puffy.cow) = 70ff9a81e94392b5ac6d7528d0c9f835
-MD5 (insub/cows/retard.cow) = 546ab3b1dba10f5d42b9bc0e3524f3df
-MD5 (insub/cows/santa.cow) = 6cbbd89df5be511b9590f03e1cc0c269
-MD5 (insub/cows/saq.cow) = fff6adb6549440a42368934b3e3d5bd1
-MD5 (insub/cows/satan.cow) = 45b133de745c238375831285128fb069
-MD5 (insub/cows/spam.cow) = b7f900b225daf3be77e85c2ed1eb6b2c
-MD5 (insub/cows/stud1.cow) = f49c30e928d73a4942b8990a0310c70c
-MD5 (insub/cows/stud2.cow) = c869316370701ac17e76515ca7467acb
-MD5 (insub/cows/tux-stab.cow) = e6327fba20441afbc89debe8652d0b48
-MD5 (insub/cows/usa.cow) = f454dde504cf80f466bd9c6868742fdf
-MD5 (insub/cows/wang.cow) = 572f73038ad7fe2cc9d72a0d451ab642
-MD5 (insub/cows/weed.cow) = dcf058fe655be603698c804a80c96cb0
-MD5 (insub/cows/wtf-pony.cow) = a6ab5324d4bd37f51609b7d9741c9538
-MD5 (insub/cows/wtf.cow) = 5f2658958536f3f2ab59709793a86cce
-MD5 (insub/cows/zig.cow) = ac4fb0c188f7bc886ab3a219a60a7cca
+MD5 (insub-6.6.tar.gz) = f18493199f386c84844d293984601515
diff --git a/irc/insub/files/cows b/irc/insub/files/cows
deleted file mode 100644
index dc7d98f30f9a..000000000000
--- a/irc/insub/files/cows
+++ /dev/null
@@ -1,50 +0,0 @@
-2bear.cow
-ahnold.cow
-apple.cow
-ass.cow
-baa.cow
-bendover.cow
-bigcow.cow
-blam.cow
-box.cow
-cack.cow
-canada.cow
-chick1.cow
-cockasaur.cow
-copter.cow
-dance.cow
-dick.cow
-doggies.cow
-duck.cow
-ferret.cow
-fish.cow
-flag.cow
-goatse.cow
-gobble.cow
-heart.cow
-invdragon.cow
-jesus.cow
-jkh.cow
-limp.cow
-peek.cow
-peepees.cow
-penis.cow
-penisbird.cow
-pman.cow
-point.cow
-pr8.cow
-puffy.cow
-retard.cow
-santa.cow
-saq.cow
-satan.cow
-spam.cow
-stud1.cow
-stud2.cow
-tux-stab.cow
-usa.cow
-wang.cow
-weed.cow
-wtf-pony.cow
-wtf.cow
-zig.cow
diff --git a/irc/insub/pkg-plist b/irc/insub/pkg-plist
index f7f8be60a921..3649f0deaeb5 100644
--- a/irc/insub/pkg-plist
+++ b/irc/insub/pkg-plist
@@ -1,51 +1,51 @@
-%%LOCALBASE%%/share/irssi/scripts/%%INSTSCRIPT%%
-%%LOCALBASE%%/share/cows2bear.cow
-%%LOCALBASE%%/share/cowsahnold.cow
-%%LOCALBASE%%/share/cowsapple.cow
-%%LOCALBASE%%/share/cowsass.cow
-%%LOCALBASE%%/share/cowsbaa.cow
-%%LOCALBASE%%/share/cowsbendover.cow
-%%LOCALBASE%%/share/cowsbigcow.cow
-%%LOCALBASE%%/share/cowsblam.cow
-%%LOCALBASE%%/share/cowsbox.cow
-%%LOCALBASE%%/share/cowscack.cow
-%%LOCALBASE%%/share/cowscanada.cow
-%%LOCALBASE%%/share/cowschick1.cow
-%%LOCALBASE%%/share/cowscockasaur.cow
-%%LOCALBASE%%/share/cowscopter.cow
-%%LOCALBASE%%/share/cowsdance.cow
-%%LOCALBASE%%/share/cowsdick.cow
-%%LOCALBASE%%/share/cowsdoggies.cow
-%%LOCALBASE%%/share/cowsduck.cow
-%%LOCALBASE%%/share/cowsferret.cow
-%%LOCALBASE%%/share/cowsfish.cow
-%%LOCALBASE%%/share/cowsflag.cow
-%%LOCALBASE%%/share/cowsgoatse.cow
-%%LOCALBASE%%/share/cowsgobble.cow
-%%LOCALBASE%%/share/cowsheart.cow
-%%LOCALBASE%%/share/cowsinvdragon.cow
-%%LOCALBASE%%/share/cowsjesus.cow
-%%LOCALBASE%%/share/cowsjkh.cow
-%%LOCALBASE%%/share/cowslimp.cow
-%%LOCALBASE%%/share/cowspeek.cow
-%%LOCALBASE%%/share/cowspeepees.cow
-%%LOCALBASE%%/share/cowspenis.cow
-%%LOCALBASE%%/share/cowspenisbird.cow
-%%LOCALBASE%%/share/cowspman.cow
-%%LOCALBASE%%/share/cowspoint.cow
-%%LOCALBASE%%/share/cowspr8.cow
-%%LOCALBASE%%/share/cowspuffy.cow
-%%LOCALBASE%%/share/cowsretard.cow
-%%LOCALBASE%%/share/cowssanta.cow
-%%LOCALBASE%%/share/cowssaq.cow
-%%LOCALBASE%%/share/cowssatan.cow
-%%LOCALBASE%%/share/cowsspam.cow
-%%LOCALBASE%%/share/cowsstud1.cow
-%%LOCALBASE%%/share/cowsstud2.cow
-%%LOCALBASE%%/share/cowstux-stab.cow
-%%LOCALBASE%%/share/cowsusa.cow
-%%LOCALBASE%%/share/cowswang.cow
-%%LOCALBASE%%/share/cowsweed.cow
-%%LOCALBASE%%/share/cowswtf-pony.cow
-%%LOCALBASE%%/share/cowswtf.cow
-%%LOCALBASE%%/share/cowszig.cow
+share/irssi/scripts/insub.pl
+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/bigcow.cow
+share/cows/blam.cow
+share/cows/box.cow
+share/cows/cack.cow
+share/cows/canada.cow
+share/cows/chick1.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/ferret.cow
+share/cows/fish.cow
+share/cows/flag.cow
+share/cows/goatse.cow
+share/cows/gobble.cow
+share/cows/heart.cow
+share/cows/invdragon.cow
+share/cows/jesus.cow
+share/cows/jkh.cow
+share/cows/limp.cow
+share/cows/peek.cow
+share/cows/peepees.cow
+share/cows/penis.cow
+share/cows/penisbird.cow
+share/cows/pman.cow
+share/cows/point.cow
+share/cows/pr8.cow
+share/cows/puffy.cow
+share/cows/retard.cow
+share/cows/santa.cow
+share/cows/saq.cow
+share/cows/satan.cow
+share/cows/spam.cow
+share/cows/stud1.cow
+share/cows/stud2.cow
+share/cows/tux-stab.cow
+share/cows/usa.cow
+share/cows/wang.cow
+share/cows/weed.cow
+share/cows/wtf-pony.cow
+share/cows/wtf.cow
+share/cows/zig.cow