Changed ns_conf to /usr/share/aolserver/include and fixed up Makefiles in preperation...

diff --git a/www-servers/aolserver/ChangeLog b/www-servers/aolserver/ChangeLog
index a2272ab04c6c8fa37fb7e6afa2293857687cb498..54db4df8d514b52fceb97cd34fea2f5da346648d 100644 (file)
--- a/www-servers/aolserver/ChangeLog
+++ b/www-servers/aolserver/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-servers/aolserver
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/aolserver/ChangeLog,v 1.2 2004/12/19 18:07:07 swegener Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/aolserver/ChangeLog,v 1.3 2005/01/05 04:18:56 port001 Exp $
+
+  05 Jan 2005; Ian Leitch <port001@gentoo.org> files/4.0.8/Makefile.global,
+  aolserver-4.0.8.ebuild:
+  Changed ns_conf to /usr/share/aolserver/include and fixed up Makefiles in
+  preperation for an aolserver eclass
 
   19 Dec 2004; Sven Wegener <swegener@gentoo.org> aolserver-4.0.8.ebuild:
   Fixed invalid atoms in *DEPEND.

diff --git a/www-servers/aolserver/Manifest b/www-servers/aolserver/Manifest
index 1491dfe730323faddd66f7ffe83000b49de5b9bf..4cea00ca6800b127609f83670cff6615f9273d1a 100644 (file)
--- a/www-servers/aolserver/Manifest
+++ b/www-servers/aolserver/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 64da22ec0d9cbd39ef22da4f3cc02c8c aolserver-4.0.8.ebuild 4646
-MD5 47d6a39a90c49051b05d29871a03462e ChangeLog 794
+MD5 1fe50c809db2eb57c9590b7f6f703430 aolserver-4.0.8.ebuild 4788
+MD5 17845c5748ee6c4705bf45cc86538dc1 ChangeLog 1010
 MD5 c47b641a14c525426948f6d60a4f6fae metadata.xml 403
 MD5 c1fe74d26475526223d11f1768983faa files/aolserver-4.0.8-nptl.patch 398
 MD5 fbf53d85d098f4b3782760c5c8b90b63 files/digest-aolserver-4.0.8 71
 MD5 ef896c9186113d2882eb14aeb7a0e0a6 files/4.0.8/aolserver.init 475
-MD5 b3cffc02111c3f39b41c85e69163cdca files/4.0.8/Makefile.global 109
+MD5 188da2cbedb4c37b6932a413fd21fead files/4.0.8/Makefile.global 127
 MD5 13793c3ec7d4fd46a2d4933030862abe files/4.0.8/config.tcl 16784
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
+Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFBxcNVI1lqEGTUzyQRAuAMAJ93JfjwOycDPAtN82TJI78fGR5WxgCgzVDi
-VPAVBlJ56zrE3t8f0vAiaDs=
-=3jXj
+iD8DBQFB22q7UxGWrFYv8KQRAk8yAKDBvdI/pjDuIZVJLS1H3j1BbCndHQCdHiua
+oTDyyRCxGnslVoZQcungTJs=
+=WMJ1
 -----END PGP SIGNATURE-----

diff --git a/www-servers/aolserver/aolserver-4.0.8.ebuild b/www-servers/aolserver/aolserver-4.0.8.ebuild
index 5919c05ac188879433611a90d6318b2ddb3d7500..f90581c789487db4b866a3e2f91305676e389092 100644 (file)
--- a/www-servers/aolserver/aolserver-4.0.8.ebuild
+++ b/www-servers/aolserver/aolserver-4.0.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/aolserver/aolserver-4.0.8.ebuild,v 1.2 2004/12/19 18:07:07 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/aolserver/aolserver-4.0.8.ebuild,v 1.3 2005/01/05 04:18:56 port001 Exp $
 
 inherit eutils
 
@@ -24,7 +24,7 @@ ns_lib=/usr/lib/${PN}/lib
 ns_bin=/usr/lib/${PN}/bin
 ns_mod=/usr/lib/${PN}/modules
 ns_data=/usr/share/${PN}
-ns_conf=/usr/share/${PN}/config
+ns_conf=/usr/share/${PN}/include
 ns_doc=/usr/share/doc/${P}
 ns_include=/usr/include/${PN}
 ns_pid=/var/run/${PN}
@@ -187,10 +187,12 @@ src_install () {
        doins sample-config.tcl
 
        insinto ${ns_conf}
-       newins ${FILESDIR}/${PV}/Makefile.global Makefile.global
+       doins ${FILESDIR}/${PV}/Makefile.global
        newins ${S}/include/Makefile.global Makefile.global.orig
        doins ${S}/include/Makefile.build
+       dosed "s:../include:${ns_conf}:g" /usr/share/aolserver/include/Makefile.build
        doins ${S}/include/Makefile.module
+       dosed "s:../include:${ns_conf}:g" /usr/share/aolserver/include/Makefile.module
 
        insinto ${ns_etc}
        newins ${FILESDIR}/${PV}/config.tcl aolserver.tcl

diff --git a/www-servers/aolserver/files/4.0.8/Makefile.global b/www-servers/aolserver/files/4.0.8/Makefile.global
index 7079b960ad1a0af1903c68b29b865fdbb2704f5b..033164670167b4a46fce7b94b2e1d71814ea645d 100644 (file)
--- a/www-servers/aolserver/files/4.0.8/Makefile.global
+++ b/www-servers/aolserver/files/4.0.8/Makefile.global
@@ -1,4 +1,4 @@
-include ../include/Makefile.global.orig
+include /usr/share/aolserver/include/Makefile.global.orig
 
 LDFLAGS        += -L/usr/lib/aolserver/lib
 INCDIR = /usr/include/aolserver