Update to version 0.14.2.

PR:		17948
Submitted by:	maintainer

7 files changed, 146 insertions, 52 deletions

diff --git a/x11-wm/sapphire/Makefile b/x11-wm/sapphire/Makefile
index dc006f0c51d1..f10f52aad8e7 100644
--- a/x11-wm/sapphire/Makefile
+++ b/x11-wm/sapphire/Makefile
@@ -6,32 +6,48 @@
 #
 
 PORTNAME=	sapphire
-PORTVERSION= 	0.14.0.2
+PORTVERSION=	0.14.2
 CATEGORIES=	x11-wm
-MASTER_SITES=	http://download.sourceforge.net/sapphire/
-DISTNAME=	${PORTNAME}-0.14.0-2
+MASTER_SITES=	http://download.sourceforge.net/sapphire/ \
+		http://sapphire.sourceforge.net/themes/
+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
+	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/sapphire.inst
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/sapphire.inst ${PREFIX}/bin
-	@${MKDIR} ${PREFIX}/share/sapphire
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/sapphire
 	@${MKDIR} ${PREFIX}/share/sapphire/menu
-	${INSTALL_DATA} ${WRKSRC}/data/menu/* ${PREFIX}/share/sapphire/menu
+	${INSTALL_DATA} ${WRKSRC}/data/menu/default ${PREFIX}/share/sapphire/menu
 	@${MKDIR} ${PREFIX}/share/sapphire/themes
-	${INSTALL_DATA} ${WRKSRC}/data/themes/* ${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/* ${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>
diff --git a/x11-wm/sapphire/distinfo b/x11-wm/sapphire/distinfo
index 0401ce042836..13534d5fe6c7 100644
--- a/x11-wm/sapphire/distinfo
+++ b/x11-wm/sapphire/distinfo
@@ -1 +1,12 @@
-MD5 (sapphire-0.14.0-2.tar.gz) = 61f70e6d4f32380147f2015fa73b326d
+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-aa b/x11-wm/sapphire/files/patch-aa
index 7fb82408f93b..7ed51b6525e0 100644
--- a/x11-wm/sapphire/files/patch-aa
+++ b/x11-wm/sapphire/files/patch-aa
@@ -1,54 +1,62 @@
---- sapphire.inst.orig	Sun Feb 13 14:27:43 2000
-+++ sapphire.inst	Thu Feb 17 22:35:52 2000
+--- sapphire.inst.orig	Tue Feb 22 08:30:53 2000
++++ sapphire.inst	Fri Mar 24 03:27:02 2000
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
  #
- # Sapphire 0.14.0
+ # Sapphire 0.14.1
  #
-@@ -9,6 +9,7 @@
- # 13 Feb 2000 at 12:27am
+@@ -9,6 +9,8 @@
+ # 21 Feb 2000 at 18:10
  # frankhale@yahoo.com
  #
-+DATADIR = %%PREFIX%%/share/sapphire
++DATADIR=%%PREFIX%%/share/sapphire
++
  if [ -d ~/.sapphire ]
  then
- 	echo "~/.sapphire directory exists, deleting it now.";
-@@ -33,15 +34,15 @@
- 	
- 	echo "created directory ~/.sapphire/menu";		
- 	
+ 	echo "~/.sapphire directory exists";
+@@ -21,12 +23,12 @@
+ if [ -d ~/.sapphire/themes ]
+ then
+ 	echo "~/.sapphire/themes directory exists, copying themes there";	
 -	cp data/themes/* ~/.sapphire/themes
-+	cp $DATADIR/themes/* ~/.sapphire/themes
- 
- 	echo "copied themes";
++	cp -pPR $DATADIR/themes/* ~/.sapphire/themes
+ else
+ 	mkdir ~/.sapphire/themes
+ 	echo "created directory ~/.sapphire/themes";
  	
--	cp data/wmconfig/* ~/.sapphire/wmconfig
-+	cp $DATADIR/wmconfig/* ~/.sapphire/wmconfig
- 
- 	echo "copied wmconfig";
+-	cp data/themes/* ~/.sapphire/themes
++	cp -pPR $DATADIR/themes/* ~/.sapphire/themes
+ 	echo "themes were copied to ~/.sapphire/themes";
+ fi
  	
+@@ -34,12 +36,12 @@
+ if [ -d ~/.sapphire/menu ]
+ then
+ 	echo "~/.sapphire/menu directory exists, copying menu files there";
 -	cp data/menu/* ~/.sapphire/menu
 +	cp $DATADIR/menu/* ~/.sapphire/menu
+ else
+ 	mkdir ~/.sapphire/menu
+ 	echo "created directory ~/.sapphire/menu";	
  	
- 	echo "copied menu";
+-	cp data/menu/* ~/.sapphire/menu
++	cp $DATADIR/menu/* ~/.sapphire/menu
+ 	echo "menu files were copied to ~/.sapphire/menu";
+ fi
  
-@@ -65,15 +66,15 @@
- 	
- 	echo "created directory ~/.sapphire/menu";		
- 	
--	cp data/themes/* ~/.sapphire/themes
-+	cp $DATADIR/themes/* ~/.sapphire/themes
+@@ -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";
  
- 	echo "copied themes";
- 	
 -	cp data/wmconfig/* ~/.sapphire/wmconfig
 +	cp $DATADIR/wmconfig/* ~/.sapphire/wmconfig
- 
- 	echo "copied wmconfig";
- 	
--	cp data/menu/* ~/.sapphire/menu
-+	cp $DATADIR/menu/* ~/.sapphire/menu
- 	
- 	echo "copied menu";
+ 	echo "configuration files were copied to ~/.sapphire/wmconfig";	
+ fi
  
diff --git a/x11-wm/sapphire/files/patch-ad b/x11-wm/sapphire/files/patch-ad
new file mode 100644
index 000000000000..233546bd5bd5
--- /dev/null
+++ b/x11-wm/sapphire/files/patch-ad
@@ -0,0 +1,28 @@
+--- 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 @@
+ 
+ 	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 (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 (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/pkg-descr b/x11-wm/sapphire/pkg-descr
index e90ddbc44be9..e69024c5a41d 100644
--- a/x11-wm/sapphire/pkg-descr
+++ b/x11-wm/sapphire/pkg-descr
@@ -1,5 +1,8 @@
-Sapphire is a small window manager based on aewm.  Windows can be
-rolled up or hidden.  Programs can be run from a menu.
+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".
 
 WWW: http://sapphire.sourceforge.net/
 
diff --git a/x11-wm/sapphire/pkg-message b/x11-wm/sapphire/pkg-message
new file mode 100644
index 000000000000..ca115ab0d4c1
--- /dev/null
+++ b/x11-wm/sapphire/pkg-message
@@ -0,0 +1,3 @@
+
+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 f0680431f0f0..c0280c18760c 100644
--- a/x11-wm/sapphire/pkg-plist
+++ b/x11-wm/sapphire/pkg-plist
@@ -1,12 +1,37 @@
 bin/sapphire
 bin/sapphire.inst
-share/sapphire/README
+share/doc/sapphire/README
 share/sapphire/menu/default
-share/sapphire/themes/darkblue
-share/sapphire/themes/default
-share/sapphire/themes/slate
+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/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/sapphire/wmconfig
-@dirrm share/sapphire/themes
+@dirrm share/doc/sapphire
 @dirrm share/sapphire/menu
+@dirrm share/sapphire/themes/backgrounds
+@dirrm share/sapphire/themes
+@dirrm share/sapphire/wmconfig
 @dirrm share/sapphire