Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 7 May 2023 16:15:00 GMT
From:      Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 7eea2c9dbb97 - main - devel/gnustep-make: Fix "makeinfo --html" output directory
Message-ID:  <202305071615.347GF0NK042183@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7eea2c9dbb97aa0238ed33373833c5c61864b1ca

commit 7eea2c9dbb97aa0238ed33373833c5c61864b1ca
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-05-07 16:05:33 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2023-05-07 16:05:33 +0000

    devel/gnustep-make: Fix "makeinfo --html" output directory
    
    - Bump PORTREVISION for package change
    
    Since texinfo 7, "makeinfo --html foo.texi" outputs to foo_html/ rather than foo/ which causes build/plist error for some ports.
    
    For example, during
    Take x11-toolkits/gnustep-gui for example, it runs "makeinfo --html AppKit.texi" then checks AppKit/ directory
    
    makeinfo --html AppKit.texi; \
    if [ -f AppKit/AppKit_toc.html ]; \
                    then \
                      mv AppKit/AppKit.html .; \
                      mv AppKit/AppKit_*.html .; \
                      rmdir AppKit/AppKit; \
                    fi
    
    Obtained from:  https://github.com/gnustep/tools-make/commit/3ff4ee8a053b85d63cd34f645258902bb0dc6f04
---
 devel/gnustep-make/Makefile            |  1 +
 devel/gnustep-make/files/patch-texinfo | 13 +++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile
index 8dd4af055654..b6ae30c71136 100644
--- a/devel/gnustep-make/Makefile
+++ b/devel/gnustep-make/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	gnustep-make
 PORTVERSION=	2.8.0
+PORTREVISION=	1
 CATEGORIES=	devel gnustep
 MASTER_SITES=	GNUSTEP/core
 
diff --git a/devel/gnustep-make/files/patch-texinfo b/devel/gnustep-make/files/patch-texinfo
new file mode 100644
index 000000000000..e2a89f0b5132
--- /dev/null
+++ b/devel/gnustep-make/files/patch-texinfo
@@ -0,0 +1,13 @@
+Obtained from:	https://github.com/gnustep/tools-make/commit/3ff4ee8a053b85d63cd34f645258902bb0dc6f04
+
+--- Instance/Documentation/texi.make.orig	2020-04-05 14:59:54 UTC
++++ Instance/Documentation/texi.make
+@@ -92,7 +92,7 @@ $(GNUSTEP_INSTANCE).pdf: $(TEXI_FILES)
+ # so after running it we try to move any from the subdirectory to
+ # where they are expected.
+ $(GNUSTEP_INSTANCE)/index.html: $(TEXI_FILES)
+-	-$(GNUSTEP_TEXI2HTML) \
++	-$(GNUSTEP_TEXI2HTML) --output=$(OUTFILE) \
+                 $(GNUSTEP_TEXI2HTML_FLAGS) $(ADDITIONAL_TEXI2HTML_FLAGS) \
+ 		$(GNUSTEP_INSTANCE).texi; \
+                 if [ -f $(GNUSTEP_INSTANCE)/$(GNUSTEP_INSTANCE)_toc.html ]; \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202305071615.347GF0NK042183>