diff -ruN /usr/ports/lang/squeak/Makefile squeak/Makefile --- /usr/ports/lang/squeak/Makefile 2015-06-02 08:29:02.000000000 -0400 +++ squeak/Makefile 2015-08-11 20:10:03.756511596 -0400 @@ -3,15 +3,15 @@ PORTNAME= squeak PORTVERSION= 4.10.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= lang MASTER_SITES= http://www.squeakvm.org/unix/release/:vmsrc \ http://ftp.squeak.org/${IMAGE_VERSION}/:src \ - ftp://squeak.org/4.1/:sqsrc \ + ftp://squeak.org/${IMAGE_VERSION}/:sqsrc \ http://squeak.610t.org/patches/:mainsrc DISTFILES= Squeak-${VM_VERSION}-src${EXTRACT_SUFX}:vmsrc \ - Squeak${IMAGE_VERSION}.zip:src \ - ${SQUEAK_SRC}.gz:sqsrc + Squeak${IMAGE_FULL_VERSION}.zip:src \ + ${SQUEAK_SRC}.zip:sqsrc EXTRACT_ONLY= Squeak-${VM_VERSION}-src${EXTRACT_SUFX} DIST_SUBDIR= ${PORTNAME} @@ -39,8 +39,10 @@ VM_VERSION= ${PORTVERSION}.${SVN_VERSION} SVN_VERSION= 2614 -IMAGE_VERSION= 4.3 -SQUEAK_SRC= SqueakV41.sources +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 @@ -52,11 +54,14 @@ CMAKE_SOURCE_PATH= ../unix SUB_FILES= pkg-message -SUB_LIST= SQUEAK_LIB_DIR=${SQUEAK_LIB_DIR} -PLIST_SUB= SQUEAK_LIB_DIR=${SQUEAK_LIB_DIR} - -IMAGES= Squeak${IMAGE_VERSION}/Squeak${IMAGE_VERSION}.image \ - Squeak${IMAGE_VERSION}/Squeak${IMAGE_VERSION}.changes +SUB_LIST= SQUEAK_LIB_DIR=${SQUEAK_LIB_DIR} \ + IMAGE_FULL_VERSION=${IMAGE_FULL_VERSION} +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} .include @@ -78,9 +83,8 @@ ${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 - ${GUNZIP_CMD} -c ${_DISTDIR}/${SQUEAK_SRC}.gz > \ - ${STAGEDIR}${PREFIX}/lib/squeak/${SQUEAK_LIB_DIR}/${SQUEAK_SRC} - ${UNZIP_NATIVE_CMD} -u ${_DISTDIR}/Squeak${IMAGE_VERSION}.zip \ + ${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 diff -ruN /usr/ports/lang/squeak/distinfo squeak/distinfo --- /usr/ports/lang/squeak/distinfo 2014-01-22 10:30:13.000000000 -0500 +++ squeak/distinfo 2015-08-11 19:40:58.242628684 -0400 @@ -1,6 +1,6 @@ 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 -SIZE (squeak/SqueakV41.sources.gz) = 6641435 +SHA256 (squeak/Squeak4.6-15102.zip) = 1605a32504b5fd364d4318676637b8991a0acd5c0d3bbe7e6f48f0c5ad786a6e +SIZE (squeak/Squeak4.6-15102.zip) = 8271964 +SHA256 (squeak/SqueakV46.sources.zip) = 33293590b185429b56c76df762295b897d6c197afe90427051f1b5bece29340e +SIZE (squeak/SqueakV46.sources.zip) = 6406218 diff -ruN /usr/ports/lang/squeak/pkg-plist squeak/pkg-plist --- /usr/ports/lang/squeak/pkg-plist 2014-10-27 11:23:30.000000000 -0400 +++ squeak/pkg-plist 2015-08-11 20:00:03.253552932 -0400 @@ -28,7 +28,7 @@ lib/squeak/%%SQUEAK_LIB_DIR%%/so.vm-sound-null lib/squeak/%%SQUEAK_LIB_DIR%%/so.vm-sound-pulse lib/squeak/%%SQUEAK_LIB_DIR%%/squeakvm -lib/squeak/%%SQUEAK_LIB_DIR%%/SqueakV41.sources -lib/squeak/Squeak4.3.changes -lib/squeak/Squeak4.3.image +lib/squeak/SqueakV46.sources +lib/squeak/Squeak%%IMAGE_FULL_VERSION%%.changes +lib/squeak/Squeak%%IMAGE_FULL_VERSION%%.image man/man1/squeak.1.gz