Update to 16.0.

3 files changed, 101 insertions, 91 deletions

diff --git a/irc/insub/Makefile b/irc/insub/Makefile
index 60fb32cc5526..6e0154650fb4 100644
--- a/irc/insub/Makefile
+++ b/irc/insub/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=		insub
-PORTVERSION=	15.1
+PORTVERSION=	16.0
 CATEGORIES=		irc
-MASTER_SITES=	http://cloud.github.com/downloads/cjones/insub/
+MASTER_SITES=	http://github.com/cjones/${PORTNAME}/archive/${DISTNAME}.tar.gz?dummy=/
 
 MAINTAINER=		adamw@FreeBSD.org
 COMMENT=		Some scripts for expressing how you feel on IRC and the web
@@ -12,19 +12,29 @@ COMMENT=		Some scripts for expressing how you feel on IRC and the web
 RUN_DEPENDS=	cowsay:${PORTSDIR}/games/cowsay \
 				figlet:${PORTSDIR}/misc/figlet
 
-USES=		perl5 tar:bzip2
+USES=		perl5
 USE_PERL5=	run
+USE_PYTHON=	2.5+
+
+OPTIONS_DEFINE=	COWS
+OPTIONS_DEFAULT=COWS
+COWS_DESC=		Install a collection of cowsay(1) cows
+OPTIONS_SUB=	yes
 
 NO_BUILD=	yes
-SCRIPT=		${PORTNAME}.pl
+WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTNAME}
 DATADIR=	${PREFIX}/share/cows
 
+post-patch:
+	${REINPLACE_CMD} -e 's,/usr/local,${PREFIX},g' \
+		${WRKSRC}/${PORTNAME}.py ${WRKSRC}/irssi/${PORTNAME}.pl
+
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/${SCRIPT} ${STAGEDIR}${PREFIX}/bin/${SCRIPT:R}
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/irssi/scripts/
-	${INSTALL_DATA} ${WRKSRC}/${SCRIPT} \
-		${STAGEDIR}${PREFIX}/share/irssi/scripts/${SCRIPT}
+	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.py ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/irssi/scripts
+	${INSTALL_DATA} ${WRKSRC}/irssi/${PORTNAME}.pl \
+		${STAGEDIR}${PREFIX}/share/irssi/scripts
 	@${MKDIR} ${STAGEDIR}${DATADIR}
-	(cd ${WRKSRC}/cows && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
+	(cd ${WRKSRC}/old/cows-extra && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
 
 .include <bsd.port.mk>
diff --git a/irc/insub/distinfo b/irc/insub/distinfo
index 7e5cce9cc436..04bfc727d7d9 100644
--- a/irc/insub/distinfo
+++ b/irc/insub/distinfo
@@ -1,2 +1,2 @@
-SHA256 (insub-15.1.tar.bz2) = 46b0c975ffa2f8b83fbc6ba1ef72423042664e5e737960e9afc8a869359c8b04
-SIZE (insub-15.1.tar.bz2) = 50569
+SHA256 (insub-16.0.tar.gz) = 6d7adb6d420e67ec802911672dfa0a17e84549aef28160dbaf81e4fbea5f375a
+SIZE (insub-16.0.tar.gz) = 1988395
diff --git a/irc/insub/pkg-plist b/irc/insub/pkg-plist
index 006d723977fc..02c47b585314 100644
--- a/irc/insub/pkg-plist
+++ b/irc/insub/pkg-plist
@@ -1,84 +1,84 @@
 bin/insub
-%%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%%
+%%COWS%%%%DATADIR%%/2bear.cow
+%%COWS%%%%DATADIR%%/ahnold.cow
+%%COWS%%%%DATADIR%%/apple.cow
+%%COWS%%%%DATADIR%%/ass.cow
+%%COWS%%%%DATADIR%%/baa.cow
+%%COWS%%%%DATADIR%%/bendover.cow
+%%COWS%%%%DATADIR%%/bendover2.cow
+%%COWS%%%%DATADIR%%/bigcow.cow
+%%COWS%%%%DATADIR%%/blam.cow
+%%COWS%%%%DATADIR%%/cack.cow
+%%COWS%%%%DATADIR%%/cake.cow
+%%COWS%%%%DATADIR%%/canada.cow
+%%COWS%%%%DATADIR%%/chick1.cow
+%%COWS%%%%DATADIR%%/chocobo.cow
+%%COWS%%%%DATADIR%%/clippy.cow
+%%COWS%%%%DATADIR%%/clover.cow
+%%COWS%%%%DATADIR%%/cockasaur.cow
+%%COWS%%%%DATADIR%%/copter.cow
+%%COWS%%%%DATADIR%%/dance.cow
+%%COWS%%%%DATADIR%%/dick.cow
+%%COWS%%%%DATADIR%%/doggies.cow
+%%COWS%%%%DATADIR%%/duck.cow
+%%COWS%%%%DATADIR%%/erect.cow
+%%COWS%%%%DATADIR%%/ferret.cow
+%%COWS%%%%DATADIR%%/fish.cow
+%%COWS%%%%DATADIR%%/flag.cow
+%%COWS%%%%DATADIR%%/flagasaur.cow
+%%COWS%%%%DATADIR%%/goatse.cow
+%%COWS%%%%DATADIR%%/gobble.cow
+%%COWS%%%%DATADIR%%/heart.cow
+%%COWS%%%%DATADIR%%/invdragon.cow
+%%COWS%%%%DATADIR%%/ipedo.cow
+%%COWS%%%%DATADIR%%/jesus.cow
+%%COWS%%%%DATADIR%%/limp.cow
+%%COWS%%%%DATADIR%%/lobster.cow
+%%COWS%%%%DATADIR%%/missle.cow
+%%COWS%%%%DATADIR%%/nascar.cow
+%%COWS%%%%DATADIR%%/nuke.cow
+%%COWS%%%%DATADIR%%/nuke2.cow
+%%COWS%%%%DATADIR%%/pedo.cow
+%%COWS%%%%DATADIR%%/peek.cow
+%%COWS%%%%DATADIR%%/peepees.cow
+%%COWS%%%%DATADIR%%/penii.cow
+%%COWS%%%%DATADIR%%/penis.cow
+%%COWS%%%%DATADIR%%/penisbird.cow
+%%COWS%%%%DATADIR%%/pez.cow
+%%COWS%%%%DATADIR%%/pig.cow
+%%COWS%%%%DATADIR%%/pman.cow
+%%COWS%%%%DATADIR%%/point.cow
+%%COWS%%%%DATADIR%%/poland.cow
+%%COWS%%%%DATADIR%%/pr8.cow
+%%COWS%%%%DATADIR%%/psyduck.cow
+%%COWS%%%%DATADIR%%/puffy.cow
+%%COWS%%%%DATADIR%%/pumpkin.cow
+%%COWS%%%%DATADIR%%/puppy.cow
+%%COWS%%%%DATADIR%%/retard.cow
+%%COWS%%%%DATADIR%%/santa.cow
+%%COWS%%%%DATADIR%%/santa2.cow
+%%COWS%%%%DATADIR%%/saq.cow
+%%COWS%%%%DATADIR%%/satan.cow
+%%COWS%%%%DATADIR%%/shark.cow
+%%COWS%%%%DATADIR%%/shlong.cow
+%%COWS%%%%DATADIR%%/smpez.cow
+%%COWS%%%%DATADIR%%/spam.cow
+%%COWS%%%%DATADIR%%/spider.cow
+%%COWS%%%%DATADIR%%/standtall.cow
+%%COWS%%%%DATADIR%%/stud1.cow
+%%COWS%%%%DATADIR%%/stud2.cow
+%%COWS%%%%DATADIR%%/tampon.cow
+%%COWS%%%%DATADIR%%/turkey-penis.cow
+%%COWS%%%%DATADIR%%/urinal.cow
+%%COWS%%%%DATADIR%%/usa.cow
+%%COWS%%%%DATADIR%%/wang.cow
+%%COWS%%%%DATADIR%%/weed.cow
+%%COWS%%%%DATADIR%%/wtc.cow
+%%COWS%%%%DATADIR%%/wtf-pony.cow
+%%COWS%%%%DATADIR%%/wtf.cow
+%%COWS%%%%DATADIR%%/wtf2.cow
+%%COWS%%%%DATADIR%%/zig.cow
+%%COWS%%@dirrmtry %%DATADIR%%
 share/irssi/scripts/insub.pl
 @dirrmtry share/irssi/scripts
 @dirrmtry share/irssi