- Bring in FreeBSD/GNOME splashes for GNOME 2.10. We're including all

  submitted splashes. Franz Klammer's #2 is default splash for the FreeBSD
  port.  Original splash is installed too.

Glanced over by:	marcus


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3911 df743ca5-7f9a-e211-a948-0013205c9059

6 files changed, 44 insertions, 18 deletions

diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 5df6e759b..1f48df2e0 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -9,13 +9,13 @@ PORTNAME=	gnomesession
 PORTVERSION=	2.10.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME} \
-		http://people.FreeBSD.org/~marcus/:local \
-		${MASTER_SITE_LOCAL:S/$/:local/}
+		${MASTER_SITE_LOCAL:S/$/:local/} \
+		http://people.FreeBSD.org/~pav/:local
 MASTER_SITE_SUBDIR=	sources/gnome-session/2.10 \
-		    	marcus/:local
+		    	pav/:local
 DISTNAME=	gnome-session-${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		${SPLASH_IMG}:local
+		${SPLASHES}:local
 DIST_SUBDIR=	gnome2
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
@@ -35,13 +35,19 @@ MAN1=		gnome-session.1 gnome-smproxy.1 gnome-wm.1 \
 MAN5=		default.session.5
 GCONF_SCHEMAS=	gnome-session.schemas
 
-SPLASH_IMG=	gnome-splash28.png
+SPLASHES=	freebsd-splashes-gnome-2.10.tar
 
 post-extract:
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${SPLASH_IMG} ${WRKDIR}
+	cd ${WRKDIR} && ${TAR} xf ${DISTDIR}/${DIST_SUBDIR}/${SPLASHES}
 
 post-install:
-	${INSTALL_DATA} ${WRKDIR}/${SPLASH_IMG} \
+	${INSTALL_DATA} ${WRKSRC}/gnome-session/gnome-splash.png \
+		${PREFIX}/share/gnome/pixmaps/splash/original-gnome-splash.png
+	${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.10/franz_klammer-2.png \
 		${PREFIX}/share/gnome/pixmaps/splash/gnome-splash.png
+.for splash in adamw.png banana_flex.png franco_malatacca.jpg franz_klammer-1.png franz_klammer-3.png radek.png
+	${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.10/${splash} \
+		${PREFIX}/share/gnome/pixmaps/splash
+.endfor
 
 .include <bsd.port.mk>
diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo
index 2a9c117d3..5f305e45c 100644
--- a/x11/gnome-session/distinfo
+++ b/x11/gnome-session/distinfo
@@ -1,4 +1,4 @@
 MD5 (gnome2/gnome-session-2.10.0.tar.bz2) = cbeb2db49dac11bf8088e6b025265fff
 SIZE (gnome2/gnome-session-2.10.0.tar.bz2) = 796754
-MD5 (gnome2/gnome-splash28.png) = 2ac880af4ca6929a82f8b64912b95a55
-SIZE (gnome2/gnome-splash28.png) = 121715
+MD5 (gnome2/freebsd-splashes-gnome-2.10.tar) = 92cfd1945f9a48dd8df3981935e9ef34
+SIZE (gnome2/freebsd-splashes-gnome-2.10.tar) = 462336
diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist
index cb40fb45f..999c30043 100644
--- a/x11/gnome-session/pkg-plist
+++ b/x11/gnome-session/pkg-plist
@@ -7,7 +7,14 @@ bin/gnome-wm
 share/gnome/applications/session-properties.desktop
 share/gnome/default.session
 share/gnome/default.wm
+share/gnome/pixmaps/splash/adamw.png
+share/gnome/pixmaps/splash/banana_flex.png
+share/gnome/pixmaps/splash/franco_malatacca.jpg
+share/gnome/pixmaps/splash/franz_klammer-1.png
+share/gnome/pixmaps/splash/franz_klammer-3.png
 share/gnome/pixmaps/splash/gnome-splash.png
+share/gnome/pixmaps/splash/original-gnome-splash.png
+share/gnome/pixmaps/splash/radek.png
 share/locale/af/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/am/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-session-2.0.mo
diff --git a/x11/gnomesession/Makefile b/x11/gnomesession/Makefile
index 5df6e759b..1f48df2e0 100644
--- a/x11/gnomesession/Makefile
+++ b/x11/gnomesession/Makefile
@@ -9,13 +9,13 @@ PORTNAME=	gnomesession
 PORTVERSION=	2.10.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME} \
-		http://people.FreeBSD.org/~marcus/:local \
-		${MASTER_SITE_LOCAL:S/$/:local/}
+		${MASTER_SITE_LOCAL:S/$/:local/} \
+		http://people.FreeBSD.org/~pav/:local
 MASTER_SITE_SUBDIR=	sources/gnome-session/2.10 \
-		    	marcus/:local
+		    	pav/:local
 DISTNAME=	gnome-session-${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		${SPLASH_IMG}:local
+		${SPLASHES}:local
 DIST_SUBDIR=	gnome2
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
@@ -35,13 +35,19 @@ MAN1=		gnome-session.1 gnome-smproxy.1 gnome-wm.1 \
 MAN5=		default.session.5
 GCONF_SCHEMAS=	gnome-session.schemas
 
-SPLASH_IMG=	gnome-splash28.png
+SPLASHES=	freebsd-splashes-gnome-2.10.tar
 
 post-extract:
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${SPLASH_IMG} ${WRKDIR}
+	cd ${WRKDIR} && ${TAR} xf ${DISTDIR}/${DIST_SUBDIR}/${SPLASHES}
 
 post-install:
-	${INSTALL_DATA} ${WRKDIR}/${SPLASH_IMG} \
+	${INSTALL_DATA} ${WRKSRC}/gnome-session/gnome-splash.png \
+		${PREFIX}/share/gnome/pixmaps/splash/original-gnome-splash.png
+	${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.10/franz_klammer-2.png \
 		${PREFIX}/share/gnome/pixmaps/splash/gnome-splash.png
+.for splash in adamw.png banana_flex.png franco_malatacca.jpg franz_klammer-1.png franz_klammer-3.png radek.png
+	${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.10/${splash} \
+		${PREFIX}/share/gnome/pixmaps/splash
+.endfor
 
 .include <bsd.port.mk>
diff --git a/x11/gnomesession/distinfo b/x11/gnomesession/distinfo
index 2a9c117d3..5f305e45c 100644
--- a/x11/gnomesession/distinfo
+++ b/x11/gnomesession/distinfo
@@ -1,4 +1,4 @@
 MD5 (gnome2/gnome-session-2.10.0.tar.bz2) = cbeb2db49dac11bf8088e6b025265fff
 SIZE (gnome2/gnome-session-2.10.0.tar.bz2) = 796754
-MD5 (gnome2/gnome-splash28.png) = 2ac880af4ca6929a82f8b64912b95a55
-SIZE (gnome2/gnome-splash28.png) = 121715
+MD5 (gnome2/freebsd-splashes-gnome-2.10.tar) = 92cfd1945f9a48dd8df3981935e9ef34
+SIZE (gnome2/freebsd-splashes-gnome-2.10.tar) = 462336
diff --git a/x11/gnomesession/pkg-plist b/x11/gnomesession/pkg-plist
index cb40fb45f..999c30043 100644
--- a/x11/gnomesession/pkg-plist
+++ b/x11/gnomesession/pkg-plist
@@ -7,7 +7,14 @@ bin/gnome-wm
 share/gnome/applications/session-properties.desktop
 share/gnome/default.session
 share/gnome/default.wm
+share/gnome/pixmaps/splash/adamw.png
+share/gnome/pixmaps/splash/banana_flex.png
+share/gnome/pixmaps/splash/franco_malatacca.jpg
+share/gnome/pixmaps/splash/franz_klammer-1.png
+share/gnome/pixmaps/splash/franz_klammer-3.png
 share/gnome/pixmaps/splash/gnome-splash.png
+share/gnome/pixmaps/splash/original-gnome-splash.png
+share/gnome/pixmaps/splash/radek.png
 share/locale/af/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/am/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-session-2.0.mo