Index: head/math/gri/files/patch-doc__texinfo2HTML
===================================================================
--- head/math/gri/files/patch-doc__texinfo2HTML (revision 465818)
+++ head/math/gri/files/patch-doc__texinfo2HTML (revision 465819)
@@ -1,25 +1,176 @@
---- ./doc/texinfo2HTML.orig 2013-10-05 13:52:30.000000000 +0400
-+++ ./doc/texinfo2HTML 2013-10-05 13:53:16.000000000 +0400
+--- doc/texinfo2HTML.orig 2009-12-12 18:11:23 UTC
++++ doc/texinfo2HTML
@@ -1,5 +1,8 @@
#!/usr/bin/perl -w
+use POSIX qw(ctime);
+use Getopt::Std;
+
#$example_indent = " ";
$example_indent = "";
-@@ -54,12 +57,10 @@
+@@ -54,12 +57,10 @@ BUGS:
the end is here} and more blah
will not get the \@code{} item converted correctly.
";
-require "ctime.pl";
-require "getopts.pl";
$debug = 0;
-die if !&Getopts('h');
+die if !getopts('h');
$print_help = 0;
$print_help = $opt_h if $opt_h;
if ($print_help) {
+@@ -120,7 +121,7 @@ while(get_a_line()) {
+ next;
+ }
+ # Process image commands (NOT...it's there already)
+- if (/\@image{(.*)}/) {
++ if (/\@image\{(.*)\}/) {
+ #print "
\n";
+ next;
+ }
+@@ -208,12 +209,12 @@ while(get_a_line()) {
+ s,<,<,og;
+ # Special tweak to make 'Gri' look cooler.
+ # s, Gri , GRI ,og;
+- s,\@code{\@\@},\@code{TEXINFO2HTML-AT-AT},og;
++ s,\@code\{\@\@\},\@code\{TEXINFO2HTML-AT-AT\},og;
+ s,\@},TEXINFO2HTML-CLOSE-BRACE,og; # retain inside e.g. @code{}
+ s,\@\@,TEXINFO2HTML-AT-AT,og;
+- s,\@{,{,og;
+- s,\@TeX{},TeX,og;
+- s,\@dots{},...,og;
++ s,\@\{,\{,og;
++ s,\@TeX\{\},TeX,og;
++ s,\@dots\{\},...,og;
+ # Put in place-holders for some accents. I should check for all
+ # of them, but for now, I'm just kludging in a couple,
+ # to solve an immediate problem and to serve as a place-holder
+@@ -237,18 +238,18 @@ while(get_a_line()) {
+ }
+ next;
+ }
+- while (/\@url{([^}]*)}/) {
++ while (/\@url\{([^}]*)\}/) {
+ $the_url = $1;
+- s:\@url{[^}]*}:\@code{$the_url}:;
++ s:\@url\{[^}]*}:\@code{$the_url}:;
+ }
+- while (/\@uref{([^}]*)}/) {
++ while (/\@uref\{([^}]*)\}/) {
+ @items = split(/,/, $1);
+ if ($#items == 0) {
+- s:\@uref{[^}]*}:$items[0]:;
++ s:\@uref\{[^}]*}:$items[0]:;
+ } elsif ($#items == 1) {
+- s:\@uref{[^}]*}:$items[1]:;
++ s:\@uref\{[^}]*}:$items[1]:;
+ } elsif ($#items == 2) {
+- s:\@uref{[^}]*}:\@code{$items[2]}:;
++ s:\@uref\{[^}]*}:\@code{$items[2]}:;
+ } else {
+ die "Cannot have more than 3 items in a 'uref' at \"$_\"";
+ }
+@@ -330,7 +331,7 @@ while(get_a_line()) {
+ while(get_a_line()) {
+ next if /\@sp/;
+ next if /\@cindex/;
+- s|\@anchor{([^}]*)}||g;
++ s|\@anchor\{([^}]*)}||g;
+ &process_examples();
+ # Handle HTML inserts
+ if (/^\@c HTML (.*)/o) {
+@@ -346,10 +347,10 @@ while(get_a_line()) {
+ }
+ if (/\s*\@item\s*(.*)/o) {
+ $the_item = $1;
+- $the_item =~ s:\@{:{:og;
++ $the_item =~ s:\@\{:{:og;
+ $the_item =~ s:\@}:}:og;
+ $the_item =~ s:\@\@:\@:og;
+- $the_item =~ s:\@code{([^}]*)}:`$1':og;
++ $the_item =~ s:\@code\{([^}]*)}:`$1':og;
+ print "
" if (/^$/o);
+@@ -402,38 +403,38 @@ sub process_examples() {
+ } else {
+ s,\@value\{([^}]*)\},$value{$1},g; # Substitute set/value pair
+ s,\@},},og;
+- s,\@{,{,og;
++ s,\@\{,{,og;
+ }
+ }
+
+
+ sub sub_refs {
+- die "line $. of file: cannot have multiple refs on one line" if (/\@[px]*ref{(.*)}(.*)\@[px]*ref{(.*)}/);
++ die "line $. of file: cannot have multiple refs on one line" if (/\@[px]*ref\{(.*)}(.*)\@[px]*ref\{(.*)}/);
+ # anchors
+- s|\@anchor{([^}]*)}||g;
++ s|\@anchor\{([^}]*)}||g;
+ # Change e.g.
+ # @xref{Viewing}
+ # into
+ # see Viewing
+
+ #if (/\@ref/){print "AAA[$_]AAA\n";
+- s|\@ref{([^}]*)}|see $1|g;
++ s|\@ref\{([^}]*)}|see $1|g;
+ #print "BBB[$_]BBB\n";}
+
+- s|\@xref{([^}]*)}|see $1|g;
+- s|\@pxref{([^}]*)}|see $1.|g;
+- while (/\@url{([^}]*)}/) {
++ s|\@xref\{([^}]*)}|see $1|g;
++ s|\@pxref\{([^}]*)}|see $1.|g;
++ while (/\@url\{([^}]*)}/) {
+ $the_url = $1;
+- s:\@url{[^}]*}:\@code{$the_url}:;
++ s:\@url\{[^}]*}:\@code{$the_url}:;
+ }
+- while (/\@uref{([^}]*)}/) {
++ while (/\@uref\{([^}]*)}/) {
+ @items = split(/,/, $1);
+ if ($#items == 0) {
+- s:\@uref{[^}]*}:$items[0]:;
++ s:\@uref\{[^}]*}:$items[0]:;
+ } elsif ($#items == 1) {
+- s:\@uref{[^}]*}:$items[1]:;
++ s:\@uref\{[^}]*}:$items[1]:;
+ } elsif ($#items == 2) {
+- s:\@uref{[^}]*}:\@code{$items[2]}:;
++ s:\@uref\{[^}]*}:\@code{$items[2]}:;
+ } else {
+ die "Cannot have more than 3 items in a 'uref' at \"$_\"";
+ }
+@@ -466,17 +467,17 @@ sub sub_headings {
+ sub sub_emphasis {
+ s,<<,<<,g;
+ s,>>,>>,g;
+- s,\@emph{([^}]*)},$1,g;
+- s,\@strong{([^}]*)},$1,g;
+- s,\@footnote{([^}]*)}, [$1],g;
+- s,\@b{([^}]*)},$1,g;
++ s,\@emph\{([^}]*)},$1,g;
++ s,\@strong\{([^}]*)},$1,g;
++ s,\@footnote\{([^}]*)}, [$1],g;
++ s,\@b\{([^}]*)},$1,g;
+
+- s,\@code{([^}]*)},`$1',g;
++ s,\@code\{([^}]*)},`$1',g;
+ s,\@\@,\@,g;
+- s,\@samp{([^}]*)},`$1',g;
+- s,\@key{([^}]*)},`$1',g;
+- s,\@kbd{([^}]*)},`$1',g;
+- s,\@file{([^}]*)},`$1',g;
++ s,\@samp\{([^}]*)},`$1',g;
++ s,\@key\{([^}]*)},`$1',g;
++ s,\@kbd\{([^}]*)},`$1',g;
++ s,\@file\{([^}]*)},`$1',g;
+ s,TEXINFO2HTML-CLOSE-BRACE,},g;
+ s,TEXINFO2HTML-AT-AT,\@,g;
+ s,TEXINFO2HTML-ACCENT-ACUTE-a,á,g;
Index: head/math/oleo/files/patch-doc_texi2html.in
===================================================================
--- head/math/oleo/files/patch-doc_texi2html.in (revision 465818)
+++ head/math/oleo/files/patch-doc_texi2html.in (revision 465819)
@@ -1,23 +1,50 @@
--- doc/texi2html.in.orig 2000-04-08 12:20:05 UTC
+++ doc/texi2html.in
+@@ -2752,7 +2752,7 @@ INPUT_LINE: while ($_ = &next_line) {
+ s/\@refill\s+//g;
+ # other substitutions
+ &simple_substitutions;
+- s/\@value{($VARRE)}/$value{$1}/eg;
++ s/\@value\{($VARRE)\}/$value{$1}/eg;
+ s/\@footnote\{/\@footnote$docu_doc\{/g; # mark footnotes, cf. pass 4
+ #
+ # analyze the tag again
+@@ -3174,7 +3174,7 @@ while (@lines) {
+ #
+ # xref
+ #
+- while (/\@(x|px|info|)ref{([^{}]+)(}?)/) {
++ while (/\@(x|px|info|)ref\{([^{}]+)(\}?)/) {
+ # note: Texinfo may accept other characters
+ ($type, $nodes, $full) = ($1, $2, $3);
+ ($before, $after) = ($`, $');
@@ -3790,9 +3790,9 @@ sub update_sec_num {
my $ret;
$level--; # here we start at 0
- if ($name =~ /^appendix/ || defined(@appendix_sec_num)) {
+ if ($name =~ /^appendix/ || @appendix_sec_num) {
# appendix style
- if (defined(@appendix_sec_num)) {
+ if (@appendix_sec_num) {
&incr_sec_num($level, @appendix_sec_num);
} else {
@appendix_sec_num = ('A', 0, 0, 0);
@@ -3800,7 +3800,7 @@ sub update_sec_num {
$ret = join('.', @appendix_sec_num[0..$level]);
} else {
# normal style
- if (defined(@normal_sec_num))
+ if (@normal_sec_num)
{
&incr_sec_num($level, @normal_sec_num);
}
+@@ -4168,7 +4168,7 @@ sub substitute_style {
+ while ($changed) {
+ $changed = 0;
+ $done = '';
+- while (/\@(\w+){([^\{\}]+)}/ || /\@(,){([^\{\}]+)}/) {
++ while (/\@(\w+)\{([^\{\}]+)\}/ || /\@(,)\{([^\{\}]+)\}/) {
+ $text = &apply_style($1, $2);
+ if ($text) {
+ $_ = "$`$text$'";
Index: head/net/ldapsdk/files/patch-ldap_build_replace.pm
===================================================================
--- head/net/ldapsdk/files/patch-ldap_build_replace.pm (nonexistent)
+++ head/net/ldapsdk/files/patch-ldap_build_replace.pm (revision 465819)
@@ -0,0 +1,11 @@
+--- ldap/build/replace.pm.orig 2011-01-06 12:05:39 UTC
++++ ldap/build/replace.pm
+@@ -62,7 +62,7 @@ sub GenerateHeader ($$\%) {
+ while() {
+ my $line = $_;
+ while(($orig, $replace) = each %$keywords) {
+- $line =~ s/{{$orig}}/$replace/g;
++ $line =~ s/\{\{$orig}}/$replace/g;
+ }
+
+ # the first line is a comment specific to the template file, which we
Property changes on: head/net/ldapsdk/files/patch-ldap_build_replace.pm
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/textproc/latex2html/Makefile
===================================================================
--- head/textproc/latex2html/Makefile (revision 465818)
+++ head/textproc/latex2html/Makefile (revision 465819)
@@ -1,42 +1,43 @@
# Created by: brett@peloton.physics.montana.edu
# $FreeBSD$
PORTNAME= latex2html
PORTVERSION= 2016
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= TEX_CTAN/support/${PORTNAME}
MAINTAINER= hrs@FreeBSD.org
COMMENT= Convert LaTeX documents to HTML
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= ${LOCALBASE}/bin/anytopnm:graphics/netpbm
RUN_DEPENDS:= ${BUILD_DEPENDS}
CONFLICTS= ja-latex2html-[0-9]*
USES= ghostscript perl5
USE_TEX= latex dvipsk texhash
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-perl=${PERL} \
--disable-gif \
--shlibdir=${DATADIR} \
--with-texpath=${PREFIX}/${TEXMFDIR}/tex/latex/html \
--without-mktexlsr
SUB_FILES= pkg-message
PLIST_SUB= TEXMFDIR=${TEXMFDIR}
TEXHASHDIRS= ${TEXMFDIR}
PORTDOCS= FAQ INSTALL README
OPTIONS_DEFINE= DOCS
post-install:
${INSTALL_MAN} ${WRKSRC}/latex2html.1 ${STAGEDIR}${MANPREFIX}/man/man1
post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
.include