Date: Tue, 22 Oct 2013 12:56:15 +0200 (CEST) From: Mathieu Arnold <mat@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Cc: kuriyama@FreeBSD.org Subject: ports/183197: [PATCH] textproc/sgmlformat: Fix with perl >= 5.16 Message-ID: <20131022105615.5D54314269C@aragorn.in.absolight.net> Resent-Message-ID: <201310221100.r9MB00x8064446@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 183197
>Category: ports
>Synopsis: [PATCH] textproc/sgmlformat: Fix with perl >= 5.16
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Oct 22 11:00:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Mathieu Arnold
>Release: FreeBSD 9.2-RELEASE i386
>Organization:
Absolight
>Environment:
System: FreeBSD aragorn.in.absolight.net 9.2-RELEASE FreeBSD 9.2-RELEASE #0 r255898: Fri Sep 27 03:52:52 UTC
>Description:
newgetopt.pl was deprecated in 5.14, so, it doesn't work any more with 5.16+.
As Getopt::Long has been there for ages (and is in all supported perls in the
port tree,) this seemed the easiest way to fix it.
Port maintainer (kuriyama@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99_8 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:
--- sgmlformat-1.7_3.patch begins here ---
diff -ruN /usr/ports/textproc/sgmlformat/Makefile ./Makefile
--- /usr/ports/textproc/sgmlformat/Makefile 2013-09-21 01:17:30.000000000 +0200
+++ ./Makefile 2013-10-22 12:54:00.000000000 +0200
@@ -1,9 +1,9 @@
# Created by: jfieber
# $FreeBSD: textproc/sgmlformat/Makefile 327773 2013-09-20 23:17:30Z bapt $
PORTNAME= sgmlformat
PORTVERSION= 1.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc print
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= kuriyama
diff -ruN /usr/ports/textproc/sgmlformat/files/patch-sgmlfmt.pl ./files/patch-sgmlfmt.pl
--- /usr/ports/textproc/sgmlformat/files/patch-sgmlfmt.pl 2012-07-14 16:29:18.000000000 +0200
+++ ./files/patch-sgmlfmt.pl 2013-10-22 12:53:41.000000000 +0200
@@ -1,5 +1,14 @@
---- sgmlfmt/sgmlfmt.pl.orig Tue Sep 15 21:05:47 1998
-+++ sgmlfmt/sgmlfmt.pl Tue Sep 4 15:27:32 2001
+--- sgmlfmt/sgmlfmt.pl.orig 1998-09-15 23:05:47.000000000 +0200
++++ sgmlfmt/sgmlfmt.pl 2013-10-22 12:52:49.000000000 +0200
+@@ -32,7 +32,7 @@
+ # project.
+
+
+-require 'newgetopt.pl';
++use Getopt::Long;
+
+ #
+ # Where to find DTDs and related files
@@ -151,19 +151,15 @@
open (outfile, ">$fileroot.trf");
&sgmlparse(infile, "roff");
@@ -24,3 +33,12 @@
unlink("${fileroot}.trf");
}
+@@ -655,7 +651,7 @@
+
+ sub main {
+ # Check arguments
+- if (!&NGetOpt('d=s', 'f=s', 'links', 'i:s@', 'hdr=s', 'ftr=s', 'e=s')) {
++ if (!GetOptions('d=s', 'f=s', 'links', 'i:s@', 'hdr=s', 'ftr=s', 'e=s')) {
+ &usage;
+ exit 1;
+ }
--- sgmlformat-1.7_3.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131022105615.5D54314269C>