aboutsummaryrefslogtreecommitdiff
path: root/lang/squeak
diff options
context:
space:
mode:
authorPawel Pekala <pawel@FreeBSD.org>2012-10-27 15:46:57 +0000
committerPawel Pekala <pawel@FreeBSD.org>2012-10-27 15:46:57 +0000
commit59d5b6f0115119c0bac15276622275e9fb9f40f7 (patch)
tree6a6d3f7c14f6043ac1c6c5530de90a6c914dc966 /lang/squeak
parent2b20d29b9f78f0d799c3771e035e663226350754 (diff)
downloadports-59d5b6f0115119c0bac15276622275e9fb9f40f7.tar.gz
ports-59d5b6f0115119c0bac15276622275e9fb9f40f7.zip
Update to version 4.10.2
PR: ports/173132 Submitted by: Takeshi MUTOH <mutoh@openedu.org> (maintainer) Feature safe: yes
Notes
Notes: svn path=/head/; revision=306504
Diffstat (limited to 'lang/squeak')
-rw-r--r--lang/squeak/Makefile15
-rw-r--r--lang/squeak/distinfo4
-rw-r--r--lang/squeak/files/patch-unix__plugins_CameraPlugin_sqCamera-linux.c36
-rw-r--r--lang/squeak/files/patch-unix__plugins_ScratchPlugin_unixSeriaPort2Ops.c11
-rw-r--r--lang/squeak/files/patch-unix__plugins_SerialPlugin_sqUnixSerial.c11
-rw-r--r--lang/squeak/pkg-plist7
6 files changed, 72 insertions, 12 deletions
diff --git a/lang/squeak/Makefile b/lang/squeak/Makefile
index 596e052997ca..7c5c4cae578f 100644
--- a/lang/squeak/Makefile
+++ b/lang/squeak/Makefile
@@ -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/)
diff --git a/lang/squeak/distinfo b/lang/squeak/distinfo
index 202d346dd2e7..682fc75a8368 100644
--- a/lang/squeak/distinfo
+++ b/lang/squeak/distinfo
@@ -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 --git a/lang/squeak/files/patch-unix__plugins_CameraPlugin_sqCamera-linux.c b/lang/squeak/files/patch-unix__plugins_CameraPlugin_sqCamera-linux.c
new file mode 100644
index 000000000000..20bd0fc2454e
--- /dev/null
+++ b/lang/squeak/files/patch-unix__plugins_CameraPlugin_sqCamera-linux.c
@@ -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 --git a/lang/squeak/files/patch-unix__plugins_ScratchPlugin_unixSeriaPort2Ops.c b/lang/squeak/files/patch-unix__plugins_ScratchPlugin_unixSeriaPort2Ops.c
new file mode 100644
index 000000000000..becdc2f816ef
--- /dev/null
+++ b/lang/squeak/files/patch-unix__plugins_ScratchPlugin_unixSeriaPort2Ops.c
@@ -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 --git a/lang/squeak/files/patch-unix__plugins_SerialPlugin_sqUnixSerial.c b/lang/squeak/files/patch-unix__plugins_SerialPlugin_sqUnixSerial.c
new file mode 100644
index 000000000000..3d268d5806e7
--- /dev/null
+++ b/lang/squeak/files/patch-unix__plugins_SerialPlugin_sqUnixSerial.c
@@ -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 --git a/lang/squeak/pkg-plist b/lang/squeak/pkg-plist
index 98f52b38103b..fff2f180c304 100644
--- a/lang/squeak/pkg-plist
+++ b/lang/squeak/pkg-plist
@@ -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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-29 04:23:13 +0000