svn commit: r435518 - in head/games/bunnysay: . files

[Wen Heping]

Author: wen
Date: Mon Mar  6 07:05:10 2017
New Revision: 435518
URL: https://svnweb.freebsd.org/changeset/ports/435518

Log:
  - Update to 1.1
  
  PR:		217569
  Submitted by:	ben.lavery at hashbang0.com(maintainer)

Added:
  head/games/bunnysay/files/patch-src_bunnysay.cc   (contents, props changed)
  head/games/bunnysay/files/patch-src_runbunnysay.cc   (contents, props changed)
Deleted:
  head/games/bunnysay/files/patch-src_BunnySay.cpp
  head/games/bunnysay/files/patch-src_BunnySay.h
Modified:
  head/games/bunnysay/Makefile
  head/games/bunnysay/distinfo
  head/games/bunnysay/pkg-descr

Modified: head/games/bunnysay/Makefile
==============================================================================
--- head/games/bunnysay/Makefile	Mon Mar  6 06:53:38 2017	(r435517)
+++ head/games/bunnysay/Makefile	Mon Mar  6 07:05:10 2017	(r435518)
@@ -2,25 +2,29 @@
 # $FreeBSD$
 
 PORTNAME=	bunnysay
-PORTVERSION=	1.0
+PORTVERSION=	1.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	games
 
 MAINTAINER=	ben.lavery at hashbang0.com
-COMMENT=	Bunny Sign for terminals
+COMMENT=	Bunny Sign for terminals with UTF-8 support
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		cmake compiler:c++11-lang dos2unix
-DOS2UNIX_FILES=	src/BunnySay.cpp src/BunnySay.h
+USES=		gmake
+
+ALL_TARGET=	bunnysay
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	co60ca
 
 PLIST_FILES=	bin/bunnysay
 
+post-extract:
+	@${MV} ${WRKSRC}/makefile ${WRKSRC}/Makefile
+
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	${INSTALL_PROGRAM} ${WRKSRC}/bunnysay ${STAGEDIR}${PREFIX}/bin/${PORTNAME} 
 
 .include <bsd.port.mk>

Modified: head/games/bunnysay/distinfo
==============================================================================
--- head/games/bunnysay/distinfo	Mon Mar  6 06:53:38 2017	(r435517)
+++ head/games/bunnysay/distinfo	Mon Mar  6 07:05:10 2017	(r435518)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1473266065
-SHA256 (co60ca-bunnysay-v1.0_GH0.tar.gz) = 81fe0b57fb307d6e6ae8ab660f0f7720a16f83b271c477812af84a3c23081e77
-SIZE (co60ca-bunnysay-v1.0_GH0.tar.gz) = 14703
+TIMESTAMP = 1488747822
+SHA256 (co60ca-bunnysay-v1.1_GH0.tar.gz) = 556752ff31633c54b2a6984dbab21bd2a79a94022277c0c2dc2f1590c8f2dbfe
+SIZE (co60ca-bunnysay-v1.1_GH0.tar.gz) = 17307

Added: head/games/bunnysay/files/patch-src_bunnysay.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/bunnysay/files/patch-src_bunnysay.cc	Mon Mar  6 07:05:10 2017	(r435518)
@@ -0,0 +1,19 @@
+--- src/bunnysay.cc.orig	2017-02-28 03:26:39 UTC
++++ src/bunnysay.cc
+@@ -99,7 +99,7 @@ void fullWidth(std::vector<std::vector<R
+ }
+ 
+ void padTo(std::vector<std::vector<Rune>> *input, size_t width) {
+-  bool left = false;
++  bool left = true;
+   for (auto &rv: *input) {
+     while(rv.size() < width) {
+       if (left) {
+@@ -109,6 +109,7 @@ void padTo(std::vector<std::vector<Rune>
+       }
+       left = !left;
+     }
++    left = true;
+   }
+ }
+ 

Added: head/games/bunnysay/files/patch-src_runbunnysay.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/bunnysay/files/patch-src_runbunnysay.cc	Mon Mar  6 07:05:10 2017	(r435518)
@@ -0,0 +1,24 @@
+--- src/runbunnysay.cc.orig	2017-02-28 03:26:39 UTC
++++ src/runbunnysay.cc
+@@ -20,7 +20,6 @@
+ */
+ #include "bunnysay.h"
+ #include <iostream>
+-#include <iterator>
+ #include <string>
+ 
+ void usage(char *prog) {
+@@ -33,9 +32,10 @@ void usage(char *prog) {
+ int main(int argc, char **argv) {
+   std::string buff;
+   if (argc >= 2 && std::string(argv[1]) == "--") {
+-    std::istream_iterator<char> it(std::cin);
+-    std::istream_iterator<char> end;
+-    buff = std::string(it, end);
++    std::string line;
++    while (std::getline(std::cin, line)) {
++      buff += std::string(line);
++    }
+   } else if (argc >= 2) {
+     for (int i = 1; i < argc; i++) {
+       if (i != 1) {

Modified: head/games/bunnysay/pkg-descr
==============================================================================
--- head/games/bunnysay/pkg-descr	Mon Mar  6 06:53:38 2017	(r435517)
+++ head/games/bunnysay/pkg-descr	Mon Mar  6 07:05:10 2017	(r435518)
@@ -1,3 +1,3 @@
-Bunny Sign for terminals with wchar support.
+Bunny Sign for terminals with UTF-8 support
 
 WWW: https://github.com/co60ca/bunnysay