From c7fd79535217004613662a63541e62df4fe93d58 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@apollo.backplane.com>
Date: Mon, 25 Oct 2010 13:46:13 -0700
Subject: [PATCH] nrelease - gui build adjustments

* Remove packages that failed to build.  Unfortunately rxvt was one of them.
  Note that I did some manual build hacks to other packages to build
  which aren't committed to pkgsrc.

* Fix size calculation for usb disk img.

* Adjust fluxbox menu firefox3->firefox and urxvt->xterm.
---
 nrelease/Makefile               | 20 +++++++++++++-------
 nrelease/gui/root/.fluxbox/menu |  4 ++--
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/nrelease/Makefile b/nrelease/Makefile
index 86f83193ade7..2fca0d82eb6d 100644
--- a/nrelease/Makefile
+++ b/nrelease/Makefile
@@ -103,6 +103,13 @@ OLD_PKGSRC_PACKAGES?=	cdrtools-2.01.01.27nb1 \
 REQ_ROOTSKELS=	${.CURDIR}/root
 ROOTSKELS?=	${REQ_ROOTSKELS}
 
+# LIST OF PACKAGES NOT INCLUDED DUE TO BUILD ISSUES:
+#	chat/pidgin		textproc/enchant dependency is broken
+#	x11/rxvt-unicode	broken configure
+#	net/nmap		tries to access openssl/md2.h which does not
+#				exist.
+#	sysutils/idesk		dying on link __sync_fetch_and_add_4
+#
 .if make(gui)
 ISOFILE?=		${ISODIR}/dfly-gui.iso
 IMGFILE?=		${ISODIR}/dfly-gui.img
@@ -117,11 +124,9 @@ PKGSRC_PACKAGES+=	meta-pkgs/modular-xorg-apps \
 			shells/zsh \
 			editors/emacs \
 			editors/vim \
-			chat/pidgin \
 			chat/irssi \
 			chat/xchat \
 			x11/modular-xorg-server \
-			x11/rxvt-unicode \
 			x11/eterm \
 			lang/perl5 \
 			editors/nano \
@@ -130,11 +135,9 @@ PKGSRC_PACKAGES+=	meta-pkgs/modular-xorg-apps \
 			archivers/zip \
 			security/sudo \
 			www/links-gui \
-			net/nmap \
 			net/wget \
 			fonts/terminus-font \
 			net/rsync \
-			sysutils/idesk \
 			time/asclock \
 			misc/screen
 ROOTSKELS+=		${.CURDIR}/gui
@@ -372,11 +375,14 @@ customizeiso:
 	${CHROOT_CMD} /etc/periodic/weekly/310.locate
 	umount ${ISOROOT}/dev
 
+	# no iso is generated for gui builds, just img.
+	#
 mkiso:
+.if !make(gui)
 	( cd ${ISOROOT}; ${PKGBIN_MKISOFS} -b boot/cdboot -no-emul-boot \
 		-R -J -o ${ISOFILE} \
 		-V "DragonFly `${.CURDIR}/../tools/gitrev.sh | cut -c -22`" . )
-
+.endif
 
 mkimg:
 	if [ ! -d ${IMGMNT} ]; then mkdir -p ${IMGMNT}; fi
@@ -389,9 +395,9 @@ mkimg:
 .else
 	@echo "STEP: determine required image size in 1GB steps"
 	sz=`du -ck ${ISOROOT} | tail -n 1 | cut -f 1`;			\
-	    sz=`bc -e "(($${sz}) * 1.15 + 999999999) / 1000000000" -equit | \
+	    sz=`bc -e "(($${sz}) * 1.15 + 999999) / 1000000" -equit | \
 	    cut -f1 -d.`;						\
-	    sz=`bc -e "(($${sz}) * 976)" -equit | cut -f1 -d.`;		\
+	    sz=`bc -e "(($${sz}) * 953)" -equit | cut -f1 -d.`;		\
 	    rm -f ${IMGFILE};						\
 	    truncate -s $${sz}M ${IMGFILE};
 .endif
diff --git a/nrelease/gui/root/.fluxbox/menu b/nrelease/gui/root/.fluxbox/menu
index 0497b1fea0aa..485c0691d1ec 100644
--- a/nrelease/gui/root/.fluxbox/menu
+++ b/nrelease/gui/root/.fluxbox/menu
@@ -15,8 +15,8 @@
 #   you can change the menu name in .fluxbox/init to:
 #     session.menuFile: /home/you/.fluxbox/my-menu
 [begin] ()
-	[exec] (Terminal) {urxvt} <~/.fluxbox/icons/terminal.png>
-	[exec] (Firefox) {firefox3} <~/.fluxbox/icons/firefox.png>
+	[exec] (Terminal) {xterm} <~/.fluxbox/icons/terminal.png>
+	[exec] (Firefox) {firefox} <~/.fluxbox/icons/firefox.png>
 	[exec] (Pidgin) {pidgin} <~/.fluxbox/icons/pidgin.png>
 	[exec] (Xchat) {xchat} <~/.fluxbox/icons/xchat.png>
     [exec] (xpdf) {xpdf} <~/.fluxbox/icons/xpdf.png>