Date: Thu, 27 Jul 2006 07:26:25 +0900 From: Takeshi MUTOH <mutoh@openedu.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: chris@chrisburkert.de, mutoh@openedu.org Subject: ports/100894: [lang/squeak] Add OPTION dialog support and using pkg-descr for refering later Message-ID: <86u054xasu.wl%mutoh@openedu.org> Resent-Message-ID: <200607262230.k6QMUIMe049236@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 100894
>Category: ports
>Synopsis: Add OPTION dialog support and using pkg-message for refering later
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Jul 26 22:30:17 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Takeshi MUTOH <mutoh@openedu.org>
>Release: FreeBSD 6.1-STABLE i386
>Organization:
610t
>Environment:
FreeBSD sacraya.610t.org 6.1-STABLE FreeBSD 6.1-STABLE #0: Tue Jul 18 20:59:34 JST 2006 root@:/usr/obj/usr/src/sys/SMP i386
>Description:
Currently, lang/squeak use knob without using dialog/OPTIONS.
Furthermore, some message for user don't use pkg-message.
So if user refer is later, he must read Makefile directory.
So I want to change
- all knob can specify OPTIONS, so we select knob using dialog
- split message for users from Makefile to pkg-message
>How-To-Repeat:
make
>Fix:
Please apply patch below.
diff -ruN /usr/ports/lang/squeak/Makefile squeak/Makefile
--- /usr/ports/lang/squeak/Makefile Wed Jun 14 07:01:23 2006
+++ squeak/Makefile Sun Jun 18 16:42:25 2006
@@ -36,6 +36,15 @@
PATCHNUMBER= 5429
##################################################
+OPTIONS+= MPG_MMX "MMX support (MPG plugin)" off
+OPTIONS+= NPSQUEAK "browser plugin support" on
+OPTIONS+= RFB "remote frame buffer support" on
+OPTIONS+= FFI "libffi support" off
+OPTIONS+= X "X Windows support" on
+
+.include <bsd.port.pre.mk>
+
+##################################################
DIST_SUBDIR= squeak
ONLY_FOR_ARCHS= i386
MAN1= inisqueak.1 squeak.1
@@ -70,11 +79,11 @@
##################################################
# Knobs
-.if defined(WITH_RFB) && (${WITH_RFB}=="no")
+.if defined(WITHOUT_RFB)
CONFIGURE_ARGS+= --without-rfb
.endif
-.if defined(WITH_NPSQUEAK) && (${WITH_NPSQUEAK}=="no")
+.if defined(WITHOUT_NPSQUEAK)
CONFIGURE_ARGS+= --without-npsqueak
PLIST_NPSQUEAK= "@comment feature not wanted - "
.else
@@ -82,7 +91,7 @@
PLIST_NPSQUEAK=
.endif
-.if defined(WITH_X) && (${WITH_X}=="no")
+.if defined(WITHOUT_X)
CONFIGURE_ARGS+= --without-x
PLIST_X= "@comment feature not wanted - "
.else
@@ -91,11 +100,11 @@
PLIST_X=
.endif
-.if defined(WITH_MPG_MMX) && (${WITH_MPG_MMX}=="yes")
+.if defined(WITH_MPG_MMX)
CONFIGURE_ARGS+= --enable-mpg-mmx
.endif
-.if defined(WITH_FFI) && (${WITH_FFI}=="yes")
+.if defined(WITH_FFI)
LIB_DEPENDS+= ffi.2:${PORTSDIR}/devel/libffi
PLIST_FFI=
EXT_PLUGINS+= SqueakFFIPrims
@@ -112,6 +121,10 @@
MAKE_ARGS+= CCFLAGS="${CFLAGS}"
.endif
+PKGMESSAGE= ${WRKDIR}/pkg-message
+PKGMESSAGE_SUB= PREFIX=${PREFIX} \
+ VMVERSION=${VMVERSION}
+
PLIST_SUB= IMAGEVERSION=${IMAGEVERSION}\
PATCHNUMBER=${PATCHNUMBER}\
VMVERSION=${VMVERSION}\
@@ -119,36 +132,9 @@
PLIST_X=${PLIST_X} \
PLIST_FFI=${PLIST_FFI}
-.include <bsd.port.pre.mk>
-
-##################################################
-pre-everything::
- @${ECHO_MSG} " "
- @${ECHO_MSG} " ------------------------- Please note: -------------------------"
- @${ECHO_MSG} " "
- @${ECHO_MSG} " Squeak has the following tunable options:"
- @${ECHO_MSG} " "
- @${ECHO_MSG} " WITH_MPG_MMX= [yes|no] MMX support (MPG plugin)"
- @${ECHO_MSG} " ^^ (default: disabled)"
- @${ECHO_MSG} " WITH_NPSQUEAK= [yes|no] browser plugin support"
- @${ECHO_MSG} " ^^^ (default: enabled)"
- @${ECHO_MSG} " WITH_RFB= [yes|no] remote frame buffer support"
- @${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>"
- @${ECHO_MSG} " CFLAGS=<aString>"
- @${ECHO_MSG} " "
- @${ECHO_MSG} " ------------------ Thanks for your attention! ------------------"
- @${ECHO_MSG} " "
-
##################################################
post-patch:
- ${REINPLACE_CMD} \
+ @${REINPLACE_CMD} \
-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
-e "s,%%X11BASE%%,${X11BASE},g" \
${WRKSRC}/platforms/unix/npsqueak/npsqueakregister.in \
@@ -159,8 +145,6 @@
##################################################
pre-configure:
@${MKDIR} ${CONFIGURE_WRKSRC}
- @cd ${WRKSRC}/platforms/unix/npsqueak && \
- ${REINPLACE_CMD} -e 's|include|include -I${X11BASE}/include|g' Makefile
##################################################
post-configure:
@@ -179,7 +163,7 @@
.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")
+.if defined(WITH_NPSQUEAK)
(cd ${DISTDIR}/${DIST_SUBDIR} && ${UNZIP_CMD} -u SqueakPlugin.zip -d ${WRKDIR})
(cd ${WRKDIR} && ${INSTALL_DATA} SqueakPlugin.image ${PREFIX}/share/squeak/npsqueak.image)
.endif
@@ -189,21 +173,8 @@
${WRKSRC}/build/inisqueak > ${WRKSRC}/build/inisqueak.tmp
${INSTALL_SCRIPT} ${WRKSRC}/build/inisqueak.tmp ${PREFIX}/bin/inisqueak
${CHMOD} 755 ${PREFIX}/bin/inisqueak
- @${ECHO_MSG} " "
- @${ECHO_MSG} " ------------------------- Please note: -------------------------"
- @${ECHO_MSG} " "
- @${ECHO_MSG} " In order to be able to make use of squeak you need to have an"
- @${ECHO_MSG} " image and a changes file in your working directory as well"
- @${ECHO_MSG} " as access to a source file. This is easy by using inisqueak."
- @${ECHO_MSG} " Please see the inisqueak(1) manpage for details."
- @${ECHO_MSG} " "
- @${ECHO_MSG} " Make sure you have the following values in your environment"
- @${ECHO_MSG} " variables:"
- @${ECHO_MSG} " PATH: ${PREFIX}/bin"
- @${ECHO_MSG} " LD_LIBRARY_PATH: ${PREFIX}/lib"
- @${ECHO_MSG} " ${PREFIX}/share/squeak/${VMVERSION}"
- @${ECHO_MSG} " "
- @${ECHO_MSG} " ------------------ Thanks for your attention! ------------------"
- @${ECHO_MSG} " "
+ @${SED} ${PKGMESSAGE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+ < ${PKGDIR}/pkg-message > ${PKGMESSAGE}
+ @${CAT} ${PKGMESSAGE}
.include <bsd.port.post.mk>
diff -ruN /usr/ports/lang/squeak/pkg-message squeak/pkg-message
--- /usr/ports/lang/squeak/pkg-message Thu Jan 1 09:00:00 1970
+++ squeak/pkg-message Sun Jun 18 15:08:21 2006
@@ -0,0 +1,17 @@
+ ------------------------- Please note: -------------------------
+
+ In order to be able to make use of squeak you need to have an
+ image and a changes file in your working directory as well
+ as access to a source file. This is easy by using inisqueak.
+ Please see the inisqueak(1) manpage for details.
+
+ Make sure you have the following values in your environment
+ variables:
+ PATH: %%PREFIX%%/bin
+ LD_LIBRARY_PATH: %%PREFIX%%/lib
+ %%PREFIX%%/share/squeak/%%VMVERSION%%
+
+ If you want to use web browser plugin,
+ run %%PREFIX%%/share/squeak/npsqueakregister.
+ ------------------ Thanks for your attention! ------------------
+
--
Takeshi MUTOH <mutoh@openedu.org>
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86u054xasu.wl%mutoh>