Merge branch 'xorg-modular' of /home/sandalle/scm/git/smgl/grimoire/ into xorg-modular

Remember kids, make sure your branch is up-to-date *before* you do a bunch of
work on it. :(

Conflicts:

	ChangeLog
	audio-creation/qsynth/HISTORY
	audio-creation/rosegarden/HISTORY
	audio-drivers/nas/BUILD
	audio-drivers/nas/HISTORY
	audio-drivers/pulseaudio/HISTORY
	audio-soft/qjackctl/DEPENDS
	audio-soft/qjackctl/HISTORY
	chat-im/gajim/DEPENDS
	chat-im/gajim/HISTORY
	devel/gambas2/HISTORY
	devel/tk/HISTORY
	display/directfb/HISTORY
	display/qingy/HISTORY
	e/e17/DEPENDS
	e/e17/HISTORY
	e/e_module-bling/HISTORY
	e/ecore/DEPENDS
	e/ecore/HISTORY
	e/evas/DEPENDS
	e/evas/HISTORY
	e/imlib2/HISTORY
	editors/lyx/HISTORY
	editors/openoffice/HISTORY
	editors/vim/HISTORY
	gnome2-apps/gthumb2/HISTORY
	gnome2-libs/java-access-bridge/HISTORY
	gnome2-libs/libxklavier/HISTORY
	gnome2-libs/pango/HISTORY
	graphics-libs/cegui/DEPENDS
	graphics-libs/cegui/HISTORY
	graphics-libs/cimg/HISTORY
	graphics-libs/devil/HISTORY
	graphics-libs/freeglut/DEPENDS
	graphics-libs/freeglut/HISTORY
	graphics-libs/freetype1/HISTORY
	graphics-libs/mesalib/HISTORY
	graphics-libs/mesalib/PRE_BUILD
	graphics-libs/vips/HISTORY
	graphics/fontforge/HISTORY
	graphics/freewrl/HISTORY
	graphics/imagemagick/HISTORY
	graphics/mesademos/HISTORY
	graphics/ploticus/HISTORY
	haskell/haskell-x11/HISTORY
	http/elinks/HISTORY
	http/links-twibright/HISTORY
	http/seamonkey/HISTORY
	http/xulrunner/HISTORY
	kde-apps/kid3/HISTORY
	kde-core/kdebase/HISTORY
	kde4/HISTORY
	kde4/KDE_DEPENDS
	kernels/synaptics/DEPENDS
	kernels/synaptics/HISTORY
	libs/sdl/HISTORY
	mail/exim/HISTORY
	mobile/gnokii/HISTORY
	mobile/gpsd/DEPENDS
	mobile/gpsd/HISTORY
	perl-cpan/perl-gd/HISTORY
	perl-cpan/perl-tk/HISTORY
	php-pear/php-dev/HISTORY
	php-pear/php/HISTORY
	php-pear/php4/HISTORY
	printer/ghostscript/HISTORY
	science-libs/vtk/HISTORY
	science/xaos/HISTORY
	shell-term-fm/mc/HISTORY
	shell-term-fm/mlterm/HISTORY
	shell-term-fm/rxvt-unicode/HISTORY
	shell-term-fm/worker/DEPENDS
	shell-term-fm/worker/HISTORY
	shell-term-fm/x3270/HISTORY
	shell-term-fm/yeahconsole/HISTORY
	utils/beagle/HISTORY
	utils/dbus/DEPENDS
	utils/dbus/HISTORY
	utils/gnuplot/HISTORY
	utils/sunbird/HISTORY
	utils/xen-tools/HISTORY
	video-libs/gst-plugins-base/HISTORY
	video-libs/gst-plugins-good/HISTORY
	video-libs/xine-lib/HISTORY
	video/mplayer/DEPENDS
	video/mplayer/HISTORY
	video/transcode/HISTORY
	video/xvattr/HISTORY
	windowmanagers/aewm++/HISTORY
	windowmanagers/dwm/HISTORY
	windowmanagers/evilwm/HISTORY
	windowmanagers/fluxbox/HISTORY
	windowmanagers/fvwm/HISTORY
	windowmanagers/icewm/DEPENDS
	windowmanagers/icewm/HISTORY
	windowmanagers/ion3/DEPENDS
	windowmanagers/ion3/HISTORY
	windowmanagers/kahakai/DEPENDS
	windowmanagers/kahakai/HISTORY
	windowmanagers/larswm/HISTORY
	windowmanagers/openbox/HISTORY
	windowmanagers/papuawm/DEPENDS
	windowmanagers/papuawm/HISTORY
	windowmanagers/pekwm/HISTORY
	windowmanagers/pwm/HISTORY
	windowmanagers/windowlab/HISTORY
	windowmanagers/windowmaker/HISTORY
	windowmanagers/wm2/HISTORY
	windowmanagers/wmi/DEPENDS
	windowmanagers/wmi/HISTORY
	windowmanagers/wmii/DEPENDS
	windowmanagers/wmii/HISTORY
	wm-addons/dzen2/HISTORY
	wm-addons/twin/HISTORY
	x11-libs/cairo/HISTORY
	x11-libs/dri/HISTORY
	x11-libs/wine/DEPENDS
	x11-libs/wine/HISTORY
	x11-toolkits/fltk/HISTORY
	x11-toolkits/fox/HISTORY
	x11-toolkits/gtk+2/HISTORY
	x11-toolkits/nucleo/HISTORY
	x11-toolkits/openmotif/DEPENDS
	x11-toolkits/openmotif/HISTORY
	x11-toolkits/qt4/HISTORY
	x11-toolkits/wxgtk/HISTORY
	x11/conky/HISTORY
	x11/fbpanel/HISTORY
	x11/gkrellm2/HISTORY
	x11/vnc/DEPENDS
	x11/vnc/HISTORY
	x11/xcompmgr/DEPENDS
	x11/xcompmgr/HISTORY
	x11/xdaliclock/HISTORY
	x11/xosview/HISTORY
	xfce/libxfce4mcs/DEPENDS
	xfce/libxfce4mcs/HISTORY
	xfce/xfce4-profile/DEPENDS
	xfce/xfce4-profile/HISTORY
	xfce/xfwm4/HISTORY

10 files changed, 34 insertions, 5 deletions

diff --git a/audio-drivers/nas/BUILD b/audio-drivers/nas/BUILD
index 70585a34df..aae29ce4e6 100755
--- a/audio-drivers/nas/BUILD
+++ b/audio-drivers/nas/BUILD
@@ -1 +1,7 @@
 make World
+
+if [[ "$NAS_STARTSERVER" = 'y' ]] ; then
+  make WORLDOPTS='-k CDEBUGFLAGS="$(CDEBUGFLAGS) -DSTARTSERVER"' World
+else
+  make World
+fi
diff --git a/audio-drivers/nas/CONFIGURE b/audio-drivers/nas/CONFIGURE
new file mode 100755
index 0000000000..0b78ab9d75
--- /dev/null
+++ b/audio-drivers/nas/CONFIGURE
@@ -0,0 +1 @@
+config_query NAS_STARTSERVER "Do you want to have the libs autostart the server on localhost?" n
diff --git a/audio-drivers/nas/DEPENDS b/audio-drivers/nas/DEPENDS
index d389002233..7772ba036b 100755
--- a/audio-drivers/nas/DEPENDS
+++ b/audio-drivers/nas/DEPENDS
@@ -3,6 +3,15 @@ depends rman       &&
 
 if [[ "$(get_spell_provider xorg-server)" == "xorg-server" ]]; then
   depends gccmakedep &&
+  depends libxt &&
+  depends libsm &&
+  depends libice &&
+  depends libxext &&
+  depends libx11 &&
+  depends libxpm &&
+  depends libxp &&
+  depends libxmu &&
+  depends libxaw &&
   depends imake
 fi
 
diff --git a/audio-drivers/nas/DETAILS b/audio-drivers/nas/DETAILS
index b204210894..ea596f35a5 100755
--- a/audio-drivers/nas/DETAILS
+++ b/audio-drivers/nas/DETAILS
@@ -1,16 +1,15 @@
            SPELL=nas
 if [[ "$NAS_DEV" = "y" ]]; then
-         VERSION=1.8b
+         VERSION=1.9a
 else
-         VERSION=1.8
+         VERSION=1.9.1
 fi
           SOURCE=$SPELL-$VERSION.src.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=http://nas.codebrilliance.com/nas/$SOURCE
+   SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
         WEB_SITE=http://radscan.com/nas.html
          ENTERED=20030315
-         UPDATED=20050403
       LICENSE[0]=GPL
         KEYWORDS="drivers audio"
            SHORT='The Network Audio System (NAS)'
diff --git a/audio-drivers/nas/HISTORY b/audio-drivers/nas/HISTORY
index 5be208e95b..a02f0e04cb 100644
--- a/audio-drivers/nas/HISTORY
+++ b/audio-drivers/nas/HISTORY
@@ -2,6 +2,16 @@
 	* DEPENDS: Switch X11-SERVER to the one and only xorg-server
 	* PRE_BUILD, BUILD: xorg-server is the only provider of X11-SERVER
 
+2008-01-26 Ethan Grammatikidis <eekee57@fastmail.fm>
+	* init.d/nasd: fixed to work with monolithic or modular xorg
+
+2008-01-03 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
+	* DEPENDS: added missing dependencies #13343
+
+2008-01-03 Arjan Bouter <abouter@sourcemage.org
+	* DETAILS: version 1.9.1 and 1.9a
+	* CONFIGURE: added, optionally have the libs autostart the server
+
 2007-04-09 Arjan Bouter <abouter@sourcemage.org
 	* DETAILS: wrapped description line
 	* init.d/nasd: fixed nasd path
diff --git a/audio-drivers/nas/init.d/nasd b/audio-drivers/nas/init.d/nasd
index 482c236e7c..baee4b6dfd 100755
--- a/audio-drivers/nas/init.d/nasd
+++ b/audio-drivers/nas/init.d/nasd
@@ -1,6 +1,10 @@
 #!/bin/bash
 
-PROGRAM="/usr/bin/nasd"
+if [[ -x "/usr/bin/nasd" ]]; then
+	PROGRAM="/usr/bin/nasd"
+elif [[ -x "/usr/X11R6/bin/nasd" ]]; then
+	PROGRAM="/usr/X11R6/bin/nasd"
+fi
 RUNLEVEL=3
 NEEDS="+remote_fs alsa"
 
diff --git a/audio-drivers/nas/nas-1.8.src.tar.gz.sig b/audio-drivers/nas/nas-1.8.src.tar.gz.sig
deleted file mode 100644
index ccad8f2de4..0000000000
--- a/audio-drivers/nas/nas-1.8.src.tar.gz.sig
+++ /dev/null
diff --git a/audio-drivers/nas/nas-1.8b.src.tar.gz.sig b/audio-drivers/nas/nas-1.8b.src.tar.gz.sig
deleted file mode 100644
index 2b78ebc505..0000000000
--- a/audio-drivers/nas/nas-1.8b.src.tar.gz.sig
+++ /dev/null
diff --git a/audio-drivers/nas/nas-1.9.1.src.tar.gz.sig b/audio-drivers/nas/nas-1.9.1.src.tar.gz.sig
new file mode 100644
index 0000000000..dd43b9cc5d
--- /dev/null
+++ b/audio-drivers/nas/nas-1.9.1.src.tar.gz.sig
diff --git a/audio-drivers/nas/nas-1.9a.src.tar.gz.sig b/audio-drivers/nas/nas-1.9a.src.tar.gz.sig
new file mode 100644
index 0000000000..b5401245b8
--- /dev/null
+++ b/audio-drivers/nas/nas-1.9a.src.tar.gz.sig