Index: head/lang/squeak/Makefile =================================================================== --- head/lang/squeak/Makefile (revision 569266) +++ head/lang/squeak/Makefile (revision 569267) @@ -1,82 +1,87 @@ # Created by: Roland Jesse # $FreeBSD$ PORTNAME= squeak PORTVERSION= 4.10.2 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= lang MASTER_SITES= http://www.squeakvm.org/unix/release/:vmsrc \ http://ftp.squeak.org/${IMAGE_VERSION}/:src \ ftp://squeak.org/${IMAGE_VERSION}/:sqsrc \ http://squeak.610t.org/patches/:mainsrc DISTFILES= Squeak-${VM_VERSION}-src${EXTRACT_SUFX}:vmsrc \ Squeak${IMAGE_FULL_VERSION}.zip:src \ ${SQUEAK_SRC}.zip:sqsrc DIST_SUBDIR= ${PORTNAME} EXTRACT_ONLY= Squeak-${VM_VERSION}-src${EXTRACT_SUFX} MAINTAINER= takeshi.mutoh@gmail.com COMMENT= Full Smalltalk 80 with portability to Unix, Mac, and Windows LICENSE= APACHE20 MIT LICENSE_COMB= multi ONLY_FOR_ARCHS= aarch64 amd64 i386 powerpc powerpc64 powerpc64le powerpcspe BUILD_DEPENDS= cmake:devel/cmake \ v4l_compat>=1.0.20120501:multimedia/v4l_compat LIB_DEPENDS= libaudio.so:audio/nas \ + libdbus-1.so:devel/dbus \ libffi.so:devel/libffi \ + libfreetype.so:print/freetype2 \ libasound.so:audio/alsa-lib \ libpulse-simple.so:audio/pulseaudio \ libv4l2.so:multimedia/libv4l -USES= gl gnome pkgconfig -USE_GNOME= cairo pango +USES= gl gnome iconv pkgconfig xorg USE_GL= gl -HAS_CONFIGURE= yes -CONFIGURE_OUTSOURCE= yes +USE_GNOME= cairo pango +USE_XORG= ice sm x11 xext xrender VM_VERSION= ${PORTVERSION}.${SVN_VERSION} SVN_VERSION= 2614 IMAGE_VERSION= 4.6 IMAGE_SVN_VERSION= 15102 IMAGE_FULL_VERSION= ${IMAGE_VERSION}-${IMAGE_SVN_VERSION} SQUEAK_SRC= SqueakV46.sources SQUEAK_LIB_DIR= ${PORTVERSION}-${SVN_VERSION} -WRKSRC= ${WRKDIR}/Squeak-${VM_VERSION}-src +CMAKE_SOURCE_PATH= unix +HAS_CONFIGURE= yes CONFIGURE_SCRIPT= unix/cmake/configure CONFIGURE_ARGS= --prefix=${PREFIX} -CMAKE_SOURCE_PATH= unix +CONFIGURE_OUTSOURCE= yes SUB_FILES= pkg-message SUB_LIST= SQUEAK_LIB_DIR=${SQUEAK_LIB_DIR} \ IMAGE_FULL_VERSION=${IMAGE_FULL_VERSION} + +WRKSRC= ${WRKDIR}/Squeak-${VM_VERSION}-src + PLIST_SUB= SQUEAK_LIB_DIR=${SQUEAK_LIB_DIR} \ IMAGE_FULL_VERSION=${IMAGE_FULL_VERSION} IMAGES= Squeak${IMAGE_FULL_VERSION}.image \ Squeak${IMAGE_FULL_VERSION}.changes \ ${SQUEAK_SRC} post-patch: @${REINPLACE_CMD} -e 's,,,' \ ${WRKSRC}/unix/plugins/PseudoTTYPlugin/openpty.h @${REINPLACE_CMD} -e 's,return;,return 0;,' \ ${WRKSRC}/Cross/plugins/Mpeg3Plugin/libmpeg/video/idct.c \ ${WRKSRC}/Cross/plugins/Mpeg3Plugin/libmpeg/audio/layer3.c @${REINPLACE_CMD} -e 's,return;,return 1;,' \ ${WRKSRC}/Cross/plugins/Mpeg3Plugin/libmpeg/video/getpicture.c post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/squeak/${SQUEAK_LIB_DIR}/so.* \ ${STAGEDIR}${PREFIX}/lib/squeak/${SQUEAK_LIB_DIR}/squeakvm \ ${STAGEDIR}${PREFIX}/lib/squeak/${SQUEAK_LIB_DIR}/ckformat ${UNZIP_NATIVE_CMD} -u ${_DISTDIR}/${SQUEAK_SRC}.zip -d ${WRKDIR} ${UNZIP_NATIVE_CMD} -u ${_DISTDIR}/Squeak${IMAGE_FULL_VERSION}.zip \ -d ${WRKDIR} ${INSTALL_DATA} ${IMAGES:S,^,${WRKDIR}/,} \ ${STAGEDIR}${PREFIX}/lib/squeak .include Index: head/lang/squeak/files/patch-unix_plugins_CameraPlugin_sqCamera-linux.c =================================================================== --- head/lang/squeak/files/patch-unix_plugins_CameraPlugin_sqCamera-linux.c (revision 569266) +++ head/lang/squeak/files/patch-unix_plugins_CameraPlugin_sqCamera-linux.c (revision 569267) @@ -1,36 +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 +--- unix/plugins/CameraPlugin/sqCamera-linux.c.orig 2012-07-30 21:59:01 UTC ++++ unix/plugins/CameraPlugin/sqCamera-linux.c @@ -45,8 +45,9 @@ #include #include -#include /* for videodev2.h */ - +#ifdef __FreeBSD__ +#include +#endif #include -@@ -176,12 +177,19 @@ +@@ -176,12 +177,19 @@ libCon(void) 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... */ Index: head/lang/squeak/files/patch-unix_plugins_ScratchPlugin_unixSeriaPort2Ops.c =================================================================== --- head/lang/squeak/files/patch-unix_plugins_ScratchPlugin_unixSeriaPort2Ops.c (revision 569266) +++ head/lang/squeak/files/patch-unix_plugins_ScratchPlugin_unixSeriaPort2Ops.c (revision 569267) @@ -1,11 +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 @@ +--- unix/plugins/ScratchPlugin/unixSeriaPort2Ops.c.orig 2012-07-30 21:58:07 UTC ++++ unix/plugins/ScratchPlugin/unixSeriaPort2Ops.c +@@ -337,7 +337,7 @@ error: } int isSerialPortDev(char *s) { - return isPrefix("ttyusb", s); + return isPrefix("ttyU", s); } int isPrefix(char *prefix, char *s) { Index: head/lang/squeak/files/patch-unix_plugins_SerialPlugin_sqUnixSerial.c =================================================================== --- head/lang/squeak/files/patch-unix_plugins_SerialPlugin_sqUnixSerial.c (revision 569266) +++ head/lang/squeak/files/patch-unix_plugins_SerialPlugin_sqUnixSerial.c (revision 569267) @@ -1,11 +1,22 @@ ---- 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 +--- unix/plugins/SerialPlugin/sqUnixSerial.c.orig 2011-03-14 05:01:56 UTC ++++ unix/plugins/SerialPlugin/sqUnixSerial.c @@ -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 */ +@@ -94,10 +94,8 @@ static drDecode dataRateDecode[] = { + #endif + #if defined(B500000) /* missing on GNU/Linux prior to 2.2 */ + { 500000, B500000 }, +- { 576000, B576000 }, + { 921600, B921600 }, + { 1000000, B1000000 }, +- { 1152000, B1152000 }, + { 1500000, B1500000 }, + { 2000000, B2000000 }, + #endif Index: head/lang/squeak/files/patch-unix_plugins_UUIDPlugin_config.cmake =================================================================== --- head/lang/squeak/files/patch-unix_plugins_UUIDPlugin_config.cmake (revision 569266) +++ head/lang/squeak/files/patch-unix_plugins_UUIDPlugin_config.cmake (revision 569267) @@ -1,12 +1,13 @@ ---- unix/plugins/UUIDPlugin/config.cmake.orig 2012-09-13 21:09:00.000000000 +0200 -+++ unix/plugins/UUIDPlugin/config.cmake 2013-10-27 14:10:07.948211424 +0100 -@@ -4,8 +4,8 @@ +--- unix/plugins/UUIDPlugin/config.cmake.orig 2012-09-13 19:09:00 UTC ++++ unix/plugins/UUIDPlugin/config.cmake +@@ -4,8 +4,8 @@ CONFIG_DEFINE (HAVE_UUID_H) PLUGIN_FIND_INCLUDE (SYS_UUID sys/uuid.h) CONFIG_DEFINE (HAVE_SYS_UUID_H) -PLUGIN_FIND_INCLUDE (UUID_UUID uuid/uuid.h) -CONFIG_DEFINE (HAVE_UUID_UUID_H) +#---PLUGIN_FIND_INCLUDE (UUID_UUID uuid/uuid.h) +#---CONFIG_DEFINE (HAVE_UUID_UUID_H) PLUGIN_FIND_LIBRARY (UUID uuid) + Index: head/lang/squeak/files/patch-unix_vm-sound-pulse_sqUnixSoundPulseAudio.c =================================================================== --- head/lang/squeak/files/patch-unix_vm-sound-pulse_sqUnixSoundPulseAudio.c (revision 569266) +++ head/lang/squeak/files/patch-unix_vm-sound-pulse_sqUnixSoundPulseAudio.c (revision 569267) @@ -1,15 +1,15 @@ ---- unix/vm-sound-pulse/sqUnixSoundPulseAudio.c.orig 2012-08-08 10:34:42 +0800 +--- unix/vm-sound-pulse/sqUnixSoundPulseAudio.c.orig 2012-08-08 02:34:42 UTC +++ unix/vm-sound-pulse/sqUnixSoundPulseAudio.c @@ -995,10 +995,10 @@ DBGMSG("sound_StopRecording()"); - if (!audioIn.open) return; + if (!audioIn.open) return false; audioIn.open = false; - if (NULL == audioIn.pa_conn) return; + if (NULL == audioIn.pa_conn) return false; ioThreadStall(&audioIn); Index: head/lang/squeak/files/patch-unix_vm_build.cmake =================================================================== --- head/lang/squeak/files/patch-unix_vm_build.cmake (revision 569266) +++ head/lang/squeak/files/patch-unix_vm_build.cmake (revision 569267) @@ -1,8 +1,8 @@ ---- unix/vm/build.cmake.orig 2013-06-09 22:54:13.000000000 +0200 -+++ unix/vm/build.cmake 2013-06-09 22:55:18.000000000 +0200 -@@ -90,4 +90,4 @@ +--- unix/vm/build.cmake.orig 2012-09-17 01:03:14 UTC ++++ unix/vm/build.cmake +@@ -90,4 +90,4 @@ ADD_CUSTOM_TARGET (squeak.1 COMMAND sh ${bld}/config ${unix}/doc/squeak.1 ${bld}/squeak.1 ) ADD_DEPENDENCIES (squeakvm${scriptsuffix} squeak.1) -INSTALL (FILES ${bld}/squeak.1 DESTINATION share/man/man1) +INSTALL (FILES ${bld}/squeak.1 DESTINATION man/man1) Index: head/lang/squeak/files/patch-unix_vm_sqUnixMain.c =================================================================== --- head/lang/squeak/files/patch-unix_vm_sqUnixMain.c (revision 569266) +++ head/lang/squeak/files/patch-unix_vm_sqUnixMain.c (revision 569267) @@ -1,13 +1,13 @@ ---- unix/vm/sqUnixMain.c.bak 2013-12-05 13:49:51 -0800 +--- unix/vm/sqUnixMain.c.orig 2012-09-17 01:03:14 UTC +++ unix/vm/sqUnixMain.c -@@ -1334,8 +1334,8 @@ +@@ -1334,8 +1334,8 @@ void imgInit(void) || defined(POWERPC) || defined(__POWERPC) || defined (__POWERPC__) ) void mtfsfi(unsigned long long fpscr) { - __asm__("lfd f0, %0" :: "m"(fpscr)); - __asm__("mtfsf 0xff, f0"); + __asm__("lfd 0, %0" :: "m"(fpscr)); + __asm__("mtfsf 0xff, 0"); } #else # define mtfsfi(fpscr)