Attachment #67495 for bug #99439

View | Details | Raw Unified | Return to bug 99439
Collapse All | Expand All

Lines 17-39 Link Here

(-)ecl/Makefile (-13 / +63 lines)
17		17
18	LIB_DEPENDS= gmp.7:${PORTSDIR}/math/libgmp4	18	LIB_DEPENDS= gmp.7:${PORTSDIR}/math/libgmp4
19		19
20	INSTALLS_SHLIB= yes	20	USE_GMAKE= yes
21	LDCONFIG_DIRS= %%PREFIX%%/lib/ecl	21	USE_PERL5_BUILD=yes
		22	GNU_CONFIGURE= yes
		23	CONFIGURE_ARGS= --with-system-gmp --with-cmuformat=yes --enable-boehm=included
		24	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
		25	CPPFLAGS= -I${LOCALBASE}/include
		26	LDFLAGS= -L${LOCALBASE}/lib
22		27
23	# It should build and run on 64-bit architectures,	28	OPTIONS= ASDF "Enable ASDF building facility" on \
24	# but it is completely untested.	29	CLOS_STREAMS "Enable user defined stream objects" on \
25	ONLY_FOR_ARCHS= i386	30	CLX "Enable X11 interface" off \
		31	SOCKETS "Enable socket interface" on \
		32	THREADS "Enable threading support" off
26		33
27	MAN1= ecl.1	34	MAN1= ecl.1
28	INFO= ecl ecldev	35	INFO= ecl ecldev
29		36
30	USE_GMAKE= YES	37	INSTALLS_SHLIB= yes
31	USE_PERL5_BUILD=yes	38	LDCONFIG_DIRS= %%PREFIX%%/lib/ecl
32	GNU_CONFIGURE= YES	39
33	CONFIGURE_ARGS= --with-asdf --with-tcp --with-system-gmp --enable-boehm=included	40	.include <bsd.port.pre.mk>
		41
		42	.if !defined(WITHOUT_ASDF)
		43	CONFIGURE_ARGS+=--with-asdf=yes
		44	PLIST_SUB+= ASDF=""
		45	.else
		46	CONFIGURE_ARGS+=--with-asdf=no
		47	PLIST_SUB+= ASDF="@comment "
		48	.endif
		49
		50	.if !defined(WITHOUT_CLOS_STREAMS)
		51	CONFIGURE_ARGS+=--with-clos-streams=yes
		52	PLIST_SUB+= CLOS_STREAMS=""
		53	.else
		54	CONFIGURE_ARGS+=--with-clos-streams=no
		55	PLIST_SUB+= CLOS_STREAMS="@comment "
		56	.endif
		57
		58	.if defined(WITH_CLX)
		59	USE_XLIB= yes
		60	CONFIGURE_ARGS+=--with-clx=yes
		61	INFO+= clx
		62	PLIST_SUB+= CLX=""
		63	.else
		64	CONFIGURE_ARGS+=--with-clx=no
		65	PLIST_SUB+= CLX="@comment "
		66	.endif
		67
		68	.if !defined(WITHOUT_SOCKETS)
		69	CONFIGURE_ARGS+=--with-tcp=yes
		70	PLIST_SUB+= SOCKETS=""
		71	.else
		72	CONFIGURE_ARGS+=--with-tcp=no
		73	PLIST_SUB+= SOCKETS="@comment "
		74	.endif
		75
		76	.if defined(WITH_THREADS)
		77	CONFIGURE_ARGS+=--enable-threads=yes
		78	LDFLAGS+= ${PTHREAD_LIBS}
		79	.else
		80	CONFIGURE_ARGS+=--enable-threads=no
		81	.endif
34		82
35	# We need to tell ECL where to find the GMP includes	83	.if defined(WITH_THREADS)
36	# and libraries.	84	post-patch:
37	CONFIGURE_ENV= LDFLAGS=-L${PREFIX}/lib CFLAGS=-I${PREFIX}/include	85	@${REINPLACE_CMD} -e 's\|_NP[[:>:]]\|\|' \
		86	${WRKSRC}/src/c/package.d ${WRKSRC}/src/c/threads.d
		87	.endif
38		88
39	.include <bsd.port.mk>	89	.include <bsd.port.post.mk>




bin/ecl
bin/ecl-config
lib/ecl/BUILD-STAMP
%%ASDF%%lib/ecl/asdf.fas
%%CLX%%lib/ecl/clx.fas
%%CLOS_STREAMS%%lib/ecl/cmp.fas
lib/ecl/dpp
lib/ecl/ecl_min
lib/ecl/h/config.h
lib/ecl/h/configpre.h
lib/ecl/h/ecl-cmp.h
lib/ecl/h/object.h
lib/ecl/h/cs.h
lib/ecl/h/ecl-cmp.h
lib/ecl/h/ecl.h
lib/ecl/h/eval.h
lib/ecl/h/external.h
lib/ecl/h/page.h
lib/ecl/h/unify.h
lib/ecl/h/lwp.h
lib/ecl/h/configpre.h
lib/ecl/h/gc.h
lib/ecl/h/gc_config_macros.h
lib/ecl/h/gc_local_alloc.h
lib/ecl/h/gc_pthread_redirects.h
lib/ecl/h/gc_typed.h
lib/ecl/h/leak_detector.h
lib/ecl/h/lwp.h
lib/ecl/h/number.h
lib/ecl/h/object.h
lib/ecl/h/page.h
lib/ecl/h/stacks.h
lib/ecl/h/unify.h
lib/ecl/dpp
lib/ecl/help.doc
lib/ecl/libecl.so
%%SOCKETS%%lib/ecl/sockets.fas
share/doc/ecl/Copyright
share/doc/ecl/LGPL
@dirrm lib/ecl/h
@dirrm lib/ecl
@dirrm share/doc/ecl




--- ./src/doc/Makefile.in.orig	Fri Aug 12 13:26:42 2005
+++ ./src/doc/Makefile.in	Sat Jun 24 22:59:42 2006
@@ -51,10 +51,6 @@
 	    $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $$k; \
 	  fi; \
 	done
-	$(mkinstalldirs) $(DESTDIR)$(docdir)
-	for i in Copyright LGPL; do \
-	  $(INSTALL_DATA) $(top_srcdir)/../$$i $(DESTDIR)$(docdir); \
-	done
 	$(mkinstalldirs) $(DESTDIR)$(mandir)/man$(manext)
 	$(INSTALL_DATA) ecl.man $(DESTDIR)$(mandir)/man$(manext)/ecl.$(manext)
 flatinstall: all $(HTML_FILES)
@@ -72,9 +68,6 @@
 	  $(mkinstalldirs) $(DESTDIR)$(docdir)/ecldev; \
 	  for i in ecldev/*; do $(INSTALL_DATA) $$i $(DESTDIR)$(docdir)/ecldev/; done; \
 	fi
-	for i in Copyright LGPL; do \
-	  $(INSTALL_DATA) $(top_srcdir)/../$$i $(DESTDIR)$(docdir); \
-	done
 	for i in *.html; do $(INSTALL_DATA) $$i $(DESTDIR)$(docdir)/; done
 
 uninstall:




--- ./src/gc/include/private/gcconfig.h.orig	Fri Aug 12 13:26:42 2005
+++ ./src/gc/include/private/gcconfig.h	Sat Jun 24 22:58:57 2006
@@ -318,10 +318,6 @@
 #   define OPENBSD
 #   define mach_type_known
 # endif
-# if defined(FREEBSD) && (defined(i386) || defined(__i386__))
-#   define I386
-#   define mach_type_known
-# endif
 # if defined(__NetBSD__) && (defined(i386) || defined(__i386__))
 #   define I386
 #   define mach_type_known
@@ -330,10 +326,24 @@
 #    define X86_64
 #    define mach_type_known
 # endif
-# if defined(FREEBSD) && defined(__sparc__)
-#    define SPARC
-#    define mach_type_known
-#endif
+# if defined(FREEBSD)
+#   ifdef __i386__
+#     define I386
+#     define mach_type_known
+#   endif
+#   ifdef __amd64__
+#     define X86_64
+#     define mach_type_known
+#   endif
+#   ifdef __sparc64__
+#     define SPARC
+#     define mach_type_known
+#   endif
+#   ifdef __ia64__
+#     define IA64
+#     define mach_type_known
+#   endif
+# endif
 # if defined(bsdi) && (defined(i386) || defined(__i386__))
 #    define I386
 #    define BSDI
@@ -979,6 +989,9 @@
 #	ifdef __ELF__
 #	    define DYNAMIC_LOADING
 #	endif
+#	ifndef GC_FREEBSD_THREADS
+#	    define MPROTECT_VDB
+#	endif
 	extern char etext[];
 	extern char edata[];
 	extern char end[];
@@ -1215,15 +1228,15 @@
 #   endif
 #   ifdef FREEBSD
 #	define OS_TYPE "FREEBSD"
-#	ifndef GC_FREEBSD_THREADS
-#	    define MPROTECT_VDB
-#	endif
 #	define SIG_SUSPEND SIGUSR1
 #	define SIG_THR_RESTART SIGUSR2
 #	define FREEBSD_STACKBOTTOM
 #	ifdef __ELF__
 #	    define DYNAMIC_LOADING
 #	endif
+#	ifndef GC_FREEBSD_THREADS
+#	    define MPROTECT_VDB
+#	endif
 	extern char etext[];
 	extern char * GC_FreeBSDGetDataStart();
 #	define DATASTART GC_FreeBSDGetDataStart(0x1000, &etext)
@@ -1926,6 +1939,23 @@
 #	    define PREFETCH(x) __builtin_prefetch((x), 0, 0)
 #	    define PREFETCH_FOR_WRITE(x) __builtin_prefetch((x), 1)
 #	endif
+#   endif
+#   ifdef FREEBSD
+#	define OS_TYPE "FREEBSD"
+#	define SIG_SUSPEND SIGUSR1
+#	define SIG_THR_RESTART SIGUSR2
+#	define FREEBSD_STACKBOTTOM
+#	ifdef __ELF__
+#	    define DYNAMIC_LOADING
+#	endif
+	extern char etext[];
+	extern char edata[];
+	extern char end[];
+#	define NEED_FIND_LIMIT
+#	define DATASTART ((ptr_t)(&etext))
+#	define DATAEND (GC_find_limit (DATASTART, TRUE))
+#	define DATASTART2 ((ptr_t)(&edata))
+#	define DATAEND2 ((ptr_t)(&end))
 #   endif
 #   ifdef NETBSD
 #	define OS_TYPE "NETBSD"

Return to bug 99439

Lines 1-34 Link Here

(-)ecl/pkg-plist (-22 / +20 lines)
		1	bin/ecl
		2	bin/ecl-config
		3	lib/ecl/BUILD-STAMP
		4	%%ASDF%%lib/ecl/asdf.fas
		5	%%CLX%%lib/ecl/clx.fas
		6	%%CLOS_STREAMS%%lib/ecl/cmp.fas
		7	lib/ecl/dpp
		8	lib/ecl/ecl_min
1	lib/ecl/h/config.h	9	lib/ecl/h/config.h
2	lib/ecl/h/ecl.h	10	lib/ecl/h/configpre.h
3	lib/ecl/h/ecl-cmp.h
4	lib/ecl/h/object.h
5	lib/ecl/h/cs.h	11	lib/ecl/h/cs.h
6	lib/ecl/h/stacks.h	12	lib/ecl/h/ecl-cmp.h
7	lib/ecl/h/external.h	13	lib/ecl/h/ecl.h
8	lib/ecl/h/eval.h	14	lib/ecl/h/eval.h
9	lib/ecl/h/number.h	15	lib/ecl/h/external.h
10	lib/ecl/h/page.h
11	lib/ecl/h/unify.h
12	lib/ecl/h/lwp.h
13	lib/ecl/h/configpre.h
14	lib/ecl/h/gc.h	16	lib/ecl/h/gc.h
15	lib/ecl/h/gc_config_macros.h	17	lib/ecl/h/gc_config_macros.h
16	lib/ecl/h/gc_local_alloc.h	18	lib/ecl/h/gc_local_alloc.h
17	lib/ecl/h/gc_pthread_redirects.h	19	lib/ecl/h/gc_pthread_redirects.h
18	lib/ecl/h/gc_typed.h	20	lib/ecl/h/gc_typed.h
19	lib/ecl/h/leak_detector.h	21	lib/ecl/h/leak_detector.h
20	lib/ecl/BUILD-STAMP	22	lib/ecl/h/lwp.h
21	lib/ecl/ecl_min	23	lib/ecl/h/number.h
22	lib/ecl/libecl.so	24	lib/ecl/h/object.h
23	lib/ecl/sockets.fas	25	lib/ecl/h/page.h
24	lib/ecl/asdf.fas	26	lib/ecl/h/stacks.h
25	lib/ecl/cmp.fas	27	lib/ecl/h/unify.h
26	lib/ecl/dpp
27	lib/ecl/help.doc	28	lib/ecl/help.doc
28	bin/ecl	29	lib/ecl/libecl.so
29	bin/ecl-config	30	%%SOCKETS%%lib/ecl/sockets.fas
30	share/doc/ecl/Copyright
31	share/doc/ecl/LGPL
32	@dirrm lib/ecl/h	31	@dirrm lib/ecl/h
33	@dirrm lib/ecl	32	@dirrm lib/ecl
34	@dirrm share/doc/ecl

Added Link Here

(-)ecl/files/patch-src__doc__Makefile.in (+23 lines)
1	--- ./src/doc/Makefile.in.orig Fri Aug 12 13:26:42 2005
2	+++ ./src/doc/Makefile.in Sat Jun 24 22:59:42 2006
3	@@ -51,10 +51,6 @@
4	$(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $$k; \
5	fi; \
6	done
7	- $(mkinstalldirs) $(DESTDIR)$(docdir)
8	- for i in Copyright LGPL; do \
9	- $(INSTALL_DATA) $(top_srcdir)/../$$i $(DESTDIR)$(docdir); \
10	- done
11	$(mkinstalldirs) $(DESTDIR)$(mandir)/man$(manext)
12	$(INSTALL_DATA) ecl.man $(DESTDIR)$(mandir)/man$(manext)/ecl.$(manext)
13	flatinstall: all $(HTML_FILES)
14	@@ -72,9 +68,6 @@
15	$(mkinstalldirs) $(DESTDIR)$(docdir)/ecldev; \
16	for i in ecldev/*; do $(INSTALL_DATA) $$i $(DESTDIR)$(docdir)/ecldev/; done; \
17	fi
18	- for i in Copyright LGPL; do \
19	- $(INSTALL_DATA) $(top_srcdir)/../$$i $(DESTDIR)$(docdir); \
20	- done
21	for i in *.html; do $(INSTALL_DATA) $$i $(DESTDIR)$(docdir)/; done
22
23	uninstall:

Added Link Here

(-)ecl/files/patch-src__gc__include__private__gcconfig.h (+95 lines)
1	--- ./src/gc/include/private/gcconfig.h.orig Fri Aug 12 13:26:42 2005
2	+++ ./src/gc/include/private/gcconfig.h Sat Jun 24 22:58:57 2006
3	@@ -318,10 +318,6 @@
4	# define OPENBSD
5	# define mach_type_known
6	# endif
7	-# if defined(FREEBSD) && (defined(i386) \|\| defined(__i386__))
8	-# define I386
9	-# define mach_type_known
10	-# endif
11	# if defined(__NetBSD__) && (defined(i386) \|\| defined(__i386__))
12	# define I386
13	# define mach_type_known
14	@@ -330,10 +326,24 @@
15	# define X86_64
16	# define mach_type_known
17	# endif
18	-# if defined(FREEBSD) && defined(__sparc__)
19	-# define SPARC
20	-# define mach_type_known
21	-#endif
22	+# if defined(FREEBSD)
23	+# ifdef __i386__
24	+# define I386
25	+# define mach_type_known
26	+# endif
27	+# ifdef __amd64__
28	+# define X86_64
29	+# define mach_type_known
30	+# endif
31	+# ifdef __sparc64__
32	+# define SPARC
33	+# define mach_type_known
34	+# endif
35	+# ifdef __ia64__
36	+# define IA64
37	+# define mach_type_known
38	+# endif
39	+# endif
40	# if defined(bsdi) && (defined(i386) \|\| defined(__i386__))
41	# define I386
42	# define BSDI
43	@@ -979,6 +989,9 @@
44	# ifdef __ELF__
45	# define DYNAMIC_LOADING
46	# endif
47	+# ifndef GC_FREEBSD_THREADS
48	+# define MPROTECT_VDB
49	+# endif
50	extern char etext[];
51	extern char edata[];
52	extern char end[];
53	@@ -1215,15 +1228,15 @@
54	# endif
55	# ifdef FREEBSD
56	# define OS_TYPE "FREEBSD"
57	-# ifndef GC_FREEBSD_THREADS
58	-# define MPROTECT_VDB
59	-# endif
60	# define SIG_SUSPEND SIGUSR1
61	# define SIG_THR_RESTART SIGUSR2
62	# define FREEBSD_STACKBOTTOM
63	# ifdef __ELF__
64	# define DYNAMIC_LOADING
65	# endif
66	+# ifndef GC_FREEBSD_THREADS
67	+# define MPROTECT_VDB
68	+# endif
69	extern char etext[];
70	extern char * GC_FreeBSDGetDataStart();
71	# define DATASTART GC_FreeBSDGetDataStart(0x1000, &etext)
72	@@ -1926,6 +1939,23 @@
73	# define PREFETCH(x) __builtin_prefetch((x), 0, 0)
74	# define PREFETCH_FOR_WRITE(x) __builtin_prefetch((x), 1)
75	# endif
76	+# endif
77	+# ifdef FREEBSD
78	+# define OS_TYPE "FREEBSD"
79	+# define SIG_SUSPEND SIGUSR1
80	+# define SIG_THR_RESTART SIGUSR2
81	+# define FREEBSD_STACKBOTTOM
82	+# ifdef __ELF__
83	+# define DYNAMIC_LOADING
84	+# endif
85	+ extern char etext[];
86	+ extern char edata[];
87	+ extern char end[];
88	+# define NEED_FIND_LIMIT
89	+# define DATASTART ((ptr_t)(&etext))
90	+# define DATAEND (GC_find_limit (DATASTART, TRUE))
91	+# define DATASTART2 ((ptr_t)(&edata))
92	+# define DATAEND2 ((ptr_t)(&end))
93	# endif
94	# ifdef NETBSD
95	# define OS_TYPE "NETBSD"