Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 27 Oct 2012 15:46:58 +0000 (UTC)
From:      Pawel Pekala <pawel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r306504 - in head/lang/squeak: . files
Message-ID:  <201210271546.q9RFkw7d006075@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pawel
Date: Sat Oct 27 15:46:57 2012
New Revision: 306504
URL: http://svn.freebsd.org/changeset/ports/306504

Log:
  Update to version 4.10.2
  
  PR:		ports/173132
  Submitted by:	Takeshi MUTOH <mutoh@openedu.org> (maintainer)
  Feature safe:	yes

Added:
  head/lang/squeak/files/patch-unix__plugins_CameraPlugin_sqCamera-linux.c   (contents, props changed)
  head/lang/squeak/files/patch-unix__plugins_ScratchPlugin_unixSeriaPort2Ops.c   (contents, props changed)
  head/lang/squeak/files/patch-unix__plugins_SerialPlugin_sqUnixSerial.c   (contents, props changed)
Modified:
  head/lang/squeak/Makefile
  head/lang/squeak/distinfo
  head/lang/squeak/pkg-plist

Modified: head/lang/squeak/Makefile
==============================================================================
--- head/lang/squeak/Makefile	Sat Oct 27 14:42:26 2012	(r306503)
+++ head/lang/squeak/Makefile	Sat Oct 27 15:46:57 2012	(r306504)
@@ -2,15 +2,14 @@
 # $FreeBSD$
 
 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 @@ LICENSE_COMB=		multi
 
 # 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 @@ pre-configure:
 
 ##################################################
 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/)

Modified: head/lang/squeak/distinfo
==============================================================================
--- head/lang/squeak/distinfo	Sat Oct 27 14:42:26 2012	(r306503)
+++ head/lang/squeak/distinfo	Sat Oct 27 15:46:57 2012	(r306504)
@@ -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

Added: head/lang/squeak/files/patch-unix__plugins_CameraPlugin_sqCamera-linux.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/squeak/files/patch-unix__plugins_CameraPlugin_sqCamera-linux.c	Sat Oct 27 15:46:57 2012	(r306504)
@@ -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... */

Added: head/lang/squeak/files/patch-unix__plugins_ScratchPlugin_unixSeriaPort2Ops.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/squeak/files/patch-unix__plugins_ScratchPlugin_unixSeriaPort2Ops.c	Sat Oct 27 15:46:57 2012	(r306504)
@@ -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) {

Added: head/lang/squeak/files/patch-unix__plugins_SerialPlugin_sqUnixSerial.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/squeak/files/patch-unix__plugins_SerialPlugin_sqUnixSerial.c	Sat Oct 27 15:46:57 2012	(r306504)
@@ -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 */

Modified: head/lang/squeak/pkg-plist
==============================================================================
--- head/lang/squeak/pkg-plist	Sat Oct 27 14:42:26 2012	(r306503)
+++ head/lang/squeak/pkg-plist	Sat Oct 27 15:46:57 2012	(r306504)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210271546.q9RFkw7d006075>