- Update to 1.1

PR:		ports/96435
Submitted by:	Matthew Holder <sixxgate@hotmail.com> (maintainer)

5 files changed, 19 insertions, 30 deletions

diff --git a/sysutils/graphicboot/Makefile b/sysutils/graphicboot/Makefile
index 2eac6a54c3e7..228613a1c791 100644
--- a/sysutils/graphicboot/Makefile
+++ b/sysutils/graphicboot/Makefile
@@ -6,27 +6,30 @@
 #
 
 PORTNAME=	graphicboot
-PORTVERSION=	1.0
-PORTREVISION=	1
+PORTVERSION=	1.1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://matt.sixxgate.com/files/
 
 MAINTAINER=	sixxgate@hotmail.com
 COMMENT=	Provides graphical X Window startup to FreeBSD during 'rc'
 
-RUN_DEPENDS=	xloadimage:${PORTSDIR}/x11/xloadimage
+BUILD_DEPENDS=	xloadimage:${PORTSDIR}/x11/xloadimage \
+		xrdb:${X_CLIENTS_PORT}
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
+USE_X_PREFIX=	yes
 USE_MOTIF=	yes
 USE_BZIP2=	yes
-USE_IMAKE=	yes
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
 
-MAN1=		graphicboot.1
+MAN8=		graphicboot.8 sendgbmsg.8
 MANCOMPRESSED=	yes
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500000
-BROKEN=		The graphical boot requires rcorder which is only on FreeBSD 5 or greater.
+IGNORE=		requires rcorder which is only on FreeBSD 5 or greater
 .endif
 
 post-install:
diff --git a/sysutils/graphicboot/distinfo b/sysutils/graphicboot/distinfo
index 897e2d5d3282..b5a45e4e19a2 100644
--- a/sysutils/graphicboot/distinfo
+++ b/sysutils/graphicboot/distinfo
@@ -1,3 +1,3 @@
-MD5 (graphicboot-1.0.tar.bz2) = 35f89a49e34ebebc094ff58726ce36af
-SHA256 (graphicboot-1.0.tar.bz2) = a5922e0ec6717f5f6b651a3c82f21b9a24f1c7353b3a052d3e43894a0beec519
-SIZE (graphicboot-1.0.tar.bz2) = 31131
+MD5 (graphicboot-1.1.tar.bz2) = e8176ac082523c9057f4f1e95794ceb4
+SHA256 (graphicboot-1.1.tar.bz2) = abcfa4b10073e4f7fafeff58bd3f93b80ce71c11037255e45a3a86c1a66ffca8
+SIZE (graphicboot-1.1.tar.bz2) = 102726
diff --git a/sysutils/graphicboot/files/patch-Imakefile b/sysutils/graphicboot/files/patch-Imakefile
deleted file mode 100644
index 1aee936e76cb..000000000000
--- a/sysutils/graphicboot/files/patch-Imakefile
+++ /dev/null
@@ -1,19 +0,0 @@
---- Imakefile.orig	Tue Apr 18 16:00:52 2006
-+++ Imakefile	Tue Apr 18 16:01:24 2006
-@@ -48,11 +48,11 @@
- ComplexProgramTarget(graphicboot)
- 
- install::
--	$(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) startgraphicboot $(RC_DDIR)/startgraphicboot
--	$(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) endgraphicboot $(RC_DDIR)/endgraphicboot
-+	$(INSTALL) $(INSTALLFLAGS) startgraphicboot $(RC_DDIR)/startgraphicboot
-+	$(INSTALL) $(INSTALLFLAGS) endgraphicboot $(RC_DDIR)/endgraphicboot
- 	$(MKDIRHIER) $(XBCONF)
--	$(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) Xsplash.jpg $(XBCONF)/Xsplash.jpg
--	$(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) Xresources $(XBCONF)/Xresources
--	$(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) xorg.conf $(XBCONF)/xorg.conf
-+	$(INSTALL) $(INSTALLFLAGS) Xsplash.jpg $(XBCONF)/Xsplash.jpg
-+	$(INSTALL) $(INSTALLFLAGS) Xresources $(XBCONF)/Xresources
-+	$(INSTALL) $(INSTALLFLAGS) xorg.conf $(XBCONF)/xorg.conf
- 	$(LN) -f $(DESTDIR)$(BINDIR)/$(XSERVERNAME) $(XBCONF)/Xserver
- 	chmod +x $(RC_DDIR)/startgraphicboot $(RC_DDIR)/endgraphicboot
diff --git a/sysutils/graphicboot/pkg-message b/sysutils/graphicboot/pkg-message
index 311f799e72a5..767a60206d26 100644
--- a/sysutils/graphicboot/pkg-message
+++ b/sysutils/graphicboot/pkg-message
@@ -5,11 +5,11 @@ file please test the port by running it in multi-user
 mode.  If you need to make any changes to the xorg.conf
 file, please remember to leave the resolution at 640x480.
 
-Please not that if you are using XDM or another display
+Please note that if you are using XDM or another display
 manager for graphical logon, please edit its startup
 script by adding the line at the beginning:
 
-	echo _XGB_EGB
+	sendgbmsg -e
 
 This will cause the graphicboot to end before the
 display manager starts.
diff --git a/sysutils/graphicboot/pkg-plist b/sysutils/graphicboot/pkg-plist
index 2b5297f32189..fc5019121264 100644
--- a/sysutils/graphicboot/pkg-plist
+++ b/sysutils/graphicboot/pkg-plist
@@ -1,4 +1,5 @@
 bin/graphicboot
+bin/sendgbmsg
 @cwd /etc/Xboot
 Xserver
 Xresources
@@ -9,3 +10,7 @@ Xsplash.jpg
 @cwd /etc/rc.d
 startgraphicboot
 endgraphicboot
+MSG.NETWORKING
+MSG.LOGIN
+MSG.DAEMON
+MSG.SERVER