From owner-svn-ports-all@FreeBSD.ORG Wed Jul 30 08:03:10 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2574317E; Wed, 30 Jul 2014 08:03:10 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 112C7293F; Wed, 30 Jul 2014 08:03:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s6U839Uc076519; Wed, 30 Jul 2014 08:03:09 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s6U838AR076505; Wed, 30 Jul 2014 08:03:08 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201407300803.s6U838AR076505@svn.freebsd.org> From: Alexey Dokuchaev Date: Wed, 30 Jul 2014 08:03:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363453 - in head/lang/squeak: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jul 2014 08:03:10 -0000 Author: danfe Date: Wed Jul 30 08:03:08 2014 New Revision: 363453 URL: http://svnweb.freebsd.org/changeset/ports/363453 QAT: https://qat.redports.org/buildarchive/r363453/ Log: - Stagify, sort the knobs, remove excessive whitespace and bogus comments - Employ USE_GSTREAMER knob instead of depending on libgstreamer.so - Use consistent separators in patch files (this also deuglifies them) PR: 192234 Added: head/lang/squeak/files/patch-unix_plugins_CameraPlugin_sqCamera-linux.c - copied unchanged from r363446, head/lang/squeak/files/patch-unix__plugins_CameraPlugin_sqCamera-linux.c head/lang/squeak/files/patch-unix_plugins_ScratchPlugin_unixSeriaPort2Ops.c - copied unchanged from r363446, head/lang/squeak/files/patch-unix__plugins_ScratchPlugin_unixSeriaPort2Ops.c head/lang/squeak/files/patch-unix_plugins_SerialPlugin_sqUnixSerial.c - copied unchanged from r363446, head/lang/squeak/files/patch-unix__plugins_SerialPlugin_sqUnixSerial.c head/lang/squeak/files/patch-unix_plugins_UUIDPlugin_config.cmake - copied unchanged from r363446, head/lang/squeak/files/patch-unix__plugins_UUIDPlugin_config.cmake head/lang/squeak/files/patch-unix_vm_build.cmake - copied unchanged from r363446, head/lang/squeak/files/patch-unix__vm__build.cmake Deleted: head/lang/squeak/files/patch-unix__plugins_CameraPlugin_sqCamera-linux.c head/lang/squeak/files/patch-unix__plugins_ScratchPlugin_unixSeriaPort2Ops.c head/lang/squeak/files/patch-unix__plugins_SerialPlugin_sqUnixSerial.c head/lang/squeak/files/patch-unix__plugins_UUIDPlugin_config.cmake head/lang/squeak/files/patch-unix__vm__build.cmake Modified: head/lang/squeak/Makefile head/lang/squeak/pkg-plist Modified: head/lang/squeak/Makefile ============================================================================== --- head/lang/squeak/Makefile Wed Jul 30 07:59:07 2014 (r363452) +++ head/lang/squeak/Makefile Wed Jul 30 08:03:08 2014 (r363453) @@ -1,103 +1,87 @@ -# Created by: roland.jesse@gmx.net +# Created by: Roland Jesse # $FreeBSD$ -PORTNAME= squeak -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}:vmsrc \ - Squeak${IMAGEVERSION}.zip:src \ - ${SQUEAK_SRC}.gz:sqsrc -EXTRACT_ONLY= Squeak-${VM_VERSION}-src${EXTRACT_SUFX} +PORTNAME= squeak +PORTVERSION= 4.10.2 +CATEGORIES= lang +MASTER_SITES= http://www.squeakvm.org/unix/release/:vmsrc \ + http://ftp.squeak.org/${IMAGE_VERSION}/:src \ + ftp://squeak.org/4.1/:sqsrc \ + http://squeak.610t.org/patches/:mainsrc +DISTFILES= Squeak-${VM_VERSION}-src${EXTRACT_SUFX}:vmsrc \ + Squeak${IMAGE_VERSION}.zip:src \ + ${SQUEAK_SRC}.gz:sqsrc +EXTRACT_ONLY= Squeak-${VM_VERSION}-src${EXTRACT_SUFX} +DIST_SUBDIR= squeak -################################################## MAINTAINER= ports@FreeBSD.org -COMMENT= Full Smalltalk 80 with portability to UNIX, Mac, and Windows +COMMENT= Full Smalltalk 80 with portability to Unix, Mac, and Windows -LICENSE= APACHE20 MIT -LICENSE_COMB= multi +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 \ - v4l_compat>=1.0.20120501:${PORTSDIR}/multimedia/v4l_compat -LIB_DEPENDS= libaudio.so:${PORTSDIR}/audio/nas \ - libffi.so:${PORTSDIR}/devel/libffi \ - libasound.so:${PORTSDIR}/audio/alsa-lib \ - libpulse-simple.so:${PORTSDIR}/audio/pulseaudio \ - libgstreamer.so:${PORTSDIR}/multimedia/gstreamer \ - libv4l2.so:${PORTSDIR}/multimedia/libv4l - -################################################## -VM_VERSION= ${PORTVERSION}.${SVNVERSION} -SVNVERSION= 2614 -IMAGEVERSION= 4.3 -SQUEAK_SRC= SqueakV41.sources -SQUEAK_LIB_DIR= ${PORTVERSION}-${SVNVERSION} -USES= pkgconfig +BUILD_DEPENDS= ${UNZIP_CMD}:${PORTSDIR}/archivers/unzip \ + 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 \ + libasound.so:${PORTSDIR}/audio/alsa-lib \ + libpulse-simple.so:${PORTSDIR}/audio/pulseaudio \ + libv4l2.so:${PORTSDIR}/multimedia/libv4l + +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 +SQUEAK_SRC= SqueakV41.sources +SQUEAK_LIB_DIR= ${PORTVERSION}-${SVN_VERSION} -NO_STAGE= yes -.include - -################################################## -DIST_SUBDIR= squeak -ONLY_FOR_ARCHS= i386 amd64 powerpc -MAN1= squeak.1 -USE_GCC= any -USE_GL= gl -HAS_CONFIGURE= yes - -# Plugin image must be writable, because of it copy to user's ~/.npsqueak/ and -# be updated. -SHAREMODE= 644 - -# shared Libaries are to be installed in: -LDCONFIG_DIRS= ${PREFIX}/lib/squeak/${VM_VERSION} - -IMAGES= Squeak${IMAGEVERSION}/Squeak${IMAGEVERSION}.image \ - Squeak${IMAGEVERSION}/Squeak${IMAGEVERSION}.changes - -################################################## -# Configure and Build WRKSRC= ${WRKDIR}/Squeak-${VM_VERSION}-src CONFIGURE_WRKSRC= ${WRKSRC}/build BUILD_WRKSRC= ${CONFIGURE_WRKSRC} INSTALL_WRKSRC= ${CONFIGURE_WRKSRC} CONFIGURE_SCRIPT= ../unix/cmake/configure -CONFIGURE_ARGS+= --prefix=${PREFIX} - +CONFIGURE_ARGS= --prefix=${PREFIX} CMAKE_SOURCE_PATH= ../unix -SUB_FILES= pkg-message -SUB_LIST= SQUEAK_LIB_DIR=${SQUEAK_LIB_DIR} +SUB_FILES= pkg-message +SUB_LIST= SQUEAK_LIB_DIR=${SQUEAK_LIB_DIR} +PLIST_SUB= SQUEAK_LIB_DIR=${SQUEAK_LIB_DIR} -PLIST_SUB= SQUEAK_LIB_DIR=${SQUEAK_LIB_DIR} +# Plugin image must be writable, because of it copy to user's ~/.npsqueak/ and +# be updated. +SHAREMODE= 644 -################################################## -post-patch: +IMAGES= Squeak${IMAGE_VERSION}/Squeak${IMAGE_VERSION}.image \ + Squeak${IMAGE_VERSION}/Squeak${IMAGE_VERSION}.changes +.include + +post-patch: # Fix utmp.h .if ${OSVERSION} > 900007 - @${REINPLACE_CMD} \ - -e "s,,,g" \ + @${REINPLACE_CMD} -e 's,,,' \ ${WRKSRC}/unix/plugins/PseudoTTYPlugin/openpty.h .endif -################################################## pre-configure: @${MKDIR} ${CONFIGURE_WRKSRC} -################################################## post-install: - ${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/) -.endfor - @${CAT} ${PKGMESSAGE} + ${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}) + ${INSTALL_DATA} ${IMAGES:S,^,${WRKDIR}/,} \ + ${STAGEDIR}${PREFIX}/lib/squeak .include Copied: head/lang/squeak/files/patch-unix_plugins_CameraPlugin_sqCamera-linux.c (from r363446, head/lang/squeak/files/patch-unix__plugins_CameraPlugin_sqCamera-linux.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/squeak/files/patch-unix_plugins_CameraPlugin_sqCamera-linux.c Wed Jul 30 08:03:08 2014 (r363453, copy of r363446, head/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 + #include + +-#include /* for videodev2.h */ +- ++#ifdef __FreeBSD__ ++#include ++#endif + #include + + +@@ -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... */ Copied: head/lang/squeak/files/patch-unix_plugins_ScratchPlugin_unixSeriaPort2Ops.c (from r363446, head/lang/squeak/files/patch-unix__plugins_ScratchPlugin_unixSeriaPort2Ops.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/squeak/files/patch-unix_plugins_ScratchPlugin_unixSeriaPort2Ops.c Wed Jul 30 08:03:08 2014 (r363453, copy of r363446, head/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) { Copied: head/lang/squeak/files/patch-unix_plugins_SerialPlugin_sqUnixSerial.c (from r363446, head/lang/squeak/files/patch-unix__plugins_SerialPlugin_sqUnixSerial.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/squeak/files/patch-unix_plugins_SerialPlugin_sqUnixSerial.c Wed Jul 30 08:03:08 2014 (r363453, copy of r363446, head/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 */ Copied: head/lang/squeak/files/patch-unix_plugins_UUIDPlugin_config.cmake (from r363446, head/lang/squeak/files/patch-unix__plugins_UUIDPlugin_config.cmake) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/squeak/files/patch-unix_plugins_UUIDPlugin_config.cmake Wed Jul 30 08:03:08 2014 (r363453, copy of r363446, head/lang/squeak/files/patch-unix__plugins_UUIDPlugin_config.cmake) @@ -0,0 +1,12 @@ +--- 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 @@ + 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) Copied: head/lang/squeak/files/patch-unix_vm_build.cmake (from r363446, head/lang/squeak/files/patch-unix__vm__build.cmake) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/squeak/files/patch-unix_vm_build.cmake Wed Jul 30 08:03:08 2014 (r363453, copy of r363446, head/lang/squeak/files/patch-unix__vm__build.cmake) @@ -0,0 +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 @@ + 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) Modified: head/lang/squeak/pkg-plist ============================================================================== --- head/lang/squeak/pkg-plist Wed Jul 30 07:59:07 2014 (r363452) +++ head/lang/squeak/pkg-plist Wed Jul 30 08:03:08 2014 (r363453) @@ -31,5 +31,6 @@ lib/squeak/%%SQUEAK_LIB_DIR%%/squeakvm lib/squeak/%%SQUEAK_LIB_DIR%%/SqueakV41.sources lib/squeak/Squeak4.3.changes lib/squeak/Squeak4.3.image +man/man1/squeak.1.gz @dirrm lib/squeak/%%SQUEAK_LIB_DIR%% @dirrm lib/squeak