Date: Sat, 27 Oct 2012 03:50:38 +0900 (JST) From: Takeshi MUTOH <mutoh@openedu.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: mutoh@610t.org Subject: ports/173132: Maintainer Update: lang/squeak version up to 4.10.2. Message-ID: <20121026185038.D305278C1C@sacraya.610t.org> Resent-Message-ID: <201210261900.q9QJ01gF033181@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 173132 >Category: ports >Synopsis: Maintainer Update: lang/squeak version up to 4.10.2. >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Oct 26 19:00:01 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Takeshi MUTOH >Release: FreeBSD 8.3-RELEASE-p3 i386 >Organization: 610t >Environment: System: FreeBSD sacraya.610t.org 8.3-RELEASE-p3 FreeBSD 8.3-RELEASE-p3 #0: Mon Jun 11 23:52:38 UTC 2012 root@i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386 >Description: Upgrade lang/squeak port to 4.10.2. Original major change is below: - Now, VM include Scratch related plugins. -- http://scratch.mit.edu/ More details are at ChangeLog below: - http://squeakvm.org/cgi-bin/viewvc.cgi/squeak/trunk/platforms/unix/ChangeLog FreeBSD original changes is below: - Serial port change /dev/ttyS0 to /dev/ttyU0. - Scratch plugins: -- plugins/CameraPlugin is now alpha quality, please send me bug report. -- plugins/WeDoPlugin is not checked, because I don't have WeDo. >How-To-Repeat: This is update request. So no problem to repeat. >Fix: Apply patch below: diff -ruN /usr/ports/lang/squeak/Makefile ../squeak/Makefile --- /usr/ports/lang/squeak/Makefile 2012-09-30 02:40:53.000000000 +0900 +++ ../squeak/Makefile 2012-10-27 02:56:45.000000000 +0900 @@ -2,15 +2,14 @@ # $FreeBSD: ports/lang/squeak/Makefile,v 1.27 2012/09/29 17:40:53 rm Exp $ PORTNAME= squeak -PORTVERSION= 4.4.7 -PORTREVISION= 3 +PORTVERSION= 4.10.2 CATEGORIES= lang ################################################## MASTER_SITES= http://www.squeakvm.org/unix/release/:vmsrc \ http://ftp.squeak.org/${IMAGEVERSION}/:src \ ftp://squeak.org/4.1/:sqsrc \ http://squeak.610t.org/patches/:mainsrc -DISTFILES= Squeak-${VM_VERSION}-src${EXTRACT_SUFX}:mainsrc \ +DISTFILES= Squeak-${VM_VERSION}-src${EXTRACT_SUFX}:vmsrc \ Squeak${IMAGEVERSION}.zip:src \ ${SQUEAK_SRC}.gz:sqsrc EXTRACT_ONLY= Squeak-${VM_VERSION}-src${EXTRACT_SUFX} @@ -24,16 +23,18 @@ # Don't set USE_ZIP as this breaks EXTRACT_CMD. BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip \ - cmake:${PORTSDIR}/devel/cmake + cmake:${PORTSDIR}/devel/cmake \ + ${LOCALBASE}/include/libv4l2.h:${PORTSDIR}/multimedia/v4l_compat LIB_DEPENDS= audio:${PORTSDIR}/audio/nas \ ffi:${PORTSDIR}/devel/libffi \ asound:${PORTSDIR}/audio/alsa-lib \ pulse-simple:${PORTSDIR}/audio/pulseaudio \ - gstreamer:${PORTSDIR}/multimedia/gstreamer + gstreamer:${PORTSDIR}/multimedia/gstreamer \ + v4l2:${PORTSDIR}/multimedia/libv4l ################################################## VM_VERSION= ${PORTVERSION}.${SVNVERSION} -SVNVERSION= 2383 +SVNVERSION= 2602 IMAGEVERSION= 4.3 SQUEAK_SRC= SqueakV41.sources SQUEAK_LIB_DIR= ${PORTVERSION}-${SVNVERSION} @@ -91,7 +92,7 @@ ################################################## post-install: - (cd ${DISTDIR}/${DIST_SUBDIR} && ${GUNZIP_CMD} ${SQUEAK_SRC}.gz && ${INSTALL_DATA} ${SQUEAK_SRC} ${PREFIX}/lib/squeak/${SQUEAK_LIB_DIR}/) + ${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/${SQUEAK_SRC}.gz > ${WRKDIR}/${SQUEAK_SRC} && ${INSTALL_DATA} ${WRKDIR}/${SQUEAK_SRC} ${PREFIX}/lib/squeak/${SQUEAK_LIB_DIR}/ (cd ${DISTDIR}/${DIST_SUBDIR} && ${UNZIP_CMD} -u Squeak${IMAGEVERSION}.zip -d ${WRKDIR}) .for f in ${IMAGES} (cd ${WRKDIR} && ${INSTALL_DATA} ${f} ${PREFIX}/lib/squeak/) diff -ruN /usr/ports/lang/squeak/distinfo ../squeak/distinfo --- /usr/ports/lang/squeak/distinfo 2012-09-30 02:40:53.000000000 +0900 +++ ../squeak/distinfo 2012-10-25 13:36:17.000000000 +0900 @@ -1,5 +1,5 @@ -SHA256 (squeak/Squeak-4.4.7.2383-src.tar.gz) = f8e049e70c185bc7cbf87265c71445557c6c0e9b79f82d50eff54f990e5da6ae -SIZE (squeak/Squeak-4.4.7.2383-src.tar.gz) = 3585774 +SHA256 (squeak/Squeak-4.10.2.2602-src.tar.gz) = 4c92edf3fb79d90613d9d962a3abb6bf5bbc8a42d0cfaa7be31fede6a63d8e30 +SIZE (squeak/Squeak-4.10.2.2602-src.tar.gz) = 4421224 SHA256 (squeak/Squeak4.3.zip) = 318ee202b10c7d0c2875dd44f121e299904d164acd3a7ff2c90d8818847b2a67 SIZE (squeak/Squeak4.3.zip) = 8689484 SHA256 (squeak/SqueakV41.sources.gz) = 1e92730f6221ced584e0050844abec1bd69848b7963a6cbf3a67986b1ad6553c diff -ruN /usr/ports/lang/squeak/files/patch-unix__plugins_CameraPlugin_sqCamera-linux.c ../squeak/files/patch-unix__plugins_CameraPlugin_sqCamera-linux.c --- /usr/ports/lang/squeak/files/patch-unix__plugins_CameraPlugin_sqCamera-linux.c 1970-01-01 09:00:00.000000000 +0900 +++ ../squeak/files/patch-unix__plugins_CameraPlugin_sqCamera-linux.c 2012-10-25 10:52:44.000000000 +0900 @@ -0,0 +1,36 @@ +--- unix/plugins/CameraPlugin/sqCamera-linux.c.orig 2012-07-31 06:59:01.000000000 +0900 ++++ unix/plugins/CameraPlugin/sqCamera-linux.c 2012-09-24 14:44:26.000000000 +0900 +@@ -45,8 +45,9 @@ + #include <sys/ioctl.h> + #include <dlfcn.h> + +-#include <asm/types.h> /* for videodev2.h */ +- ++#ifdef __FreeBSD__ ++#include <libv4l2.h> ++#endif + #include <linux/videodev2.h> + + +@@ -176,12 +177,19 @@ + int devNum; + camPtr cam; + ++#ifndef __FreeBSD__ + vd_open = open; + vd_close = close; +- vd_dup = dup; ++ vd_mmap = mmap; + vd_ioctl = ioctl; ++#else ++ vd_open = v4l2_open; ++ vd_close = v4l2_close; ++ vd_mmap = v4l2_mmap; ++ vd_ioctl = v4l2_ioctl; ++#endif ++ vd_dup = dup; + vd_read = read; +- vd_mmap = mmap; + vd_munmap = munmap; + + /* Use libv4l2: use if available... */ diff -ruN /usr/ports/lang/squeak/files/patch-unix__plugins_ScratchPlugin_unixSeriaPort2Ops.c ../squeak/files/patch-unix__plugins_ScratchPlugin_unixSeriaPort2Ops.c --- /usr/ports/lang/squeak/files/patch-unix__plugins_ScratchPlugin_unixSeriaPort2Ops.c 1970-01-01 09:00:00.000000000 +0900 +++ ../squeak/files/patch-unix__plugins_ScratchPlugin_unixSeriaPort2Ops.c 2012-10-25 10:52:44.000000000 +0900 @@ -0,0 +1,11 @@ +--- unix/plugins/ScratchPlugin/unixSeriaPort2Ops.c.org 2012-09-24 15:26:44.000000000 +0900 ++++ unix/plugins/ScratchPlugin/unixSeriaPort2Ops.c 2012-09-24 15:26:54.000000000 +0900 +@@ -337,7 +337,7 @@ + } + + int isSerialPortDev(char *s) { +- return isPrefix("ttyusb", s); ++ return isPrefix("ttyU", s); + } + + int isPrefix(char *prefix, char *s) { diff -ruN /usr/ports/lang/squeak/files/patch-unix__plugins_SerialPlugin_sqUnixSerial.c ../squeak/files/patch-unix__plugins_SerialPlugin_sqUnixSerial.c --- /usr/ports/lang/squeak/files/patch-unix__plugins_SerialPlugin_sqUnixSerial.c 1970-01-01 09:00:00.000000000 +0900 +++ ../squeak/files/patch-unix__plugins_SerialPlugin_sqUnixSerial.c 2012-10-25 10:52:44.000000000 +0900 @@ -0,0 +1,11 @@ +--- unix/plugins/SerialPlugin/sqUnixSerial.c.org 2012-09-24 15:29:28.000000000 +0900 ++++ unix/plugins/SerialPlugin/sqUnixSerial.c 2012-09-24 15:29:38.000000000 +0900 +@@ -21,7 +21,7 @@ + #define PORT_NAME_SIZE 64 + + static const char serialPortBaseName[] = "/dev/tty"; +-static const char serialPortBaseNameDefault[] = "/dev/ttyS0"; ++static const char serialPortBaseNameDefault[] = "/dev/ttyU0"; + + /* stopBits 0=1.5, 1=1, 2=2 */ + /* I don't know how to get 1.5 stop bits. Oh well. So you get 2 instead */ diff -ruN /usr/ports/lang/squeak/pkg-plist ../squeak/pkg-plist --- /usr/ports/lang/squeak/pkg-plist 2012-06-25 00:03:36.000000000 +0900 +++ ../squeak/pkg-plist 2012-10-25 10:52:44.000000000 +0900 @@ -1,21 +1,22 @@ bin/squeak bin/squeak.sh +lib/squeak/%%SQUEAK_LIB_DIR%%/ckformat lib/squeak/%%SQUEAK_LIB_DIR%%/so.AioPlugin lib/squeak/%%SQUEAK_LIB_DIR%%/so.B3DAcceleratorPlugin +lib/squeak/%%SQUEAK_LIB_DIR%%/so.CameraPlugin lib/squeak/%%SQUEAK_LIB_DIR%%/so.ClipboardExtendedPlugin lib/squeak/%%SQUEAK_LIB_DIR%%/so.DBusPlugin lib/squeak/%%SQUEAK_LIB_DIR%%/so.FileCopyPlugin -lib/squeak/%%SQUEAK_LIB_DIR%%/so.GStreamerPlugin lib/squeak/%%SQUEAK_LIB_DIR%%/so.HostWindowPlugin -lib/squeak/%%SQUEAK_LIB_DIR%%/so.KedamaPlugin -lib/squeak/%%SQUEAK_LIB_DIR%%/so.KedamaPlugin2 lib/squeak/%%SQUEAK_LIB_DIR%%/so.MIDIPlugin lib/squeak/%%SQUEAK_LIB_DIR%%/so.Mpeg3Plugin lib/squeak/%%SQUEAK_LIB_DIR%%/so.RomePlugin +lib/squeak/%%SQUEAK_LIB_DIR%%/so.ScratchPlugin lib/squeak/%%SQUEAK_LIB_DIR%%/so.Squeak3D lib/squeak/%%SQUEAK_LIB_DIR%%/so.SqueakFFIPrims lib/squeak/%%SQUEAK_LIB_DIR%%/so.UUIDPlugin lib/squeak/%%SQUEAK_LIB_DIR%%/so.UnixOSProcessPlugin +lib/squeak/%%SQUEAK_LIB_DIR%%/so.UnicodePlugin lib/squeak/%%SQUEAK_LIB_DIR%%/so.XDisplayControlPlugin lib/squeak/%%SQUEAK_LIB_DIR%%/so.vm-display-X11 lib/squeak/%%SQUEAK_LIB_DIR%%/so.vm-display-custom See also redports build log below: - http://redports.org/buildarchive/20121026045518-5726/ >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20121026185038.D305278C1C>