Bug 92757
| Summary: | Currently lang/squeak web browser plugin can't work | ||
|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Takeshi MUTOH <mutoh> |
| Component: | Individual Port(s) | Assignee: | Stefan Walter <stefan> |
| Status: | Closed FIXED | ||
| Severity: | Affects Only Me | CC: | chris |
| Priority: | Normal | ||
| Version: | Latest | ||
| Hardware: | Any | ||
| OS: | Any | ||
|
Description
Takeshi MUTOH
2006-02-03 03:40:05 UTC
State Changed From-To: open->feedback Awaiting maintainers feedback Edwin, I approve the patch! best regards Chris > Maintainer of lang/squeak, > > Please note that PR ports/92757 has just been submitted. > > If it contains a patch for an upgrade, an enhancement or a bug fix > you agree on, reply to this email stating that you approve the patch > and a committer will take care of it. > > The full text of the PR can be found at: > http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/92757 > > -- > Edwin Groothuis > edwin@FreeBSD.org > State Changed From-To: feedback->open Feedback received. Responsible Changed From-To: freebsd-ports-bugs->stefan Take. Hi Takeshi, hi Chris,
there are a couple of minor issues with the changes here:
The patches added to the files directory contain hardcoded paths. Instead
of "/usr/local/" and "/usr/X11R6", the values of ${LOCALBASE} and
${X11BASE} could/should be used here. Furthermore, running portlint(1)
(available in devel/portlint) in the port's directory should give you a
few hints of what should look a bit different in the Makefile.
Could you please send an updated patch that addresses the above issues?
Regards,
Stefan
p.s.: The PR ports/94058 (adding FFI support to squeak) is assigned to me,
too - if you like, you can merge both patches into one.
State Changed From-To: open->feedback Awaiting feedback. Hi Stefan. At Sun, 21 May 2006 17:48:26 +0200, Stefan Walter <stefan@FreeBSD.org> wrote: > there are a couple of minor issues with the changes here: > > The patches added to the files directory contain hardcoded paths. Instead > of "/usr/local/" and "/usr/X11R6", the values of ${LOCALBASE} and > ${X11BASE} could/should be used here. Furthermore, running portlint(1) > (available in devel/portlint) in the port's directory should give you a > few hints of what should look a bit different in the Makefile. > > Could you please send an updated patch that addresses the above issues? > > Regards, > Stefan > > p.s.: The PR ports/94058 (adding FFI support to squeak) is assigned to me, > too - if you like, you can merge both patches into one. I create new version of patch. - ports/94058 and ports/92757 are merged, - portlint says 'looks fine', - modify direct /usr/X11R6 and /usr/local references. - add one more patch for FFI (files/patch-platforms::unix::plugins::SqueakFFIPrims::ffi-config) If you agree this patch, please commit it. Regards, Takeshi MUTOH diff -ruN /usr/ports/lang/squeak/Makefile squeak/Makefile --- /usr/ports/lang/squeak/Makefile Wed May 10 05:52:22 2006 +++ squeak/Makefile Mon May 22 15:53:37 2006 @@ -5,42 +5,45 @@ # $FreeBSD: ports/lang/squeak/Makefile,v 1.4 2006/05/09 20:52:22 edwin Exp $ # -################################################## PORTNAME= squeak PORTVERSION= 3.6 PORTREVISION= 1 CATEGORIES= lang -VMVERSION= 3.6-3 -IMAGEVERSION= 3.6 -PATCHNUMBER= 5429 - ################################################## MASTER_SITES= ftp://st.cs.uiuc.edu/Smalltalk/Squeak/3.6/ \ ftp://st.cs.uiuc.edu/Smalltalk/Squeak/3.6/unix-linux/ \ ftp://ftp.cs.uni-magdeburg.de/pub/Smalltalk/Smalltalk/Squeak/3.6/ \ ftp://ftp.cs.uni-magdeburg.de/pub/Smalltalk/Smalltalk/Squeak/3.6/unix-linux/ \ http://www-sor.inria.fr/~piumarta/squeak/unix/release/ \ - + http://www.squeakland.org/installers/ DISTFILES= Squeak-${VMVERSION}.src.tar.gz \ Squeak${IMAGEVERSION}-${PATCHNUMBER}-basic.zip \ Squeak${IMAGEVERSION}-${PATCHNUMBER}-full.zip \ + SqueakPlugin.zip \ SqueakV3.sources.gz - -DIST_SUBDIR= squeak EXTRACT_ONLY= Squeak-${VMVERSION}.src.tar.gz ################################################## MAINTAINER= chris@chrisburkert.de -COMMENT= Full Smalltalk 80 with portability to UNIX, Mac, and Windows. +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 ################################################## +VMVERSION= 3.6-3 +IMAGEVERSION= 3.6 +PATCHNUMBER= 5429 + +################################################## +DIST_SUBDIR= squeak ONLY_FOR_ARCHS= i386 MAN1= inisqueak.1 squeak.1 USE_GMAKE= yes HAS_CONFIGURE= yes -# Don't set USE_ZIP as this breaks EXTRACT_CMD. -BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip +# 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}/share/squeak/${VMVERSION} @@ -58,7 +61,9 @@ INSTALL_WRKSRC= ${CONFIGURE_WRKSRC} CONFIGURE_SCRIPT= ../platforms/unix/config/configure CONFIGURE_ARGS+= --libdir=${PREFIX}/share \ - --without-quartz + --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= @@ -72,6 +77,7 @@ CONFIGURE_ARGS+= --without-npsqueak PLIST_NPSQUEAK= "@comment feature not wanted - " .else +WITH_NPSQUEAK= yes PLIST_NPSQUEAK= .endif @@ -88,6 +94,15 @@ CONFIGURE_ARGS+= --enable-mpg-mmx .endif +.if defined(WITH_FFI) && (${WITH_FFI}=="yes") +LIB_DEPENDS+= ffi.2:${PORTSDIR}/devel/libffi +PLIST_FFI= +EXT_PLUGINS+= SqueakFFIPrims +.else +CONFIGURE_ARGS+= --without-ffi +PLIST_FFI= "@comment feature not wanted - " +.endif + .ifdef (CC) MAKE_ARGS+= CC="${CC}" .endif @@ -100,7 +115,8 @@ PATCHNUMBER=${PATCHNUMBER}\ VMVERSION=${VMVERSION}\ PLIST_NPSQUEAK=${PLIST_NPSQUEAK}\ - PLIST_X=${PLIST_X} + PLIST_X=${PLIST_X} \ + PLIST_FFI=${PLIST_FFI} .include <bsd.port.pre.mk> @@ -119,6 +135,8 @@ @${ECHO_MSG} " ^^^ (default: enabled)" @${ECHO_MSG} " WITH_X= [yes|no] X Windows support" @${ECHO_MSG} " ^^^ (default: enabled)" + @${ECHO_MSG} " WITH_FFI= [yes|no] FFI support" + @${ECHO_MSG} " ^^ (default: disabled)" @${ECHO_MSG} " " @${ECHO_MSG} " additional make arguments" @${ECHO_MSG} " CC=<aString>" @@ -128,6 +146,16 @@ @${ECHO_MSG} " " ################################################## +post-patch: + ${REINPLACE_CMD} \ + -e "s,%%LOCALBASE%%,${LOCALBASE},g" \ + -e "s,%%X11BASE%%,${X11BASE},g" \ + ${WRKSRC}/platforms/unix/npsqueak/npsqueakregister.in \ + ${WRKSRC}/platforms/unix/npsqueak/Makefile +# Fix external plugins + @${ECHO_MSG} "EXTERNAL_PLUGINS = B3DAcceleratorPlugin UnixOSProcessPlugin XDisplayControlPlugin ${EXT_PLUGINS}" > ${WRKSRC}/src/plugins.ext + +################################################## pre-configure: @${MKDIR} ${CONFIGURE_WRKSRC} @cd ${WRKSRC}/platforms/unix/npsqueak && \ @@ -144,12 +172,16 @@ 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} && unzip -u Squeak${IMAGEVERSION}-${PATCHNUMBER}-basic.zip -d ${WRKDIR}) - (cd ${DISTDIR}/${DIST_SUBDIR} && unzip -u Squeak${IMAGEVERSION}-${PATCHNUMBER}-full.zip -d ${WRKDIR}) + (cd ${DISTDIR}/${DIST_SUBDIR} && ${UNZIP_CMD} -u Squeak${IMAGEVERSION}-${PATCHNUMBER}-basic.zip -d ${WRKDIR}) + (cd ${DISTDIR}/${DIST_SUBDIR} && ${UNZIP_CMD} -u Squeak${IMAGEVERSION}-${PATCHNUMBER}-full.zip -d ${WRKDIR}) (cd ${WRKDIR} && ${INSTALL_DATA} ReadMe.txt ${PREFIX}/share/squeak/) .for file in ${FILES_TO_GZIP} (cd ${WRKDIR} && ${GZIP_CMD} ${file} && ${INSTALL_DATA} ${file}.gz ${PREFIX}/share/squeak/) .endfor +.if defined(WITH_NPSQUEAK) && (${WITH_NPSQUEAK}=="yes") + (cd ${DISTDIR}/${DIST_SUBDIR} && ${UNZIP_CMD} -u SqueakPlugin.zip -d ${WRKDIR}) + (cd ${WRKDIR} && ${INSTALL_DATA} SqueakPlugin.image ${PREFIX}/share/squeak/npsqueak.image) +.endif ${SED} -e 's|VERSION=3.5-5180|VERSION=${IMAGEVERSION}-${PATCHNUMBER}|' \ -e 's|IMAGE=Squeak3.5-5180|IMAGE=Squeak${IMAGEVERSION}-${PATCHNUMBER}|' \ -e 's|CHANGES=Squeak3.5-5180|CHANGES=Squeak${IMAGEVERSION}-${PATCHNUMBER}|' \ diff -ruN /usr/ports/lang/squeak/distinfo squeak/distinfo --- /usr/ports/lang/squeak/distinfo Sun Jan 22 21:42:23 2006 +++ squeak/distinfo Mon May 22 13:37:50 2006 @@ -7,6 +7,9 @@ MD5 (squeak/Squeak3.6-5429-full.zip) = 9a35fa39f2338d26a721564472d4d933 SHA256 (squeak/Squeak3.6-5429-full.zip) = 63a4e8458b2f58b69e351c1c4161db1a1deed860d9bde40cbb414257cbab4ea2 SIZE (squeak/Squeak3.6-5429-full.zip) = 7837139 +MD5 (squeak/SqueakPlugin.zip) = 8a14a482fc0e601fc9c1e702ac52b760 +SHA256 (squeak/SqueakPlugin.zip) = 9442d8f95166db4874800caa21b88551906d9ad66cb9391151d0d24e5022b488 +SIZE (squeak/SqueakPlugin.zip) = 5732659 MD5 (squeak/SqueakV3.sources.gz) = 7dc6b3840e6bc1e5f81e3717fb46d2c3 SHA256 (squeak/SqueakV3.sources.gz) = 6d8262b61d5608de36eff5cb930ea8aa588b7402c0a963680b07ff664ba74d02 SIZE (squeak/SqueakV3.sources.gz) = 3476504 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 Thu Jan 1 09:00:00 1970 +++ squeak/files/patch-platforms::unix::npsqueak::Makefile Mon May 22 15:52:45 2006 @@ -0,0 +1,11 @@ +--- platforms/unix/npsqueak/Makefile.org Tue Jan 31 10:36:12 2006 ++++ platforms/unix/npsqueak/Makefile Tue Jan 31 10:37:14 2006 +@@ -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%%X11BASE%%/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::npsqueakregister.in squeak/files/patch-platforms::unix::npsqueak::npsqueakregister.in --- /usr/ports/lang/squeak/files/patch-platforms::unix::npsqueak::npsqueakregister.in Thu Jan 1 09:00:00 1970 +++ squeak/files/patch-platforms::unix::npsqueak::npsqueakregister.in Mon May 22 14:12:59 2006 @@ -0,0 +1,13 @@ +--- platforms/unix/npsqueak/npsqueakregister.in.orig Mon Jan 30 19:47:54 2006 ++++ platforms/unix/npsqueak/npsqueakregister.in Mon Jan 30 19:48:13 2006 +@@ -8,8 +8,8 @@ + # Parameters: -u unregister + + NPSQUEAK_SO=@NPSQUEAK_SO@ +-BROWSERS="netscape mozilla opera" +-BROWSER_DIRS="/usr/local/lib /usr/lib" ++BROWSERS="netscape mozilla firefox opera seamonkey" ++BROWSER_DIRS="%%X11BASE%%/lib %%X11BASE%%/share %%LOCALBASE%%/lib /usr/lib" + + ACTION=register + diff -ruN /usr/ports/lang/squeak/files/patch-platforms::unix::plugins::SqueakFFIPrims::Makefile.in squeak/files/patch-platforms::unix::plugins::SqueakFFIPrims::Makefile.in --- /usr/ports/lang/squeak/files/patch-platforms::unix::plugins::SqueakFFIPrims::Makefile.in Thu Jan 1 09:00:00 1970 +++ squeak/files/patch-platforms::unix::plugins::SqueakFFIPrims::Makefile.in Mon May 22 13:58:03 2006 @@ -0,0 +1,11 @@ +--- platforms/unix/plugins/SqueakFFIPrims/Makefile.in.orig Sun Mar 20 05:38:18 2005 ++++ platforms/unix/plugins/SqueakFFIPrims/Makefile.in Sun Feb 26 00:08:03 2006 +@@ -14,7 +14,7 @@ + XINCLUDES = [includes] + + $(TARGET) : $(OBJS) Makefile +- $(LINK) $(TARGET) $(OBJS) ++ $(LINK) $(TARGET) $(OBJS) -lffi + $(RANLIB) $(TARGET) + + [make_targets] 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 Thu Jan 1 09:00:00 1970 +++ squeak/files/patch-platforms::unix::plugins::SqueakFFIPrims::ffi-config Mon May 22 13:39:14 2006 @@ -0,0 +1,10 @@ +--- 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/pkg-plist squeak/pkg-plist --- /usr/ports/lang/squeak/pkg-plist Sun Jan 8 03:37:39 2006 +++ squeak/pkg-plist Mon May 22 13:58:50 2006 @@ -9,6 +9,8 @@ %%PLIST_X%%share/squeak/%%VMVERSION%%/B3DAcceleratorPlugin share/squeak/%%VMVERSION%%/UnixOSProcessPlugin %%PLIST_X%%share/squeak/%%VMVERSION%%/XDisplayControlPlugin +%%PLIST_FFI%%share/squeak/%%VMVERSION%%/SqueakFFIPrims +%%PLIST_NPSQUEAK%%share/squeak/npsqueak.image %%PLIST_NPSQUEAK%%share/squeak/%%VMVERSION%%/npsqueak.so %%PLIST_NPSQUEAK%%share/squeak/%%VMVERSION%%/npsqueakrun share/squeak/%%VMVERSION%%/squeak State Changed From-To: feedback->closed Committed, thanks! |
