Add additional theme distributed by the author along with login.app itself and

make it default theme.

5 files changed, 43 insertions, 5 deletions

diff --git a/x11/login.app/Makefile b/x11/login.app/Makefile
index 034002774e0b..bde677be1d22 100644
--- a/x11/login.app/Makefile
+++ b/x11/login.app/Makefile
@@ -8,14 +8,18 @@
 PORTNAME=	login.app
 PORTVERSION= 	2.0.0.a7
 CATEGORIES=	x11 windowmaker
-MASTER_SITES=	http://wm.current.nu/files/Login.app/
-DISTNAME=	Login.app-${PORTVERSION:S/.a/-Alpha-/}
+MASTER_SITES=	http://wm.current.nu/files/Login.app/ \
+		http://wm.current.nu/files/Login.app/Themes/
+DISTFILES=	Login.app-${PORTVERSION:S/.a/-Alpha-/}${EXTRACT_SUFX} \
+		Drone${EXTRACT_SUFX}
 
 MAINTAINER=	sobomax@FreeBSD.org
 
 LIB_DEPENDS=	wraster.3:${PORTSDIR}/x11-wm/windowmaker \
 		PropList.2:${PORTSDIR}/devel/libPropList
 
+WRKSRC=		${WRKDIR}/Login.app-${PORTVERSION:S/.a/-Alpha-/}
+
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 MAKE_ENV=	MKDIR="${MKDIR}"
@@ -28,4 +32,8 @@ post-configure:
 		Scripts/Login.root Scripts/Logout.root Scripts/Startup \
 		Preferences config.h
 
+post-install:
+	@(cd ${WRKDIR} && ${TAR} --exclude "*.orig" -c -f - Drone) \
+		| (cd ${PREFIX}/GNUstep/Apps/Login.app/Themes && ${TAR} --unlink -x -f -)
+
 .include <bsd.port.mk>
diff --git a/x11/login.app/distinfo b/x11/login.app/distinfo
index ddf6ca4b89cc..3811ef4487c4 100644
--- a/x11/login.app/distinfo
+++ b/x11/login.app/distinfo
@@ -1 +1,2 @@
 MD5 (Login.app-2.0.0-Alpha-7.tar.gz) = 97101446a0fe23e7b528160290126b9e
+MD5 (Drone.tar.gz) = 5dd4a22bd23ffe8d66a3a86fb70e502b
diff --git a/x11/login.app/files/patch-af b/x11/login.app/files/patch-af
index 740325e78c36..ef6c3218143a 100644
--- a/x11/login.app/files/patch-af
+++ b/x11/login.app/files/patch-af
@@ -12,7 +12,7 @@
 -  XServer = "/usr/X11R6/bin/X -nolisten tcp";
 -  Theme = "Linux";
 +  XServer = "%%X11BASE%%/bin/X -nolisten tcp";
-+  Theme = "GNUstep";
++  Theme = "Drone";
  
    DisableWelcomeMessage = Yes;
    DisableUserShutdown = No;
diff --git a/x11/login.app/files/patch-aq b/x11/login.app/files/patch-aq
new file mode 100644
index 000000000000..221a46877c86
--- /dev/null
+++ b/x11/login.app/files/patch-aq
@@ -0,0 +1,17 @@
+--- ../Drone/Settings	2000/12/14 09:12:17	1.1
++++ ../Drone/Settings	2000/12/14 09:12:54
+@@ -15,12 +15,12 @@
+ 
+   MessagePosition = "205, 280";
+   MessageJustification = Center;
+-  MessageFont = "-*-utopia-regular-*-*-*-18-*-*-*-*-*-*-*";
++  MessageFont = "-*-utopia-regular-*-*-*-19-*-*-*-*-*-*-*";
+   MessageColor = "grey20";
+ 
+   HostnamePosition = "203, 249";
+   HostnameJustification = center;
+-  HostnameFont = "-*-utopia-regular-*-*-*-18-*-*-*-*-*-*-*";
++  HostnameFont = "-*-utopia-regular-*-*-*-19-*-*-*-*-*-*-*";
+   HostnameColor = "grey30";
+ 
+   InputFont = "-*-helvetica-medium-r-*-*-18-*-*-*-*-*-*-*";
diff --git a/x11/login.app/pkg-plist b/x11/login.app/pkg-plist
index 7da203e603c0..67049e7f8fab 100644
--- a/x11/login.app/pkg-plist
+++ b/x11/login.app/pkg-plist
@@ -7,6 +7,17 @@ GNUstep/Apps/Login.app/Scripts/PowerOff
 GNUstep/Apps/Login.app/Scripts/Restart
 GNUstep/Apps/Login.app/Scripts/Startup
 GNUstep/Apps/Login.app/Scripts/Suspend
+GNUstep/Apps/Login.app/Themes/Drone/README
+GNUstep/Apps/Login.app/Themes/Drone/Settings
+GNUstep/Apps/Login.app/Themes/Drone/fieldlabels1.png
+GNUstep/Apps/Login.app/Themes/Drone/inputfield2.png
+GNUstep/Apps/Login.app/Themes/Drone/inputfield3.png
+GNUstep/Apps/Login.app/Themes/Drone/panel3.png
+GNUstep/Apps/Login.app/Themes/Drone/powerbuttondown2.png
+GNUstep/Apps/Login.app/Themes/Drone/powerbuttonup2.png
+GNUstep/Apps/Login.app/Themes/Drone/restartbuttondown2.png
+GNUstep/Apps/Login.app/Themes/Drone/restartbuttonup2.png
+GNUstep/Apps/Login.app/Themes/Drone/stop1.png
 GNUstep/Apps/Login.app/Themes/GNUstep/Settings
 GNUstep/Apps/Login.app/Themes/GNUstep/fieldlabels.tiff
 GNUstep/Apps/Login.app/Themes/GNUstep/inputfield.tiff
@@ -25,8 +36,9 @@ GNUstep/Apps/Login.app/Themes/Linux/powerbuttonup.tiff
 GNUstep/Apps/Login.app/Themes/Linux/restartbuttondown.tiff
 GNUstep/Apps/Login.app/Themes/Linux/restartbuttonup.tiff
 GNUstep/Apps/Login.app/Themes/Linux/stop.tiff
-@dirrm GNUstep/Apps/Login.app/Scripts
-@dirrm GNUstep/Apps/Login.app/Themes/GNUstep
 @dirrm GNUstep/Apps/Login.app/Themes/Linux
+@dirrm GNUstep/Apps/Login.app/Themes/GNUstep
+@dirrm GNUstep/Apps/Login.app/Themes/Drone
 @dirrm GNUstep/Apps/Login.app/Themes
+@dirrm GNUstep/Apps/Login.app/Scripts
 @dirrm GNUstep/Apps/Login.app