Date: Sat, 07 Aug 2010 17:20:45 +0400 From: Anonymous <swell.k@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/149397: [patch] x11-wm/stumpwm: install stumpish and other contrib Message-ID: <867hk2o8ya.fsf@gmail.com> Resent-Message-ID: <201008071330.o77DU854079213@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 149397
>Category: ports
>Synopsis: [patch] x11-wm/stumpwm: install stumpish and other contrib
>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: Sat Aug 07 13:30:07 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Anonymous
>Release: FreeBSD 9.0-CURRENT amd64
>Organization:
>Environment:
>Description:
while here reformat OPTS and add --no-sysinit
>How-To-Repeat:
>Fix:
--- a.diff begins here ---
Index: x11-wm/stumpwm/Makefile
===================================================================
RCS file: /a/.cvsup/ports/x11-wm/stumpwm/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- x11-wm/stumpwm/Makefile 14 Jun 2010 12:28:10 -0000 1.8
+++ x11-wm/stumpwm/Makefile 7 Aug 2010 12:58:00 -0000
@@ -17,8 +17,10 @@ COMMENT= A tiling, keyboard driven Windo
GNU_CONFIGURE= yes
MAKE_JOBS_UNSAFE=yes
-PLIST_FILES= bin/${PORTNAME}
+PLIST_FILES= bin/stumpish \
+ bin/${PORTNAME}
INFO= ${PORTNAME}
+PORTDATA= *
OPTIONS= SBCL "Build with lang/sbcl (otherwise with lang/clisp)" on
@@ -49,12 +51,23 @@ post-extract: .SILENT
${LN} -sf ${WRKDIR}/clx*/*.asd ${WRKSRC}/cl-ppcre/*.asd ${WRKSRC}
post-patch: .SILENT
- ${REINPLACE_CMD} 's|sbcl_.*OPTS=|&--disable-debugger --no-userinit \
+ ${REINPLACE_CMD} 's|sbcl_.*OPTS=|& \
+ --disable-debugger \
+ --no-userinit \
+ --no-sysinit \
--eval "(require :asdf)" \
- --eval "(pop asdf:*central-registry*)" |' \
- ${WRKSRC}/Makefile.in
+ --eval "(pop asdf:*central-registry*)" \
+ |' ${WRKSRC}/Makefile.in
${REINPLACE_CMD} 's/\(sb-introspect:function-\)arglist/\1lambda-list/' \
${WRKSRC}/manual.lisp
.endif
+post-install:
+ ${INSTALL_SCRIPT} ${WRKSRC}/contrib/stumpish ${PREFIX}/bin
+.if !defined(NOPORTDATA)
+ ${MKDIR} ${DATADIR}
+ ${TAR} cf - -C${WRKSRC}/contrib --exclude stumpish\* . \
+ | ${TAR} xovf - -C${DATADIR}
+.endif
+
.include <bsd.port.mk>
Index: x11-wm/stumpwm/files/patch-contrib-stumpish
===================================================================
RCS file: x11-wm/stumpwm/files/patch-contrib-stumpish
diff -N x11-wm/stumpwm/files/patch-contrib-stumpish
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11-wm/stumpwm/files/patch-contrib-stumpish 7 Aug 2010 13:13:48 -0000
@@ -0,0 +1,98 @@
+ - spout a warning when command completion cannot be used
+ - try to guess whether sleep(1) supports fractions
+ - remove GNUisms from sed(1) lines without breaking GNU sed usage
+ - use termcap names, they have higher chance to work on FreeBSD
+
+diff --git contrib/stumpish~ contrib/stumpish
+index 1d48bb4..59c783e 100755
+--- contrib/stumpish~
++++ contrib/stumpish
+@@ -21,10 +21,10 @@
+
+ ### STUMPwm Interactive SHell.
+
+-if sleep --version 2>/dev/null | grep -q GNU
++DELAY=0.01
++
++if ! sleep $DELAY 2>/dev/null >&2
+ then
+- DELAY=0.1
+-else
+ DELAY=1
+ fi
+
+@@ -49,8 +49,16 @@ wait_result ()
+ return 1
+ fi
+
+- echo $RESULT | sed 's/[^"]*"//;s/"$//;s/\\n/\n/g;s/\\"/"/g;s/\n\+$//;
+- s/\^[*[:digit:]]\{2\}//g;s/\^[Bbn]//g;'
++ echo $RESULT |
++ sed -E 's/[^"]*"//
++ s/"$//
++ s/([^\])\\n/\1\
++/g
++ s/\\\\n/\\n/g
++ s/\\"/"/g
++ s/\\n[[:space:]]+$//
++ s/\^[*[:digit:]]{2}//g
++ s/\^[Bbn]//g'
+ }
+
+ send_cmd ()
+@@ -121,24 +129,34 @@ then
+ else
+ if [ -t 0 ]
+ then
+- if [ $READLINE = yes ] && type rlwrap >/dev/null 2>&1
++ if ! type rlwrap 2>/dev/null >&2
++ then
++ tput md
++ tput AF 1
++ echo -n WARN:
++ tput me
++ echo \ rlwrap not found, command completion won\'t work. >&2
++ elif [ $READLINE = yes ]
+ then
+ # Note: $TEMP is not conventional; it is left here purely
+ # for backwards compatibility.
+- COMMANDS="${TEMP:-${TEMPDIR:-/var/tmp}}/stumpish.commands.$$"
+- echo `send_cmd "commands"` | sed 's/[[:space:]]\+/\n/g' | sort > "$COMMANDS"
++ COMMANDS="${TEMPDIR:-/tmp}/stumpish.commands.$$"
++ echo `send_cmd "commands"` |
++ sed -E 's/[[:space:]]+/\
++/g' |
++ sort > "$COMMANDS"
+ rlwrap -f "$COMMANDS" "$0" -r
+ rm -f "$COMMANDS"
+ exit
+ fi
+
+- tput setaf 5
++ tput AF 5
+ echo Welcome to the STUMPwm Interactive SHell.
+- tput sgr0
++ tput me
+ echo -n 'Type '
+- tput setaf 2
++ tput AF 2
+ echo -n commands
+- tput sgr0
++ tput me
+ echo \ for a list of commands.
+
+ IFS='
+@@ -146,10 +164,10 @@ else
+ echo -n "> "
+ while read REPLY
+ do
+- tput bold
+- tput setaf 2
++ tput md
++ tput AF 2
+ send_cmd "$REPLY"
+- tput sgr0
++ tput me
+
+ echo -n "> "
+ done
--- a.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?867hk2o8ya.fsf>