Date: Sun, 15 Apr 2012 17:37:14 +0900 (JST) From: Takeshi MUTOH <mutoh@openedu.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/166959: Maintainer Update: lang/squeak version up to 4.4.7-2375 Message-ID: <20120415083714.66C4578C3E@sacraya.610t.org> Resent-Message-ID: <201204150840.q3F8e2BE093764@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 166959 >Category: ports >Synopsis: Maintainer Update: lang/squeak version up to 4.4.7-2375 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Apr 15 08:40:01 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Takeshi MUTOH <mutoh@openedu.org> >Release: FreeBSD 8.2-RELEASE-p3 i386 >Organization: 610t >Environment: System: FreeBSD sacraya.610t.org 8.2-RELEASE-p3 FreeBSD 8.2-RELEASE-p3 #0: Tue Sep 27 18:07:27 UTC 2011 root@i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386 >Description: Upgrade lang/squeak port to 4.4.7-2375. >How-To-Repeat: This is update request. So no problem to repeat. >Fix: Please apply patch below: diff -ruN /usr/ports/lang/squeak/Makefile squeak/Makefile --- /usr/ports/lang/squeak/Makefile 2010-06-08 15:52:56.000000000 -0400 +++ squeak/Makefile 2012-04-15 01:10:34.000000000 -0400 @@ -2,170 +2,92 @@ # Date created: 12 October 2001 # Whom: roland.jesse@gmx.net # -# $FreeBSD: ports/lang/squeak/Makefile,v 1.22 2010/06/08 19:52:56 makc Exp $ +# $FreeBSD: $ # PORTNAME= squeak -PORTVERSION= 3.9 -PORTREVISION= 2 +PORTVERSION= 4.4.7 CATEGORIES= lang ################################################## MASTER_SITES= http://www.squeakvm.org/unix/release/ \ - http://ftp.squeak.org/${PORTVERSION}/ \ - http://ftp.squeak.org/${PORTVERSION}/unix-linux/ \ + http://ftp.squeak.org/${IMAGEVERSION}/ \ + http://ftp.squeak.org/${IMAGEVERSION}/unix-linux/ \ ftp://st.cs.uiuc.edu/Smalltalk/Squeak/${PORTVERSION}/ \ ftp://st.cs.uiuc.edu/Smalltalk/Squeak/${PORTVERSION}/unix-linux/ \ ftp://ftp.cs.uni-magdeburg.de/pub/Smalltalk/Smalltalk/Squeak/${PORTVERSION}/ \ ftp://ftp.cs.uni-magdeburg.de/pub/Smalltalk/Smalltalk/Squeak/${PORTVERSION}/unix-linux/ \ http://www.squeakland.org/installers/:plugin \ http://squeakland.jp/plugin/installers/:jpplugin \ - http://squeak.610t.org/patches/:ximpatch -DISTFILES= Squeak-${VMVERSION}.src${EXTRACT_SUFX} \ - Squeak${IMAGEVERSION}-${PATCHNUMBER}.zip \ - SqueakV3.sources.gz \ - SqueakV39.sources.gz -EXTRACT_ONLY= Squeak-${VMVERSION}.src${EXTRACT_SUFX} + http://squeak.610t.org/patches/ +DISTFILES= Squeak-${VM_VERSION}-src${EXTRACT_SUFX} \ + Squeak${IMAGEVERSION}.zip \ + SqueakV41.sources +EXTRACT_ONLY= Squeak-${VM_VERSION}-src${EXTRACT_SUFX} ################################################## MAINTAINER= mutoh@openedu.org COMMENT= Full Smalltalk 80 with portability to UNIX, Mac, and Windows # Don't set USE_ZIP as this breaks EXTRACT_CMD. -BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip +BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip \ + cmake:${PORTSDIR}/devel/cmake LIB_DEPENDS= audio:${PORTSDIR}/audio/nas \ - ffi:${PORTSDIR}/devel/libffi + ffi:${PORTSDIR}/devel/libffi \ + asound:${PORTSDIR}/audio/alsa-lib \ + pulse-simple:${PORTSDIR}/audio/pulseaudio \ + gstreamer:${PORTSDIR}/multimedia/gstreamer ################################################## -VMVERSION= 3.9-7 -IMAGEVERSION= 3.9-final -PATCHNUMBER= 7067 -IMAGEDIR= Squeak${IMAGEVERSION}-${PATCHNUMBER} +VM_VERSION= ${PORTVERSION}.${SVNVERSION} +SVNVERSION= 2375 +IMAGEVERSION= 4.3 +SQUEAK_LIB_DIR= ${PORTVERSION}-${SVNVERSION} -################################################## -OPTIONS+= MPG_MMX "MMX support (MPG plugin)" off -OPTIONS+= NPSQUEAK "browser plugin support" on -OPTIONS+= RFB "remote frame buffer support" on -OPTIONS+= X "X Windows support" on -OPTIONS+= XIM "XIM support (Implies X)" off .include <bsd.port.pre.mk> ################################################## -XIM_PATCH= SqueakImmX11Plugin3a${EXTRACT_SUFX} -PLUGIN_IMAGE= SqueakPlugin.zip -JAPANESE_PLUGIN_IMAGE= SqueakPlugin2005J2.zip - -################################################## DIST_SUBDIR= squeak ONLY_FOR_ARCHS= i386 -MAN1= inisqueak.1 squeak.1 +MAN1= squeak.1 USE_GMAKE= yes -GNU_CONFIGURE= yes +HAS_CONFIGURE= yes # Plugin image must be writable, because of it copy to user's ~/.npsqueak/ and # be updated. SHAREMODE= 644 -FILES_TO_GZIP= ${IMAGEDIR}/Squeak${IMAGEVERSION}-${PATCHNUMBER}.image \ - ${IMAGEDIR}/Squeak${IMAGEVERSION}-${PATCHNUMBER}.changes +# 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-${VMVERSION} +WRKSRC= ${WRKDIR}/Squeak-${VM_VERSION}-src CONFIGURE_WRKSRC= ${WRKSRC}/build BUILD_WRKSRC= ${CONFIGURE_WRKSRC} INSTALL_WRKSRC= ${CONFIGURE_WRKSRC} -CONFIGURE_SCRIPT= ../platforms/unix/config/configure -CONFIGURE_ARGS+= --libdir=${PREFIX}/share \ - --without-quartz \ - LDFLAGS="-L${LOCALBASE}/lib" \ - CPPFLAGS="-I${LOCALBASE}/include" - -# don't pass "-s" to install to avoid trying to strip a shell script -CONFIGURE_ENV= +CONFIGURE_SCRIPT= ../unix/cmake/configure +CONFIGURE_ARGS+= --prefix=${PREFIX} -################################################## -# Knobs -.if defined(WITHOUT_RFB) -CONFIGURE_ARGS+= --without-rfb -.endif - -.if defined(WITHOUT_NPSQUEAK) -CONFIGURE_ARGS+= --without-npsqueak -PLIST_NPSQUEAK= "@comment feature not wanted - " -.else -DISTFILES+= SqueakPlugin.zip:plugin -WITH_NPSQUEAK= yes -PLIST_NPSQUEAK= -FILES_TO_GZIP+= SqueakPlugin.image -RUN_DEPENDS+= bash:${PORTSDIR}/shells/bash -.endif - -.if defined(WITHOUT_X) -CONFIGURE_ARGS+= --without-x -PLIST_X= "@comment feature not wanted - " -.else -USE_XORG= x11 -USE_GL= yes -CONFIGURE_ARGS+= --with-x -PLIST_X= -.endif - -.if defined(WITH_MPG_MMX) -CONFIGURE_ARGS+= --enable-mpg-mmx -.endif - -.if defined(WITH_XIM) -DISTFILES+= ${XIM_PATCH}:ximpatch \ - ${JAPANESE_PLUGIN_IMAGE}:jpplugin -PLIST_XIM= -WITH_X= yes -USE_ICONV= yes -PLUGIN_IMAGE= ${JAPANESE_PLUGIN_IMAGE} -EXT_PLUGINS+= ImmX11Plugin -.else -PLIST_XIM= "@comment feature not wanted - " -.endif - -.ifdef (CC) -MAKE_ARGS+= CC="${CC}" -.endif - -.ifdef (CFLAGS) -MAKE_ARGS+= CCFLAGS="${CFLAGS}" -.endif +# USE_CMAKE= yes +CMAKE_SOURCE_PATH= ../unix SUB_FILES= pkg-message -SUB_LIST= VMVERSION=${VMVERSION} +SUB_LIST= SQUEAK_LIB_DIR=${SQUEAK_LIB_DIR} -PLIST_SUB= IMAGEVERSION=${IMAGEVERSION}\ - PATCHNUMBER=${PATCHNUMBER}\ - VMVERSION=${VMVERSION}\ - PLIST_NPSQUEAK=${PLIST_NPSQUEAK}\ - PLIST_X=${PLIST_X} \ - PLIST_XIM=${PLIST_XIM} +PLIST_SUB= SQUEAK_LIB_DIR=${SQUEAK_LIB_DIR} ################################################## post-patch: - @${REINPLACE_CMD} \ - -e "s,%%LOCALBASE%%,${LOCALBASE},g" \ - ${WRKSRC}/platforms/unix/npsqueak/npsqueakregister.in \ - ${WRKSRC}/platforms/unix/npsqueak/npsqueakrun.in \ - ${WRKSRC}/platforms/unix/npsqueak/Makefile - @${REINPLACE_CMD} -e "s,echo aout,echo elf," ${WRKSRC}/platforms/unix/config/configure -.if defined(WITH_XIM) - @cd ${WRKSRC} && \ - ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${XIM_PATCH} ${EXTRACT_AFTER_ARGS} -# Skip first patch for plugins.ext because patch place has changed. - @cd ${WRKSRC} && \ - ${PATCH} -S + -p0 < ImmX11.patch -.endif -# Fix external plugins - @${ECHO_MSG} "EXTERNAL_PLUGINS = B3DAcceleratorPlugin PseudoTTYPlugin UnixOSProcessPlugin XDisplayControlPlugin Squeak3D AioPlugin ${EXT_PLUGINS}" > ${WRKSRC}/platforms/unix/src/plugins.ext + # Fix utmp.h .if ${OSVERSION} > 900007 - @${REINPLACE_CMD} -e 's,<utmp.h>,<utmpx.h>,g' \ - ${WRKSRC}/platforms/unix/plugins/PseudoTTYPlugin/openpty.h + @${REINPLACE_CMD} \ + -e "s,<utmp.h>,<utmpx.h>,g" \ + ${WRKSRC}/unix/plugins/PseudoTTYPlugin/openpty.h .endif ################################################## @@ -173,28 +95,12 @@ @${MKDIR} ${CONFIGURE_WRKSRC} ################################################## -post-configure: - @${REINPLACE_CMD} -E \ - -e s'|^(prefix).*$$|\1=${PREFIX}|' \ - -e s'|^(docdir).*$$|\1=${DOCSDIR}|' \ - ${CONFIGURE_WRKSRC}/Makefile - -################################################## post-install: - (cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} SqueakV3.sources.gz ${PREFIX}/share/squeak/) - (cd ${PREFIX}/share/squeak && ${EXTRACT_CMD} -d SqueakV3.sources.gz) - (cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} SqueakV39.sources.gz ${PREFIX}/share/squeak/) - (cd ${PREFIX}/share/squeak && ${EXTRACT_CMD} -d SqueakV39.sources.gz) - (cd ${DISTDIR}/${DIST_SUBDIR} && ${UNZIP_CMD} -u Squeak${IMAGEVERSION}-${PATCHNUMBER}.zip -d ${WRKDIR} Squeak${IMAGEVERSION}-${PATCHNUMBER}/*) -.if defined(WITH_NPSQUEAK) - (cd ${DISTDIR}/${DIST_SUBDIR} && ${UNZIP_CMD} -u ${PLUGIN_IMAGE} -d ${WRKDIR}) -.endif -.for file in ${FILES_TO_GZIP} - (cd ${WRKDIR} && ${GZIP_CMD} ${file} && ${INSTALL_DATA} ${file}.gz ${PREFIX}/share/squeak/) + (cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} SqueakV41.sources ${PREFIX}/lib/squeak/) + (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 - (cd ${WRKDIR} && ${INSTALL_DATA} ${IMAGEDIR}/SqueakV39.sources ${PREFIX}/share/squeak/${VMVERSION}) - ${INSTALL_SCRIPT} ${WRKSRC}/build/inisqueak ${PREFIX}/bin/inisqueak - ${CHMOD} 755 ${PREFIX}/bin/inisqueak @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff -ruN /usr/ports/lang/squeak/distinfo squeak/distinfo --- /usr/ports/lang/squeak/distinfo 2011-07-03 09:45:32.000000000 -0400 +++ squeak/distinfo 2012-04-12 18:12:24.000000000 -0400 @@ -1,14 +1,6 @@ -SHA256 (squeak/Squeak-3.9-7.src.tar.gz) = fbfa95093b32c53b302189f3b8ea08406dd9b133194e91810263d93f42344d0f -SIZE (squeak/Squeak-3.9-7.src.tar.gz) = 3948315 -SHA256 (squeak/Squeak3.9-final-7067.zip) = 4353a7bd05f2dba23ed735ac3171b32a0935a20ebfce9307cffc4eb9f254e872 -SIZE (squeak/Squeak3.9-final-7067.zip) = 11842207 -SHA256 (squeak/SqueakPlugin.zip) = 9442d8f95166db4874800caa21b88551906d9ad66cb9391151d0d24e5022b488 -SIZE (squeak/SqueakPlugin.zip) = 5732659 -SHA256 (squeak/SqueakV3.sources.gz) = 6d8262b61d5608de36eff5cb930ea8aa588b7402c0a963680b07ff664ba74d02 -SIZE (squeak/SqueakV3.sources.gz) = 3476504 -SHA256 (squeak/SqueakV39.sources.gz) = ac73d415398b0f79e64d01310e15e3af4203be3c97ea8c1154337d98949cf1a0 -SIZE (squeak/SqueakV39.sources.gz) = 4185101 -SHA256 (squeak/SqueakImmX11Plugin3a.tar.gz) = 76858ebf5e45adc48cad2cee69312163ea0082b173325ef02e57dd826c6e3bdf -SIZE (squeak/SqueakImmX11Plugin3a.tar.gz) = 11614 -SHA256 (squeak/SqueakPlugin2005J2.zip) = 01a6df94213616e70b224710f7a572155a0e13259ffffcd702bd2e618b5ee584 -SIZE (squeak/SqueakPlugin2005J2.zip) = 7973501 +SHA256 (squeak/Squeak-4.4.7.2375-src.tar.gz) = 1d6026dfec13c99b01709ab858be1bc78c939648923499fd97b6c9db1f2b2ab6 +SIZE (squeak/Squeak-4.4.7.2375-src.tar.gz) = 3614177 +SHA256 (squeak/Squeak4.3.zip) = 318ee202b10c7d0c2875dd44f121e299904d164acd3a7ff2c90d8818847b2a67 +SIZE (squeak/Squeak4.3.zip) = 8689484 +SHA256 (squeak/SqueakV41.sources) = 1e92730f6221ced584e0050844abec1bd69848b7963a6cbf3a67986b1ad6553c +SIZE (squeak/SqueakV41.sources) = 6641435 diff -ruN /usr/ports/lang/squeak/files/patch-platforms__Cross__plugins__Mpeg3Plugin__libmpeg__mpeg3io.h squeak/files/patch-platforms__Cross__plugins__Mpeg3Plugin__libmpeg__mpeg3io.h --- /usr/ports/lang/squeak/files/patch-platforms__Cross__plugins__Mpeg3Plugin__libmpeg__mpeg3io.h 2009-04-22 16:55:48.000000000 -0400 +++ squeak/files/patch-platforms__Cross__plugins__Mpeg3Plugin__libmpeg__mpeg3io.h 1969-12-31 19:00:00.000000000 -0500 @@ -1,11 +0,0 @@ ---- platforms/Cross/plugins/Mpeg3Plugin/libmpeg/mpeg3io.h.orig 2006-04-15 01:17:20.000000000 +0200 -+++ platforms/Cross/plugins/Mpeg3Plugin/libmpeg/mpeg3io.h 2009-04-11 14:54:38.000000000 +0200 -@@ -35,7 +35,7 @@ - #endif - - #define mpeg3io_total_bytes(fs) (((mpeg3_fs_t *)(fs))->total_bytes) --inline int mpeg3io_fgetc(mpeg3_fs_t *fs); -+int mpeg3io_fgetc(mpeg3_fs_t *fs); - - static inline unsigned int mpeg3io_read_int32(mpeg3_fs_t *fs) - { diff -ruN /usr/ports/lang/squeak/files/patch-platforms__unix__config__configure squeak/files/patch-platforms__unix__config__configure --- /usr/ports/lang/squeak/files/patch-platforms__unix__config__configure 2008-08-25 17:04:41.000000000 -0400 +++ squeak/files/patch-platforms__unix__config__configure 1969-12-31 19:00:00.000000000 -0500 @@ -1,10 +0,0 @@ ---- platforms/unix/config/configure.orig Mon May 10 10:54:48 2004 -+++ platforms/unix/config/configure Mon May 10 10:54:15 2004 -@@ -23526,6 +23526,7 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - #include <sys/soundcard.h> -+#define OPEN_SOUND_SYSTEM - int - main () - { diff -ruN /usr/ports/lang/squeak/files/patch-platforms__unix__config__inisqueak.in squeak/files/patch-platforms__unix__config__inisqueak.in --- /usr/ports/lang/squeak/files/patch-platforms__unix__config__inisqueak.in 2007-01-07 17:55:23.000000000 -0500 +++ squeak/files/patch-platforms__unix__config__inisqueak.in 1969-12-31 19:00:00.000000000 -0500 @@ -1,23 +0,0 @@ ---- platforms/unix/config/inisqueak.in.org Mon Feb 6 15:10:05 2006 -+++ platforms/unix/config/inisqueak.in Mon Feb 6 15:10:58 2006 -@@ -99,7 +99,7 @@ - exit 1 - } - --if ${test} \( -f squeak.image \) -a \( -f squeak.changes \) -a \( -e ${SOURCES} \) -+if ${test} \( -f squeak.image \) -a \( -e ${SOURCES} \) - then - if ${startup}; then - if test ! -x ${SQUEAK}; then -@@ -200,7 +200,10 @@ - - install "ln -s" "${imgdir}/${SOURCES}" " " "${SOURCES}" - install "gunzip -dc" "${imgdir}/${IMAGE}" ">" "squeak.image" --install "gunzip -dc" "${imgdir}/${CHANGES}" ">" "squeak.changes" -+# For SqueakPlugin.image which don't have changes file. -+if test -e "${imgdir}/${CHANGES}"; then -+ install "gunzip -dc" "${imgdir}/${CHANGES}" ">" "squeak.changes" -+fi - - if ${startup}; then - if test ! -x ${SQUEAK}; then diff -ruN /usr/ports/lang/squeak/files/patch-platforms__unix__npsqueak__Makefile squeak/files/patch-platforms__unix__npsqueak__Makefile --- /usr/ports/lang/squeak/files/patch-platforms__unix__npsqueak__Makefile 2008-08-25 17:04:41.000000000 -0400 +++ squeak/files/patch-platforms__unix__npsqueak__Makefile 1969-12-31 19:00:00.000000000 -0500 @@ -1,20 +0,0 @@ ---- platforms/unix/npsqueak/Makefile.orig Sat Aug 23 06:59:39 2003 -+++ platforms/unix/npsqueak/Makefile Fri Nov 24 18:55:48 2006 -@@ -3,7 +3,7 @@ - - ############ Customize flags here ####################### - --INC = -I./include -I/usr/X11R6/include -+INC = -I./include -I%%LOCALBASE%%/include - CC = gcc - CFLAGS = $(INC) -O2 -fPIC -Wall - LD = gcc -@@ -20,7 +20,7 @@ - ############ compile and link ########################### - - npsqueak.so : npsqueak.o npunix.o -- $(LD) $(LDFLAGS) npsqueak.o npunix.o -o npsqueak.so -+ $(LD) $(LDFLAGS) npsqueak.o npunix.o -o npsqueak.so -L%%LOCALBASE%%/lib -lXt -lX11 - - npsqueak.o: npsqueak.c ../config.h - $(CC) -c $(CFLAGS) -DVM_LIBDIR=\"$(VM_LIBDIR)\" $< diff -ruN /usr/ports/lang/squeak/files/patch-platforms__unix__npsqueak__npsqueak.c squeak/files/patch-platforms__unix__npsqueak__npsqueak.c --- /usr/ports/lang/squeak/files/patch-platforms__unix__npsqueak__npsqueak.c 2007-01-07 17:55:23.000000000 -0500 +++ squeak/files/patch-platforms__unix__npsqueak__npsqueak.c 1969-12-31 19:00:00.000000000 -0500 @@ -1,20 +0,0 @@ ---- platforms/unix/npsqueak/npsqueak.c.orig Sun Mar 20 05:38:26 2005 -+++ platforms/unix/npsqueak/npsqueak.c Sat Oct 7 19:56:10 2006 -@@ -177,13 +177,16 @@ - findFileInPaths(char* result, char *filename, int dirn, char *dirv[PATH_MAX]){ - int i; - char path[PATH_MAX]; -+ char gzipedpath[PATH_MAX]; - - for(i= 0; i < dirn; i++){ - DPRINT("NP: search \"%s\" in \"%s\" \n",filename,dirv[i]); - - strcpy(path, dirv[i]); - strcat(path, filename); -- if (access(path, R_OK) == 0){ -+ strcpy(gzipedpath, path); -+ strcat(gzipedpath, ".gz"); -+ if (access(path, R_OK) == 0 || access(gzipedpath, R_OK) == 0){ - DPRINT("NP: \"%s\" in \"%s\" found\n",filename,dirv[i]); - return strcpy(result, path); - } diff -ruN /usr/ports/lang/squeak/files/patch-platforms__unix__npsqueak__npsqueakregister.in squeak/files/patch-platforms__unix__npsqueak__npsqueakregister.in --- /usr/ports/lang/squeak/files/patch-platforms__unix__npsqueak__npsqueakregister.in 2008-08-25 17:04:41.000000000 -0400 +++ squeak/files/patch-platforms__unix__npsqueak__npsqueakregister.in 1969-12-31 19:00:00.000000000 -0500 @@ -1,13 +0,0 @@ ---- platforms/unix/npsqueak/npsqueakregister.in.orig Sun Mar 20 05:38:26 2005 -+++ platforms/unix/npsqueak/npsqueakregister.in Fri Oct 6 21:02:25 2006 -@@ -8,8 +8,8 @@ - # Parameters: -u unregister - - NPSQUEAK_SO=@NPSQUEAK_SO@ --BROWSERS="netscape mozilla mozilla-firefox opera MozillaFirefox/lib" --BROWSER_DIRS="/usr/local/lib /usr/lib /opt" -+BROWSERS="netscape mozilla firefox opera seamonkey" -+BROWSER_DIRS="%%LOCALBASE%%/lib %%LOCALBASE%%/share /usr/lib" - SYSTEM_BROWSER_DIR="/usr/lib/browser-plugins" - - ACTION=register diff -ruN /usr/ports/lang/squeak/files/patch-platforms__unix__npsqueak__npsqueakrun.in squeak/files/patch-platforms__unix__npsqueak__npsqueakrun.in --- /usr/ports/lang/squeak/files/patch-platforms__unix__npsqueak__npsqueakrun.in 2007-01-07 17:55:23.000000000 -0500 +++ squeak/files/patch-platforms__unix__npsqueak__npsqueakrun.in 1969-12-31 19:00:00.000000000 -0500 @@ -1,38 +0,0 @@ ---- platforms/unix/npsqueak/npsqueakrun.in.orig Sun Mar 20 05:38:26 2005 -+++ platforms/unix/npsqueak/npsqueakrun.in Sun Jan 7 16:30:12 2007 -@@ -1,4 +1,4 @@ --#! /bin/bash -+#! %%LOCALBASE%%/bin/bash - - # File: npsqueakrun - # Author: Bert Freudenberg -@@ -60,12 +60,24 @@ - ensurefile() - { - if [ ! -e "${1}" ] ; then -- if cp "${2}" "${1}" ; then -- pdebug "Created ${1}" -+ if [ -e "${2}" ] ;then -+ if cp "${2}" "${1}" ; then -+ pdebug "Created ${1}" -+ else -+ perror "Could not create ${1}" -+ if [ ! -r "${2}" ] ; then -+ perror "because ${2} is missing" -+ fi -+ fi - else -- perror "Could not create ${1}" -- if [ ! -r "${2}" ] ; then -- perror "because ${2} is missing" -+ if [ -e "${2}.gz" ] ; then -+ gunzip -c "${2}.gz" > "${1}" -+ pdebug "Created ${1} from ${2}.gz" -+ else -+ perror "Could not create ${1}" -+ if [ ! -r "${2}" ] ; then -+ perror "because ${2} is missing" -+ fi - fi - fi - fi diff -ruN /usr/ports/lang/squeak/files/patch-platforms__unix__plugins__PseudoTTYPlugin__openpty.h squeak/files/patch-platforms__unix__plugins__PseudoTTYPlugin__openpty.h --- /usr/ports/lang/squeak/files/patch-platforms__unix__plugins__PseudoTTYPlugin__openpty.h 2008-08-25 17:04:41.000000000 -0400 +++ squeak/files/patch-platforms__unix__plugins__PseudoTTYPlugin__openpty.h 1969-12-31 19:00:00.000000000 -0500 @@ -1,14 +0,0 @@ ---- platforms/unix/plugins/PseudoTTYPlugin/openpty.h.orig Tue Jan 14 16:02:55 2003 -+++ platforms/unix/plugins/PseudoTTYPlugin/openpty.h Tue Jan 14 16:03:09 2003 -@@ -45,7 +45,10 @@ - # elif defined(HAVE_LIBUTIL_H) - # include <libutil.h> /* openpty() on FreeBSD */ - # else --# error: cannot find headers for openpty() -+# include <sys/types.h> -+# include <sys/ioctl.h> -+# include <termios.h> -+# include <libutil.h> - # endif - - #else /* !HAVE_OPENPTY */ diff -ruN /usr/ports/lang/squeak/files/patch-platforms__unix__plugins__SqueakFFIPrims__ffi-config squeak/files/patch-platforms__unix__plugins__SqueakFFIPrims__ffi-config --- /usr/ports/lang/squeak/files/patch-platforms__unix__plugins__SqueakFFIPrims__ffi-config 2008-08-25 17:04:41.000000000 -0400 +++ squeak/files/patch-platforms__unix__plugins__SqueakFFIPrims__ffi-config 1969-12-31 19:00:00.000000000 -0500 @@ -1,10 +0,0 @@ ---- platforms/unix/plugins/SqueakFFIPrims/ffi-config.org Wed Apr 26 20:27:53 2006 -+++ platforms/unix/plugins/SqueakFFIPrims/ffi-config Wed Apr 26 20:29:00 2006 -@@ -39,6 +39,7 @@ - - case ${abi} in - linux) abi=sysv;; -+ freebsd*) abi=sysv;; - darwin*) abi=darwin;; - *) abi=libffi; lib="-lffi";; - esac diff -ruN /usr/ports/lang/squeak/files/patch-platforms__unix__src__plugins__UnixOSProcessPlugin__UnixOSProcessPlugin.c squeak/files/patch-platforms__unix__src__plugins__UnixOSProcessPlugin__UnixOSProcessPlugin.c --- /usr/ports/lang/squeak/files/patch-platforms__unix__src__plugins__UnixOSProcessPlugin__UnixOSProcessPlugin.c 2008-08-25 17:04:41.000000000 -0400 +++ squeak/files/patch-platforms__unix__src__plugins__UnixOSProcessPlugin__UnixOSProcessPlugin.c 1969-12-31 19:00:00.000000000 -0500 @@ -1,47 +0,0 @@ ---- platforms/unix/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c.org Sun Apr 23 16:18:27 2006 -+++ platforms/unix/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c Sun Apr 23 16:20:43 2006 -@@ -1818,7 +1818,7 @@ - return interpreterProxy->primitiveFail(); - } - sqFile = interpreterProxy->arrayValueOf(sqFileOop); -- if ((feof(sqFile->file)) == 0) { -+ if ((feof((FILE *)sqFile->file)) == 0) { - result = interpreterProxy->falseObject(); - } else { - result = interpreterProxy->trueObject(); -@@ -1870,7 +1870,7 @@ - - /* Set up the flock structure parameter for fcntl() */ - -- fileNo = fileno(sqFile->file); -+ fileNo = fileno((FILE *)sqFile->file); - if (exclusive) { - lockStruct.l_type = F_WRLCK; - } else { -@@ -2897,7 +2897,7 @@ - - /* Set up the flock structure parameter for fcntl() */ - -- fileNo = fileno(sqFile->file); -+ fileNo = fileno((FILE *)sqFile->file); - if (exclusive) { - lockStruct.l_type = F_WRLCK; - } else { -@@ -2957,7 +2957,7 @@ - return interpreterProxy->primitiveFail(); - } - sqFile = interpreterProxy->arrayValueOf(sqFileOop); -- fileNo = fileno(sqFile->file); -+ fileNo = fileno((FILE *)sqFile->file); - interpreterProxy->pop(2); - interpreterProxy->pushInteger(fileNo); - } -@@ -3001,7 +3001,7 @@ - - /* Set up the flock structure parameter for fcntl() */ - -- fileNo = fileno(sqFile->file); -+ fileNo = fileno((FILE *)sqFile->file); - lockStruct.l_type = F_UNLCK; - lockStruct.l_whence = SEEK_SET; - lockStruct.l_start = start; diff -ruN /usr/ports/lang/squeak/files/patch-platforms__unix__vm-sound-OSS__acinclude.m4 squeak/files/patch-platforms__unix__vm-sound-OSS__acinclude.m4 --- /usr/ports/lang/squeak/files/patch-platforms__unix__vm-sound-OSS__acinclude.m4 2008-08-25 17:04:41.000000000 -0400 +++ squeak/files/patch-platforms__unix__vm-sound-OSS__acinclude.m4 1969-12-31 19:00:00.000000000 -0500 @@ -1,11 +0,0 @@ ---- platforms/unix/vm-sound-OSS/acinclude.m4.orig Mon May 10 10:18:03 2004 -+++ platforms/unix/vm-sound-OSS/acinclude.m4 Mon May 10 10:18:22 2004 -@@ -1,7 +1,7 @@ - # -*- sh -*- - - AC_MSG_CHECKING([for Open Sound System]) --AC_TRY_COMPILE([#include <sys/soundcard.h>],[OPEN_SOUND_SYSTEM;],[ -+AC_TRY_COMPILE([#include <sys/soundcard.h>],[EV_SEQ_LOCAL;],[ - AC_MSG_RESULT(yes) - ],[ - AC_MSG_RESULT(no) diff -ruN /usr/ports/lang/squeak/files/patch-unix__vm__build.cmake squeak/files/patch-unix__vm__build.cmake --- /usr/ports/lang/squeak/files/patch-unix__vm__build.cmake 1969-12-31 19:00:00.000000000 -0500 +++ squeak/files/patch-unix__vm__build.cmake 2012-04-14 09:28:05.000000000 -0400 @@ -0,0 +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 @@ + COMMAND sh ${bld}/config ${unix}/doc/squeak.1 ${bld}/squeak.1 + ) + ADD_DEPENDENCIES (squeakvm squeak.1) +-INSTALL (FILES ${bld}/squeak.1 DESTINATION share/man/man1) ++INSTALL (FILES ${bld}/squeak.1 DESTINATION man/man1) diff -ruN /usr/ports/lang/squeak/files/pkg-message.in squeak/files/pkg-message.in --- /usr/ports/lang/squeak/files/pkg-message.in 2007-01-08 05:45:34.000000000 -0500 +++ squeak/files/pkg-message.in 2012-04-15 00:58:45.000000000 -0400 @@ -9,14 +9,6 @@ variables: PATH: %%PREFIX%%/bin LD_LIBRARY_PATH: %%PREFIX%%/lib - %%PREFIX%%/share/squeak/%%VMVERSION%% + %%PREFIX%%/lib/squeak/%%SQUEAK_LIB_DIR%% - If you want to use web browser plugin, - run %%PREFIX%%/share/squeak/npsqueakregister. - - If you want to use (Japanese) XIM at full screen, - you get changeset at - http://squeak.610t.org/patches/CompositionFocus.1.cs - and file in it. ------------------ Thanks for your attention! ------------------ - diff -ruN /usr/ports/lang/squeak/pkg-plist squeak/pkg-plist --- /usr/ports/lang/squeak/pkg-plist 2008-08-25 17:04:41.000000000 -0400 +++ squeak/pkg-plist 2012-04-15 01:07:37.000000000 -0400 @@ -1,33 +1,32 @@ -bin/inisqueak -bin/squeak -%%DOCSDIR%%/COPYING.gz -%%DOCSDIR%%/COPYRIGHT.gz -%%DOCSDIR%%/LICENSE.gz -%%DOCSDIR%%/README.Contributing.gz -%%DOCSDIR%%/README.Keyboard.gz -%%DOCSDIR%%/README.Sound.gz -%%PLIST_X%%%%DATADIR%%/%%VMVERSION%%/B3DAcceleratorPlugin -%%PLIST_X%%%%DATADIR%%/%%VMVERSION%%/Squeak3D -%%PLIST_X%%%%DATADIR%%/%%VMVERSION%%/XDisplayControlPlugin -%%PLIST_XIM%%%%DATADIR%%/%%VMVERSION%%/ImmX11Plugin -%%PLIST_NPSQUEAK%%%%DATADIR%%/%%VMVERSION%%/npsqueak.so -%%PLIST_NPSQUEAK%%%%DATADIR%%/npsqueakrun -%%DATADIR%%/%%VMVERSION%%/squeak -%%PLIST_X%%%%DATADIR%%/%%VMVERSION%%/vm-display-X11 -%%DATADIR%%/%%VMVERSION%%/AioPlugin -%%DATADIR%%/%%VMVERSION%%/PseudoTTYPlugin -%%DATADIR%%/%%VMVERSION%%/UnixOSProcessPlugin -%%DATADIR%%/%%VMVERSION%%/vm-display-null -%%DATADIR%%/%%VMVERSION%%/vm-sound-NAS -%%DATADIR%%/%%VMVERSION%%/vm-sound-OSS -%%DATADIR%%/%%VMVERSION%%/vm-sound-null -%%DATADIR%%/Squeak%%IMAGEVERSION%%-%%PATCHNUMBER%%.changes.gz -%%DATADIR%%/Squeak%%IMAGEVERSION%%-%%PATCHNUMBER%%.image.gz -%%PLIST_NPSQUEAK%%%%DATADIR%%/SqueakPlugin.image.gz -%%DATADIR%%/SqueakV3.sources -%%DATADIR%%/SqueakV39.sources -%%DATADIR%%/%%VMVERSION%%/SqueakV39.sources -%%PLIST_NPSQUEAK%%%%DATADIR%%/npsqueakregister -@dirrm %%DATADIR%%/%%VMVERSION%% -@dirrm %%DATADIR%% -@dirrm %%DOCSDIR%% +lib/squeak/%%SQUEAK_LIB_DIR%%/so.AioPlugin +lib/squeak/%%SQUEAK_LIB_DIR%%/so.B3DAcceleratorPlugin +lib/squeak/%%SQUEAK_LIB_DIR%%/so.ClipboardExtendedPlugin +lib/squeak/%%SQUEAK_LIB_DIR%%/so.DBusPlugin +lib/squeak/%%SQUEAK_LIB_DIR%%/so.FileCopyPlugin +lib/squeak/%%SQUEAK_LIB_DIR%%/so.GStreamerPlugin +lib/squeak/%%SQUEAK_LIB_DIR%%/so.HostWindowPlugin +lib/squeak/%%SQUEAK_LIB_DIR%%/so.KedamaPlugin +lib/squeak/%%SQUEAK_LIB_DIR%%/so.KedamaPlugin2 +lib/squeak/%%SQUEAK_LIB_DIR%%/so.MIDIPlugin +lib/squeak/%%SQUEAK_LIB_DIR%%/so.Mpeg3Plugin +lib/squeak/%%SQUEAK_LIB_DIR%%/so.RomePlugin +lib/squeak/%%SQUEAK_LIB_DIR%%/so.Squeak3D +lib/squeak/%%SQUEAK_LIB_DIR%%/so.SqueakFFIPrims +lib/squeak/%%SQUEAK_LIB_DIR%%/so.UUIDPlugin +lib/squeak/%%SQUEAK_LIB_DIR%%/so.UnixOSProcessPlugin +lib/squeak/%%SQUEAK_LIB_DIR%%/so.XDisplayControlPlugin +lib/squeak/%%SQUEAK_LIB_DIR%%/so.vm-display-X11 +lib/squeak/%%SQUEAK_LIB_DIR%%/so.vm-display-custom +lib/squeak/%%SQUEAK_LIB_DIR%%/so.vm-display-null +lib/squeak/%%SQUEAK_LIB_DIR%%/so.vm-sound-ALSA +lib/squeak/%%SQUEAK_LIB_DIR%%/so.vm-sound-NAS +lib/squeak/%%SQUEAK_LIB_DIR%%/so.vm-sound-OSS +lib/squeak/%%SQUEAK_LIB_DIR%%/so.vm-sound-custom +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/Squeak4.3.changes +lib/squeak/Squeak4.3.image +lib/squeak/SqueakV41.sources +@dirrm lib/squeak/%%SQUEAK_LIB_DIR%% +@dirrm lib/squeak >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120415083714.66C4578C3E>