Fix copyright problem.

PR:		21043
Submitted by:	maintainer

7 files changed, 61 insertions, 63 deletions

diff --git a/x11-wm/sapphire/Makefile b/x11-wm/sapphire/Makefile
index 9715874d45e5..5f89bcb098b7 100644
--- a/x11-wm/sapphire/Makefile
+++ b/x11-wm/sapphire/Makefile
@@ -8,29 +8,19 @@
 PORTNAME=	sapphire
 PORTVERSION=	0.14.2
 CATEGORIES=	x11-wm
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
-		http://sapphire.sourceforge.net/themes/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${THEMES_SRC}
 
 MAINTAINER=	trevor@jpj.net
 
-RUN_DEPENDS=	xsetbg:${PORTSDIR}/graphics/xli
-
 DIST_SUBDIR=	sapphire
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 
-THEMES_SRC=	atomic.tar.gz bevel.tar.gz blues.tar.gz dtheater.tar.gz \
-		klamath.tar.gz metal.tar.gz nocturne.tar.gz river.tar.gz \
-		sapphire.tar.gz slate.tar.gz synopsis.tar.gz
-
 post-extract:
 	@${CP} ${WRKSRC}/data.inst ${WRKSRC}/sapphire.inst
-	@${CP} ${WRKDIR}/*/*.theme ${WRKSRC}/data/themes
-	@${CP} ${WRKDIR}/*/*.jpg ${WRKSRC}/data/themes
 
 post-patch:
 	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/sapphire.inst
@@ -39,10 +29,11 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/sapphire.inst ${PREFIX}/bin
 	@${MKDIR} ${PREFIX}/share/sapphire/menu
 	${INSTALL_DATA} ${WRKSRC}/data/menu/default ${PREFIX}/share/sapphire/menu
+	# so the sapphire-themes port can restore the original menu when the
+	# themes are de-installed
+	${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/themes/backgrounds
-	${INSTALL_DATA} ${WRKSRC}/data/themes/*.jpg ${PREFIX}/share/sapphire/themes/backgrounds
 	@${MKDIR} ${PREFIX}/share/sapphire/wmconfig
 	${INSTALL_DATA} ${WRKSRC}/data/wmconfig/wmconf ${PREFIX}/share/sapphire/wmconfig
 .if !defined(NOPORTDOCS)
diff --git a/x11-wm/sapphire/distinfo b/x11-wm/sapphire/distinfo
index 13534d5fe6c7..d599caf9b5e5 100644
--- a/x11-wm/sapphire/distinfo
+++ b/x11-wm/sapphire/distinfo
@@ -1,12 +1 @@
 MD5 (sapphire/sapphire-0.14.2.tar.gz) = 486c33f1cc95369338a69bd7c5d2aafe
-MD5 (sapphire/atomic.tar.gz) = 91946c1930e9edccbf81110a9d9d3c45
-MD5 (sapphire/bevel.tar.gz) = 3911f81528ec43cdd9e1c9035cdc5fc0
-MD5 (sapphire/blues.tar.gz) = 48a3e242acb42886e260563bc3029fff
-MD5 (sapphire/dtheater.tar.gz) = 3adad23140cbb728f4e2a6bd5169d9b0
-MD5 (sapphire/klamath.tar.gz) = be0c66ffd2a1b8fcbe04cc4136cb0064
-MD5 (sapphire/metal.tar.gz) = 5698e04e8b46a61c557f57bb6af69492
-MD5 (sapphire/nocturne.tar.gz) = 5f11db03eee42b71fb6b361230c45db2
-MD5 (sapphire/river.tar.gz) = 4d177069374474ea9382437df025bd42
-MD5 (sapphire/sapphire.tar.gz) = 1073a89bca0949f5f17bfd5ccd375a47
-MD5 (sapphire/slate.tar.gz) = 7200b8e0637265d8336c112854ee7140
-MD5 (sapphire/synopsis.tar.gz) = ac892fc69f5da628add1d0876afc6be0
diff --git a/x11-wm/sapphire/files/patch-ad b/x11-wm/sapphire/files/patch-ad
index 233546bd5bd5..8f9db1a45387 100644
--- a/x11-wm/sapphire/files/patch-ad
+++ b/x11-wm/sapphire/files/patch-ad
@@ -1,6 +1,6 @@
 --- data/menu/default.orig	Mon Feb 21 23:06:19 2000
 +++ data/menu/default	Mon Apr 10 22:06:34 2000
-@@ -38,11 +38,20 @@
+@@ -38,11 +38,11 @@
  
  	submenu (themes)
  	{
@@ -10,19 +10,10 @@
 -		theme (rose)    {~/.sapphire/themes/rose.theme}
 -		theme (green)   {~/.sapphire/themes/green.theme}
 +		theme (default)  {~/.sapphire/themes/default.theme}
-+		theme (atomic)   {~/.sapphire/themes/atomic.theme}
-+		theme (bevel)    {~/.sapphire/themes/bevel.theme}
-+		theme (blues)    {~/.sapphire/themes/blues.theme}
 +		theme (darkblue) {~/.sapphire/themes/darkblue.theme}
-+		theme (dtheater) {~/.sapphire/themes/dtheater.theme}
-+		theme (klamath)  {~/.sapphire/themes/klamath.theme}
-+		theme (metal)    {~/.sapphire/themes/metal.theme}
-+		theme (nocturne) {~/.sapphire/themes/nocturne.theme}
-+		theme (river)    {~/.sapphire/themes/river.theme}
++		theme (gray)     {~/.sapphire/themes/gray.theme}
 +		theme (rose)     {~/.sapphire/themes/rose.theme}
-+		theme (sapphire) {~/.sapphire/themes/sapphire.theme}
 +		theme (slate)    {~/.sapphire/themes/slate.theme}
-+		theme (synopsis) {~/.sapphire/themes/synopsis.theme}
  	}
  		
  	separator
diff --git a/x11-wm/sapphire/files/patch-ap b/x11-wm/sapphire/files/patch-ap
new file mode 100644
index 000000000000..94fd9f1ed30f
--- /dev/null
+++ b/x11-wm/sapphire/files/patch-ap
@@ -0,0 +1,43 @@
+--- 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: 
diff --git a/x11-wm/sapphire/pkg-descr b/x11-wm/sapphire/pkg-descr
index e69024c5a41d..9737a7cc04db 100644
--- a/x11-wm/sapphire/pkg-descr
+++ b/x11-wm/sapphire/pkg-descr
@@ -1,8 +1,12 @@
 Sapphire is a small window manager based on aewm and blackbox.
 Windows can be rolled up or hidden.  Programs can be run from a
-menu.  A clock and calendar are built in.  This port installs
-both sapphire itelf and all the themes from its Web site, except
-"linux" and "linuxturf".
+menu.  A clock and calendar are built in.
+
+This version of sapphire incorporates a patch which cycles windows
+up or down when Alt+up cursor or Alt+down cursor are pressed.
+
+If you like this window manager, you may wish to install the
+sapphire-themes package to accompany it.
 
 WWW: http://sapphire.sourceforge.net/
 
diff --git a/x11-wm/sapphire/pkg-message b/x11-wm/sapphire/pkg-message
index ca115ab0d4c1..d778ca47f685 100644
--- a/x11-wm/sapphire/pkg-message
+++ b/x11-wm/sapphire/pkg-message
@@ -1,3 +1,4 @@
-
-Before running sapphire, users should run sapphire.inst, even if they ran
-it for an earlier version.  Otherwise sapphire is likely to crash.
+*****************************************************************************
+* Before running sapphire, users should run sapphire.inst, even if they ran *
+* it for an earlier version.  Otherwise sapphire is likely to crash.        *
+*****************************************************************************
diff --git a/x11-wm/sapphire/pkg-plist b/x11-wm/sapphire/pkg-plist
index c0280c18760c..58f75888284c 100644
--- a/x11-wm/sapphire/pkg-plist
+++ b/x11-wm/sapphire/pkg-plist
@@ -2,36 +2,15 @@ bin/sapphire
 bin/sapphire.inst
 share/doc/sapphire/README
 share/sapphire/menu/default
-share/sapphire/themes/atomic.theme
-share/sapphire/themes/backgrounds/atomic.jpg
-share/sapphire/themes/backgrounds/bevel.jpg
-share/sapphire/themes/backgrounds/blues.jpg
-share/sapphire/themes/backgrounds/dtheater.jpg
-share/sapphire/themes/backgrounds/klamath.jpg
-share/sapphire/themes/backgrounds/metal.jpg
-share/sapphire/themes/backgrounds/nocturne.jpg
-share/sapphire/themes/backgrounds/river.jpg
-share/sapphire/themes/backgrounds/sapphire.jpg
-share/sapphire/themes/backgrounds/slate.jpg
-share/sapphire/themes/backgrounds/synopsis.jpg
-share/sapphire/themes/bevel.theme
-share/sapphire/themes/blues.theme
+share/sapphire/menu/default.orig
 share/sapphire/themes/darkblue.theme
 share/sapphire/themes/default.theme
-share/sapphire/themes/dtheater.theme
 share/sapphire/themes/gray.theme
-share/sapphire/themes/klamath.theme
-share/sapphire/themes/metal.theme
-share/sapphire/themes/nocturne.theme
-share/sapphire/themes/river.theme
 share/sapphire/themes/rose.theme
-share/sapphire/themes/sapphire.theme
 share/sapphire/themes/slate.theme
-share/sapphire/themes/synopsis.theme
 share/sapphire/wmconfig/wmconf
 @dirrm share/doc/sapphire
 @dirrm share/sapphire/menu
-@dirrm share/sapphire/themes/backgrounds
 @dirrm share/sapphire/themes
 @dirrm share/sapphire/wmconfig
 @dirrm share/sapphire