Attachment #230741 for bug #260960





PORTNAME=	guile
PORTVERSION=	1.8.8
PORTREVISION=	1
CATEGORIES=	lang scheme
MASTER_SITES=	GNU
PKGNAMESUFFIX=	1

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\.

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=		guile${GUILE_VER}/goops guile${GUILE_VER}/guile-tut guile${GUILE_VER}/guile guile${GUILE_VER}/r5rs

OPTIONS_DEFINE=	NLS
OPTIONS_SUB=	yes

	@${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>




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

lib/libguilereadline-v-17.so.17
lib/libguilereadline-v-17.so.17.0.3
libdata/pkgconfig/guile-1.8.pc
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

%%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%%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





PORTNAME=	guile
PORTVERSION=	2.2.7
PORTREVISION=	2
CATEGORIES=	lang scheme
MASTER_SITES=	GNU
PKGNAMESUFFIX=	2


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${GUILE_VER}/guile guile${GUILE_VER}/r5rs

GUILE_VER=${PORTVERSION:R}
PLIST_SUB=	GUILE_VER=${GUILE_VER}

OPTIONS_DEFINE=	NLS THREADS
OPTIONS_DEFAULT=THREADS

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>




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

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%%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

Lines 66-71 OPTIONS_SUB= yes Link Here

(-)b/print/lilypond-devel/Makefile (+1 lines)
66	GUILE2_DESC= Use guile2 (will incur some performance penalty)	66	GUILE2_DESC= Use guile2 (will incur some performance penalty)
67	URW_DESC= Use bundled URW fonts	67	URW_DESC= Use bundled URW fonts
68		68
		69	GUILE2_CONFIGURE_ENV= GUILE_FLAVOR=guile-2.2
69	GUILE2_LIB_DEPENDS= libgc-threaded.so:devel/boehm-gc-threaded \	70	GUILE2_LIB_DEPENDS= libgc-threaded.so:devel/boehm-gc-threaded \
70	libguile-2.2.so:lang/guile2	71	libguile-2.2.so:lang/guile2
71	GUILE2_LIB_DEPENDS_OFF= libguile.so:lang/guile1	72	GUILE2_LIB_DEPENDS_OFF= libguile.so:lang/guile1

Lines 65-70 OPTIONS_SUB= yes Link Here

(-)b/print/lilypond/Makefile (+1 lines)
65	GUILE2_DESC= guile2 instead guile (incurs performance penalty)	65	GUILE2_DESC= guile2 instead guile (incurs performance penalty)
66	URW_DESC= Use bundled URW fonts	66	URW_DESC= Use bundled URW fonts
67		67
		68	GUILE2_CONFIGURE_ENV= GUILE_FLAVOR=guile-2.2
68	GUILE2_LIB_DEPENDS= libgc-threaded.so:devel/boehm-gc-threaded \	69	GUILE2_LIB_DEPENDS= libgc-threaded.so:devel/boehm-gc-threaded \
69	libguile-2.2.so:lang/guile2	70	libguile-2.2.so:lang/guile2
70	GUILE2_LIB_DEPENDS_OFF= libguile.so:lang/guile1	71	GUILE2_LIB_DEPENDS_OFF= libguile.so:lang/guile1

Return to bug 260960

Lines 3-8 Link Here

(-)b/lang/guile1/Makefile (-4 / +8 lines)
3		3
4	PORTNAME= guile	4	PORTNAME= guile
5	PORTVERSION= 1.8.8	5	PORTVERSION= 1.8.8
		6	PORTREVISION= 1
6	CATEGORIES= lang scheme	7	CATEGORIES= lang scheme
7	MASTER_SITES= GNU	8	MASTER_SITES= GNU
8	PKGNAMESUFFIX= 1	9	PKGNAMESUFFIX= 1
Lines 20-41 USES= autoreconf cpe gmake libtool makeinfo ncurses pathfix Link Here
20	CPE_VENDOR= gnu	21	CPE_VENDOR= gnu
21	USE_LDCONFIG= yes	22	USE_LDCONFIG= yes
22		23
23	CONFLICTS_INSTALL= guile2 guile
24
25	GNU_CONFIGURE= yes	24	GNU_CONFIGURE= yes
		25	CONFIGURE_ARGS+= --program-suffix=${GUILE_VER}
26	CFLAGS+= -fwrapv	26	CFLAGS+= -fwrapv
27	CPPFLAGS+= -I${LOCALBASE}/include	27	CPPFLAGS+= -I${LOCALBASE}/include
28	LIBS+= -L${LOCALBASE}/lib	28	LIBS+= -L${LOCALBASE}/lib
29	INSTALL_TARGET= install-strip	29	INSTALL_TARGET= install-strip
30	PORTSCOUT= limit:^1\.	30	PORTSCOUT= limit:^1\.
31		31
32	PLIST_SUB= GUILE_VER=${PORTVERSION:R}	32	GUILE_VER=${PORTVERSION:R}
		33	PLIST_SUB= GUILE_VER=${GUILE_VER}
33		34
34	REINPLACE_FILES= libguile/smob.c libguile/filesys.c libguile/gc.c \	35	REINPLACE_FILES= libguile/smob.c libguile/filesys.c libguile/gc.c \
35	libguile/mallocs.c libguile/eval.c libguile/gc-malloc.c \	36	libguile/mallocs.c libguile/eval.c libguile/gc-malloc.c \
36	libguile/ports.c libguile/gc-mark.c libguile/gc_os_dep.c	37	libguile/ports.c libguile/gc-mark.c libguile/gc_os_dep.c
37		38
38	INFO= goops guile-tut guile r5rs	39	INFO= guile${GUILE_VER}/goops guile${GUILE_VER}/guile-tut guile${GUILE_VER}/guile guile${GUILE_VER}/r5rs
39		40
40	OPTIONS_DEFINE= NLS	41	OPTIONS_DEFINE= NLS
41	OPTIONS_SUB= yes	42	OPTIONS_SUB= yes
Lines 53-56 post-patch: Link Here
53	@${REINPLACE_CMD} -e 's\|$$(libdir)\|$$(libdir)data\|g' ${WRKSRC}/Makefile.am	54	@${REINPLACE_CMD} -e 's\|$$(libdir)\|$$(libdir)data\|g' ${WRKSRC}/Makefile.am
54	@${TOUCH} ${WRKSRC}/Makefile.in	55	@${TOUCH} ${WRKSRC}/Makefile.in
55		56
		57	post-install:
		58	${MV} ${STAGEDIR}${PREFIX}/share/aclocal/guile.m4 ${STAGEDIR}${PREFIX}/share/aclocal/guile${GUILE_VER}.m4
		59
56	.include <bsd.port.mk>	60	.include <bsd.port.mk>

Lines 1-7 Link Here

(-)b/lang/guile1/pkg-plist (-23 / +23 lines)
1	bin/guile	1	bin/guile%%GUILE_VER%%
2	bin/guile-config	2	bin/guile-config%%GUILE_VER%%
3	bin/guile-snarf	3	bin/guile-snarf%%GUILE_VER%%
4	bin/guile-tools	4	bin/guile-tools%%GUILE_VER%%
5	include/guile/gh.h	5	include/guile/gh.h
6	include/guile/readline.h	6	include/guile/readline.h
7	include/guile/srfi/srfi-1.h	7	include/guile/srfi/srfi-1.h
Lines 135-142 lib/libguilereadline-v-17.so Link Here
135	lib/libguilereadline-v-17.so.17	135	lib/libguilereadline-v-17.so.17
136	lib/libguilereadline-v-17.so.17.0.3	136	lib/libguilereadline-v-17.so.17.0.3
137	libdata/pkgconfig/guile-1.8.pc	137	libdata/pkgconfig/guile-1.8.pc
138	man/man1/guile.1.gz	138	man/man1/guile%%GUILE_VER%%.1.gz
139	share/aclocal/guile.m4	139	share/aclocal/guile%%GUILE_VER%%.m4
140	%%DATADIR%%/%%GUILE_VER%%/guile-procedures.txt	140	%%DATADIR%%/%%GUILE_VER%%/guile-procedures.txt
141	%%DATADIR%%/%%GUILE_VER%%/ice-9/and-let-star.scm	141	%%DATADIR%%/%%GUILE_VER%%/ice-9/and-let-star.scm
142	%%DATADIR%%/%%GUILE_VER%%/ice-9/boot-9.scm	142	%%DATADIR%%/%%GUILE_VER%%/ice-9/boot-9.scm
Lines 252-274 share/aclocal/guile.m4 Link Here
252	%%DATADIR%%/%%GUILE_VER%%/oop/goops/simple.scm	252	%%DATADIR%%/%%GUILE_VER%%/oop/goops/simple.scm
253	%%DATADIR%%/%%GUILE_VER%%/oop/goops/stklos.scm	253	%%DATADIR%%/%%GUILE_VER%%/oop/goops/stklos.scm
254	%%DATADIR%%/%%GUILE_VER%%/oop/goops/util.scm	254	%%DATADIR%%/%%GUILE_VER%%/oop/goops/util.scm
255	%%DATADIR%%/%%GUILE_VER%%/scripts/PROGRAM	255	%%DATADIR%%/%%GUILE_VER%%/scripts/PROGRAM%%GUILE_VER%%
256	%%DATADIR%%/%%GUILE_VER%%/scripts/api-diff	256	%%DATADIR%%/%%GUILE_VER%%/scripts/api-diff%%GUILE_VER%%
257	%%DATADIR%%/%%GUILE_VER%%/scripts/autofrisk	257	%%DATADIR%%/%%GUILE_VER%%/scripts/autofrisk%%GUILE_VER%%
258	%%DATADIR%%/%%GUILE_VER%%/scripts/display-commentary	258	%%DATADIR%%/%%GUILE_VER%%/scripts/display-commentary%%GUILE_VER%%
259	%%DATADIR%%/%%GUILE_VER%%/scripts/doc-snarf	259	%%DATADIR%%/%%GUILE_VER%%/scripts/doc-snarf%%GUILE_VER%%
260	%%DATADIR%%/%%GUILE_VER%%/scripts/frisk	260	%%DATADIR%%/%%GUILE_VER%%/scripts/frisk%%GUILE_VER%%
261	%%DATADIR%%/%%GUILE_VER%%/scripts/generate-autoload	261	%%DATADIR%%/%%GUILE_VER%%/scripts/generate-autoload%%GUILE_VER%%
262	%%DATADIR%%/%%GUILE_VER%%/scripts/lint	262	%%DATADIR%%/%%GUILE_VER%%/scripts/lint%%GUILE_VER%%
263	%%DATADIR%%/%%GUILE_VER%%/scripts/punify	263	%%DATADIR%%/%%GUILE_VER%%/scripts/punify%%GUILE_VER%%
264	%%DATADIR%%/%%GUILE_VER%%/scripts/read-rfc822	264	%%DATADIR%%/%%GUILE_VER%%/scripts/read-rfc822%%GUILE_VER%%
265	%%DATADIR%%/%%GUILE_VER%%/scripts/read-scheme-source	265	%%DATADIR%%/%%GUILE_VER%%/scripts/read-scheme-source%%GUILE_VER%%
266	%%DATADIR%%/%%GUILE_VER%%/scripts/read-text-outline	266	%%DATADIR%%/%%GUILE_VER%%/scripts/read-text-outline%%GUILE_VER%%
267	%%DATADIR%%/%%GUILE_VER%%/scripts/scan-api	267	%%DATADIR%%/%%GUILE_VER%%/scripts/scan-api%%GUILE_VER%%
268	%%DATADIR%%/%%GUILE_VER%%/scripts/snarf-check-and-output-texi	268	%%DATADIR%%/%%GUILE_VER%%/scripts/snarf-check-and-output-texi%%GUILE_VER%%
269	%%DATADIR%%/%%GUILE_VER%%/scripts/snarf-guile-m4-docs	269	%%DATADIR%%/%%GUILE_VER%%/scripts/snarf-guile-m4-docs%%GUILE_VER%%
270	%%DATADIR%%/%%GUILE_VER%%/scripts/summarize-guile-TODO	270	%%DATADIR%%/%%GUILE_VER%%/scripts/summarize-guile-TODO%%GUILE_VER%%
271	%%DATADIR%%/%%GUILE_VER%%/scripts/use2dot	271	%%DATADIR%%/%%GUILE_VER%%/scripts/use2dot%%GUILE_VER%%
272	%%DATADIR%%/%%GUILE_VER%%/srfi/srfi-1.scm	272	%%DATADIR%%/%%GUILE_VER%%/srfi/srfi-1.scm
273	%%DATADIR%%/%%GUILE_VER%%/srfi/srfi-10.scm	273	%%DATADIR%%/%%GUILE_VER%%/srfi/srfi-10.scm
274	%%DATADIR%%/%%GUILE_VER%%/srfi/srfi-11.scm	274	%%DATADIR%%/%%GUILE_VER%%/srfi/srfi-11.scm

Lines 2-8 Link Here

(-)b/lang/guile2/Makefile (-5 / +8 lines)
2		2
3	PORTNAME= guile	3	PORTNAME= guile
4	PORTVERSION= 2.2.7	4	PORTVERSION= 2.2.7
5	PORTREVISION= 1	5	PORTREVISION= 2
6	CATEGORIES= lang scheme	6	CATEGORIES= lang scheme
7	MASTER_SITES= GNU	7	MASTER_SITES= GNU
8	PKGNAMESUFFIX= 2	8	PKGNAMESUFFIX= 2
Lines 24-41 USE_LDCONFIG= yes Link Here
24		24
25	CPE_VENDOR= gnu	25	CPE_VENDOR= gnu
26		26
27	CONFLICTS_INSTALL= guile
28
29	MAKE_JOBS_UNSAFE= yes	27	MAKE_JOBS_UNSAFE= yes
30		28
31	GNU_CONFIGURE= yes	29	GNU_CONFIGURE= yes
		30	CONFIGURE_ARGS+= --program-suffix=${GUILE_VER}
32	CPPFLAGS+= -I${LOCALBASE}/include	31	CPPFLAGS+= -I${LOCALBASE}/include
33	LIBS+= -L${LOCALBASE}/lib	32	LIBS+= -L${LOCALBASE}/lib
34	INSTALL_TARGET= install-strip	33	INSTALL_TARGET= install-strip
35		34
36	INFO= guile r5rs	35	INFO= guile${GUILE_VER}/guile guile${GUILE_VER}/r5rs
37		36
38	PLIST_SUB= GUILE_VER=${PORTVERSION:R}	37	GUILE_VER=${PORTVERSION:R}
		38	PLIST_SUB= GUILE_VER=${GUILE_VER}
39		39
40	OPTIONS_DEFINE= NLS THREADS	40	OPTIONS_DEFINE= NLS THREADS
41	OPTIONS_DEFAULT=THREADS	41	OPTIONS_DEFAULT=THREADS
Lines 64-67 post-patch: Link Here
64	post-patch-THREADS-on:	64	post-patch-THREADS-on:
65	@${REINPLACE_CMD} -e 's\|bdw-gc\|bdw-gc-threaded\|g' ${WRKSRC}/configure	65	@${REINPLACE_CMD} -e 's\|bdw-gc\|bdw-gc-threaded\|g' ${WRKSRC}/configure
66		66
		67	post-install:
		68	${MV} ${STAGEDIR}${PREFIX}/share/aclocal/guile.m4 ${STAGEDIR}${PREFIX}/share/aclocal/guile${GUILE_VER}.m4
		69
67	.include <bsd.port.mk>	70	.include <bsd.port.mk>

Lines 1-8 Link Here

(-)b/lang/guile2/pkg-plist (-7 / +7 lines)
1	bin/guild	1	bin/guild%%GUILE_VER%%
2	bin/guile	2	bin/guile%%GUILE_VER%%
3	bin/guile-config	3	bin/guile-config%%GUILE_VER%%
4	bin/guile-snarf	4	bin/guile-snarf%%GUILE_VER%%
5	bin/guile-tools	5	bin/guile-tools%%GUILE_VER%%
6	include/guile/%%GUILE_VER%%/libguile.h	6	include/guile/%%GUILE_VER%%/libguile.h
7	include/guile/%%GUILE_VER%%/libguile/__scm.h	7	include/guile/%%GUILE_VER%%/libguile/__scm.h
8	include/guile/%%GUILE_VER%%/libguile/alist.h	8	include/guile/%%GUILE_VER%%/libguile/alist.h
Lines 442-449 lib/libguile-%%GUILE_VER%%.so.1 Link Here
442	lib/libguile-%%GUILE_VER%%.so.1.4.2	442	lib/libguile-%%GUILE_VER%%.so.1.4.2
443	lib/libguile-%%GUILE_VER%%.so.1.4.2-gdb.scm	443	lib/libguile-%%GUILE_VER%%.so.1.4.2-gdb.scm
444	libdata/pkgconfig/guile-%%GUILE_VER%%.pc	444	libdata/pkgconfig/guile-%%GUILE_VER%%.pc
445	man/man1/guile.1.gz	445	man/man1/guile%%GUILE_VER%%.1.gz
446	share/aclocal/guile.m4	446	share/aclocal/guile%%GUILE_VER%%.m4
447	%%DATADIR%%/%%GUILE_VER%%/guile-procedures.txt	447	%%DATADIR%%/%%GUILE_VER%%/guile-procedures.txt
448	%%DATADIR%%/%%GUILE_VER%%/ice-9/and-let-star.scm	448	%%DATADIR%%/%%GUILE_VER%%/ice-9/and-let-star.scm
449	%%DATADIR%%/%%GUILE_VER%%/ice-9/arrays.scm	449	%%DATADIR%%/%%GUILE_VER%%/ice-9/arrays.scm