Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 17 Oct 2018 09:09:08 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r482283 - in head: . x11-wm x11-wm/skippy-xd x11-wm/skippy-xd/files
Message-ID:  <201810170909.w9H9982N012623@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Wed Oct 17 09:09:08 2018
New Revision: 482283
URL: https://svnweb.freebsd.org/changeset/ports/482283

Log:
  Resurrect `x11-wm/skippy-xd', a full-screen Expose-style standalone task
  switcher for X11.  It is now being hosted on GitHub as a fork from the
  original 0.5.0 release (2004), initially maintained by Nick Watts (2011)
  and now by Richard Grenville (2013).  Assume maintainership.

Added:
  head/x11-wm/skippy-xd/
     - copied from r306387, head/x11-wm/skippy-xd/
  head/x11-wm/skippy-xd/files/patch-src_config.c
     - copied, changed from r306387, head/x11-wm/skippy-xd/files/patch-config.c
Deleted:
  head/x11-wm/skippy-xd/files/patch-config.c
  head/x11-wm/skippy-xd/files/patch-skippy.h
  head/x11-wm/skippy-xd/pkg-message
Modified:
  head/MOVED
  head/x11-wm/Makefile
  head/x11-wm/skippy-xd/Makefile
  head/x11-wm/skippy-xd/distinfo
  head/x11-wm/skippy-xd/pkg-descr

Modified: head/MOVED
==============================================================================
--- head/MOVED	Wed Oct 17 09:09:05 2018	(r482282)
+++ head/MOVED	Wed Oct 17 09:09:08 2018	(r482283)
@@ -3679,7 +3679,6 @@ games/rigsofrods||2012-10-16|Has expired: Broken for m
 sysutils/bacula2-client||2012-10-20|No longer supported upstream and may contain vulnerabilities. Use sysutils/bacula-client instead
 sysutils/bacula2-server||2012-10-20|No longer supported upstream and may contain vulnerabilities. Use sysutils/bacula-server instead
 x11-wm/wmcp||2012-10-25|Has expired: No more public distfiles
-x11-wm/skippy-xd||2012-10-25|Has expired: Abandonware, upstream disappeared
 x11-wm/skippy||2012-10-25|Has expired: Abandonware, upstream disappeared
 x11-wm/matchbox||2012-10-25|Has expired: Abandonware, upstream disappeared
 x11-wm/blwm||2012-10-25|Has expired: Abandonware, upstream disappeared

Modified: head/x11-wm/Makefile
==============================================================================
--- head/x11-wm/Makefile	Wed Oct 17 09:09:05 2018	(r482282)
+++ head/x11-wm/Makefile	Wed Oct 17 09:09:08 2018	(r482283)
@@ -113,6 +113,7 @@
     SUBDIR += sawfish
     SUBDIR += selectwm
     SUBDIR += simple-ccsm
+    SUBDIR += skippy-xd
     SUBDIR += spectrwm
     SUBDIR += stumpwm
     SUBDIR += subtle

Modified: head/x11-wm/skippy-xd/Makefile
==============================================================================
--- head/x11-wm/skippy-xd/Makefile	Thu Oct 25 16:41:08 2012	(r306387)
+++ head/x11-wm/skippy-xd/Makefile	Wed Oct 17 09:09:08 2018	(r482283)
@@ -1,54 +1,36 @@
-# New ports collection makefile for:	skippy-xd
-# Date created:		2004-05-19
-# Whom:			michael johnson <ahze@ahze.net>
-#
+# Created by: Michael Johnson <ahze@ahze.net>
 # $FreeBSD$
-#
 
 PORTNAME=	skippy-xd
 PORTVERSION=	0.5.0
 PORTREVISION=	2
 CATEGORIES=	x11-wm
-MASTER_SITES=	http://cdn.thegraveyard.org/releases/skippy/
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A full-screen X11 task-switcher like Apple's Expose
+MAINTAINER=	danfe@FreeBSD.org
+COMMENT=	Full-screen Expose-style standalone task switcher for X11
 
-DEPRECATED=	Abandonware, upstream disappeared
-EXPIRATION_DATE=	2012-10-20
+LICENSE=	GPLv2
 
-BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libgif.so:graphics/giflib \
+		libpng.so:graphics/png
 
-USE_BZIP2=	yes
-USE_XORG=	x11 xft xcomposite xdamage xfixes xrender xinerama xext xmu
-USE_PKGCONFIG=	yes
-PLIST_FILES=	bin/skippy-xd \
-		%%DATADIR%%/skippy-xd.rc-default
-PLIST_DIRS=	%%DATADIR%%
-PKGMESSAGE=	${WRKDIR}/pkg-message
+USES=		gmake jpeg pkgconfig
+USE_XORG=	x11 xcomposite xdamage xext xfixes xft xinerama xrender
 
-.include <bsd.port.pre.mk>
+USE_GITHUB=	yes
+GH_ACCOUNT=	richardgv
+GH_TAGNAME=	397216c
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|; \
-		s|/usr/local|${LOCALBASE}|; s|gcc|${CC}|' \
-			${WRKSRC}/Makefile
+MAKE_ARGS=	SKIPPYXD_VERSION=${PORTVERSION}-git-${GH_TAGNAME}-2015-02-24
 
-.if ${ARCH} == "amd64"
-	@${REINPLACE_CMD} -e 's|CARD32|CARD64|g' \
-		${WRKSRC}/clientwin.c ${WRKSRC}/skippy.c \
-		${WRKSRC}/wm.c ${WRKSRC}/wm.h
-.endif
+PLIST_FILES=	bin/skippy-xd \
+		@sample\ etc/xdg/skippy-xd.rc.sample
+PORTDOCS=	CHANGELOG
 
-post-build:
-	@${SED} 's|%%DATADIR%%|${DATADIR}|' ${PKGDIR}/pkg-message >${PKGMESSAGE}
+OPTIONS_DEFINE=	DOCS
 
-do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/skippy-xd ${PREFIX}/bin
-	@${MKDIR} ${DATADIR}
-	@${INSTALL_DATA} ${WRKSRC}/skippy-xd.rc-default ${DATADIR}
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${STAGEDIR}${DOCSDIR}
 
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/x11-wm/skippy-xd/distinfo
==============================================================================
--- head/x11-wm/skippy-xd/distinfo	Thu Oct 25 16:41:08 2012	(r306387)
+++ head/x11-wm/skippy-xd/distinfo	Wed Oct 17 09:09:08 2018	(r482283)
@@ -1,2 +1,3 @@
-SHA256 (skippy-xd-0.5.0.tar.bz2) = 52ff7476b3580a92c385167f1855583c2cf74ae1898a6a5e8446ce67c80bc139
-SIZE (skippy-xd-0.5.0.tar.bz2) = 23970
+TIMESTAMP = 1424784900
+SHA256 (richardgv-skippy-xd-0.5.0-397216c_GH0.tar.gz) = 172ab8c0fcbd61df3de27d08b87851c17a31a2e06f99dd42894436921a92e1d9
+SIZE (richardgv-skippy-xd-0.5.0-397216c_GH0.tar.gz) = 57168

Copied and modified: head/x11-wm/skippy-xd/files/patch-src_config.c (from r306387, head/x11-wm/skippy-xd/files/patch-config.c)
==============================================================================
--- head/x11-wm/skippy-xd/files/patch-config.c	Thu Oct 25 16:41:08 2012	(r306387, copy source)
+++ head/x11-wm/skippy-xd/files/patch-src_config.c	Wed Oct 17 09:09:08 2018	(r482283)
@@ -1,6 +1,6 @@
---- config.c.orig	Mon Jul  5 22:36:39 2004
-+++ config.c	Mon Jul  5 23:32:25 2004
-@@ -72,9 +72,9 @@
+--- src/config.c.orig	2015-02-24 13:35:00 UTC
++++ src/config.c
+@@ -73,9 +73,9 @@ config_parse(const char *config) {
  	int ix = 0, l_ix = 0;
  	dlist *new_config = 0;
  	
@@ -12,7 +12,7 @@
  	
  	while(1)
  	{
-@@ -148,6 +148,7 @@
+@@ -150,6 +150,7 @@ config_load(const char *path)
  		fclose(fin);
  		return 0;
  	}

Modified: head/x11-wm/skippy-xd/pkg-descr
==============================================================================
--- head/x11-wm/skippy-xd/pkg-descr	Thu Oct 25 16:41:08 2012	(r306387)
+++ head/x11-wm/skippy-xd/pkg-descr	Wed Oct 17 09:09:08 2018	(r482283)
@@ -9,4 +9,4 @@ snapshots of all windows on the current desktop and it
 window using a mouse or a keyboard. Yes, this is also what expocity and Apple's
 Expose.
 
-WWW:	http://thegraveyard.org/skippy.php
+WWW: https://github.com/richardgv/skippy-xd



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810170909.w9H9982N012623>