git: a56bbe0104cb - main - lang/guile1: Remove USES=makeinfo
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 24 Oct 2023 13:08:39 UTC
The branch main has been updated by bofh:
URL: https://cgit.FreeBSD.org/ports/commit/?id=a56bbe0104cbad417e302ceca26e03ee6bee6d4f
commit a56bbe0104cbad417e302ceca26e03ee6bee6d4f
Author: Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-10-23 14:45:47 +0000
Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-10-24 13:08:26 +0000
lang/guile1: Remove USES=makeinfo
- Distfile ships with pregenerated info files
- Remove patches related to texi files
- Utilize USES=localbase
---
lang/guile1/Makefile | 27 +++++++--------
lang/guile1/files/patch-doc-ref-guile.texi | 10 ------
lang/guile1/files/patch-doc__goops__goops.texi | 19 -----------
lang/guile1/files/patch-doc__r5rs__r5rs.texi | 12 -------
lang/guile1/files/patch-doc__ref__fdl.texi | 11 ------
lang/guile1/files/patch-doc__ref__gh.texi | 11 ------
.../files/patch-doc__tutorial__guile-tut.texi | 39 ----------------------
7 files changed, 14 insertions(+), 115 deletions(-)
diff --git a/lang/guile1/Makefile b/lang/guile1/Makefile
index f4b32e378206..fcc9ce5f944a 100644
--- a/lang/guile1/Makefile
+++ b/lang/guile1/Makefile
@@ -19,9 +19,8 @@ LIB_DEPENDS= libltdl.so:devel/libltdl \
# our own version, in order to avoid conflicts.
RUN_DEPENDS= guile-aclocal>=3:lang/guile-aclocal
-USES= guile:${PORTVERSION:R},env \
- autoreconf cpe gmake libtool makeinfo ncurses pathfix \
- readline
+USES= guile:${PORTVERSION:R},env autoreconf cpe gmake libtool \
+ localbase ncurses pathfix readline
CPE_VENDOR= gnu
USE_LDCONFIG= yes
@@ -32,8 +31,7 @@ CONFIGURE_ARGS+=--program-suffix=-${GUILE_VER} \
INSTALL_TARGET= install-strip
CFLAGS+= -fwrapv
-CPPFLAGS+= -I${LOCALBASE}/include
-LIBS+= -L${LOCALBASE}/lib
+
PORTSCOUT= limit:^1\.
INFO= goops guile-tut guile r5rs
@@ -46,25 +44,24 @@ NLS_USES= gettext
NLS_USES_OFF= gettext-tools
NLS_CONFIGURE_ENABLE= nls
-post-extract:
- @${FIND} ${WRKSRC}/doc -name "*.info*" -delete
-
REINPLACE_FILES_1= libguile/smob.c libguile/filesys.c libguile/gc.c \
libguile/mallocs.c libguile/eval.c libguile/gc-malloc.c \
libguile/ports.c libguile/gc-mark.c libguile/gc_os_dep.c
-
REINPLACE_FILES_2= guile-config/guile-config.in
-
REINPLACE_FILES_3= PROGRAM frisk read-text-outline generate-autoload \
scan-api api-diff lint snarf-check-and-output-texi \
autofrisk punify snarf-guile-m4-docs display-commentary \
read-rfc822 summarize-guile-TODO doc-snarf \
read-scheme-source use2dot
+post-extract:
+ ${MV} ${WRKSRC}/doc/guile.1 ${WRKSRC}/doc/guile${GUILE_SFX}.1
+
post-patch:
@cd ${WRKSRC} ; \
${REINPLACE_CMD} -e 's|<malloc\.h>|<stdlib.h>|g' ${REINPLACE_FILES_1}
- @${REINPLACE_CMD} -e 's|$$(libdir)|$$(libdir)data|g' ${WRKSRC}/Makefile.am
+ @${REINPLACE_CMD} -e 's|srfi doc examples|srfi examples|g' \
+ ${WRKSRC}/Makefile.am
@${TOUCH} ${WRKSRC}/Makefile.in
@cd ${WRKSRC} ; \
${REINPLACE_CMD} -e '1s/guile/guile-${GUILE_VER}/' ${REINPLACE_FILES_2}
@@ -77,7 +74,11 @@ post-install:
for p in guile guile-tools guile-config guile-snarf; do \
${LN} -s $${p}-${GUILE_VER} ${STAGEDIR}${PREFIX}/bin/$${p}${GUILE_SFX}; \
done
- ${MV} ${STAGEDIR}${PREFIX}/man/man1/guile-${GUILE_VER}.1 \
- ${STAGEDIR}${PREFIX}/man/man1/guile${GUILE_SFX}.1
+ ${INSTALL_MAN} ${WRKSRC}/doc/guile${GUILE_SFX}.1 ${STAGEDIR}${PREFIX}/man/man1/
+ ${MKDIR} ${STAGEDIR}${PREFIX}/${GUILE_INFO_PATH}
+ ${INSTALL_DATA} ${WRKSRC}/doc/goops/goops.info ${STAGEDIR}${PREFIX}/${GUILE_INFO_PATH}/
+ ${INSTALL_DATA} ${WRKSRC}/doc/tutorial/guile-tut.info ${STAGEDIR}${PREFIX}/${GUILE_INFO_PATH}/
+ ${INSTALL_DATA} ${WRKSRC}/doc/ref/guile.info ${STAGEDIR}${PREFIX}/${GUILE_INFO_PATH}/
+ ${INSTALL_DATA} ${WRKSRC}/doc/r5rs/r5rs.info ${STAGEDIR}${PREFIX}/${GUILE_INFO_PATH}/
.include <bsd.port.mk>
diff --git a/lang/guile1/files/patch-doc-ref-guile.texi b/lang/guile1/files/patch-doc-ref-guile.texi
deleted file mode 100644
index 4c013a39a046..000000000000
--- a/lang/guile1/files/patch-doc-ref-guile.texi
+++ /dev/null
@@ -1,10 +0,0 @@
---- doc/ref/guile.texi.orig 2010-12-13 17:25:01 UTC
-+++ doc/ref/guile.texi
-@@ -1,6 +1,7 @@
- \input texinfo
- @c -*-texinfo-*-
- @c %**start of header
-+@documentencoding ISO-8859-1
- @setfilename guile.info
- @settitle Guile Reference Manual
- @set guile
diff --git a/lang/guile1/files/patch-doc__goops__goops.texi b/lang/guile1/files/patch-doc__goops__goops.texi
deleted file mode 100644
index 2873bdde0d56..000000000000
--- a/lang/guile1/files/patch-doc__goops__goops.texi
+++ /dev/null
@@ -1,19 +0,0 @@
---- doc/goops/goops.texi.orig 2010-12-13 17:24:39 UTC
-+++ doc/goops/goops.texi
-@@ -1,6 +1,7 @@
- \input texinfo
- @c -*-texinfo-*-
- @c %**start of header
-+@documentencoding ISO-8859-1
- @setfilename goops.info
- @settitle Goops Manual
- @set goops
-@@ -131,7 +132,7 @@ info (goops.info) and texinfo format.
- @end menu
-
- @node Running GOOPS, Methods, Getting Started, Getting Started
--@subsection Running GOOPS
-+@section Running GOOPS
-
- @enumerate
- @item
diff --git a/lang/guile1/files/patch-doc__r5rs__r5rs.texi b/lang/guile1/files/patch-doc__r5rs__r5rs.texi
deleted file mode 100644
index be7c4a765759..000000000000
--- a/lang/guile1/files/patch-doc__r5rs__r5rs.texi
+++ /dev/null
@@ -1,12 +0,0 @@
---- doc/r5rs/r5rs.texi.orig 2010-12-08 09:06:50 UTC
-+++ doc/r5rs/r5rs.texi
-@@ -116,9 +116,6 @@
-
-
-
--@unnumbered Summary
--
--
- The report gives a defining description of the programming language
- Scheme. Scheme is a statically scoped and properly tail-recursive
- dialect of the Lisp programming language invented by Guy Lewis
diff --git a/lang/guile1/files/patch-doc__ref__fdl.texi b/lang/guile1/files/patch-doc__ref__fdl.texi
deleted file mode 100644
index 9df3c18cd4e6..000000000000
--- a/lang/guile1/files/patch-doc__ref__fdl.texi
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/ref/fdl.texi.orig 2010-12-13 17:24:39 UTC
-+++ doc/ref/fdl.texi
-@@ -408,7 +408,7 @@ as a draft) by the Free Software Foundat
- @end enumerate
-
- @page
--@appendixsubsec ADDENDUM: How to use this License for your documents
-+@appendixsec ADDENDUM: How to use this License for your documents
-
- To use this License in a document you have written, include a copy of
- the License in the document and put the following copyright and
diff --git a/lang/guile1/files/patch-doc__ref__gh.texi b/lang/guile1/files/patch-doc__ref__gh.texi
deleted file mode 100644
index a3fe80cd33bc..000000000000
--- a/lang/guile1/files/patch-doc__ref__gh.texi
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/ref/gh.texi.orig 2010-12-13 17:24:39 UTC
-+++ doc/ref/gh.texi
-@@ -995,8 +995,6 @@ These correspond to the Scheme @code{(co
-
- @deftypefun SCM gh_car (SCM @var{obj})
- @deftypefunx SCM gh_cdr (SCM @var{obj})
--@dots{}
--
- @deftypefunx SCM gh_c[ad][ad][ad][ad]r (SCM @var{obj})
- These correspond to the Scheme @code{(caadar ls)} procedures etc @dots{}
- @end deftypefun
diff --git a/lang/guile1/files/patch-doc__tutorial__guile-tut.texi b/lang/guile1/files/patch-doc__tutorial__guile-tut.texi
deleted file mode 100644
index 8d475d8e6728..000000000000
--- a/lang/guile1/files/patch-doc__tutorial__guile-tut.texi
+++ /dev/null
@@ -1,39 +0,0 @@
---- doc/tutorial/guile-tut.texi.orig 2010-12-13 17:24:39 UTC
-+++ doc/tutorial/guile-tut.texi
-@@ -446,7 +446,7 @@ get started, look at the books @cite{Sim
- Schemer} from that list.}
-
-
--@subsection Hello World
-+@section Hello World
- @cindex hello world
-
- Our first program is the typical Scheme "hello world" program. Put the
-@@ -535,12 +535,12 @@ guile> @kbd{(memq 4 ls)}
- guile> @kbd{(if (memq 4 ls)
- (display "hey, it's true!\n")
- (display "dude, it's false\n"))}
-- @print{hey, it's true!}
-+ @print{} hey, it's true!
- @result{}
- guile> @kbd{(if (memq 12 ls)
- (display "hey, it's true!\n")
- (display "dude, it's false\n"))}
-- @print{dude, it's false}
-+ @print{} dude, it's false
- @result{}
- guile> @kbd{(memq 4 (reverse ls))}
- @result{} (4 3 2 1)
-@@ -656,9 +656,9 @@ And then invoke it with
- (represent-matrix m
- (lambda (x) (begin (display x) (display " ")))
- (lambda (l) (begin (display "\n"))))
--@print{7 2 1 3 2 8 5 3 6}
--@print{4 1 1 1 3 8 9 8 1}
--@print{5 5 4 8 1 8 2 2 4}
-+@print{} 7 2 1 3 2 8 5 3 6
-+@print{} 4 1 1 1 3 8 9 8 1
-+@print{} 5 5 4 8 1 8 2 2 4
- @end smalllisp
-
- @cindex objects