Attachment #212540 for bug #244926

View | Details | Raw Unified | Return to bug 244926
Collapse All | Expand All

Lines 2-8 Link Here

(-)textproc/linuxdoc-tools/Makefile (-3 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= linuxdoc-tools	4	PORTNAME= linuxdoc-tools
5	PORTVERSION= 0.9.71	5	PORTVERSION= 0.9.75
6	CATEGORIES= textproc	6	CATEGORIES= textproc
7	MASTER_SITES= DEBIAN	7	MASTER_SITES= DEBIAN
8	DISTNAME= ${PORTNAME}_${DISTVERSION}.orig	8	DISTNAME= ${PORTNAME}_${DISTVERSION}.orig
Lines 10-17 Link Here
10	MAINTAINER= felix@palmen-it.de	10	MAINTAINER= felix@palmen-it.de
11	COMMENT= Fork of SGML-tools specially tailored for linuxdoc SGMLs	11	COMMENT= Fork of SGML-tools specially tailored for linuxdoc SGMLs
12		12
13	BROKEN= unfetchable
14
15	LICENSE= GPLv3 LinuxdocTools	13	LICENSE= GPLv3 LinuxdocTools
16	LICENSE_COMB= multi	14	LICENSE_COMB= multi
17	LICENSE_NAME_LinuxdocTools= The linuxdoc-tools license	15	LICENSE_NAME_LinuxdocTools= The linuxdoc-tools license

Lines 1-2 Link Here

(-)textproc/linuxdoc-tools/distinfo (-2 / +3 lines)
1	SHA256 (linuxdoc-tools_0.9.71.orig.tar.gz) = 641e4f02ccbe3ee7fad9e866d334f8880a3f621e70c7412a7bd504a777a992ed	1	TIMESTAMP = 1584658100
2	SIZE (linuxdoc-tools_0.9.71.orig.tar.gz) = 613067	2	SHA256 (linuxdoc-tools_0.9.75.orig.tar.gz) = 8ced91532e5f70527e01474f6bdec7a0483ec0ba39589b00869f18a72168a6fa
		3	SIZE (linuxdoc-tools_0.9.75.orig.tar.gz) = 649381




--- Makefile.in.orig	2016-04-20 23:33:09 UTC
+++ Makefile.in
@@ -83,6 +83,7 @@ ifneq ($(BUILDDOC_FORMATS),)
 #    -- Build documentation
 	@echo "Building documentation ..."
 	(cd doc; \
+		MAKE=$(MAKE) \
 		PREFIX=$(prefix) \
 		BUILD_ISO_ENTITIES=$(BUILD_ISO_ENTITIES) \
 		BUILD_ENTITY_MAP=$(BUILD_ENTITY_MAP) \
@@ -121,7 +122,7 @@ ifeq ($(BUILD_ISO_ENTITIES), true)
 endif
 
 #    -- Install linuxdoc script
-	$(INSTALL_PROGRAM) bin/linuxdoc $(bin_ddir)/linuxdoc
+	$(INSTALL) -m755 bin/linuxdoc $(bin_ddir)/linuxdoc
 
 #    -- Install auxiliary programs
 	mkdir -p $(auxbin_ddir)




--- doc/Makedoc.sh.orig	2015-10-20 11:22:17 UTC
+++ doc/Makedoc.sh
@@ -33,10 +33,10 @@ if [ "${BUILD_ENTITY_MAP}" = "true" ]; t
     # Create a modified EntityMap.pm with entity-map location in doc
     # build temporary dir. Need to properly install entity-map there.
     mkdir $TMPDIR/Text
-    make -C ../entity-map install DESTDIR="$TMPDIR"
+    ${MAKE} -C ../entity-map install DESTDIR="$TMPDIR"
     sed < ../entity-map/EntityMap.pm.in > $TMPDIR/Text/EntityMap.pm \
-	-e 's|\@localentitymapdir\@|'${TMPDIR}'/usr/share/entity-map|g' \
-	-e 's|\@entitymapdir\@|'${TMPDIR}'/usr/share/entity-map/0.1.0|g'
+	-e 's|\@localentitymapdir\@|'${TMPDIR}${PREFIX}'/share/entity-map|g' \
+	-e 's|\@entitymapdir\@|'${TMPDIR}${PREFIX}'/share/entity-map/0.1.0|g'
 
     # Set ${TMPDIR} first in perl load path (Will put Text dir there
     # for modified EntityMap.pm), then our perl5lib
@@ -49,8 +49,8 @@ fi
 if [ "${BUILD_ISO_ENTITIES}" = "true" ]; then
     # --without-installed-iso-entities: Install iso-entities in
     # "$TMPDIR/usr" and set it as iso-entities prefix.
-    make -C ../iso-entities install DESTDIR="$TMPDIR"
-    ISOENTITIES_PREFIX="${TMPDIR}/usr"
+    ${MAKE} -C ../iso-entities install DESTDIR="$TMPDIR"
+    ISOENTITIES_PREFIX="${TMPDIR}${PREFIX}"
 else
     # --with-installed-iso-entities: Use system prefix.
     ISOENTITIES_PREFIX="${PREFIX}"




--- lib/fmt/fmt_latex2e.pl.orig	2018-03-28 15:14:45 UTC
+++ lib/fmt/fmt_latex2e.pl
@@ -284,13 +284,13 @@ $latex2e->{postASP} = sub
       push @texlines, $_;
       # and check for nameurl
       if ( /\\nameurl/ ){
-	($urlid, $urlnam) = ($_ =~ /\\nameurl{(.*)}{(.*)}/);
+	($urlid, $urlnam) = ($_ =~ /\\nameurl\{(.*)\}\{(.*)\}/);
 	print $urlnum . ": " . $urlid . "\n" if ( $global->{debug} );
 
 	$urldef = latex2e_defnam($urlnum) . "url";
-	s/\\nameurl{.*}{.*}/{\\em $urlnam} {\\tt \\$urldef}/;
+	s/\\nameurl\{.*\}\{.*\}/{\\em $urlnam} {\\tt \\$urldef}/;
 	push @urlnames, $_;
-	push @urldefines, "\\urldef{\\$urldef} \\url{$urlid}\n";
+	push @urldefines, "\\urldef\{\\$urldef\} \\url\{$urlid\}\n";
 	$urlnum++;
       }
     }
@@ -367,12 +367,12 @@ $latex2e->{postASP} = sub
 	    $_ = $_ . "\\makeindex\n" if ($latex2e->{makeindex});
 	  }
 	  # Set correct DTD name
-	  elsif (/^\\usepackage{\@LINUXDOC_DTD\@-sgml}/) {
+	  elsif (/^\\usepackage\{\@LINUXDOC_DTD\@-sgml\}/) {
 	    my $dtd = $global->{"dtd"};
 	    s/\@LINUXDOC_DTD\@/$dtd/;
 	  }
 	  # Set correct babel options
-	  elsif (/^\\usepackage\[\@BABELOPTIONS\@\]{babel}/) {
+	  elsif (/^\\usepackage\[\@BABELOPTIONS\@\]\{babel\}/) {
 	    if ( $babeloptions ) {
 	      s/\@BABELOPTIONS\@/$babeloptions/;
 	    } else {

Lines 97-102 Link Here

(-)textproc/linuxdoc-tools/pkg-plist (+3 lines)
97	%%DATADIR%%/LinuxDocTools.pm	97	%%DATADIR%%/LinuxDocTools.pm
98	%%DATADIR%%/LinuxDocTools/BackEnd.pm	98	%%DATADIR%%/LinuxDocTools/BackEnd.pm
99	%%DATADIR%%/LinuxDocTools/CharEnts.pm	99	%%DATADIR%%/LinuxDocTools/CharEnts.pm
		100	%%DATADIR%%/LinuxDocTools/Data/Latin1ToSgml.pm
		101	%%DATADIR%%/LinuxDocTools/Data/Strings_SBCS.pm
		102	%%DATADIR%%/LinuxDocTools/Data/Strings_UTF8.pm
100	%%DATADIR%%/LinuxDocTools/FixRef.pm	103	%%DATADIR%%/LinuxDocTools/FixRef.pm
101	%%DATADIR%%/LinuxDocTools/Html2Html.pm	104	%%DATADIR%%/LinuxDocTools/Html2Html.pm
102	%%DATADIR%%/LinuxDocTools/InfoUtils.pm	105	%%DATADIR%%/LinuxDocTools/InfoUtils.pm

Return to bug 244926

Lines 1-19 Link Here

(-)textproc/linuxdoc-tools/files/patch-Makefile.in (-19 lines)
1	--- Makefile.in.orig 2016-04-20 23:33:09 UTC
2	+++ Makefile.in
3	@@ -83,6 +83,7 @@ ifneq ($(BUILDDOC_FORMATS),)
4	# -- Build documentation
5	@echo "Building documentation ..."
6	(cd doc; \
7	+ MAKE=$(MAKE) \
8	PREFIX=$(prefix) \
9	BUILD_ISO_ENTITIES=$(BUILD_ISO_ENTITIES) \
10	BUILD_ENTITY_MAP=$(BUILD_ENTITY_MAP) \
11	@@ -121,7 +122,7 @@ ifeq ($(BUILD_ISO_ENTITIES), true)
12	endif
13
14	# -- Install linuxdoc script
15	- $(INSTALL_PROGRAM) bin/linuxdoc $(bin_ddir)/linuxdoc
16	+ $(INSTALL) -m755 bin/linuxdoc $(bin_ddir)/linuxdoc
17
18	# -- Install auxiliary programs
19	mkdir -p $(auxbin_ddir)

Lines 1-27 Link Here

(-)textproc/linuxdoc-tools/files/patch-doc_Makedoc.sh (-27 lines)
1	--- doc/Makedoc.sh.orig 2015-10-20 11:22:17 UTC
2	+++ doc/Makedoc.sh
3	@@ -33,10 +33,10 @@ if [ "${BUILD_ENTITY_MAP}" = "true" ]; t
4	# Create a modified EntityMap.pm with entity-map location in doc
5	# build temporary dir. Need to properly install entity-map there.
6	mkdir $TMPDIR/Text
7	- make -C ../entity-map install DESTDIR="$TMPDIR"
8	+ ${MAKE} -C ../entity-map install DESTDIR="$TMPDIR"
9	sed < ../entity-map/EntityMap.pm.in > $TMPDIR/Text/EntityMap.pm \
10	- -e 's\|\@localentitymapdir\@\|'${TMPDIR}'/usr/share/entity-map\|g' \
11	- -e 's\|\@entitymapdir\@\|'${TMPDIR}'/usr/share/entity-map/0.1.0\|g'
12	+ -e 's\|\@localentitymapdir\@\|'${TMPDIR}${PREFIX}'/share/entity-map\|g' \
13	+ -e 's\|\@entitymapdir\@\|'${TMPDIR}${PREFIX}'/share/entity-map/0.1.0\|g'
14
15	# Set ${TMPDIR} first in perl load path (Will put Text dir there
16	# for modified EntityMap.pm), then our perl5lib
17	@@ -49,8 +49,8 @@ fi
18	if [ "${BUILD_ISO_ENTITIES}" = "true" ]; then
19	# --without-installed-iso-entities: Install iso-entities in
20	# "$TMPDIR/usr" and set it as iso-entities prefix.
21	- make -C ../iso-entities install DESTDIR="$TMPDIR"
22	- ISOENTITIES_PREFIX="${TMPDIR}/usr"
23	+ ${MAKE} -C ../iso-entities install DESTDIR="$TMPDIR"
24	+ ISOENTITIES_PREFIX="${TMPDIR}${PREFIX}"
25	else
26	# --with-installed-iso-entities: Use system prefix.
27	ISOENTITIES_PREFIX="${PREFIX}"

Lines 1-34 Link Here

(-)textproc/linuxdoc-tools/files/patch-lib_fmt_fmt__latex2e.pl (-34 lines)
1	--- lib/fmt/fmt_latex2e.pl.orig 2018-03-28 15:14:45 UTC
2	+++ lib/fmt/fmt_latex2e.pl
3	@@ -284,13 +284,13 @@ $latex2e->{postASP} = sub
4	push @texlines, $_;
5	# and check for nameurl
6	if ( /\\nameurl/ ){
7	- ($urlid, $urlnam) = ($_ =~ /\\nameurl{(.)}{(.)}/);
8	+ ($urlid, $urlnam) = ($_ =~ /\\nameurl\{(.)\}\{(.)\}/);
9	print $urlnum . ": " . $urlid . "\n" if ( $global->{debug} );
10
11	$urldef = latex2e_defnam($urlnum) . "url";
12	- s/\\nameurl{.}{.}/{\\em $urlnam} {\\tt \\$urldef}/;
13	+ s/\\nameurl\{.\}\{.\}/{\\em $urlnam} {\\tt \\$urldef}/;
14	push @urlnames, $_;
15	- push @urldefines, "\\urldef{\\$urldef} \\url{$urlid}\n";
16	+ push @urldefines, "\\urldef\{\\$urldef\} \\url\{$urlid\}\n";
17	$urlnum++;
18	}
19	}
20	@@ -367,12 +367,12 @@ $latex2e->{postASP} = sub
21	$_ = $_ . "\\makeindex\n" if ($latex2e->{makeindex});
22	}
23	# Set correct DTD name
24	- elsif (/^\\usepackage{\@LINUXDOC_DTD\@-sgml}/) {
25	+ elsif (/^\\usepackage\{\@LINUXDOC_DTD\@-sgml\}/) {
26	my $dtd = $global->{"dtd"};
27	s/\@LINUXDOC_DTD\@/$dtd/;
28	}
29	# Set correct babel options
30	- elsif (/^\\usepackage\[\@BABELOPTIONS\@\]{babel}/) {
31	+ elsif (/^\\usepackage\[\@BABELOPTIONS\@\]\{babel\}/) {
32	if ( $babeloptions ) {
33	s/\@BABELOPTIONS\@/$babeloptions/;
34	} else {