Date: Wed, 30 Jul 2014 11:25:31 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363463 - in head/lang/squeak: . files Message-ID: <201407301125.s6UBPVdm068550@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Wed Jul 30 11:25:30 2014 New Revision: 363463 URL: http://svnweb.freebsd.org/changeset/ports/363463 QAT: https://qat.redports.org/buildarchive/r363463/ Log: - Drop `archivers/unzip' bdep; base system unzip(1) is sufficient - Fix some sloppy code to make Clang happy and remove USE_GCC knob - Simplify post-install target recipe; remove one trivial comment Added: head/lang/squeak/files/patch-unix_vm-sound-pulse_sqUnixSoundPulseAudio.c (contents, props changed) Modified: head/lang/squeak/Makefile Modified: head/lang/squeak/Makefile ============================================================================== --- head/lang/squeak/Makefile Wed Jul 30 11:20:24 2014 (r363462) +++ head/lang/squeak/Makefile Wed Jul 30 11:25:30 2014 (r363463) @@ -12,7 +12,7 @@ DISTFILES= Squeak-${VM_VERSION}-src${EXT Squeak${IMAGE_VERSION}.zip:src \ ${SQUEAK_SRC}.gz:sqsrc EXTRACT_ONLY= Squeak-${VM_VERSION}-src${EXTRACT_SUFX} -DIST_SUBDIR= squeak +DIST_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Full Smalltalk 80 with portability to Unix, Mac, and Windows @@ -20,9 +20,7 @@ COMMENT= Full Smalltalk 80 with portabil LICENSE= APACHE20 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= cmake:${PORTSDIR}/devel/cmake \ v4l_compat>=1.0.20120501:${PORTSDIR}/multimedia/v4l_compat LIB_DEPENDS= libaudio.so:${PORTSDIR}/audio/nas \ libffi.so:${PORTSDIR}/devel/libffi \ @@ -33,10 +31,10 @@ LIB_DEPENDS= libaudio.so:${PORTSDIR}/aud ONLY_FOR_ARCHS= i386 amd64 powerpc USES= pkgconfig -USE_GCC= any USE_GL= gl HAS_CONFIGURE= yes USE_GSTREAMER= yes + VM_VERSION= ${PORTVERSION}.${SVN_VERSION} SVN_VERSION= 2614 IMAGE_VERSION= 4.3 @@ -65,22 +63,24 @@ IMAGES= Squeak${IMAGE_VERSION}/Squeak${ .include <bsd.port.pre.mk> post-patch: -# Fix utmp.h .if ${OSVERSION} > 900007 - @${REINPLACE_CMD} -e 's,<utmp.h>,<utmpx.h>,' \ + @${REINPLACE_CMD} -e 's,<utmp\.h>,<utmpx.h>,' \ ${WRKSRC}/unix/plugins/PseudoTTYPlugin/openpty.h .endif + @${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 pre-configure: @${MKDIR} ${CONFIGURE_WRKSRC} post-install: - ${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/${SQUEAK_SRC}.gz > \ - ${WRKDIR}/${SQUEAK_SRC} && ${INSTALL_DATA} \ - ${WRKDIR}/${SQUEAK_SRC} \ - ${STAGEDIR}${PREFIX}/lib/squeak/${SQUEAK_LIB_DIR} - (cd ${DISTDIR}/${DIST_SUBDIR} && ${UNZIP_CMD} -u \ - Squeak${IMAGE_VERSION}.zip -d ${WRKDIR}) + ${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 \ + -d ${WRKDIR} ${INSTALL_DATA} ${IMAGES:S,^,${WRKDIR}/,} \ ${STAGEDIR}${PREFIX}/lib/squeak Added: head/lang/squeak/files/patch-unix_vm-sound-pulse_sqUnixSoundPulseAudio.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/squeak/files/patch-unix_vm-sound-pulse_sqUnixSoundPulseAudio.c Wed Jul 30 11:25:30 2014 (r363463) @@ -0,0 +1,15 @@ +--- unix/vm-sound-pulse/sqUnixSoundPulseAudio.c.orig 2012-08-08 10:34:42 +0800 ++++ unix/vm-sound-pulse/sqUnixSoundPulseAudio.c +@@ -995,10 +995,10 @@ DBGMSG("<sound_StartRecording()"); + static sqInt sound_StopRecording(void) { + 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); +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407301125.s6UBPVdm068550>