scrot: Update to 1.2

Removes patch-src_getopt.c since the changes have been integrated to upstream.

Changes since 1.1.1:

Sun Aug 19 08:35:00 -03:00 2019  Joao Eriberto Mota Filho <eriberto@eriberto.pro.br>
Version 1.2

  [ Daniel T. Borelli ]

  * Changed the cursor to indicate the selection mode.
  * Fixed GCC >=8.0 warning: -Wstringop-truncation.
  * Evaluate return of strftime.

  [ Jade Auer ]

  * Added a gitignore to prevent accidentally including any files generated by
    autotools.

  [ Santhosh Raju ]

  * Fixes ambiguous else warning by providing proper braces for if in
    src/getopt.c.
  * Fixed missing <string.h> warnings.

  [ Joao Eriberto Mota Filho ]

  * Added rights for Santhosh Raju.
  * Prepare for new release.

3 files changed, 7 insertions, 44 deletions

diff --git a/graphics/scrot/Makefile b/graphics/scrot/Makefile
index 861ecab8b3e..4309a594c4f 100644
--- a/graphics/scrot/Makefile
+++ b/graphics/scrot/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2019/08/18 16:52:03 fox Exp $
+# $NetBSD: Makefile,v 1.36 2019/08/19 17:41:56 fox Exp $
 
-DISTNAME=	scrot-1.1.1
+DISTNAME=	scrot-1.2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GITHUB:=resurrecting-open-source-projects/}
 GITHUB_TAG=	${PKGVERSION_NOREV}
diff --git a/graphics/scrot/distinfo b/graphics/scrot/distinfo
index 1f25447b148..8aede83dd95 100644
--- a/graphics/scrot/distinfo
+++ b/graphics/scrot/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.7 2019/08/18 16:52:03 fox Exp $
+$NetBSD: distinfo,v 1.8 2019/08/19 17:41:56 fox Exp $
 
-SHA1 (scrot-1.1.1.tar.gz) = f55835cd5ce3cc16154ca700ed664409a79a497e
-RMD160 (scrot-1.1.1.tar.gz) = dbdef82be484bc071acac01339841b8a21812426
-SHA512 (scrot-1.1.1.tar.gz) = 6444fec6d793053b120a6f81bb1696b2c3d1a48f2b7d3949f63ab7e97cbd60d87962b87e52bf43acfae12c3381d59f7924c0f7c71d5372876d14a698f9b9f138
-Size (scrot-1.1.1.tar.gz) = 36473 bytes
-SHA1 (patch-src_getopt.c) = 8008e9c52cfe5c3dd76fd47ce96a9e0d2d36783f
+SHA1 (scrot-1.2.tar.gz) = a05d57cd475d31ec99e98b5d0b51b7d74c9ddf2f
+RMD160 (scrot-1.2.tar.gz) = 944e2693a0c4079178c15f7344bb9fe4eea95e91
+SHA512 (scrot-1.2.tar.gz) = b89e7a94e6317fdb7bd260190c6d68a2dfefc08691b4574337afdfff84f55b8b9c955a6ac60642ae9749c1deaa16bee7b855fbd15833a95f602536693daf8c37
+Size (scrot-1.2.tar.gz) = 36839 bytes
diff --git a/graphics/scrot/patches/patch-src_getopt.c b/graphics/scrot/patches/patch-src_getopt.c
deleted file mode 100644
index 3e535c2f957..00000000000
--- a/graphics/scrot/patches/patch-src_getopt.c
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-src_getopt.c,v 1.1 2019/08/18 16:52:03 fox Exp $
-
-1. Adds missing string.h header unconditionally, this is needed
-   for proper builds since it is used by getopt functions.
-
-   Upstream bug report: https://github.com/resurrecting-open-source-projects/scrot/issues/26
-
-2. Adds brackets for "if" to prevent ambigious "else"
-   (-Wparentheses)
-
---- src/getopt.c.orig	2019-08-18 15:26:09.139597715 +0000
-+++ src/getopt.c
-@@ -76,6 +76,8 @@
- #endif
- #endif
- 
-+#include <string.h>
-+
- #ifndef _
- /* This is for other GNU distributions with internationalized messages.
-    When compiling libc, the _ macro is predefined.  */
-@@ -692,6 +696,7 @@ _getopt_internal(argc, argv, optstring, 
-             else
-             {
-                if (opterr)
-+	         {
-                   if (argv[optind - 1][1] == '-')
-                      /* --option */
-                      fprintf(stderr,
-@@ -704,5 +709,6 @@ _getopt_internal(argc, argv, optstring, 
-                              _
-                              ("%s: option `%c%s' doesn't allow an argument\n"),
-                              argv[0], argv[optind - 1][0], pfound->name);
-+	         }
- 
-                nextchar += strlen(nextchar);