From owner-svn-ports-head@freebsd.org  Tue Jul 19 00:14:09 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2E344B9D98D;
 Tue, 19 Jul 2016 00:14:09 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 007DB196A;
 Tue, 19 Jul 2016 00:14:08 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6J0E8P9097503;
 Tue, 19 Jul 2016 00:14:08 GMT (envelope-from cy@FreeBSD.org)
Received: (from cy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6J0E8sB097501;
 Tue, 19 Jul 2016 00:14:08 GMT (envelope-from cy@FreeBSD.org)
Message-Id: <201607190014.u6J0E8sB097501@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org
 using -f
From: Cy Schubert <cy@FreeBSD.org>
Date: Tue, 19 Jul 2016 00:14:08 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r418757 - in head/security/racoon2: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 19 Jul 2016 00:14:09 -0000

Author: cy
Date: Tue Jul 19 00:14:07 2016
New Revision: 418757
URL: https://svnweb.freebsd.org/changeset/ports/418757

Log:
  Fix ancient getopts invocation in pskgen.
  
  PR:		211178

Modified:
  head/security/racoon2/Makefile
  head/security/racoon2/files/patch-pskgen-pskgen.in

Modified: head/security/racoon2/Makefile
==============================================================================
--- head/security/racoon2/Makefile	Mon Jul 18 23:36:42 2016	(r418756)
+++ head/security/racoon2/Makefile	Tue Jul 19 00:14:07 2016	(r418757)
@@ -3,7 +3,7 @@
 
 PORTNAME=	racoon2
 PORTVERSION=	20100526a
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	security net ipv6
 MASTER_SITES=	ftp://ftp.racoon2.wide.ad.jp/pub/racoon2/
 

Modified: head/security/racoon2/files/patch-pskgen-pskgen.in
==============================================================================
--- head/security/racoon2/files/patch-pskgen-pskgen.in	Mon Jul 18 23:36:42 2016	(r418756)
+++ head/security/racoon2/files/patch-pskgen-pskgen.in	Tue Jul 19 00:14:07 2016	(r418757)
@@ -1,18 +1,13 @@
 --- pskgen/pskgen.in.orig	2005-09-15 23:52:20.000000000 -0700
-+++ pskgen/pskgen.in	2012-10-19 22:21:12.364329713 -0700
-@@ -59,8 +59,13 @@
++++ pskgen/pskgen.in	2016-07-18 12:59:05.207263000 -0700
+@@ -59,8 +59,8 @@
  	exit 0;
  }
  
 -require 'getopts.pl';
 -do Getopts('rs:o:di:he:d');
-+if ($] > 5.014002) {
-+	use Getopt::Std;
-+	getopts('rs:o:di:he:d');
-+} else {
-+	require 'getopts.pl';
-+	do Getopts('rs:o:di:he:d');
-+}
++use Getopt::Std;
++getopts('rs:o:di:he:d') or &usage;
  $output = '-';
  $output = $opt_o if ($opt_o);