3 files changed, 25 insertions, 40 deletions

diff --git a/mail/mahogany/Makefile b/mail/mahogany/Makefile
index a90caaa50794..32a0399fd52f 100644
--- a/mail/mahogany/Makefile
+++ b/mail/mahogany/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		mahogany
 PORTVERSION=		0.60
+PORTREVISION=		1
 CATEGORIES=		mail python
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	mahogany
@@ -22,6 +23,7 @@ BUILD_DEPENDS+=		latex2html:${PORTSDIR}/textproc/latex2html
 PYTHON_VERSION=		python1.5
 USE_AUTOCONF=		yes
 USE_GMAKE=		yes
+CONFIGURE_ENV+=		OSTYPE=${OPSYS}
 
 INSTALL_TARGET=		install_bin install_locale
 .if !defined(NOPORTDOCS)
diff --git a/mail/mahogany/files/patch-af b/mail/mahogany/files/patch-af
index 7e10a68fefdd..475fa258cd43 100644
--- a/mail/mahogany/files/patch-af
+++ b/mail/mahogany/files/patch-af
@@ -25,7 +25,7 @@
  \makeatletter
  
 --- doc/Makefile.sub.orig	Sat Sep 30 12:10:13 2000
-+++ doc/Makefile.sub	Sun Nov 12 17:12:52 2000
++++ doc/Makefile.sub	Thu Feb  1 12:44:15 2001
 @@ -3,12 +3,14 @@
  
  include ../../makeopts
@@ -50,7 +50,7 @@
 -	@$(RM) -r $(DIR)
 -	$(LATEX2HTML) -local_icons -debug $(DIR).htex
 -	cd $(DIR) && ../../../.src/extra/scripts/html2wxhelp > ../wxhelp.map
-+	$(LATEX2HTML) -dir /tmp/$(DIR) -local_icons -debug $(DIR).htex
++	$(LATEX2HTML) -mkdir -dir /tmp/$(DIR) -local_icons -debug $(DIR).htex
 +	cd /tmp/$(DIR) && $(HTML2WXHELP) > wxhelp.map
 +	@(cd /tmp; tar -cpf - ${DIR}) | tar -xf -
 +	@${RM} -r /tmp/$(DIR)
diff --git a/mail/mahogany/pkg-plist b/mail/mahogany/pkg-plist
index 94e0d9530ce9..c04e6919307a 100644
--- a/mail/mahogany/pkg-plist
+++ b/mail/mahogany/pkg-plist
@@ -159,28 +159,21 @@ share/doc/Mahogany/HackersGuide/IMG_PARAMS.db
 share/doc/Mahogany/HackersGuide/ORIG_MAP.db
 share/doc/Mahogany/HackersGuide/aux_preamble
 share/doc/Mahogany/HackersGuide/contents.pl
-share/doc/Mahogany/HackersGuide/contents_motif.png
+share/doc/Mahogany/HackersGuide/contents.png
 share/doc/Mahogany/HackersGuide/dependent
 share/doc/Mahogany/HackersGuide/depends_on
 share/doc/Mahogany/HackersGuide/env_style
 share/doc/Mahogany/HackersGuide/envstyles.db
 share/doc/Mahogany/HackersGuide/expanded.db
 share/doc/Mahogany/HackersGuide/global.db
-share/doc/Mahogany/HackersGuide/image001.ppm
-share/doc/Mahogany/HackersGuide/image001.ps
-share/doc/Mahogany/HackersGuide/images.aux
-share/doc/Mahogany/HackersGuide/images.dvi
-share/doc/Mahogany/HackersGuide/images.log
-share/doc/Mahogany/HackersGuide/images.pl
-share/doc/Mahogany/HackersGuide/images.tex
-share/doc/Mahogany/HackersGuide/img1.png
+share/doc/Mahogany/HackersGuide/img_style
 share/doc/Mahogany/HackersGuide/index.html
 share/doc/Mahogany/HackersGuide/internals.pl
 share/doc/Mahogany/HackersGuide/labels.pl
 share/doc/Mahogany/HackersGuide/new_command
 share/doc/Mahogany/HackersGuide/new_theorem
-share/doc/Mahogany/HackersGuide/next_motif.png
-share/doc/Mahogany/HackersGuide/next_motif_gr.png
+share/doc/Mahogany/HackersGuide/next.png
+share/doc/Mahogany/HackersGuide/next_g.png
 share/doc/Mahogany/HackersGuide/node1.html
 share/doc/Mahogany/HackersGuide/node10.html
 share/doc/Mahogany/HackersGuide/node11.html
@@ -235,11 +228,11 @@ share/doc/Mahogany/HackersGuide/node6.html
 share/doc/Mahogany/HackersGuide/node7.html
 share/doc/Mahogany/HackersGuide/node8.html
 share/doc/Mahogany/HackersGuide/node9.html
-share/doc/Mahogany/HackersGuide/part001
+share/doc/Mahogany/HackersGuide/part_001
 share/doc/Mahogany/HackersGuide/preamble
 share/doc/Mahogany/HackersGuide/prelatex
-share/doc/Mahogany/HackersGuide/previous_motif.png
-share/doc/Mahogany/HackersGuide/previous_motif_gr.png
+share/doc/Mahogany/HackersGuide/prev.png
+share/doc/Mahogany/HackersGuide/prev_g.png
 share/doc/Mahogany/HackersGuide/provide_command
 share/doc/Mahogany/HackersGuide/sections.pl
 share/doc/Mahogany/HackersGuide/styleID
@@ -247,11 +240,11 @@ share/doc/Mahogany/HackersGuide/styleIDs.db
 share/doc/Mahogany/HackersGuide/styles
 share/doc/Mahogany/HackersGuide/txt_style
 share/doc/Mahogany/HackersGuide/txtstyles.db
-share/doc/Mahogany/HackersGuide/up_motif.png
-share/doc/Mahogany/HackersGuide/up_motif_gr.png
+share/doc/Mahogany/HackersGuide/up.png
+share/doc/Mahogany/HackersGuide/up_g.png
 share/doc/Mahogany/HackersGuide/verb.db
 share/doc/Mahogany/HackersGuide/verb_delim.db
-share/doc/Mahogany/HackersGuide/verbatim_counter
+share/doc/Mahogany/HackersGuide/verbatim
 share/doc/Mahogany/HackersGuide/wxhelp.map
 share/doc/Mahogany/Manual/ID_MAP.db
 share/doc/Mahogany/Manual/IMG_PARAMS.db
@@ -261,32 +254,22 @@ share/doc/Mahogany/Manual/Manual.html
 share/doc/Mahogany/Manual/ORIG_MAP.db
 share/doc/Mahogany/Manual/aux_preamble
 share/doc/Mahogany/Manual/contents.pl
-share/doc/Mahogany/Manual/contents_motif.png
-share/doc/Mahogany/Manual/cross_ref_motif.png
+share/doc/Mahogany/Manual/contents.png
+share/doc/Mahogany/Manual/crossref.png
 share/doc/Mahogany/Manual/dependent
 share/doc/Mahogany/Manual/depends_on
 share/doc/Mahogany/Manual/env_style
 share/doc/Mahogany/Manual/envstyles.db
 share/doc/Mahogany/Manual/expanded.db
 share/doc/Mahogany/Manual/global.db
-share/doc/Mahogany/Manual/image001.ppm
-share/doc/Mahogany/Manual/image001.ps
-share/doc/Mahogany/Manual/image002.ppm
-share/doc/Mahogany/Manual/image002.ps
-share/doc/Mahogany/Manual/images.aux
-share/doc/Mahogany/Manual/images.dvi
-share/doc/Mahogany/Manual/images.log
-share/doc/Mahogany/Manual/images.pl
-share/doc/Mahogany/Manual/images.tex
-share/doc/Mahogany/Manual/img1.png
-share/doc/Mahogany/Manual/img2.png
+share/doc/Mahogany/Manual/img_style
 share/doc/Mahogany/Manual/index.html
 share/doc/Mahogany/Manual/internals.pl
 share/doc/Mahogany/Manual/labels.pl
 share/doc/Mahogany/Manual/new_command
 share/doc/Mahogany/Manual/new_theorem
-share/doc/Mahogany/Manual/next_motif.png
-share/doc/Mahogany/Manual/next_motif_gr.png
+share/doc/Mahogany/Manual/next.png
+share/doc/Mahogany/Manual/next_g.png
 share/doc/Mahogany/Manual/node1.html
 share/doc/Mahogany/Manual/node10.html
 share/doc/Mahogany/Manual/node100.html
@@ -410,22 +393,22 @@ share/doc/Mahogany/Manual/node96.html
 share/doc/Mahogany/Manual/node97.html
 share/doc/Mahogany/Manual/node98.html
 share/doc/Mahogany/Manual/node99.html
-share/doc/Mahogany/Manual/part001
+share/doc/Mahogany/Manual/part_001
 share/doc/Mahogany/Manual/preamble
 share/doc/Mahogany/Manual/prelatex
-share/doc/Mahogany/Manual/previous_motif.png
-share/doc/Mahogany/Manual/previous_motif_gr.png
+share/doc/Mahogany/Manual/prev.png
+share/doc/Mahogany/Manual/prev_g.png
 share/doc/Mahogany/Manual/sections.pl
 share/doc/Mahogany/Manual/styleID
 share/doc/Mahogany/Manual/styleIDs.db
 share/doc/Mahogany/Manual/styles
 share/doc/Mahogany/Manual/txt_style
 share/doc/Mahogany/Manual/txtstyles.db
-share/doc/Mahogany/Manual/up_motif.png
-share/doc/Mahogany/Manual/up_motif_gr.png
+share/doc/Mahogany/Manual/up.png
+share/doc/Mahogany/Manual/up_g.png
 share/doc/Mahogany/Manual/verb.db
 share/doc/Mahogany/Manual/verb_delim.db
-share/doc/Mahogany/Manual/verbatim_counter
+share/doc/Mahogany/Manual/verbatim
 share/doc/Mahogany/Manual/wxhelp.map
 share/doc/Mahogany/Pdf/HackersGuide.pdf
 share/doc/Mahogany/Pdf/Manual.pdf