From: Jeremy Huddleston <eradicator@gentoo.org>
Date: Tue, 23 Nov 2004 03:12:23 +0000 (+0000)
Subject: Fix missing includes to close bug #71355.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a58f0ceb95f3042a6fe5c79ae9f150ad391eaa87;p=gentoo.git

Fix missing includes to close bug #71355.
---

diff --git a/media-libs/nas/ChangeLog b/media-libs/nas/ChangeLog
index 6bc263d057e2..b05871e4895d 100644
--- a/media-libs/nas/ChangeLog
+++ b/media-libs/nas/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/nas
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/ChangeLog,v 1.34 2004/11/17 06:00:08 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/ChangeLog,v 1.35 2004/11/23 03:12:23 eradicator Exp $
+
+*nas-1.7-r1 (22 Nov 2004)
+
+  22 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/nas-1.7-header.patch, +nas-1.7-r1.ebuild:
+  Fix missing includes to close bug #71355.
 
 *nas-1.7 (16 Nov 2004)
 
diff --git a/media-libs/nas/Manifest b/media-libs/nas/Manifest
index eb2af705f30f..e78535405b76 100644
--- a/media-libs/nas/Manifest
+++ b/media-libs/nas/Manifest
@@ -5,20 +5,23 @@ MD5 044efcfdce6736c9e5e60bbc29e4b1fc nas-1.7.ebuild 1831
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 7ce8c01516ef911ec47a454856346e26 nas-1.5-r1.ebuild 1113
 MD5 002163cc6cfa0bf0a83c4f1c6d5e1607 nas-1.6.ebuild 1020
-MD5 936a11d0e3a2fcc12bd2bbd9ab4a9ce6 ChangeLog 4399
+MD5 2efa23404c64612f56c165e13fb1474a nas-1.7-r1.ebuild 1647
+MD5 40aef4410664e8f45e5db0807db76a61 ChangeLog 4579
 MD5 800bbe9718949a8e4f6bbca09ba27826 nas-1.6c-r2.ebuild 1824
 MD5 520a4d59a7e5ce53b6130d9e920c064c files/digest-nas-1.7 64
 MD5 ac506d33fb676e68c2a77d95d3f6027e files/digest-nas-1.5-r1 63
 MD5 4a7327fe2c6fba8c4315133a522358a3 files/digest-nas-1.6 64
+MD5 53c1b622336ab2a0dabb9da8e69f7f56 files/nas-1.7-header.patch 774
 MD5 f0200b3a05bd59ab92413ec1eee10a5b files/nas-1.5-libaudioMakefile.patch 300
 MD5 83023e52672dc59996f4f620563b072a files/nas.conf.d 235
 MD5 e533db5e64a7cf585a37091b49735c64 files/nas.init.d 569
 MD5 fa86b591efa17e2e000c996127a2c77f files/nas-1.6c-header.patch 264
 MD5 8d4c92b527f79724412d1d1a77631c14 files/digest-nas-1.6c-r2 65
+MD5 520a4d59a7e5ce53b6130d9e920c064c files/digest-nas-1.7-r1 64
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBmujzArHZZzCEUG0RAkwLAJoCy/wSsSHWK631yqwzjVUulVom4gCdHv47
-ROPT0A8mtuBsfR4UtHjFXCY=
-=FYJ+
+iD8DBQFBoqqjArHZZzCEUG0RAkJAAJ9GZDshUaPUNV+rgq/DCjfX930EIACbB9uM
+0tLu/WNPkOj0l2j1Fv0fRdg=
+=Vnlq
 -----END PGP SIGNATURE-----
diff --git a/media-libs/nas/files/digest-nas-1.7-r1 b/media-libs/nas/files/digest-nas-1.7-r1
new file mode 100644
index 000000000000..03723dcf4b59
--- /dev/null
+++ b/media-libs/nas/files/digest-nas-1.7-r1
@@ -0,0 +1 @@
+MD5 c9918e9c9c95d587a95b455bbabe3b49 nas-1.7.src.tar.gz 1288569
diff --git a/media-libs/nas/files/nas-1.7-header.patch b/media-libs/nas/files/nas-1.7-header.patch
new file mode 100644
index 000000000000..e697c334bb64
--- /dev/null
+++ b/media-libs/nas/files/nas-1.7-header.patch
@@ -0,0 +1,26 @@
+diff -Naur nas-1.7.orig/server/dia/main.c nas-1.7/server/dia/main.c
+--- nas-1.7.orig/server/dia/main.c	2004-11-22 19:05:15.391186001 -0800
++++ nas-1.7/server/dia/main.c	2004-11-22 19:04:02.640209930 -0800
+@@ -52,6 +52,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <audio/audio.h>
+ #include <audio/Aproto.h>
+ #include "NasConfig.h"
+diff -Naur nas-1.7.orig/server/os/connection.c nas-1.7/server/os/connection.c
+--- nas-1.7.orig/server/os/connection.c	2004-02-14 15:12:22.000000000 -0800
++++ nas-1.7/server/os/connection.c	2004-11-22 19:06:41.434964865 -0800
+@@ -79,7 +79,10 @@
+ #include <netdb.h>
+ #endif 
+ 
+-
++#include <stdio.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
++#include <arpa/inet.h>
+ 
+ #include <audio/audio.h>
+ #include <audio/Aproto.h>
diff --git a/media-libs/nas/nas-1.7-r1.ebuild b/media-libs/nas/nas-1.7-r1.ebuild
new file mode 100644
index 000000000000..f0f7251c5509
--- /dev/null
+++ b/media-libs/nas/nas-1.7-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/nas-1.7-r1.ebuild,v 1.1 2004/11/23 03:12:23 eradicator Exp $
+
+IUSE="static"
+
+inherit eutils
+
+DESCRIPTION="Network Audio System"
+HOMEPAGE="http://radscan.com/nas.html"
+SRC_URI="http://radscan.com/nas/${P}.src.tar.gz"
+
+SLOT="0"
+LICENSE="X11"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="virtual/x11"
+
+DEPEND="${RDEPEND}
+	sys-apps/sed"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-1.7-header.patch
+}
+
+src_compile() {
+	xmkmf
+	touch doc/man/lib/tmp.{_man,man}
+	CFLAGS="-O2 -ggdb" emake World || die
+}
+
+src_install () {
+	make DESTDIR=${D} install || die
+	make DESTDIR=${D} install.man || die
+
+	for i in ${D}/usr/X11R6/man/man?/*.?x
+	do
+		gzip -9 $i
+	done
+
+	dodoc BUGS BUILDNOTES FAQ HISTORY README RELEASE TODO
+	mv ${D}/usr/X11R6/lib/X11/doc/html ${D}/usr/share/doc/${P}/
+	rmdir ${D}/usr/X11R6/lib/X11/doc
+
+	# rename example nasd.conf.eg to nasd.conf and change it so that NAS
+	# doesn't change mixer's settings (inspired by Debian package):
+	mv ${D}/etc/nas/nasd.conf.eg ${D}/etc/nas/nasd.conf
+	dosed 's,\(MixerInit.*\)"\(.*\)",\1"no",' /etc/nas/nasd.conf
+
+	# Remove the static lib
+	use static || rm ${D}/usr/X11R6/lib/libaudio.a
+
+	insinto /etc/conf.d
+	newins ${FILESDIR}/nas.conf.d nas
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/nas.init.d nas
+}
+
+pkg_postinst() {
+	einfo "To enable NAS on boot you will have to add it to the"
+	einfo "default profile, issue the following command as root to do so."
+	einfo ""
+	einfo "rc-update add nas default"
+}