diff --git a/lang/squeak/Makefile b/lang/squeak/Makefile index 71c45a12d6f7..78043fb8ccae 100644 --- a/lang/squeak/Makefile +++ b/lang/squeak/Makefile @@ -22,8 +22,9 @@ LICENSE= AL2 MIT LICENSE_COMB= multi # Don't set USE_ZIP as this breaks EXTRACT_CMD. -BUILD_DEPENDS= ${UNZIP_CMD}:${PORTSDIR}/archivers/unzip \ - cmake:${PORTSDIR}/devel/cmake +BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip \ + cmake:${PORTSDIR}/devel/cmake \ + v4l_compat>=1.0.20120501:${PORTSDIR}/multimedia/v4l_compat LIB_DEPENDS= audio:${PORTSDIR}/audio/nas \ ffi:${PORTSDIR}/devel/libffi \ asound:${PORTSDIR}/audio/alsa-lib \ @@ -33,7 +34,7 @@ LIB_DEPENDS= audio:${PORTSDIR}/audio/nas \ ################################################## VM_VERSION= ${PORTVERSION}.${SVNVERSION} -SVNVERSION= 2602 +SVNVERSION= 2614 IMAGEVERSION= 4.3 SQUEAK_SRC= SqueakV41.sources SQUEAK_LIB_DIR= ${PORTVERSION}-${SVNVERSION} @@ -44,6 +45,7 @@ SQUEAK_LIB_DIR= ${PORTVERSION}-${SVNVERSION} DIST_SUBDIR= squeak ONLY_FOR_ARCHS= i386 amd64 MAN1= squeak.1 +USE_GCC= 4.2+ USE_GMAKE= yes USE_GL= gl HAS_CONFIGURE= yes @@ -67,7 +69,6 @@ INSTALL_WRKSRC= ${CONFIGURE_WRKSRC} CONFIGURE_SCRIPT= ../unix/cmake/configure CONFIGURE_ARGS+= --prefix=${PREFIX} -# USES+= cmake CMAKE_SOURCE_PATH= ../unix SUB_FILES= pkg-message diff --git a/lang/squeak/distinfo b/lang/squeak/distinfo index 682fc75a8368..b3c36bd23733 100644 --- a/lang/squeak/distinfo +++ b/lang/squeak/distinfo @@ -1,5 +1,5 @@ -SHA256 (squeak/Squeak-4.10.2.2602-src.tar.gz) = 4c92edf3fb79d90613d9d962a3abb6bf5bbc8a42d0cfaa7be31fede6a63d8e30 -SIZE (squeak/Squeak-4.10.2.2602-src.tar.gz) = 4421224 +SHA256 (squeak/Squeak-4.10.2.2614-src.tar.gz) = 3db6d12ea223e5bc49f52af7f6f832e383a3a006a53bc8a87f6469e1af5dfc2e +SIZE (squeak/Squeak-4.10.2.2614-src.tar.gz) = 3297314 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__vm__build.cmake b/lang/squeak/files/patch-unix__vm__build.cmake index f23665987695..5a940fc3c444 100644 --- a/lang/squeak/files/patch-unix__vm__build.cmake +++ b/lang/squeak/files/patch-unix__vm__build.cmake @@ -1,8 +1,8 @@ ---- unix/vm/build.cmake.bak 2012-04-14 22:26:13.000000000 +0900 -+++ unix/vm/build.cmake 2012-04-14 22:26:30.000000000 +0900 -@@ -83,4 +83,4 @@ +--- 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 @@ COMMAND sh ${bld}/config ${unix}/doc/squeak.1 ${bld}/squeak.1 ) - ADD_DEPENDENCIES (squeakvm 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)