5 files changed, 31 insertions, 17 deletions

diff --git a/games/cowsay/Makefile b/games/cowsay/Makefile
index 55d31a799dda..db6d823d0dd8 100644
--- a/games/cowsay/Makefile
+++ b/games/cowsay/Makefile
@@ -2,16 +2,23 @@
 # $FreeBSD$
 
 PORTNAME=	cowsay
-PORTVERSION=	3.03
-PORTREVISION=	2
+PORTVERSION=	3.04
+DISTVERSIONPREFIX=	cowsay-
 CATEGORIES=	games
-MASTER_SITES=	SF/lifanov-ports-distfiles/${CATEGORIES}/${PORTNAME}
 
 MAINTAINER=	lifanov@mail.lifanov.com
 COMMENT=	Configurable talking characters in ASCII art
 
+LICENSE=	GPLv3+
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
 USES=		perl5
 
+USE_GITHUB=	yes
+
+GH_ACCOUNT=	tnalpgge
+GH_PROJECT=	rank-amateur-cowsay
+
 NO_BUILD=	# defined
 
 post-patch:
@@ -20,8 +27,8 @@ post-patch:
 do-install:
 	cd ${WRKSRC}; ${SH} install.sh ${STAGEDIR}${PREFIX}
 	@${SED} -i '' 's,${STAGEDIR},,' ${STAGEDIR}${PREFIX}/bin/cowsay
-	@${INSTALL_DATA} ${FILESDIR}/box.cow ${STAGEDIR}${PREFIX}/share/cows
-	@${INSTALL_DATA} ${FILESDIR}/jkh.cow ${STAGEDIR}${PREFIX}/share/cows
-	@${INSTALL_DATA} ${FILESDIR}/tux-stab.cow ${STAGEDIR}${PREFIX}/share/cows
+	${INSTALL_DATA} ${FILESDIR}/box.cow ${STAGEDIR}${PREFIX}/share/cows
+	${INSTALL_DATA} ${FILESDIR}/jkh.cow ${STAGEDIR}${PREFIX}/share/cows
+	${INSTALL_DATA} ${FILESDIR}/tux-stab.cow ${STAGEDIR}${PREFIX}/share/cows
 
 .include <bsd.port.mk>
diff --git a/games/cowsay/distinfo b/games/cowsay/distinfo
index f2f5c7122cac..395b4de7b2b2 100644
--- a/games/cowsay/distinfo
+++ b/games/cowsay/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1464980374
-SHA256 (cowsay-3.03.tar.gz) = 0b8672a7ac2b51183780db72618b42af8ec1ce02f6c05fe612510b650540b2af
-SIZE (cowsay-3.03.tar.gz) = 15189
+TIMESTAMP = 1466936737
+SHA256 (tnalpgge-rank-amateur-cowsay-cowsay-3.04_GH0.tar.gz) = d8b871332cfc1f0b6c16832ecca413ca0ac14d58626491a6733829e3d655878b
+SIZE (tnalpgge-rank-amateur-cowsay-cowsay-3.04_GH0.tar.gz) = 31961
diff --git a/games/cowsay/files/patch-cowsay b/games/cowsay/files/patch-cowsay
index 7bf7019778eb..4dbcd556a587 100644
--- a/games/cowsay/files/patch-cowsay
+++ b/games/cowsay/files/patch-cowsay
@@ -1,7 +1,7 @@
 $NetBSD: patch-aa,v 1.1.1.1 2000/03/25 20:13:24 jlam Exp $
 
---- cowsay.orig	Thu Nov  4 11:29:53 1999
-+++ cowsay	Sat Mar 25 12:07:09 2000
+--- cowsay.orig	2016-06-25 02:45:15 UTC
++++ cowsay
 @@ -7,7 +7,7 @@
  ##
  
@@ -11,11 +11,10 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/03/25 20:13:24 jlam Exp $
  use File::Basename;
  use Getopt::Std;
  use Cwd;
-@@ -180,4 +180,21 @@
- Usage: $progname [-bdgpstwy] [-h] [-e eyes] [-f cowfile] 
+@@ -185,3 +185,20 @@ Usage: $progname [-bdgpstwy] [-h] [-e ey
            [-l] [-n] [-T tongue] [-W wrapcolumn] [message]
  EOF
-+}
+ }
 +
 +sub fill {
 +    my ($ip, $xp, @raw) = @_;
@@ -32,4 +31,4 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/03/25 20:13:24 jlam Exp $
 +    # separate paragraphs with blank lines
 +
 +    return join ($ip eq $xp ? "\n\n" : "\n", @para);
- }
++}
diff --git a/games/cowsay/pkg-descr b/games/cowsay/pkg-descr
index 3bab8b236cda..8cdf4e2f0c24 100644
--- a/games/cowsay/pkg-descr
+++ b/games/cowsay/pkg-descr
@@ -2,4 +2,4 @@ cowsay is a configurable talking ASCII cow (and other characters),
 written in Perl.  It operates much as the figlet program does, and
 is written in the same spirit of silliness.
 
-WWW: http://www.nog.net/~tony/warez/cowsay.shtml
+WWW: https://github.com/tnalpgge/rank-amateur-cowsay
diff --git a/games/cowsay/pkg-plist b/games/cowsay/pkg-plist
index d42c99e13cde..5532ee0bc9c4 100644
--- a/games/cowsay/pkg-plist
+++ b/games/cowsay/pkg-plist
@@ -2,7 +2,15 @@ bin/cowsay
 bin/cowthink
 man/man1/cowsay.1.gz
 man/man1/cowthink.1.gz
+share/cows/DragonAndCow.pm
+share/cows/Example.pm
+share/cows/Frogs.pm
+share/cows/MechAndCow.pm
+share/cows/Stegosaurus.pm
+share/cows/TextBalloon.pm
+share/cows/TuxStab.pm
 share/cows/beavis.zen.cow
+share/cows/blowfish.cow
 share/cows/bong.cow
 share/cows/box.cow
 share/cows/bud-frogs.cow
@@ -46,8 +54,8 @@ share/cows/telebears.cow
 share/cows/three-eyes.cow
 share/cows/turkey.cow
 share/cows/turtle.cow
-share/cows/tux.cow
 share/cows/tux-stab.cow
+share/cows/tux.cow
 share/cows/udder.cow
 share/cows/vader-koala.cow
 share/cows/vader.cow