View | Details | Raw Unified | Return to bug 178869 | Differences between
and this patch

Collapse All | Expand All

(-)lang/scm/Makefile (-50 / +48 lines)
Lines 1-99 Link Here
1
# New ports collection makefile for:	scm
1
# Created by: hsu
2
# Date created:		Sat Nov  5 17:11:01 PST 1994
3
# Whom:			hsu
4
#
5
# $FreeBSD: head/lang/scm/Makefile 300896 2012-07-14 13:54:48Z beat $
2
# $FreeBSD: head/lang/scm/Makefile 300896 2012-07-14 13:54:48Z beat $
6
#
7
3
8
PORTNAME=	scm
4
PORTNAME=	scm
9
PORTVERSION=	5e7
5
PORTVERSION=	5f1
10
CATEGORIES=	lang scheme
6
CATEGORIES=	lang scheme
11
MASTER_SITES=	http://groups.csail.mit.edu/mac/ftpdir/scm/%SUBDIR%/ \
7
MASTER_SITES=	http://groups.csail.mit.edu/mac/ftpdir/scm/%SUBDIR%/
12
		ftp://ftp.informatik.uni-hamburg.de/ftpmnt/inf1/pub/soft/lang/scheme/
13
MASTER_SITE_SUBDIR=	. OLD
8
MASTER_SITE_SUBDIR=	. OLD
14
DISTFILES=	${DISTNAME}${EXTRACT_SUFX} slib-3b3.zip slib-psd1-3.tar.gz
9
DISTFILES=	${DISTNAME}${EXTRACT_SUFX} slib-3b4.zip slib-psd1-3.tar.gz
15
EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} slib-3b3.zip
10
EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} slib-3b4.zip
16
11
17
MAINTAINER=	ports@FreeBSD.org
12
MAINTAINER=	ports@FreeBSD.org
18
COMMENT=	A scheme interpreter
13
COMMENT=	Scheme interpreter
14
15
LICENSE=	LGPL21
16
17
OPTIONS_DEFINE=	X11
19
18
20
WRKSRC=		${WRKDIR}/${PORTNAME}
19
WRKSRC=		${WRKDIR}/${PORTNAME}
21
20
22
USE_ZIP=	yes
21
USE_ZIP=	yes
22
USES=		readline
23
USE_GCC=	any
23
USE_GMAKE=	yes
24
USE_GMAKE=	yes
24
MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" IMPLPATH="${PREFIX}/lib/scm/" \
25
		SCMLIT="./scmlit"
26
ALL_TARGET=	scmlit scm5 mydlls
27
MAN1=		scm.1
28
INFO=		scm
29
MAKE_JOBS_UNSAFE=	yes
25
MAKE_JOBS_UNSAFE=	yes
30
26
27
SUB_FILES=	require.scm
28
31
PLIST_SUB=	VERSION="${PORTVERSION}"
29
PLIST_SUB=	VERSION="${PORTVERSION}"
32
30
33
SUB_FILES=	require.scm
31
MAN1=		scm.1
32
INFO=		scm
34
33
35
SCM_DATA=	COPYING COPYING.LESSER Iedline.scm Idiffer.scm \
34
SCM_DATA=	COPYING COPYING.LESSER Iedline.scm Idiffer.scm \
36
		Init${PORTVERSION}.scm Link.scm Macexp.scm Macro.scm \
35
		Init${PORTVERSION}.scm Link.scm Macexp.scm Macro.scm \
37
		Transcen.scm Tscript.scm build build.scm compile.scm \
36
		Transcen.scm Tscript.scm build build.scm compile.scm \
38
		hobbit.scm keysymdef.scm mkimpcat.scm patchlvl.h \
37
		hobbit.scm mkimpcat.scm patchlvl.h \
39
		r4rstest.scm rwb-isam.scm scmhob.h scmhob.scm wbtab.scm \
38
		r4rstest.scm rwb-isam.scm scmhob.h scmhob.scm wbtab.scm
40
		x11.scm xatoms.scm xevent.scm
41
SCM_MODULES=	byte.so bytenumb.so crs.so differ.so edline.so gsubr.so \
39
SCM_MODULES=	byte.so bytenumb.so crs.so differ.so edline.so gsubr.so \
42
		ioext.so posix.so ramap.so record.so rgx.so sc2.so \
40
		ioext.so posix.so ramap.so record.so rgx.so sc2.so \
43
		socket.so unix.so
41
		socket.so unix.so
44
42
43
.include <bsd.port.options.mk>
44
45
.if ${PORT_OPTIONS:MX11}
46
USE_XORG=	ice sm x11 xext
47
PLIST_SUB+=	X11=""
48
SCM_DATA+=	keysymdef.scm x11.scm xatoms.scm xevent.scm
49
SCM_MODULES+=	x.so
50
.else
51
PLIST_SUB+=	X11="@comment "
52
.endif
53
45
.include <bsd.port.pre.mk>
54
.include <bsd.port.pre.mk>
46
55
47
.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
56
.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
48
BROKEN=		Does not compile on ia64, powerpc, or sparc64
57
BROKEN=		Does not compile on ia64, powerpc, or sparc64
49
.endif
58
.endif
50
59
51
.if defined(WITH_X11)
60
.if ${OSVERSION} > 1000000
52
USE_XORG=	ice sm x11 xext
61
READLINE_DIR=	${LOCALBASE}
53
SCM_MODULES+=	x.so
54
PLIST_SUB+=	X11=""
55
.else
62
.else
56
PLIST_SUB+=	X11="@comment "
63
READLINE_DIR=	/usr
57
.endif
64
.endif
58
65
59
post-extract:
66
post-extract:
60
	@${TAR} -C ${WRKDIR} -zxf ${DISTDIR}/slib-psd1-3.tar.gz
67
	@${TAR} -C ${WRKDIR} -zxf ${DISTDIR}/slib-psd1-3.tar.gz
61
68
62
post-patch:
69
post-patch:
63
	@${REINPLACE_CMD} -e 's|exec ./scmlit|exec $$SCMLIT|g' ${WRKSRC}/build
70
	@${REINPLACE_CMD} -e 's|/usr/include|${LOCALBASE}/include|' \
71
		${WRKSRC}/Makefile
64
	@${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g ; \
72
	@${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g ; \
65
		 s|%%CFLAGS%%|${CFLAGS}|g ; \
73
		 s|%%CFLAGS%%|${CFLAGS}|g ; \
74
		 s|%%READLINE_DIR%%|${READLINE_DIR}|g ; \
66
		 s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/build.scm
75
		 s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/build.scm
67
	@${REINPLACE_CMD} -e 's|gnuregex\.h|gnu/regex.h|g' ${WRKSRC}/rgx.c
76
	@${REINPLACE_CMD} -e 's|gnuregex\.h|gnu/regex.h|g' ${WRKSRC}/rgx.c
68
77
	@${REINPLACE_CMD} -e 's|/usr/include|${LOCALBASE}/include|g' \
69
post-build:
78
		${WRKSRC}/xgen.scm
70
	@cd ${WRKSRC} \
71
		&& SCMLIT="./scmlit" ${SH} ./build \
72
		 -c differ.c \
73
		 -h system \
74
		 -t dll
75
.if defined(WITH_X11)
76
	@cd ${WRKSRC} \
77
		&& SCMLIT="./scmlit" ${SH} ./build \
78
		 -F x \
79
		 -h system \
80
		 -t dll
81
.endif
82
79
83
do-install:
80
do-install:
84
	${INSTALL_PROGRAM} ${WRKSRC}/scm ${PREFIX}/bin
81
	(cd ${WRKSRC} && ${INSTALL_PROGRAM} scm ${PREFIX}/bin)
85
	${INSTALL_PROGRAM} ${WRKSRC}/scmlit ${PREFIX}/bin
82
	(cd ${WRKSRC} && ${INSTALL_SCRIPT} scmlit ${PREFIX}/bin)
86
	${INSTALL_MAN} ${WRKSRC}/scm.1 ${MANPREFIX}/man/man1
83
	(cd ${WRKSRC} && ${INSTALL_MAN} scm.1 ${MANPREFIX}/man/man1)
87
	@${MKDIR} ${PREFIX}/lib/scm
84
	@${MKDIR} ${PREFIX}/lib/scm
88
	${INSTALL_DATA} ${WRKDIR}/require.scm ${PREFIX}/lib/scm
85
	(cd ${WRKDIR} && ${INSTALL_DATA} require.scm ${PREFIX}/lib/scm)
89
.for file in ${SCM_DATA} ${SCM_MODULES}
86
.for i in ${SCM_DATA} ${SCM_MODULES}
90
	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/lib/scm
87
	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${PREFIX}/lib/scm)
91
.endfor
88
.endfor
92
	@${MKDIR} ${PREFIX}/lib/scm/slib
89
	@${MKDIR} ${PREFIX}/lib/scm/slib
93
	${INSTALL_DATA} ${WRKDIR}/slib/*.scm ${PREFIX}/lib/scm/slib
90
	(cd ${WRKDIR}/slib && ${INSTALL_DATA} *.scm ${PREFIX}/lib/scm/slib)
94
	@${MKDIR} ${PREFIX}/lib/scm/slib/psd
91
	@${MKDIR} ${PREFIX}/lib/scm/slib/psd
95
	${INSTALL_DATA} ${WRKDIR}/slib/psd/*.scm ${PREFIX}/lib/scm/slib/psd
92
	(cd ${WRKDIR}/slib/psd && ${INSTALL_DATA} *.scm \
96
	${INSTALL_DATA} ${WRKDIR}/scm/scm.info ${PREFIX}/${INFO_PATH}
93
		${PREFIX}/lib/scm/slib/psd)
97
	cd ${PREFIX}/lib/scm && ${PREFIX}/bin/scm -lmkimpcat.scm
94
	(cd ${WRKDIR}/scm && ${INSTALL_DATA} scm.info ${PREFIX}/${INFO_PATH})
95
	(cd ${PREFIX}/lib/scm && ${PREFIX}/bin/scm -lmkimpcat.scm)
98
96
99
.include <bsd.port.post.mk>
97
.include <bsd.port.post.mk>
(-)lang/scm/distinfo (-4 / +4 lines)
Lines 1-6 Link Here
1
SHA256 (scm-5e7.zip) = f4869c7925574c8a167249adb0bc0e4bbd0415cd1e3d02c8daf98fbe0d710f51
1
SHA256 (scm-5f1.zip) = f469e08e03fef5e2fa54349faaff630e63e88fc39f5fc98a6a55a6aa865a57c0
2
SIZE (scm-5e7.zip) = 919897
2
SIZE (scm-5f1.zip) = 952965
3
SHA256 (slib-3b3.zip) = 1861aad6e80b2afaf14789a8778c1f0c00ff8fd6051f7cffcd2aa945880b443e
3
SHA256 (slib-3b4.zip) = ddfa66c61db1dec44147cad98e46cb9ec151f62dfaa10aa2508fbd26d46272a7
4
SIZE (slib-3b3.zip) = 1085062
4
SIZE (slib-3b4.zip) = 1099910
5
SHA256 (slib-psd1-3.tar.gz) = 1665fc6cf572e6d8d99e81b4f6b1e65b04a095b69baebd85d0085ad552dc2955
5
SHA256 (slib-psd1-3.tar.gz) = 1665fc6cf572e6d8d99e81b4f6b1e65b04a095b69baebd85d0085ad552dc2955
6
SIZE (slib-psd1-3.tar.gz) = 62397
6
SIZE (slib-psd1-3.tar.gz) = 62397
(-)lang/scm/files/patch-build.scm (-11 / +22 lines)
Lines 1-14 Link Here
1
--- build.scm.orig	2009-08-04 03:35:57.000000000 +0900
1
--- build.scm.orig	2009-08-04 03:35:57.000000000 +0900
2
+++ build.scm	2009-08-07 01:59:30.000000000 +0900
2
+++ build.scm	2009-08-07 01:59:30.000000000 +0900
3
@@ -659,6 +659,7 @@
3
@@ -667,12 +667,13 @@
4
      (curses freebsd "" "-lncurses" "/usr/lib/libncurses.a" () ())
4
 
5
      (c freebsd "" "-export-dynamic" #f () ())
6
      (m freebsd "" "-lm" #f () ())
7
-     (curses freebsd "" "-lncurses" "/usr/lib/libncurses.a" () ())
8
+     (curses freebsd "" "-lcurses" "/usr/lib/libcurses.a" () ())
5
      (regex freebsd "-I/usr/include/gnu" "-lgnuregex" "" () ())
9
      (regex freebsd "-I/usr/include/gnu" "-lgnuregex" "" () ())
6
      (editline freebsd "" "-lreadline" "" () ())
10
-     (editline freebsd "" "-lreadline" "" () ())
7
+     (graphics freebsd "-I%%LOCALBASE%%/include -DX11" "-L%%LOCALBASE%%/lib -lX 11" "%%LOCALBASE%%/lib/libX11.so" () ())
11
+     (editline freebsd "-I%%READLINE_DIR%%/include" "-lreadline" "-L%%READLINE_DIR%%/lib" () ())
12
+     (graphics freebsd "-I%%LOCALBASE%%/include -DX11" "-lX11" "-L%%LOCALBASE%%/lib" () ())
8
      (dlll freebsd "-DSUN_DL" "-export-dynamic" "" () ())
13
      (dlll freebsd "-DSUN_DL" "-export-dynamic" "" () ())
9
      (nostart freebsd "" "-e start -dc -dp -Bstatic -lgnumalloc" #f ("pre-crt0.c") ())
14
-     (nostart freebsd "" "-e start -dc -dp -Bstatic -lgnumalloc" #f ("pre-crt0.c") ())
10
      (dump freebsd "" "/usr/lib/crt0.o" "" ("unexsunos4.c") ())
15
-     (dump freebsd "" "/usr/lib/crt0.o" "" ("unexsunos4.c") ())
11
@@ -1619,7 +1620,7 @@
16
+     (nostart freebsd "" "" #f () ())
17
+     (dump freebsd "" "" #f ("unexeclf.c" "gmalloc.c") ())
18
      (curses netbsd "-I/usr/pkg/include" "-lncurses" "-Wl,-rpath -Wl,/usr/pkg/lib -L/usr/pkg/lib" () ())
19
      (editline netbsd "-I/usr/pkg/include" "-lreadline" "-Wl,-rpath -Wl,/usr/pkg/lib -L/usr/pkg/lib" () ())
20
      (graphics netbsd "-I/usr/X11R6/include -DX11" "-lX11" "-Wl,-rpath -Wl,/usr/X11R6/lib -L/usr/X11R6/lib" () ())
21
@@ -1630,7 +1631,7 @@
12
 	  parms
22
 	  parms
13
 ;;; gcc 3.4.2 for FreeBSD does not allow options other than default i.e. -O0 if NO -DGCC_SPARC_BUG - dai 2004-10-30
23
 ;;; gcc 3.4.2 for FreeBSD does not allow options other than default i.e. -O0 if NO -DGCC_SPARC_BUG - dai 2004-10-30
14
 	  ;;"cc" "-O3 -pipe -DGCC_SPARC_BUG " "-c"
24
 	  ;;"cc" "-O3 -pipe -DGCC_SPARC_BUG " "-c"
Lines 17-23 Link Here
17
 	  (include-spec "-I" parms)
27
 	  (include-spec "-I" parms)
18
 	  (c-includes parms)
28
 	  (c-includes parms)
19
 	  (c-flags parms)
29
 	  (c-flags parms)
20
@@ -1630,7 +1631,7 @@
30
@@ -1641,7 +1642,7 @@
21
     (batch:rename-file parms
31
     (batch:rename-file parms
22
 		       oname (string-append oname "~"))
32
 		       oname (string-append oname "~"))
23
     (and (batch:try-command parms
33
     (and (batch:try-command parms
Lines 26-32 Link Here
26
 			    (must-be-first
36
 			    (must-be-first
27
 			     '("-nostartfiles"
37
 			     '("-nostartfiles"
28
 			       "pre-crt0.o" "crt0.o"
38
 			       "pre-crt0.o" "crt0.o"
29
@@ -1640,17 +1641,18 @@
39
@@ -1651,17 +1652,18 @@
30
 (defcommand compile-dll-c-files freebsd
40
 (defcommand compile-dll-c-files freebsd
31
   (lambda (files parms)
41
   (lambda (files parms)
32
     (and (batch:try-chopped-command
42
     (and (batch:try-chopped-command
Lines 41-54 Link Here
41
-		 parms "cc" "-shared"
51
-		 parms "cc" "-shared"
42
+		 parms "%%CC%%" "-shared"
52
+		 parms "%%CC%%" "-shared"
43
 		 (cond
53
 		 (cond
44
 		  ((equal? (car fnames) "edline") "-lreadline")
54
-		  ((equal? (car fnames) "edline") "-lreadline")
45
-		  ((equal? (car fnames) "x") "-L/usr/X11R6/lib -lSM -lICE -lXext -lX11 -lxpg4")
55
-		  ((equal? (car fnames) "x") "-L/usr/X11R6/lib -lSM -lICE -lXext -lX11 -lxpg4")
56
+		  ((equal? (car fnames) "edline") "-L%%READLINE_DIR%%/lib -lreadline")
46
+		  ((equal? (car fnames) "rgx") "-lgnuregex")
57
+		  ((equal? (car fnames) "rgx") "-lgnuregex")
47
+		  ((equal? (car fnames) "x") "-L%%LOCALBASE%%/lib -lSM -lICE -lXext -lX11")
58
+		  ((equal? (car fnames) "x") "-L%%LOCALBASE%%/lib -lSM -lICE -lXext -lX11")
48
 		  (else ""))
59
 		  (else ""))
49
 		 "-o" (string-append (car fnames) ".so")
60
 		 "-o" (string-append (car fnames) ".so")
50
 		 (map (lambda (fname) (string-append fname ".o")) fnames))
61
 		 (map (lambda (fname) (string-append fname ".o")) fnames))
51
@@ -1663,7 +1665,7 @@
62
@@ -1674,7 +1676,7 @@
52
   (lambda (oname objects libs parms)
63
   (lambda (oname objects libs parms)
53
     (and (batch:try-command
64
     (and (batch:try-command
54
 	  parms
65
 	  parms
(-)lang/scm/pkg-plist (-5 / +6 lines)
Lines 22-28 Link Here
22
lib/scm/hobbit.scm
22
lib/scm/hobbit.scm
23
lib/scm/implcat
23
lib/scm/implcat
24
lib/scm/ioext.so
24
lib/scm/ioext.so
25
lib/scm/keysymdef.scm
25
%%X11%%lib/scm/keysymdef.scm
26
lib/scm/mkimpcat.scm
26
lib/scm/mkimpcat.scm
27
lib/scm/patchlvl.h
27
lib/scm/patchlvl.h
28
lib/scm/posix.so
28
lib/scm/posix.so
Lines 78-83 Link Here
78
lib/scm/slib/dynwind.scm
78
lib/scm/slib/dynwind.scm
79
lib/scm/slib/eval.scm
79
lib/scm/slib/eval.scm
80
lib/scm/slib/factor.scm
80
lib/scm/slib/factor.scm
81
lib/scm/slib/fluid-let.scm
81
lib/scm/slib/fluidlet.scm
82
lib/scm/slib/fluidlet.scm
82
lib/scm/slib/format.scm
83
lib/scm/slib/format.scm
83
lib/scm/slib/formatst.scm
84
lib/scm/slib/formatst.scm
Lines 195-201 Link Here
195
lib/scm/slib/values.scm
196
lib/scm/slib/values.scm
196
lib/scm/slib/vet.scm
197
lib/scm/slib/vet.scm
197
lib/scm/slib/withfile.scm
198
lib/scm/slib/withfile.scm
198
lib/scm/slib/wttest.scm
199
lib/scm/slib/wttree-test.scm
199
lib/scm/slib/wttree.scm
200
lib/scm/slib/wttree.scm
200
lib/scm/slib/xml-parse.scm
201
lib/scm/slib/xml-parse.scm
201
lib/scm/slib/yasyn.scm
202
lib/scm/slib/yasyn.scm
Lines 204-212 Link Here
204
lib/scm/unix.so
205
lib/scm/unix.so
205
lib/scm/wbtab.scm
206
lib/scm/wbtab.scm
206
%%X11%%lib/scm/x.so
207
%%X11%%lib/scm/x.so
207
lib/scm/x11.scm
208
%%X11%%lib/scm/x11.scm
208
lib/scm/xatoms.scm
209
%%X11%%lib/scm/xatoms.scm
209
lib/scm/xevent.scm
210
%%X11%%lib/scm/xevent.scm
210
@dirrm lib/scm/slib/psd
211
@dirrm lib/scm/slib/psd
211
@dirrm lib/scm/slib
212
@dirrm lib/scm/slib
212
@dirrm lib/scm
213
@dirrm lib/scm

Return to bug 178869