mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-26 09:46:09 +00:00
Code Issues Releases Activity

Update to 0.15.6. Don't use a DIST_SUBDIR any more (it was only

Browse Source 
needed for Frank Hale's themes).  Be more verbose.  In the post-patch
target, patch a hard-coded path in several files.  Remove
files/patch-ap, my patch to add alt+up/down cursor cycling of
windows (an equivalent feature has been added upstream, using
alt+Tab and alt+shift+tab).  Update pkg-descr to mention the new
virtual screens feature.  Remove the imperative that users run
sapphire.inst.
This commit is contained in:
Trevor Johnson 2000-12-25 06:10:16 +00:00
parent c8e54f2184
commit ed5700e2a2
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=36325
7 changed files with 36 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
x11-wm/sapphire/Makefile
View File

@ -6,24 +6,25 @@
#
PORTNAME= sapphire
PORTVERSION= 0.14.2
PORTVERSION= 0.15.6
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= trevor@FreeBSD.org
DIST_SUBDIR= sapphire
USE_GMAKE= yes
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
post-extract:
@${CP} ${WRKSRC}/data.inst ${WRKSRC}/sapphire.inst
post-patch:
@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/sapphire.inst
${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/data.inst
.for i in data/menu/default configure data.inst src/sapphire.hh
${PERL} -pi -e "s|/usr/local|${PREFIX}|g" ${WRKSRC}/${i}
.endfor
${CP} ${WRKSRC}/data.inst ${WRKSRC}/sapphire.inst
post-install:
${INSTALL_SCRIPT} ${WRKSRC}/sapphire.inst ${PREFIX}/bin
@ -34,12 +35,9 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/data/menu/default ${PREFIX}/share/sapphire/menu/default.orig
@${MKDIR} ${PREFIX}/share/sapphire/themes
${INSTALL_DATA} ${WRKSRC}/data/themes/*.theme ${PREFIX}/share/sapphire/themes
@${MKDIR} ${PREFIX}/share/sapphire/wmconfig
${INSTALL_DATA} ${WRKSRC}/data/wmconfig/wmconf ${PREFIX}/share/sapphire/wmconfig
.if !defined(NOPORTDOCS)
@${MKDIR} ${PREFIX}/share/doc/sapphire
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/sapphire
.endif
@${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>

2
x11-wm/sapphire/distinfo
View File

@ -1 +1 @@
MD5 (sapphire/sapphire-0.14.2.tar.gz) = 486c33f1cc95369338a69bd7c5d2aafe
MD5 (sapphire-0.15.6.tar.gz) = 00bdddd80e8bd3f1853961d4e9d87b5f

73
x11-wm/sapphire/files/patch-aa
View File

@ -1,62 +1,47 @@
--- sapphire.inst.orig Tue Feb 22 08:30:53 2000
+++ sapphire.inst Fri Mar 24 03:27:02 2000
--- data.inst.orig Tue Nov 7 02:39:24 2000
+++ data.inst Tue Nov 7 02:44:11 2000
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
#
# Sapphire 0.14.1
#
@@ -9,6 +9,8 @@
# 21 Feb 2000 at 18:10
# frankhale@yahoo.com
# Sapphire 0.15.4 and above
#
@@ -16,6 +16,8 @@
CONFIGURATION_PATH=/usr/local/share/sapphire
###############################################################
+DATADIR=%%PREFIX%%/share/sapphire
+
if [ -d ~/.sapphire ]
if [ -d $CONFIGURATION_PATH ]
then
echo "~/.sapphire directory exists";
@@ -21,12 +23,12 @@
if [ -d ~/.sapphire/themes ]
echo "$CONFIGURATION_PATH directory already exists";
@@ -28,12 +30,12 @@
if [ -d $CONFIGURATION_PATH/themes ]
then
echo "~/.sapphire/themes directory exists, copying themes there";
- cp data/themes/* ~/.sapphire/themes
+ cp -pPR $DATADIR/themes/* ~/.sapphire/themes
echo "$CONFIGURATION_PATH directory already exists, copying over current themes";
- cp data/themes/* $CONFIGURATION_PATH/themes
+ cp -pPR DATADIR/themes/* $CONFIGURATION_PATH/themes
else
mkdir ~/.sapphire/themes
echo "created directory ~/.sapphire/themes";
mkdir $CONFIGURATION_PATH/themes
echo "created directory $CONFIGURATION_PATH/themes";
- cp data/themes/* ~/.sapphire/themes
+ cp -pPR $DATADIR/themes/* ~/.sapphire/themes
echo "themes were copied to ~/.sapphire/themes";
- cp data/themes/* $CONFIGURATION_PATH/themes
+ cp -pPR DATADIR/themes/* $CONFIGURATION_PATH/themes
echo "themes were copied to $CONFIGURATION_PATH/themes";
fi
@@ -34,12 +36,12 @@
if [ -d ~/.sapphire/menu ]
@@ -41,12 +43,12 @@
if [ -d $CONFIGURATION_PATH/menu ]
then
echo "~/.sapphire/menu directory exists, copying menu files there";
- cp data/menu/* ~/.sapphire/menu
+ cp $DATADIR/menu/* ~/.sapphire/menu
echo "$CONFIGURATION_PATH/menu directory already exists, copying over current menu files";
- cp data/menu/* $CONFIGURATION_PATH/menu
+ cp -pPR DATADIR/menu/* $CONFIGURATION_PATH/menu
else
mkdir ~/.sapphire/menu
echo "created directory ~/.sapphire/menu";
mkdir $CONFIGURATION_PATH/menu
echo "created directory $CONFIGURATION_PATH/menu";
- cp data/menu/* ~/.sapphire/menu
+ cp $DATADIR/menu/* ~/.sapphire/menu
echo "menu files were copied to ~/.sapphire/menu";
fi
@@ -47,12 +49,12 @@
if [ -d ~/.sapphire/wmconfig ]
then
echo "~/.sapphire/wmconfig directory exists, copying configuration files there";
- cp data/wmconfig/* ~/.sapphire/wmconfig
+ cp $DATADIR/wmconfig/* ~/.sapphire/wmconfig
else
mkdir ~/.sapphire/wmconfig
echo "created directory ~/.sapphire/wmconfig";
- cp data/wmconfig/* ~/.sapphire/wmconfig
+ cp $DATADIR/wmconfig/* ~/.sapphire/wmconfig
echo "configuration files were copied to ~/.sapphire/wmconfig";
- cp data/menu/* $CONFIGURATION_PATH/menu
+ cp -pPR DATADIR/menu/* $CONFIGURATION_PATH/menu
echo "menu files were copied to $CONFIGURATION_PATH/menu";
fi

19
x11-wm/sapphire/files/patch-ad
View File

@ -1,19 +0,0 @@
--- data/menu/default.orig Mon Feb 21 23:06:19 2000
+++ data/menu/default Mon Apr 10 22:06:34 2000
@@ -38,11 +38,11 @@
submenu (themes)
{
- theme (default) {~/.sapphire/themes/default.theme}
- theme (darkblue){~/.sapphire/themes/darkblue.theme}
- theme (slate) {~/.sapphire/themes/slate.theme}
- theme (rose) {~/.sapphire/themes/rose.theme}
- theme (green) {~/.sapphire/themes/green.theme}
+ theme (default) {~/.sapphire/themes/default.theme}
+ theme (darkblue) {~/.sapphire/themes/darkblue.theme}
+ theme (gray) {~/.sapphire/themes/gray.theme}
+ theme (rose) {~/.sapphire/themes/rose.theme}
+ theme (slate) {~/.sapphire/themes/slate.theme}
}
separator

43
x11-wm/sapphire/files/patch-ap
View File

@ -1,43 +0,0 @@
--- src/windowmanager.cc.orig Wed Feb 23 23:26:21 2000
+++ src/windowmanager.cc Mon Sep 4 23:15:30 2000
@@ -127,7 +127,7 @@
#ifdef SHAPE
if(! QueryShapeExtentions())
{
- printf("Shape extentions not supported\n");
+ printf("Shape extensions not supported\n");
}
#endif
@@ -175,6 +175,10 @@
t = new Toolbar();
im = new IconMenu();
+ // Grab alt+up cursor and alt+down cursor for cycling windows in
+ // WindowManager::do_event_loop().
+ XGrabKey(dpy, XKeysymToKeycode(dpy, XK_Up), Mod1Mask, root, True, GrabModeAsync, GrabModeAsync);
+ XGrabKey(dpy, XKeysymToKeycode(dpy, XK_Down), Mod1Mask, root, True, GrabModeAsync, GrabModeAsync);
addToMenuList(rm);
rm->parseMenuConfigurationFile();
@@ -511,6 +515,20 @@
head_client->handle_reparent_event(&ev.xreparent);
break;
+ }
+
+ case KeyPress:
+ {
+ if (XKeycodeToKeysym(dpy, ev.xkey.keycode, 0) == XK_Up)
+ {
+ XCirculateSubwindowsUp(wm->getDisplay(), wm->getRootWindow());
+ break;
+ }
+ if (XKeycodeToKeysym(dpy, ev.xkey.keycode, 0) == XK_Down)
+ {
+ XCirculateSubwindowsDown(wm->getDisplay(), wm->getRootWindow());
+ break;
+ }
}
default:

4
x11-wm/sapphire/pkg-message
View File

@ -1,4 +0,0 @@
*****************************************************************************
* Before running sapphire, users should run sapphire.inst, even if they ran *
* it for an earlier version. Otherwise sapphire is likely to crash. *
*****************************************************************************

2
x11-wm/sapphire/pkg-plist
View File

@ -8,9 +8,7 @@ share/sapphire/themes/default.theme
share/sapphire/themes/gray.theme
share/sapphire/themes/rose.theme
share/sapphire/themes/slate.theme
share/sapphire/wmconfig/wmconf
@dirrm share/doc/sapphire
@dirrm share/sapphire/menu
@dirrm share/sapphire/themes
@dirrm share/sapphire/wmconfig
@dirrm share/sapphire