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

(-)ypsilon/Makefile (-5 / +5 lines)
Lines 6-29 Link Here
6
#
6
#
7
7
8
PORTNAME=	ypsilon
8
PORTNAME=	ypsilon
9
PORTVERSION=	0.9.6
9
PORTVERSION=	0.9.6u3
10
CATEGORIES=	lang scheme
10
CATEGORIES=	lang scheme
11
MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
11
MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
12
12
13
MAINTAINER=	vmagerya@gmail.com
13
MAINTAINER=	vmagerya@gmail.com
14
COMMENT=	Scheme implementation for real-time applications
14
COMMENT=	Scheme implementation for real-time applications
15
15
16
DISTVERSION=	0.9.6.update3
17
16
USE_GMAKE=	yes
18
USE_GMAKE=	yes
17
MAKE_ARGS=	PROG="${PORTNAME}" \
19
MAKE_ARGS=	DATADIR="${DATADIR}" \
18
		DATADIR="${DATADIR}" \
19
		PTHREAD_LIBS="${PTHREAD_LIBS}"
20
		PTHREAD_LIBS="${PTHREAD_LIBS}"
20
21
21
MAN1=		ypsilon.1
22
MAN1=		ypsilon.1
22
23
23
ONLY_FOR_ARCHS=	i386
24
ONLY_FOR_ARCHS=	i386 amd64
24
25
25
post-patch:
26
post-patch:
26
	${RM} ${WRKSRC}/sitelib/*.orig
27
27
28
do-install:
28
do-install:
29
	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
29
	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
(-)ypsilon/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (ypsilon-0.9.6.tar.gz) = dd6886731fb78a85bc6a019f635f26a2
1
MD5 (ypsilon-0.9.6.update3.tar.gz) = b330ebabce9b665418f3c347a43dcd24
2
SHA256 (ypsilon-0.9.6.tar.gz) = 5072ef7bc0248f546112631dd34a202d791ad8312f184d2ee387a6b40f9de17a
2
SHA256 (ypsilon-0.9.6.update3.tar.gz) = 2ca3c901dc3f6bca857a94a9d991d14ecc12727d2833694f0e4f5aa1a8a4064d
3
SIZE (ypsilon-0.9.6.tar.gz) = 4533453
3
SIZE (ypsilon-0.9.6.update3.tar.gz) = 4555843
(-)ypsilon/files/patch-Makefile (-36 / +42 lines)
Lines 1-46 Link Here
1
--- Makefile.orig	2008-08-01 04:39:41.000000000 +0300
1
--- Makefile.orig	2008-12-23 10:56:02.000000000 +0200
2
+++ Makefile	2008-08-02 22:01:30.000000000 +0300
2
+++ Makefile	2008-12-27 16:33:07.000000000 +0200
3
@@ -3,13 +3,11 @@
3
@@ -1,14 +1,11 @@
4
 #   Use Win32 native build for Cygwin
4
-#   Makefile for Linux, FreeBSD, OpenBSD, and Darwin
5
 #
5
 #   Requirements: GNU Make, GCC 4.0 or later
6
 #   Options: DESTDIR, PREFIX, DATAMODEL(ILP32/LP64)
6
 
7
 
7
-PROG 	 = ypsilon
8
 PROG 	 = ypsilon
8
+PROG 	 = ${PORTNAME}
9
 
9
 
10
-PREFIX 	 = /usr/local
10
-PREFIX 	 = /usr/local
11
+CPPFLAGS = -DNDEBUG -DDEFAULT_HEAP_LIMIT=32 -DSYSTEM_SHARE_PATH='"${DATADIR}"'
11
+CPPFLAGS = -DNDEBUG -DSYSTEM_SHARE_PATH='"$(DESTDIR)$(DATADIR)"'
12
 
12
 
13
-CPPFLAGS = -DNDEBUG -DDEFAULT_HEAP_LIMIT=32 -DSYSTEM_SHARE_PATH='"$(PREFIX)/share/$(PROG)"'
13
-CPPFLAGS = -DNDEBUG -DSYSTEM_SHARE_PATH='"$(DESTDIR)$(PREFIX)/share/$(PROG)"'
14
-
14
-
15
-CXXFLAGS = -x c++ -pthread -msse -mfpmath=sse -O3 -fstrict-aliasing \
15
-CXXFLAGS = -pipe -x c++ -pthread -O3 -fstrict-aliasing -fomit-frame-pointer -momit-leaf-frame-pointer
16
+CXXFLAGS = -x c++ ${CFLAGS} \
16
+CXXFLAGS = -x c++ ${CFLAGS}
17
 	   -fomit-frame-pointer -momit-leaf-frame-pointer \
17
 
18
 	   -fno-align-labels -fno-align-loops -fno-align-jumps
18
 SRCS 	 = file.cpp main.cpp vm0.cpp object_heap_compact.cpp subr_flonum.cpp vm1.cpp object_set.cpp \
19
 
19
 	   subr_hash.cpp vm2.cpp object_slab.cpp subr_list.cpp interpreter.cpp serialize.cpp \
20
@@ -25,6 +23,18 @@
20
@@ -60,15 +57,7 @@
21
 
21
 endif
22
 UNAME 	 = $(shell uname)
22
 
23
 
23
 ifneq (, $(findstring FreeBSD, $(UNAME)))
24
+ifneq (, $(findstring FreeBSD, $(UNAME)))
24
-  ifeq ($(shell $(CXX) -dumpspecs | grep 'march=native'), )
25
+  ifeq ($(shell $(CXX) -dumpspecs | grep 'march=native')), )
25
-    ifeq ($(DATAMODEL), ILP32)  
26
+    CXXFLAGS += -m32 -march=i386
26
-      CXXFLAGS += -march=i686
27
+  else
27
-    endif
28
+    CXXFLAGS += -m32# -march=native
28
-  else
29
+  endif
29
-    CXXFLAGS += -march=native
30
+  CPPFLAGS += -D__LITTLE_ENDIAN__
30
-  endif
31
+  ASFLAGS = --32
31
   CPPFLAGS += -D__LITTLE_ENDIAN__
32
+  LDFLAGS = -m32 ${PTHREAD_LIBS}
32
-  CXXFLAGS += -msse2 -mfpmath=sse  
33
+  SRCS += ffi_stub_linux.s
33
   ifeq ($(DATAMODEL), ILP32)  
34
+endif
34
     CPPFLAGS += -DDEFAULT_HEAP_LIMIT=32
35
+
35
     CXXFLAGS += -m32
36
 ifneq (, $(findstring Linux, $(UNAME)))
36
@@ -82,7 +71,7 @@
37
   ifeq ($(shell $(CXX) -dumpspecs | grep 'march=native')), )
37
     ASFLAGS = --64
38
     CXXFLAGS += -m32 -march=i686
38
     SRCS += ffi_stub_freebsd64.s
39
@@ -48,7 +58,6 @@
39
   endif
40
 .PHONY: all install uninstall sitelib stdlib check bench clean
40
-  LDLIBS = -pthread
41
+  LDLIBS = ${PTHREAD_LIBS}
42
 endif
43
 
44
 ifneq (, $(findstring OpenBSD, $(UNAME)))
45
@@ -123,7 +112,6 @@
46
 .PHONY: all install uninstall sitelib stdlib check bench clean distclean
41
 
47
 
42
 all: $(PROG)
48
 all: $(PROG)
43
-	@mkdir -p -m755 $(HOME)/.ypsilon
49
-	@mkdir -p -m755 $(HOME)/.ypsilon
44
 
50
 
45
 $(PROG): $(OBJS)
51
 $(PROG): $(OBJS)
46
 	$(CXX) $(LDFLAGS) -o $@ $^
52
 	$(CXX) $(LDFLAGS) $(LDLIBS) -o $@ $^
(-)ypsilon/files/patch-gtk-hello.scm (+18 lines)
Line 0 Link Here
1
--- example/gtk-hello.scm.orig	2008-12-27 17:14:34.000000000 +0200
2
+++ example/gtk-hello.scm	2008-12-27 17:15:07.000000000 +0200
3
@@ -7,6 +7,7 @@
4
 ;; Requirements:
5
 ;;   Darwin:  Gtk.framework
6
 ;;   Linux:   libgtk-x11-2.0.so.0
7
+;;   FreeBSD: libgtk-x11-2.0.so
8
 
9
 (import (rnrs)
10
         (srfi :28)
11
@@ -16,6 +17,7 @@
12
 
13
 (define libgtk-name (cond (on-linux "libgtk-x11-2.0.so.0")
14
                           (on-darwin "Gtk.framework/Gtk")
15
+                          (on-freebsd "libgtk-x11-2.0.so")
16
                           (else
17
                            (assertion-violation #f "can not locate GTK library, unknown operating system"))))
18
 
(-)ypsilon/files/patch-sitelib (-42 lines)
Lines 1-42 Link Here
1
diff -ruN sitelib.old/ffi.scm sitelib/ffi.scm
2
--- sitelib.old/ffi.scm	2008-08-02 22:38:36.000000000 +0300
3
+++ sitelib/ffi.scm	2008-08-02 22:38:49.000000000 +0300
4
@@ -6,7 +6,7 @@
5
 (library (ffi)
6
 
7
   (export c-function c-argument
8
-          on-windows on-darwin on-linux on-posix)
9
+          on-windows on-darwin on-linux on-freebsd on-posix)
10
 
11
   (import (core primitives)
12
           (core syntax-case)
13
@@ -16,6 +16,7 @@
14
   (define on-windows (and (string-contains (architecture-feature 'operating-system) "windows") #t))
15
   (define on-darwin  (and (string-contains (architecture-feature 'operating-system) "darwin")  #t))
16
   (define on-linux   (and (string-contains (architecture-feature 'operating-system) "linux")   #t))
17
+  (define on-freebsd (and (string-contains (architecture-feature 'operating-system) "freebsd") #t))
18
   (define on-posix   (not on-windows))
19
   
20
   (define assert-int
21
diff -ruN sitelib.old/gl.scm sitelib/gl.scm
22
--- sitelib.old/gl.scm	2008-08-02 22:38:36.000000000 +0300
23
+++ sitelib/gl.scm	2008-08-02 22:38:49.000000000 +0300
24
@@ -1242,6 +1242,7 @@
25
   (define libGL (cond (on-darwin  (load-shared-object "OpenGL.framework/OpenGL"))
26
                       (on-windows (load-shared-object "opengl32.dll"))
27
                       (on-linux   (load-shared-object "libGL.so.1"))
28
+                      (on-freebsd (load-shared-object "libGL.so.1"))
29
                       (else       (assertion-violation #f "can not locate OpenGL library, unknown operating system"))))
30
   
31
   ;;;; Boolean values
32
diff -ruN sitelib.old/glut.scm sitelib/glut.scm
33
--- sitelib.old/glut.scm	2008-08-02 22:38:36.000000000 +0300
34
+++ sitelib/glut.scm	2008-08-02 22:38:49.000000000 +0300
35
@@ -181,6 +181,7 @@
36
   (define libGLUT (cond (on-darwin  (load-shared-object "GLUT.framework/GLUT"))
37
                         (on-windows (load-shared-object "glut32.dll"))
38
                         (on-linux   (load-shared-object "libglut.so.3"))
39
+                        (on-freebsd (load-shared-object "libglut.so.4"))
40
                         (else       (assertion-violation #f "can not locate GLUT library, unknown operating system"))))
41
 
42
   ;; Display mode bit masks.
(-)ypsilon/pkg-plist (+47 lines)
Lines 1-25 Link Here
1
bin/ypsilon
1
bin/ypsilon
2
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gears.scm
2
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gears.scm
3
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glut-demo.scm
3
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glut-demo.scm
4
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gtk-hello.scm
4
%%DATADIR%%/sitelib/apropos.scm
5
%%DATADIR%%/sitelib/apropos.scm
6
%%DATADIR%%/sitelib/concurrent.scm
7
%%DATADIR%%/sitelib/debug.scm
5
%%DATADIR%%/sitelib/ffi.scm
8
%%DATADIR%%/sitelib/ffi.scm
6
%%DATADIR%%/sitelib/gl.scm
9
%%DATADIR%%/sitelib/gl.scm
7
%%DATADIR%%/sitelib/glut.scm
10
%%DATADIR%%/sitelib/glut.scm
8
%%DATADIR%%/sitelib/match.scm
11
%%DATADIR%%/sitelib/match.scm
9
%%DATADIR%%/sitelib/pregexp.scm
12
%%DATADIR%%/sitelib/pregexp.scm
13
%%DATADIR%%/sitelib/slib/format.scm
14
%%DATADIR%%/sitelib/socket.scm
15
%%DATADIR%%/sitelib/srfi/%3a1.scm
16
%%DATADIR%%/sitelib/srfi/%3a13.scm
17
%%DATADIR%%/sitelib/srfi/%3a14.scm
18
%%DATADIR%%/sitelib/srfi/%3a19.scm
19
%%DATADIR%%/sitelib/srfi/%3a26.scm
20
%%DATADIR%%/sitelib/srfi/%3a27.scm
21
%%DATADIR%%/sitelib/srfi/%3a28.scm
22
%%DATADIR%%/sitelib/srfi/%3a38.scm
23
%%DATADIR%%/sitelib/srfi/%3a39.scm
24
%%DATADIR%%/sitelib/srfi/%3a41.scm
25
%%DATADIR%%/sitelib/srfi/%3a42.scm
26
%%DATADIR%%/sitelib/srfi/%3a6.scm
27
%%DATADIR%%/sitelib/srfi/%3a8.scm
28
%%DATADIR%%/sitelib/srfi/%3a9.scm
29
%%DATADIR%%/sitelib/srfi/%3a98.scm
10
%%DATADIR%%/sitelib/srfi/srfi-1.scm
30
%%DATADIR%%/sitelib/srfi/srfi-1.scm
31
%%DATADIR%%/sitelib/srfi/srfi-13.scm
32
%%DATADIR%%/sitelib/srfi/srfi-14.scm
33
%%DATADIR%%/sitelib/srfi/srfi-19.scm
11
%%DATADIR%%/sitelib/srfi/srfi-26.scm
34
%%DATADIR%%/sitelib/srfi/srfi-26.scm
35
%%DATADIR%%/sitelib/srfi/srfi-27.scm
12
%%DATADIR%%/sitelib/srfi/srfi-28.scm
36
%%DATADIR%%/sitelib/srfi/srfi-28.scm
37
%%DATADIR%%/sitelib/srfi/srfi-38.scm
13
%%DATADIR%%/sitelib/srfi/srfi-39.scm
38
%%DATADIR%%/sitelib/srfi/srfi-39.scm
39
%%DATADIR%%/sitelib/srfi/srfi-41.scm
14
%%DATADIR%%/sitelib/srfi/srfi-42.scm
40
%%DATADIR%%/sitelib/srfi/srfi-42.scm
15
%%DATADIR%%/sitelib/srfi/srfi-6.scm
41
%%DATADIR%%/sitelib/srfi/srfi-6.scm
16
%%DATADIR%%/sitelib/srfi/srfi-8.scm
42
%%DATADIR%%/sitelib/srfi/srfi-8.scm
43
%%DATADIR%%/sitelib/srfi/srfi-9.scm
44
%%DATADIR%%/sitelib/srfi/srfi-98.scm
45
%%DATADIR%%/sitelib/stdio.scm
17
%%DATADIR%%/sitelib/streams.scm
46
%%DATADIR%%/sitelib/streams.scm
18
%%DATADIR%%/sitelib/tidbits/define-inline.scm
47
%%DATADIR%%/sitelib/tidbits/define-inline.scm
19
%%DATADIR%%/sitelib/tidbits/dotimes.scm
48
%%DATADIR%%/sitelib/tidbits/dotimes.scm
49
%%DATADIR%%/sitelib/tidbits/generator.scm
50
%%DATADIR%%/sitelib/tidbits/remote-repl.scm
20
%%DATADIR%%/sitelib/tidbits/string-split.scm
51
%%DATADIR%%/sitelib/tidbits/string-split.scm
21
%%DATADIR%%/sitelib/time.scm
52
%%DATADIR%%/sitelib/time.scm
22
%%DATADIR%%/sitelib/trace.scm
53
%%DATADIR%%/sitelib/trace.scm
54
%%DATADIR%%/sitelib/ypsilon/apropos.scm
55
%%DATADIR%%/sitelib/ypsilon/c-types.scm
56
%%DATADIR%%/sitelib/ypsilon/concurrent.scm
57
%%DATADIR%%/sitelib/ypsilon/debug.scm
58
%%DATADIR%%/sitelib/ypsilon/ffi.scm
59
%%DATADIR%%/sitelib/ypsilon/gl.scm
60
%%DATADIR%%/sitelib/ypsilon/glut.scm
61
%%DATADIR%%/sitelib/ypsilon/match.scm
62
%%DATADIR%%/sitelib/ypsilon/pregexp.scm
63
%%DATADIR%%/sitelib/ypsilon/socket.scm
64
%%DATADIR%%/sitelib/ypsilon/stdio.scm
65
%%DATADIR%%/sitelib/ypsilon/streams.scm
66
%%DATADIR%%/sitelib/ypsilon/time.scm
67
%%DATADIR%%/sitelib/ypsilon/trace.scm
23
%%DATADIR%%/stdlib/core.scm
68
%%DATADIR%%/stdlib/core.scm
24
%%DATADIR%%/stdlib/core/arithmetic.scm
69
%%DATADIR%%/stdlib/core/arithmetic.scm
25
%%DATADIR%%/stdlib/core/bytevector-transcoders.scm
70
%%DATADIR%%/stdlib/core/bytevector-transcoders.scm
Lines 77-83 Link Here
77
@dirrm %%DATADIR%%/stdlib/rnrs
122
@dirrm %%DATADIR%%/stdlib/rnrs
78
@dirrm %%DATADIR%%/stdlib/core
123
@dirrm %%DATADIR%%/stdlib/core
79
@dirrm %%DATADIR%%/stdlib
124
@dirrm %%DATADIR%%/stdlib
125
@dirrm %%DATADIR%%/sitelib/slib
80
@dirrm %%DATADIR%%/sitelib/srfi
126
@dirrm %%DATADIR%%/sitelib/srfi
81
@dirrm %%DATADIR%%/sitelib/tidbits
127
@dirrm %%DATADIR%%/sitelib/tidbits
128
@dirrm %%DATADIR%%/sitelib/ypsilon
82
@dirrm %%DATADIR%%/sitelib
129
@dirrm %%DATADIR%%/sitelib
83
@dirrm %%DATADIR%%
130
@dirrm %%DATADIR%%

Return to bug 129974