Date: Sat, 27 Dec 2008 15:58:00 GMT From: Vitaly Magerya <vmagerya@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/129974: [maintainer update] Update port lang/ypsilon to 0.9.6-update3 Message-ID: <200812271558.mBRFw0c3053097@www.freebsd.org> Resent-Message-ID: <200812271600.mBRG0HEV064570@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 129974 >Category: ports >Synopsis: [maintainer update] Update port lang/ypsilon to 0.9.6-update3 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Dec 27 16:00:17 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Vitaly Magerya >Release: FreeBSD 7.1-PRERELEASE i386 >Organization: >Environment: FreeBSD landmine.tx97.net 7.1-PRERELEASE FreeBSD 7.1-PRERELEASE #5: Sun Dec 14 19:55:05 EET 2008 root@landmine.tx97.net:/usr/obj/usr/src/sys/T40 i386 >Description: Update lang/ypsilon from 0.9.6 to 0.9.6-update3. Notable changes: - support for FreeBSD/amd64 - a bunch of new libraries - several bugs are fixed Detailed change log is at http://code.google.com/p/ypsilon/wiki/Changes Note: I haven't test it under amd64 myself, but apparently the author have, so there should be no problems. >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN ypsilon.orig/Makefile ypsilon/Makefile --- ypsilon.orig/Makefile 2008-12-27 17:53:55.000000000 +0200 +++ ypsilon/Makefile 2008-12-27 17:54:21.000000000 +0200 @@ -6,24 +6,24 @@ # PORTNAME= ypsilon -PORTVERSION= 0.9.6 +PORTVERSION= 0.9.6u3 CATEGORIES= lang scheme MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} MAINTAINER= vmagerya@gmail.com COMMENT= Scheme implementation for real-time applications +DISTVERSION= 0.9.6.update3 + USE_GMAKE= yes -MAKE_ARGS= PROG="${PORTNAME}" \ - DATADIR="${DATADIR}" \ +MAKE_ARGS= DATADIR="${DATADIR}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" MAN1= ypsilon.1 -ONLY_FOR_ARCHS= i386 +ONLY_FOR_ARCHS= i386 amd64 post-patch: - ${RM} ${WRKSRC}/sitelib/*.orig do-install: @${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin diff -ruN ypsilon.orig/distinfo ypsilon/distinfo --- ypsilon.orig/distinfo 2008-12-27 17:53:55.000000000 +0200 +++ ypsilon/distinfo 2008-12-27 17:54:21.000000000 +0200 @@ -1,3 +1,3 @@ -MD5 (ypsilon-0.9.6.tar.gz) = dd6886731fb78a85bc6a019f635f26a2 -SHA256 (ypsilon-0.9.6.tar.gz) = 5072ef7bc0248f546112631dd34a202d791ad8312f184d2ee387a6b40f9de17a -SIZE (ypsilon-0.9.6.tar.gz) = 4533453 +MD5 (ypsilon-0.9.6.update3.tar.gz) = b330ebabce9b665418f3c347a43dcd24 +SHA256 (ypsilon-0.9.6.update3.tar.gz) = 2ca3c901dc3f6bca857a94a9d991d14ecc12727d2833694f0e4f5aa1a8a4064d +SIZE (ypsilon-0.9.6.update3.tar.gz) = 4555843 diff -ruN ypsilon.orig/files/patch-Makefile ypsilon/files/patch-Makefile --- ypsilon.orig/files/patch-Makefile 2008-12-27 17:53:55.000000000 +0200 +++ ypsilon/files/patch-Makefile 2008-12-27 17:54:42.000000000 +0200 @@ -1,46 +1,52 @@ ---- Makefile.orig 2008-08-01 04:39:41.000000000 +0300 -+++ Makefile 2008-08-02 22:01:30.000000000 +0300 -@@ -3,13 +3,11 @@ - # Use Win32 native build for Cygwin - # +--- Makefile.orig 2008-12-23 10:56:02.000000000 +0200 ++++ Makefile 2008-12-27 16:33:07.000000000 +0200 +@@ -1,14 +1,11 @@ +-# Makefile for Linux, FreeBSD, OpenBSD, and Darwin + # Requirements: GNU Make, GCC 4.0 or later + # Options: DESTDIR, PREFIX, DATAMODEL(ILP32/LP64) --PROG = ypsilon -+PROG = ${PORTNAME} + PROG = ypsilon -PREFIX = /usr/local -+CPPFLAGS = -DNDEBUG -DDEFAULT_HEAP_LIMIT=32 -DSYSTEM_SHARE_PATH='"${DATADIR}"' ++CPPFLAGS = -DNDEBUG -DSYSTEM_SHARE_PATH='"$(DESTDIR)$(DATADIR)"' --CPPFLAGS = -DNDEBUG -DDEFAULT_HEAP_LIMIT=32 -DSYSTEM_SHARE_PATH='"$(PREFIX)/share/$(PROG)"' +-CPPFLAGS = -DNDEBUG -DSYSTEM_SHARE_PATH='"$(DESTDIR)$(PREFIX)/share/$(PROG)"' - --CXXFLAGS = -x c++ -pthread -msse -mfpmath=sse -O3 -fstrict-aliasing \ -+CXXFLAGS = -x c++ ${CFLAGS} \ - -fomit-frame-pointer -momit-leaf-frame-pointer \ - -fno-align-labels -fno-align-loops -fno-align-jumps - -@@ -25,6 +23,18 @@ - - UNAME = $(shell uname) - -+ifneq (, $(findstring FreeBSD, $(UNAME))) -+ ifeq ($(shell $(CXX) -dumpspecs | grep 'march=native')), ) -+ CXXFLAGS += -m32 -march=i386 -+ else -+ CXXFLAGS += -m32# -march=native -+ endif -+ CPPFLAGS += -D__LITTLE_ENDIAN__ -+ ASFLAGS = --32 -+ LDFLAGS = -m32 ${PTHREAD_LIBS} -+ SRCS += ffi_stub_linux.s -+endif -+ - ifneq (, $(findstring Linux, $(UNAME))) - ifeq ($(shell $(CXX) -dumpspecs | grep 'march=native')), ) - CXXFLAGS += -m32 -march=i686 -@@ -48,7 +58,6 @@ - .PHONY: all install uninstall sitelib stdlib check bench clean +-CXXFLAGS = -pipe -x c++ -pthread -O3 -fstrict-aliasing -fomit-frame-pointer -momit-leaf-frame-pointer ++CXXFLAGS = -x c++ ${CFLAGS} + + SRCS = file.cpp main.cpp vm0.cpp object_heap_compact.cpp subr_flonum.cpp vm1.cpp object_set.cpp \ + subr_hash.cpp vm2.cpp object_slab.cpp subr_list.cpp interpreter.cpp serialize.cpp \ +@@ -60,15 +57,7 @@ + endif + + ifneq (, $(findstring FreeBSD, $(UNAME))) +- ifeq ($(shell $(CXX) -dumpspecs | grep 'march=native'), ) +- ifeq ($(DATAMODEL), ILP32) +- CXXFLAGS += -march=i686 +- endif +- else +- CXXFLAGS += -march=native +- endif + CPPFLAGS += -D__LITTLE_ENDIAN__ +- CXXFLAGS += -msse2 -mfpmath=sse + ifeq ($(DATAMODEL), ILP32) + CPPFLAGS += -DDEFAULT_HEAP_LIMIT=32 + CXXFLAGS += -m32 +@@ -82,7 +71,7 @@ + ASFLAGS = --64 + SRCS += ffi_stub_freebsd64.s + endif +- LDLIBS = -pthread ++ LDLIBS = ${PTHREAD_LIBS} + endif + + ifneq (, $(findstring OpenBSD, $(UNAME))) +@@ -123,7 +112,6 @@ + .PHONY: all install uninstall sitelib stdlib check bench clean distclean all: $(PROG) - @mkdir -p -m755 $(HOME)/.ypsilon $(PROG): $(OBJS) - $(CXX) $(LDFLAGS) -o $@ $^ + $(CXX) $(LDFLAGS) $(LDLIBS) -o $@ $^ diff -ruN ypsilon.orig/files/patch-gtk-hello.scm ypsilon/files/patch-gtk-hello.scm --- ypsilon.orig/files/patch-gtk-hello.scm 1970-01-01 03:00:00.000000000 +0300 +++ ypsilon/files/patch-gtk-hello.scm 2008-12-27 17:54:21.000000000 +0200 @@ -0,0 +1,18 @@ +--- example/gtk-hello.scm.orig 2008-12-27 17:14:34.000000000 +0200 ++++ example/gtk-hello.scm 2008-12-27 17:15:07.000000000 +0200 +@@ -7,6 +7,7 @@ + ;; Requirements: + ;; Darwin: Gtk.framework + ;; Linux: libgtk-x11-2.0.so.0 ++;; FreeBSD: libgtk-x11-2.0.so + + (import (rnrs) + (srfi :28) +@@ -16,6 +17,7 @@ + + (define libgtk-name (cond (on-linux "libgtk-x11-2.0.so.0") + (on-darwin "Gtk.framework/Gtk") ++ (on-freebsd "libgtk-x11-2.0.so") + (else + (assertion-violation #f "can not locate GTK library, unknown operating system")))) + diff -ruN ypsilon.orig/files/patch-sitelib ypsilon/files/patch-sitelib --- ypsilon.orig/files/patch-sitelib 2008-12-27 17:53:55.000000000 +0200 +++ ypsilon/files/patch-sitelib 2008-12-27 17:54:21.000000000 +0200 @@ -1,42 +0,0 @@ -diff -ruN sitelib.old/ffi.scm sitelib/ffi.scm ---- sitelib.old/ffi.scm 2008-08-02 22:38:36.000000000 +0300 -+++ sitelib/ffi.scm 2008-08-02 22:38:49.000000000 +0300 -@@ -6,7 +6,7 @@ - (library (ffi) - - (export c-function c-argument -- on-windows on-darwin on-linux on-posix) -+ on-windows on-darwin on-linux on-freebsd on-posix) - - (import (core primitives) - (core syntax-case) -@@ -16,6 +16,7 @@ - (define on-windows (and (string-contains (architecture-feature 'operating-system) "windows") #t)) - (define on-darwin (and (string-contains (architecture-feature 'operating-system) "darwin") #t)) - (define on-linux (and (string-contains (architecture-feature 'operating-system) "linux") #t)) -+ (define on-freebsd (and (string-contains (architecture-feature 'operating-system) "freebsd") #t)) - (define on-posix (not on-windows)) - - (define assert-int -diff -ruN sitelib.old/gl.scm sitelib/gl.scm ---- sitelib.old/gl.scm 2008-08-02 22:38:36.000000000 +0300 -+++ sitelib/gl.scm 2008-08-02 22:38:49.000000000 +0300 -@@ -1242,6 +1242,7 @@ - (define libGL (cond (on-darwin (load-shared-object "OpenGL.framework/OpenGL")) - (on-windows (load-shared-object "opengl32.dll")) - (on-linux (load-shared-object "libGL.so.1")) -+ (on-freebsd (load-shared-object "libGL.so.1")) - (else (assertion-violation #f "can not locate OpenGL library, unknown operating system")))) - - ;;;; Boolean values -diff -ruN sitelib.old/glut.scm sitelib/glut.scm ---- sitelib.old/glut.scm 2008-08-02 22:38:36.000000000 +0300 -+++ sitelib/glut.scm 2008-08-02 22:38:49.000000000 +0300 -@@ -181,6 +181,7 @@ - (define libGLUT (cond (on-darwin (load-shared-object "GLUT.framework/GLUT")) - (on-windows (load-shared-object "glut32.dll")) - (on-linux (load-shared-object "libglut.so.3")) -+ (on-freebsd (load-shared-object "libglut.so.4")) - (else (assertion-violation #f "can not locate GLUT library, unknown operating system")))) - - ;; Display mode bit masks. diff -ruN ypsilon.orig/pkg-plist ypsilon/pkg-plist --- ypsilon.orig/pkg-plist 2008-12-27 17:53:55.000000000 +0200 +++ ypsilon/pkg-plist 2008-12-27 17:54:21.000000000 +0200 @@ -1,25 +1,70 @@ bin/ypsilon %%PORTEXAMPLES%%%%EXAMPLESDIR%%/gears.scm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/glut-demo.scm +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gtk-hello.scm %%DATADIR%%/sitelib/apropos.scm +%%DATADIR%%/sitelib/concurrent.scm +%%DATADIR%%/sitelib/debug.scm %%DATADIR%%/sitelib/ffi.scm %%DATADIR%%/sitelib/gl.scm %%DATADIR%%/sitelib/glut.scm %%DATADIR%%/sitelib/match.scm %%DATADIR%%/sitelib/pregexp.scm +%%DATADIR%%/sitelib/slib/format.scm +%%DATADIR%%/sitelib/socket.scm +%%DATADIR%%/sitelib/srfi/%3a1.scm +%%DATADIR%%/sitelib/srfi/%3a13.scm +%%DATADIR%%/sitelib/srfi/%3a14.scm +%%DATADIR%%/sitelib/srfi/%3a19.scm +%%DATADIR%%/sitelib/srfi/%3a26.scm +%%DATADIR%%/sitelib/srfi/%3a27.scm +%%DATADIR%%/sitelib/srfi/%3a28.scm +%%DATADIR%%/sitelib/srfi/%3a38.scm +%%DATADIR%%/sitelib/srfi/%3a39.scm +%%DATADIR%%/sitelib/srfi/%3a41.scm +%%DATADIR%%/sitelib/srfi/%3a42.scm +%%DATADIR%%/sitelib/srfi/%3a6.scm +%%DATADIR%%/sitelib/srfi/%3a8.scm +%%DATADIR%%/sitelib/srfi/%3a9.scm +%%DATADIR%%/sitelib/srfi/%3a98.scm %%DATADIR%%/sitelib/srfi/srfi-1.scm +%%DATADIR%%/sitelib/srfi/srfi-13.scm +%%DATADIR%%/sitelib/srfi/srfi-14.scm +%%DATADIR%%/sitelib/srfi/srfi-19.scm %%DATADIR%%/sitelib/srfi/srfi-26.scm +%%DATADIR%%/sitelib/srfi/srfi-27.scm %%DATADIR%%/sitelib/srfi/srfi-28.scm +%%DATADIR%%/sitelib/srfi/srfi-38.scm %%DATADIR%%/sitelib/srfi/srfi-39.scm +%%DATADIR%%/sitelib/srfi/srfi-41.scm %%DATADIR%%/sitelib/srfi/srfi-42.scm %%DATADIR%%/sitelib/srfi/srfi-6.scm %%DATADIR%%/sitelib/srfi/srfi-8.scm +%%DATADIR%%/sitelib/srfi/srfi-9.scm +%%DATADIR%%/sitelib/srfi/srfi-98.scm +%%DATADIR%%/sitelib/stdio.scm %%DATADIR%%/sitelib/streams.scm %%DATADIR%%/sitelib/tidbits/define-inline.scm %%DATADIR%%/sitelib/tidbits/dotimes.scm +%%DATADIR%%/sitelib/tidbits/generator.scm +%%DATADIR%%/sitelib/tidbits/remote-repl.scm %%DATADIR%%/sitelib/tidbits/string-split.scm %%DATADIR%%/sitelib/time.scm %%DATADIR%%/sitelib/trace.scm +%%DATADIR%%/sitelib/ypsilon/apropos.scm +%%DATADIR%%/sitelib/ypsilon/c-types.scm +%%DATADIR%%/sitelib/ypsilon/concurrent.scm +%%DATADIR%%/sitelib/ypsilon/debug.scm +%%DATADIR%%/sitelib/ypsilon/ffi.scm +%%DATADIR%%/sitelib/ypsilon/gl.scm +%%DATADIR%%/sitelib/ypsilon/glut.scm +%%DATADIR%%/sitelib/ypsilon/match.scm +%%DATADIR%%/sitelib/ypsilon/pregexp.scm +%%DATADIR%%/sitelib/ypsilon/socket.scm +%%DATADIR%%/sitelib/ypsilon/stdio.scm +%%DATADIR%%/sitelib/ypsilon/streams.scm +%%DATADIR%%/sitelib/ypsilon/time.scm +%%DATADIR%%/sitelib/ypsilon/trace.scm %%DATADIR%%/stdlib/core.scm %%DATADIR%%/stdlib/core/arithmetic.scm %%DATADIR%%/stdlib/core/bytevector-transcoders.scm @@ -77,7 +122,9 @@ @dirrm %%DATADIR%%/stdlib/rnrs @dirrm %%DATADIR%%/stdlib/core @dirrm %%DATADIR%%/stdlib +@dirrm %%DATADIR%%/sitelib/slib @dirrm %%DATADIR%%/sitelib/srfi @dirrm %%DATADIR%%/sitelib/tidbits +@dirrm %%DATADIR%%/sitelib/ypsilon @dirrm %%DATADIR%%/sitelib @dirrm %%DATADIR%% >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200812271558.mBRFw0c3053097>