Fixed directory issues, .desktop issue, and fixed bug #67658 by patching nvu script.

7 files changed, 67 insertions, 21 deletions

diff --git a/net-www/nvu/ChangeLog b/net-www/nvu/ChangeLog
index 2e5409a6e21c..afb846d9b790 100644
--- a/net-www/nvu/ChangeLog
+++ b/net-www/nvu/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/nvu
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/nvu/ChangeLog,v 1.3 2004/10/15 05:13:57 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/nvu/ChangeLog,v 1.4 2004/10/16 13:16:31 chriswhite Exp $
+
+  16 Oct 2004; Chris White <chriswhite@gentoo.org> files/mozconfig,
+  +files/nvu-0.50-dir.patch, +files/nvu-0.50-nvu.patch, nvu-0.50.ebuild:
+  Fixed directory issues, .desktop issue, and fixed bug #67658 by patching nvu
+  script.
 
   15 Oct 2004; Chris White <chriswhite@gentoo.org> -files/.mozconfig,
   +files/mozconfig, nvu-0.50.ebuild:
diff --git a/net-www/nvu/Manifest b/net-www/nvu/Manifest
index 906cc546d6d4..0db625b38571 100644
--- a/net-www/nvu/Manifest
+++ b/net-www/nvu/Manifest
@@ -1,7 +1,8 @@
-MD5 7bb403551957770d884b85124878cf97 nvu-0.50.ebuild 1219
+MD5 211f0c620bc32b0c7aed707f67d0d650 nvu-0.50.ebuild 1344
 MD5 61e0760385f6cbd59f2e755773e22932 metadata.xml 226
 MD5 e8b3cf86d9c0f7b4a077aeb547dc8991 ChangeLog 992
 MD5 f04489cb980dbc4f22e78024f3e611e0 files/digest-nvu-0.50 71
-MD5 aae073cc843ae213edb20559a512ee71 files/nvu-0.50-prefix.patch 331
+MD5 7880f1109c0f8a9df0830238e70b0d62 files/nvu-0.50-nvu.patch 674
 MD5 4f757ecfc69252df6ebc3c62bb4713f1 files/nvu.desktop 182
-MD5 804d8ace1834e359837a61cd14b800ae files/mozconfig 2167
+MD5 73b0f49343fb2c309bdd2721ab8a4012 files/mozconfig 2130
+MD5 841f7a0a89c5d8be3841444ce2dd0b85 files/nvu-0.50-dir.patch 713
diff --git a/net-www/nvu/files/mozconfig b/net-www/nvu/files/mozconfig
index 152ff2522efc..ae81dc8f0264 100644
--- a/net-www/nvu/files/mozconfig
+++ b/net-www/nvu/files/mozconfig
@@ -30,7 +30,7 @@ ac_add_options --disable-debug
 
 # You may need to uncomment and edit that line. On Linspire,
 # just uncomment it
-#ac_add_options --with-default-mozilla-five-home=/usr/lib/mozilla
+ac_add_options --with-default-mozilla-five-home=/usr/lib/nvu
 
 # You probably have nothing to change below that line
 ac_add_options  --disable-svg
@@ -59,4 +59,4 @@ ac_add_options  --enable-freetype2
 ac_add_options  --enable-toolkit=gtk2
 ac_add_options  --enable-default-toolkit=gtk2
 ac_add_options  --enable-xft
-ac_add_options  --with-default-mozilla-five-home=/usr/lib/nvu
+ac_add_options  --prefix=/usr
diff --git a/net-www/nvu/files/nvu-0.50-dir.patch b/net-www/nvu/files/nvu-0.50-dir.patch
new file mode 100644
index 000000000000..4720de24c5d5
--- /dev/null
+++ b/net-www/nvu/files/nvu-0.50-dir.patch
@@ -0,0 +1,21 @@
+--- config/autoconf.mk.in_old	2004-10-16 05:22:43.345006816 +0900
++++ config/autoconf.mk.in	2004-10-16 05:23:52.239533256 +0900
+@@ -31,14 +31,14 @@
+ prefix		= @prefix@
+ exec_prefix	= @exec_prefix@
+ bindir		= @bindir@
+-includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++includedir	= @includedir@/$(MOZ_APP_NAME)
+ libdir		= @libdir@
+ datadir		= @datadir@
+ mandir		= @mandir@
+-idldir		= @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++idldir		= @datadir@/idl/$(MOZ_APP_NAME)
+ 
+-mozappdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-mredir		= $(libdir)/mre/mre-$(MOZ_APP_VERSION)
++mozappdir	= $(libdir)/$(MOZ_APP_NAME)
++mredir		= $(libdir)/mre/mre
+ mrelibdir	= $(mredir)/lib
+ 
+ DIST		= $(DEPTH)/dist
diff --git a/net-www/nvu/files/nvu-0.50-nvu.patch b/net-www/nvu/files/nvu-0.50-nvu.patch
new file mode 100644
index 000000000000..636607062835
--- /dev/null
+++ b/net-www/nvu/files/nvu-0.50-nvu.patch
@@ -0,0 +1,26 @@
+--- composer/app/nvu_old	2004-10-16 03:25:35.694372104 +0900
++++ composer/app/nvu	2004-10-16 03:25:16.489291720 +0900
+@@ -35,10 +35,11 @@
+ moz_libdir=/usr/lib/nvu
+ MRE_HOME=/usr/lib/mre/mre
+ 
++# no, don't honor it, that breaks stuff :) - Chris
+ # honor MOZILLA_FIVE_HOME if it's there
+-if [ -n "$MOZILLA_FIVE_HOME" ] ; then
+-  dist_bin="$MOZILLA_FIVE_HOME"
+-else
++#if [ -n "$MOZILLA_FIVE_HOME" ] ; then
++#  dist_bin="$MOZILLA_FIVE_HOME"
++#else
+   # Use run-mozilla.sh in the current dir if it exists
+   # If not, then start resolving symlinks until we find run-mozilla.sh
+   found=0
+@@ -77,7 +78,7 @@
+       exit 1
+     fi
+   fi
+-fi
++#fi
+ 
+ script_args=""
+ moreargs="-edit"
diff --git a/net-www/nvu/files/nvu-0.50-prefix.patch b/net-www/nvu/files/nvu-0.50-prefix.patch
deleted file mode 100644
index bd22cfc88d53..000000000000
--- a/net-www/nvu/files/nvu-0.50-prefix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure_old	2004-10-14 18:25:24.851365664 +0900
-+++ configure	2004-10-14 18:25:31.244393776 +0900
-@@ -14,7 +14,7 @@
- 
- # Defaults:
- ac_help=
--ac_default_prefix=/usr/local
-+ac_default_prefix=/usr
- # Any additions from configure.in:
- ac_help="$ac_help
-   --with-macos-sdk=dir   Location of platform SDK to use (Mac OS X only)"
diff --git a/net-www/nvu/nvu-0.50.ebuild b/net-www/nvu/nvu-0.50.ebuild
index ec662fbef5ac..48202d5ec6b6 100644
--- a/net-www/nvu/nvu-0.50.ebuild
+++ b/net-www/nvu/nvu-0.50.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/nvu/nvu-0.50.ebuild,v 1.3 2004/10/15 05:13:57 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/nvu/nvu-0.50.ebuild,v 1.4 2004/10/16 13:16:31 chriswhite Exp $
 
 inherit eutils mozilla flag-o-matic
 
@@ -24,9 +24,9 @@ src_compile() {
 	# has some quirks... just copy the darn thing over :) - Chris
 	cp ${FILESDIR}/mozconfig ${S}/.mozconfig
 
-	# It "sort of" has a standard configure system
-	# Here's how I fix the prefix issue. - Chris
-	epatch ${FILESDIR}/${P}-prefix.patch
+	# Fix those darn directories!  Make something more "standard"
+	# That can extend to future versions with much more ease. - Chris
+	epatch ${FILESDIR}/${P}-dir.patch
 
 	# The build system is a weeee bit sensitive to naughty -O flags.
 	# filter them out and let the build system figure out what
@@ -37,6 +37,10 @@ src_compile() {
 }
 
 src_install() {
+
+	# patch the final nvu binary to workaround bug #67658
+	epatch ${FILESDIR}/${P}-nvu.patch
+
 	make -f client.mk DESTDIR=${D} install || die
 
 	#menu entry for gnome/kde