Attachment 230741 Details for Bug 260960 – patch for guile1 and guile2 to coexist

[patch] patch for guile1 and guile2 to coexist

guile_multiple_versions.patch (text/plain), 7.30 KB, created by Martin Neubauer on 2022-01-05 18:29:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Neubauer

Created: 2022-01-05 18:29:01 UTC

Size: 7.30 KB

patch

obsolete

>diff --git a/lang/guile1/Makefile b/lang/guile1/Makefile
>index 0643292655b5..8a1ffade9fd0 100644
>--- a/lang/guile1/Makefile
>+++ b/lang/guile1/Makefile
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	guile
> PORTVERSION=	1.8.8
>+PORTREVISION=	1
> CATEGORIES=	lang scheme
> MASTER_SITES=	GNU
> PKGNAMESUFFIX=	1
>@@ -20,22 +21,22 @@ USES=		autoreconf cpe gmake libtool makeinfo ncurses pathfix
> CPE_VENDOR=	gnu
> USE_LDCONFIG=	yes
> 
>-CONFLICTS_INSTALL=	guile2 guile
>-
> GNU_CONFIGURE=	yes
>+CONFIGURE_ARGS+=	--program-suffix=${GUILE_VER}
> CFLAGS+=	-fwrapv
> CPPFLAGS+=	-I${LOCALBASE}/include
> LIBS+=		-L${LOCALBASE}/lib
> INSTALL_TARGET=	install-strip
> PORTSCOUT=	limit:^1\.
> 
>-PLIST_SUB=	GUILE_VER=${PORTVERSION:R}
>+GUILE_VER=${PORTVERSION:R}
>+PLIST_SUB=	GUILE_VER=${GUILE_VER}
> 
> REINPLACE_FILES=	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
> 
>-INFO=		goops guile-tut guile r5rs
>+INFO=		guile${GUILE_VER}/goops guile${GUILE_VER}/guile-tut guile${GUILE_VER}/guile guile${GUILE_VER}/r5rs
> 
> OPTIONS_DEFINE=	NLS
> OPTIONS_SUB=	yes
>@@ -53,4 +54,7 @@ post-patch:
> 	@${REINPLACE_CMD} -e 's|$$(libdir)|$$(libdir)data|g' ${WRKSRC}/Makefile.am
> 	@${TOUCH} ${WRKSRC}/Makefile.in
> 
>+post-install:
>+	${MV} ${STAGEDIR}${PREFIX}/share/aclocal/guile.m4 ${STAGEDIR}${PREFIX}/share/aclocal/guile${GUILE_VER}.m4
>+
> .include <bsd.port.mk>
>diff --git a/lang/guile1/pkg-plist b/lang/guile1/pkg-plist
>index 21a21b732956..c169788ce579 100644
>--- a/lang/guile1/pkg-plist
>+++ b/lang/guile1/pkg-plist
>@@ -1,7 +1,7 @@
>-bin/guile
>-bin/guile-config
>-bin/guile-snarf
>-bin/guile-tools
>+bin/guile%%GUILE_VER%%
>+bin/guile-config%%GUILE_VER%%
>+bin/guile-snarf%%GUILE_VER%%
>+bin/guile-tools%%GUILE_VER%%
> include/guile/gh.h
> include/guile/readline.h
> include/guile/srfi/srfi-1.h
>@@ -135,8 +135,8 @@ lib/libguilereadline-v-17.so
> lib/libguilereadline-v-17.so.17
> lib/libguilereadline-v-17.so.17.0.3
> libdata/pkgconfig/guile-1.8.pc
>-man/man1/guile.1.gz
>-share/aclocal/guile.m4
>+man/man1/guile%%GUILE_VER%%.1.gz
>+share/aclocal/guile%%GUILE_VER%%.m4
> %%DATADIR%%/%%GUILE_VER%%/guile-procedures.txt
> %%DATADIR%%/%%GUILE_VER%%/ice-9/and-let-star.scm
> %%DATADIR%%/%%GUILE_VER%%/ice-9/boot-9.scm
>@@ -252,23 +252,23 @@ share/aclocal/guile.m4
> %%DATADIR%%/%%GUILE_VER%%/oop/goops/simple.scm
> %%DATADIR%%/%%GUILE_VER%%/oop/goops/stklos.scm
> %%DATADIR%%/%%GUILE_VER%%/oop/goops/util.scm
>-%%DATADIR%%/%%GUILE_VER%%/scripts/PROGRAM
>-%%DATADIR%%/%%GUILE_VER%%/scripts/api-diff
>-%%DATADIR%%/%%GUILE_VER%%/scripts/autofrisk
>-%%DATADIR%%/%%GUILE_VER%%/scripts/display-commentary
>-%%DATADIR%%/%%GUILE_VER%%/scripts/doc-snarf
>-%%DATADIR%%/%%GUILE_VER%%/scripts/frisk
>-%%DATADIR%%/%%GUILE_VER%%/scripts/generate-autoload
>-%%DATADIR%%/%%GUILE_VER%%/scripts/lint
>-%%DATADIR%%/%%GUILE_VER%%/scripts/punify
>-%%DATADIR%%/%%GUILE_VER%%/scripts/read-rfc822
>-%%DATADIR%%/%%GUILE_VER%%/scripts/read-scheme-source
>-%%DATADIR%%/%%GUILE_VER%%/scripts/read-text-outline
>-%%DATADIR%%/%%GUILE_VER%%/scripts/scan-api
>-%%DATADIR%%/%%GUILE_VER%%/scripts/snarf-check-and-output-texi
>-%%DATADIR%%/%%GUILE_VER%%/scripts/snarf-guile-m4-docs
>-%%DATADIR%%/%%GUILE_VER%%/scripts/summarize-guile-TODO
>-%%DATADIR%%/%%GUILE_VER%%/scripts/use2dot
>+%%DATADIR%%/%%GUILE_VER%%/scripts/PROGRAM%%GUILE_VER%%
>+%%DATADIR%%/%%GUILE_VER%%/scripts/api-diff%%GUILE_VER%%
>+%%DATADIR%%/%%GUILE_VER%%/scripts/autofrisk%%GUILE_VER%%
>+%%DATADIR%%/%%GUILE_VER%%/scripts/display-commentary%%GUILE_VER%%
>+%%DATADIR%%/%%GUILE_VER%%/scripts/doc-snarf%%GUILE_VER%%
>+%%DATADIR%%/%%GUILE_VER%%/scripts/frisk%%GUILE_VER%%
>+%%DATADIR%%/%%GUILE_VER%%/scripts/generate-autoload%%GUILE_VER%%
>+%%DATADIR%%/%%GUILE_VER%%/scripts/lint%%GUILE_VER%%
>+%%DATADIR%%/%%GUILE_VER%%/scripts/punify%%GUILE_VER%%
>+%%DATADIR%%/%%GUILE_VER%%/scripts/read-rfc822%%GUILE_VER%%
>+%%DATADIR%%/%%GUILE_VER%%/scripts/read-scheme-source%%GUILE_VER%%
>+%%DATADIR%%/%%GUILE_VER%%/scripts/read-text-outline%%GUILE_VER%%
>+%%DATADIR%%/%%GUILE_VER%%/scripts/scan-api%%GUILE_VER%%
>+%%DATADIR%%/%%GUILE_VER%%/scripts/snarf-check-and-output-texi%%GUILE_VER%%
>+%%DATADIR%%/%%GUILE_VER%%/scripts/snarf-guile-m4-docs%%GUILE_VER%%
>+%%DATADIR%%/%%GUILE_VER%%/scripts/summarize-guile-TODO%%GUILE_VER%%
>+%%DATADIR%%/%%GUILE_VER%%/scripts/use2dot%%GUILE_VER%%
> %%DATADIR%%/%%GUILE_VER%%/srfi/srfi-1.scm
> %%DATADIR%%/%%GUILE_VER%%/srfi/srfi-10.scm
> %%DATADIR%%/%%GUILE_VER%%/srfi/srfi-11.scm
>diff --git a/lang/guile2/Makefile b/lang/guile2/Makefile
>index 9a88ec772454..ace3f49b50ca 100644
>--- a/lang/guile2/Makefile
>+++ b/lang/guile2/Makefile
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	guile
> PORTVERSION=	2.2.7
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	lang scheme
> MASTER_SITES=	GNU
> PKGNAMESUFFIX=	2
>@@ -24,18 +24,18 @@ USE_LDCONFIG=	yes
> 
> CPE_VENDOR=	gnu
> 
>-CONFLICTS_INSTALL=	guile
>-
> MAKE_JOBS_UNSAFE=	yes
> 
> GNU_CONFIGURE=	yes
>+CONFIGURE_ARGS+=	--program-suffix=${GUILE_VER}
> CPPFLAGS+=	-I${LOCALBASE}/include
> LIBS+=		-L${LOCALBASE}/lib
> INSTALL_TARGET=	install-strip
> 
>-INFO=		guile r5rs
>+INFO=		guile${GUILE_VER}/guile guile${GUILE_VER}/r5rs
> 
>-PLIST_SUB=	GUILE_VER=${PORTVERSION:R}
>+GUILE_VER=${PORTVERSION:R}
>+PLIST_SUB=	GUILE_VER=${GUILE_VER}
> 
> OPTIONS_DEFINE=	NLS THREADS
> OPTIONS_DEFAULT=THREADS
>@@ -64,4 +64,7 @@ post-patch:
> post-patch-THREADS-on:
> 	@${REINPLACE_CMD} -e 's|bdw-gc|bdw-gc-threaded|g' ${WRKSRC}/configure
> 
>+post-install:
>+	${MV} ${STAGEDIR}${PREFIX}/share/aclocal/guile.m4 ${STAGEDIR}${PREFIX}/share/aclocal/guile${GUILE_VER}.m4
>+
> .include <bsd.port.mk>
>diff --git a/lang/guile2/pkg-plist b/lang/guile2/pkg-plist
>index 134d20a68441..5af4059a1cfe 100644
>--- a/lang/guile2/pkg-plist
>+++ b/lang/guile2/pkg-plist
>@@ -1,8 +1,8 @@
>-bin/guild
>-bin/guile
>-bin/guile-config
>-bin/guile-snarf
>-bin/guile-tools
>+bin/guild%%GUILE_VER%%
>+bin/guile%%GUILE_VER%%
>+bin/guile-config%%GUILE_VER%%
>+bin/guile-snarf%%GUILE_VER%%
>+bin/guile-tools%%GUILE_VER%%
> include/guile/%%GUILE_VER%%/libguile.h
> include/guile/%%GUILE_VER%%/libguile/__scm.h
> include/guile/%%GUILE_VER%%/libguile/alist.h
>@@ -442,8 +442,8 @@ lib/libguile-%%GUILE_VER%%.so.1
> lib/libguile-%%GUILE_VER%%.so.1.4.2
> lib/libguile-%%GUILE_VER%%.so.1.4.2-gdb.scm
> libdata/pkgconfig/guile-%%GUILE_VER%%.pc
>-man/man1/guile.1.gz
>-share/aclocal/guile.m4
>+man/man1/guile%%GUILE_VER%%.1.gz
>+share/aclocal/guile%%GUILE_VER%%.m4
> %%DATADIR%%/%%GUILE_VER%%/guile-procedures.txt
> %%DATADIR%%/%%GUILE_VER%%/ice-9/and-let-star.scm
> %%DATADIR%%/%%GUILE_VER%%/ice-9/arrays.scm
>diff --git a/print/lilypond-devel/Makefile b/print/lilypond-devel/Makefile
>index 106b0e71a1fd..c768c9c470b5 100644
>--- a/print/lilypond-devel/Makefile
>+++ b/print/lilypond-devel/Makefile
>@@ -66,6 +66,7 @@ OPTIONS_SUB=	yes
> GUILE2_DESC=	Use guile2 (will incur some performance penalty)
> URW_DESC=	Use bundled URW fonts
> 
>+GUILE2_CONFIGURE_ENV=	GUILE_FLAVOR=guile-2.2
> GUILE2_LIB_DEPENDS=	libgc-threaded.so:devel/boehm-gc-threaded \
> 			libguile-2.2.so:lang/guile2
> GUILE2_LIB_DEPENDS_OFF=	libguile.so:lang/guile1
>diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
>index 8c32aa5f7a38..abd08fba4d84 100644
>--- a/print/lilypond/Makefile
>+++ b/print/lilypond/Makefile
>@@ -65,6 +65,7 @@ OPTIONS_SUB=	yes
> GUILE2_DESC=	guile2 instead guile (incurs performance penalty)
> URW_DESC=	Use bundled URW fonts
> 
>+GUILE2_CONFIGURE_ENV=	GUILE_FLAVOR=guile-2.2
> GUILE2_LIB_DEPENDS=	libgc-threaded.so:devel/boehm-gc-threaded \
> 			libguile-2.2.so:lang/guile2
> GUILE2_LIB_DEPENDS_OFF=	libguile.so:lang/guile1

Actions: View | Diff

Attachments on bug 260960: 230741 | 243778