ports/151318: [repocopy][new port] x11-wm/stumpwm: rename to x11-wm/cl-stumpwm and split

Anonymous swell.k at gmail.com
Fri Oct 8 17:00:16 UTC 2010 

>Number:         151318
>Category:       ports
>Synopsis:       [repocopy][new port] x11-wm/stumpwm: rename to x11-wm/cl-stumpwm and split
>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:   Fri Oct 08 17:00:14 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Anonymous
>Release:        FreeBSD 9.0-CURRENT amd64
>Organization:
>Environment:
- depends on ports/151315
- devel/cl-alexandria was used as a template (again)
- tested only on sbcl-1.0.43
>Description:
- add to `cl-' prefix to pkgname
- split clisp and sbcl options to separate ports
- use system cl-ppcre and clx
- grab maintainership
- import recent stumpish fixes after discussion on stumpwm-devel@

While the rename is mostly needed to preserve CVS history I think users
should be pointed at x11-wm/cl-stumpwm-sbcl when updating.

Also, x11-wm/cl-stumpwm-clisp is completeley untested. I have a local
issue that prevents me from building lang/clisp (segfault). And there
are no clisp packages built with CLX_NEW.
>How-To-Repeat:
>Fix:
--- a.diff begins here ---
Index: x11-wm/Makefile
===================================================================
RCS file: /a/.cvsup/ports/x11-wm/Makefile,v
retrieving revision 1.253
diff -u -p -r1.253 Makefile
--- x11-wm/Makefile	24 May 2010 21:52:42 -0000	1.253
+++ x11-wm/Makefile	8 Oct 2010 04:58:25 -0000
@@ -21,6 +21,10 @@
     SUBDIR += blwm
     SUBDIR += boxtools
     SUBDIR += ccsm
+    SUBDIR += cl-stumpwm
+    SUBDIR += cl-stumpwm-clisp
+    SUBDIR += cl-stumpwm-doc
+    SUBDIR += cl-stumpwm-sbcl
     SUBDIR += clementine
     SUBDIR += compiz
     SUBDIR += compiz-fusion
@@ -112,7 +118,6 @@
     SUBDIR += simple-ccsm
     SUBDIR += skippy
     SUBDIR += skippy-xd
-    SUBDIR += stumpwm
     SUBDIR += swm
     SUBDIR += tinywm
     SUBDIR += transset-df
Index: x11-wm/cl-stumpwm/Makefile
===================================================================
RCS file: /a/.cvsup/ports/x11-wm/cl-stumpwm/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- x11-wm/cl-stumpwm/Makefile	15 Sep 2010 11:56:58 -0000	1.9
+++ x11-wm/cl-stumpwm/Makefile	8 Oct 2010 16:46:50 -0000
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	stumpwm
+# New ports collection makefile for:	cl-stumpwm
 # Date created:				2008-02-20
 # Whom:					alepulver
 #
@@ -7,77 +7,83 @@
 
 PORTNAME=	stumpwm
 PORTVERSION=	0.9.7
-PORTREVISION=	1
+PORTREVISION?=	2
 CATEGORIES=	x11-wm lisp
 MASTER_SITES=	SAVANNAH
-DISTFILES=	${DISTNAME}.tgz
+PKGNAMEPREFIX=	cl-
+EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports at FreeBSD.org
-COMMENT=	A tiling, keyboard driven Window Manager written in Common Lisp
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-contrib-dir=${DATADIR}
-MAKE_JOBS_UNSAFE=yes
+MAINTAINER=	swell.k at gmail.com
+COMMENT?=	A tiling, keyboard driven Window Manager written in Common Lisp
 
 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
 
-PLIST_FILES=	bin/stumpish \
-		bin/${PORTNAME}
-INFO=		${PORTNAME}
-PORTEXAMPLES=	sample-stumpwmrc.lisp
-PORTDATA=	*
+.if !defined(FASL_BUILD)
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-OPTIONS=	SBCL "Build with lang/sbcl (otherwise with lang/clisp)" on
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-contrib-dir=${DATADIR}
 
-.include <bsd.port.options.mk>
+DATADIR=	${PREFIX}/share/${UNIQUENAME}
 
-.if defined(WITH_SBCL) || make(makesum) || defined(FETCH_ALL)
-MASTER_SITES+=	http://common-lisp.net/~abridgewater/dist/clx/:clx
-DISTFILES+=	clx-0.7.4.tgz:clx
-.endif
+.if !defined(ALL_TARGET)
+RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/cl-ppcre/cl-ppcre.asd:${PORTSDIR}/textproc/cl-ppcre \
+		${LOCALBASE}/${CL_LIBDIR_REL}/clx/clx.asd:${PORTSDIR}/x11/cl-clx
 
-.if defined(WITH_SBCL)
-CONFIGURE_ARGS+=	--with-lisp=sbcl
-BUILD_DEPENDS+=	sbcl:${PORTSDIR}/lang/sbcl
-.else
-CONFIGURE_ARGS+=	--with-lisp=clisp
-BUILD_DEPENDS+=	clisp:${PORTSDIR}/lang/clisp
-.endif
+NO_BUILD=	yes
+USE_ASDF=	yes
 
-.if !defined(WITH_SBCL)
-.if exists(${LOCALBASE}/bin/clisp) && \
-    !exists(${LOCALBASE}/lib/clisp/full/clx.o)
-IGNORE=		requires lang/clisp built with CLX_NEW option ON
-.endif
+SUB_FILES=	stumpwm
+PORTEXAMPLES=	sample-stumpwmrc.lisp
+PORTDATA=	*
+PLIST_SUB=	ASDF_PATHNAME="${ASDF_PATHNAME:S,^${PREFIX}/,,}" \
+		ASDF_REGISTRY="${ASDF_REGISTRY:S,^${PREFIX}/,,}"
 .endif
 
-.if defined(WITH_SBCL)
 post-extract:	.SILENT
-	${LN} -sf ${WRKDIR}/clx*/*.asd ${WRKSRC}/cl-ppcre/*.asd ${WRKSRC}
+	${RM} -fr ${WRKSRC}/cl-ppcre*
 
 post-patch:	.SILENT
-	${REINPLACE_CMD} 's|sbcl_.*OPTS=|& \
-		--disable-debugger \
-		--no-userinit \
-		--no-sysinit \
-		--eval "(require :asdf)" \
-		--eval "(pop asdf:*central-registry*)" \
-		|' ${WRKSRC}/Makefile.in
+	${REINPLACE_CMD} '/if.*LISP_PROGRAM/,/fi/d' ${WRKSRC}/configure
 	${REINPLACE_CMD} 's/\(sb-introspect:function-\)arglist/\1lambda-list/' \
 		${WRKSRC}/manual.lisp
-.endif
 
-post-install:
+.if !defined(ALL_TARGET)
+do-install:
+	${INSTALL_SCRIPT} ${WRKDIR}/stumpwm ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/stumpish ${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/contrib/stumpwm-mode.el ${PREFIX}/share/emacs/site-lisp
+	${MKDIR} ${ASDF_PATHNAME}
+	${INSTALL_DATA} ${WRKSRC}/*.lisp ${ASDF_PATHNAME}
+	${INSTALL_DATA} ${WRKSRC}/*.asd ${ASDF_PATHNAME}
+	${LN} -sf ${ASDF_PATHNAME}/*.asd ${ASDF_REGISTRY}
 .if !defined(NOPORTEXAMPLES)
 	${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTEXAMPLES} ${EXAMPLESDIR}
 .endif
 .if !defined(NOPORTDATA)
 	${MKDIR} ${DATADIR}
-	${TAR} cf - -C${WRKSRC}/contrib --exclude stumpish\* . \
-		| ${TAR} xovf - -C${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/contrib/amixer.lisp ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/contrib/aumix.lisp ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/contrib/battery-portable.lisp ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/contrib/battery.lisp ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/contrib/cpu.lisp ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/contrib/disk.lisp ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/contrib/g15-keysyms.lisp ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/contrib/maildir.lisp ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/contrib/mem.lisp ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/contrib/mpd.lisp ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/contrib/net.lisp ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/contrib/notifications.lisp ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/contrib/productivity.lisp ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/contrib/sbclfix.lisp ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/contrib/surfraw.lisp ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/contrib/wifi.lisp ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/contrib/window-tags.lisp ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/contrib/wmii-like-stumpwmrc.lisp ${DATADIR}
 .endif
+.endif # ALL_TARGET
+.endif # FASL_BUILD
 
+.include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>
Index: x11-wm/cl-stumpwm/pkg-plist
===================================================================
RCS file: x11-wm/cl-stumpwm/pkg-plist
diff -N x11-wm/cl-stumpwm/pkg-plist
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ x11-wm/cl-stumpwm/pkg-plist	8 Oct 2010 16:29:59 -0000
@@ -0,0 +1,45 @@
+bin/stumpish
+bin/stumpwm
+%%ASDF_PATHNAME%%/asdf.lisp
+%%ASDF_PATHNAME%%/bindings.lisp
+%%ASDF_PATHNAME%%/color.lisp
+%%ASDF_PATHNAME%%/command.lisp
+%%ASDF_PATHNAME%%/core.lisp
+%%ASDF_PATHNAME%%/events.lisp
+%%ASDF_PATHNAME%%/fdump.lisp
+%%ASDF_PATHNAME%%/floating-group.lisp
+%%ASDF_PATHNAME%%/group.lisp
+%%ASDF_PATHNAME%%/head.lisp
+%%ASDF_PATHNAME%%/help.lisp
+%%ASDF_PATHNAME%%/input.lisp
+%%ASDF_PATHNAME%%/iresize.lisp
+%%ASDF_PATHNAME%%/keysyms.lisp
+%%ASDF_PATHNAME%%/keytrans.lisp
+%%ASDF_PATHNAME%%/kmap.lisp
+%%ASDF_PATHNAME%%/make-image.lisp
+%%ASDF_PATHNAME%%/manual.lisp
+%%ASDF_PATHNAME%%/menu.lisp
+%%ASDF_PATHNAME%%/message-window.lisp
+%%ASDF_PATHNAME%%/mode-line.lisp
+%%ASDF_PATHNAME%%/module.lisp
+%%ASDF_PATHNAME%%/package.lisp
+%%ASDF_PATHNAME%%/pathnames.lisp
+%%ASDF_PATHNAME%%/primitives.lisp
+%%ASDF_PATHNAME%%/sample-stumpwmrc.lisp
+%%ASDF_PATHNAME%%/screen.lisp
+%%ASDF_PATHNAME%%/selection.lisp
+%%ASDF_PATHNAME%%/stumpwm.asd
+%%ASDF_PATHNAME%%/stumpwm.lisp
+%%ASDF_PATHNAME%%/test-wm.lisp
+%%ASDF_PATHNAME%%/tile-group.lisp
+%%ASDF_PATHNAME%%/tile-window.lisp
+%%ASDF_PATHNAME%%/time.lisp
+%%ASDF_PATHNAME%%/user.lisp
+%%ASDF_PATHNAME%%/version.lisp
+%%ASDF_PATHNAME%%/window-placement.lisp
+%%ASDF_PATHNAME%%/window.lisp
+%%ASDF_PATHNAME%%/workarounds.lisp
+%%ASDF_PATHNAME%%/wrappers.lisp
+%%ASDF_REGISTRY%%/stumpwm.asd
+share/emacs/site-lisp/stumpwm-mode.el
+ at dirrm %%ASDF_PATHNAME%%
Index: x11-wm/cl-stumpwm/files/patch-Makefile.in
===================================================================
RCS file: x11-wm/cl-stumpwm/files/patch-Makefile.in
diff -N x11-wm/cl-stumpwm/files/patch-Makefile.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ x11-wm/cl-stumpwm/files/patch-Makefile.in	8 Oct 2010 16:27:55 -0000
@@ -0,0 +1,13 @@
+--- Makefile.in~
++++ Makefile.in
+@@ -5,8 +5,8 @@ sbcl_BUILDOPTS=--load ./make-image.lisp
+ ccl_BUILDOPTS=--load ./make-image.lisp
+ ecl_BUILDOPTS=-norc -shell ./make-image.lisp
+ 
+-clisp_INFOOPTS=-K full -on-error exit -x "(require 'asdf '(\"asdf.lisp\")) (load \"stumpwm.asd\") (load \"@PPCRE_PATH@/cl-ppcre.asd\") (asdf:operate 'asdf:load-op :stumpwm) (load (compile-file \"manual.lisp\")) (stumpwm::generate-manual) (ext:exit)"
+-sbcl_INFOOPTS=--eval "(progn (require 'asdf) (require 'stumpwm) (load \"manual.lisp\"))" --eval "(progn (stumpwm::generate-manual) (sb-ext:quit))"
++clisp_INFOOPTS=-K full -on-error exit -i $(LOCALBASE)/etc/asdf-init -x "(asdf:operate 'asdf:load-op :stumpwm) (load (compile-file \"manual.lisp\")) (stumpwm::generate-manual) (ext:exit)"
++sbcl_INFOOPTS=--eval "(progn \#.(load \"$(LOCALBASE)/etc/asdf-init\") (require 'asdf) (require 'stumpwm) (load \"manual.lisp\"))" --eval "(progn (stumpwm::generate-manual) (sb-ext:quit))"
+ ccl_INFOOPTS=--eval "(progn (require 'asdf) (require 'stumpwm))" --load manual.lisp --eval "(progn (stumpwm::generate-manual) (quit))"
+ ecl_INFOOPTS=-eval "(progn (require 'asdf) (load \"@PPCRE_PATH@/cl-ppcre.asd\") (require 'stumpwm) (load \"manual.lisp\"))" -eval "(progn (stumpwm::generate-manual) (ext:quit))"
+ datarootdir = @datarootdir@
Index: x11-wm/cl-stumpwm/files/patch-contrib-stumpish
===================================================================
RCS file: /a/.cvsup/ports/x11-wm/cl-stumpwm/files/patch-contrib-stumpish,v
retrieving revision 1.1
diff -u -p -r1.1 patch-contrib-stumpish
--- x11-wm/cl-stumpwm/files/patch-contrib-stumpish	15 Sep 2010 11:56:58 -0000	1.1
+++ x11-wm/cl-stumpwm/files/patch-contrib-stumpish	7 Oct 2010 07:54:28 -0000
@@ -49,7 +49,7 @@ index 1d48bb4..2b0fca1 100755
  	if echo "$RESULT" | grep -v -q 'not found.$'
  	then
  	    break
-@@ -49,8 +55,14 @@ wait_result ()
+@@ -49,8 +55,13 @@ wait_result ()
  	return 1
      fi
  
@@ -57,12 +57,11 @@ index 1d48bb4..2b0fca1 100755
 -			s/\^[*[:digit:]]\{2\}//g;s/\^[Bbn]//g;'
 +    echo "$RESULT" |
 +    sed -E 's/[^"\\n]+"//
-+            s/"[[:space:]]*$//
-+            s/([^\\])\\n/\1\
++            /^"[[:space:]]*$/d
++            s/(^|[^\\])\\n/\1\
 +/g
 +            s/\\(["\\n])/\1/g
-+            s/\^([*[:digit:]]+|[Bbn])//g' |
-+    sed '/^[[:space:]]*$/d'
++            s/\^([*[:digit:]]+|[Bbn])//g'
  }
  
  send_cmd ()
Index: x11-wm/cl-stumpwm/files/stumpwm.in
===================================================================
RCS file: x11-wm/cl-stumpwm/files/stumpwm.in
diff -N x11-wm/cl-stumpwm/files/stumpwm.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ x11-wm/cl-stumpwm/files/stumpwm.in	8 Oct 2010 15:34:40 -0000
@@ -0,0 +1,30 @@
+#! /bin/sh
+
+have() {
+    type $1 >&- 2>&-
+}
+
+if [ -n "$LISP" ]; then
+elif have sbcl; then
+    LISP=sbcl
+elif have clisp; then
+    LISP=clisp
+else
+    echo No lisp implementation found.
+    exit 1
+fi
+
+: ${STUMPWM_EVAL:="(progn (stumpwm:stumpwm) (quit))"}
+case $LISP in
+    sbcl)
+	args="$args --eval '#.(load \"%%LOCALBASE%%/etc/asdf-init\")'"
+	args="$args --eval \"(require 'stumpwm)\""
+	args="$args --eval \"$STUMPWM_EVAL\""
+	;;
+    clisp)
+	args="$args -i %%LOCALBASE%%/etc/asdf-init"
+	args="$args -x \"(asdf:operate 'asdf:load-op :stumpwm) $STUMPWM_EVAL\""
+	;;
+esac
+
+eval exec $LISP $args '"$@"'
Index: x11-wm/cl-stumpwm-clisp/Makefile
===================================================================
RCS file: x11-wm/cl-stumpwm-clisp/Makefile
diff -N x11-wm/cl-stumpwm-clisp/Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ x11-wm/cl-stumpwm-clisp/Makefile	8 Oct 2010 04:57:04 -0000
@@ -0,0 +1,27 @@
+# New ports collection makefile for:	cl-stumpwm-clisp
+# Date created:				7 Oct 2010
+# Whom:					Anonymous
+#
+# $FreeBSD$
+
+PORTREVISION=	0
+DISTFILES=	# none
+
+BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/stumpwm/stumpwm.asd:${PORTSDIR}/x11-wm/cl-stumpwm \
+		${LOCALBASE}/${CL_LIBDIR_REL}/cl-ppcre/clispfasl/scanner.fasl:${PORTSDIR}/textproc/cl-ppcre-clisp
+RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/stumpwm/stumpwm.asd:${PORTSDIR}/x11-wm/cl-stumpwm \
+		${LOCALBASE}/${CL_LIBDIR_REL}/cl-ppcre/clispfasl/scanner.fasl:${PORTSDIR}/textproc/cl-ppcre-clisp
+
+.if exists(${LOCALBASE}/bin/clisp) && \
+    !exists(${LOCALBASE}/lib/clisp/full/clx.o)
+IGNORE=		requires lang/clisp built with CLX_NEW option ON
+.endif
+
+USE_ASDF_FASL=	yes
+FASL_BUILD=	yes
+FASL_TARGET=	clisp
+
+MASTERDIR=	${.CURDIR}/../../x11-wm/cl-stumpwm
+PATCHDIR=	${.CURDIR}/files
+
+.include "${MASTERDIR}/Makefile"
Index: x11-wm/cl-stumpwm-doc/Makefile
===================================================================
RCS file: x11-wm/cl-stumpwm-doc/Makefile
diff -N x11-wm/cl-stumpwm-doc/Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ x11-wm/cl-stumpwm-doc/Makefile	8 Oct 2010 16:31:14 -0000
@@ -0,0 +1,23 @@
+# New ports collection makefile for:	cl-stumpwm-doc
+# Date created:				7 Oct 2010
+# Whom:					Anonymous
+#
+# $FreeBSD$
+
+PORTREVISION=	0
+PKGNAMESUFFIX=	-doc
+
+COMMENT=	StumpWM info(1) manual
+
+BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/stumpwm/sbclfasl/stumpwm.fasl:${PORTSDIR}/x11-wm/cl-stumpwm-sbcl
+
+ALL_TARGET=	stumpwm.info
+INFO=		stumpwm
+
+MASTERDIR=	${.CURDIR}/../../x11-wm/cl-stumpwm
+PLIST=		${.CURDIR}/pkg-plist
+
+do-install:
+	${INSTALL_DATA} ${WRKSRC}/stumpwm.info ${PREFIX}/info
+
+.include "${MASTERDIR}/Makefile"
Index: x11-wm/cl-stumpwm-sbcl/Makefile
===================================================================
RCS file: x11-wm/cl-stumpwm-sbcl/Makefile
diff -N x11-wm/cl-stumpwm-sbcl/Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ x11-wm/cl-stumpwm-sbcl/Makefile	8 Oct 2010 02:57:08 -0000
@@ -0,0 +1,24 @@
+# New ports collection makefile for:	cl-stumpwm-sbcl
+# Date created:				7 Oct 2010
+# Whom:					Anonymous
+#
+# $FreeBSD$
+
+PORTREVISION=	0
+DISTFILES=	# none
+
+BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/stumpwm/stumpwm.asd:${PORTSDIR}/x11-wm/cl-stumpwm \
+		${LOCALBASE}/${CL_LIBDIR_REL}/cl-ppcre/sbclfasl/scanner.fasl:${PORTSDIR}/textproc/cl-ppcre-sbcl \
+		${LOCALBASE}/${CL_LIBDIR_REL}/clx/sbclfasl/clx.fasl:${PORTSDIR}/x11/cl-clx-sbcl
+RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/stumpwm/stumpwm.asd:${PORTSDIR}/x11-wm/cl-stumpwm \
+		${LOCALBASE}/${CL_LIBDIR_REL}/cl-ppcre/sbclfasl/scanner.fasl:${PORTSDIR}/textproc/cl-ppcre-sbcl \
+		${LOCALBASE}/${CL_LIBDIR_REL}/clx/sbclfasl/clx.fasl:${PORTSDIR}/x11/cl-clx-sbcl
+
+USE_ASDF_FASL=	yes
+FASL_BUILD=	yes
+FASL_TARGET=	sbcl
+
+MASTERDIR=	${.CURDIR}/../../x11-wm/cl-stumpwm
+PATCHDIR=	${.CURDIR}/files
+
+.include "${MASTERDIR}/Makefile"
--- a.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list