4 files changed, 40 insertions, 83 deletions

diff --git a/mail/gmime2/Makefile b/mail/gmime2/Makefile
index 87306e71ff50..27ac6300778c 100644
--- a/mail/gmime2/Makefile
+++ b/mail/gmime2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gmime
 PORTVERSION=	2.1.9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	http://spruce.sourceforge.net/gmime/sources/v2.1/
 
@@ -20,11 +20,24 @@ USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnometarget glib20
 USE_LIBTOOL_VER=15
-CONFIGURE_ARGS+=	--with-libiconv=${LOCALBASE}
+CONFIGURE_ARGS+=	--with-libiconv=${LOCALBASE} \
+			--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 			LIBS="-L${LOCALBASE}/lib"
 INSTALLS_SHLIB=		yes
 
 LATEST_LINK=	gmime2
 
+.if !defined(NOPORTDOCS)
+PORTDOCS=	*
+.endif
+
+post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for i in docs/reference/html/*
+	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+.endfor
+.endif
+
 .include <bsd.port.mk>
diff --git a/mail/gmime2/files/patch-docs_Makefile.in b/mail/gmime2/files/patch-docs_Makefile.in
new file mode 100644
index 000000000000..22b8b8eba851
--- /dev/null
+++ b/mail/gmime2/files/patch-docs_Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- docs/Makefile.in.orig
++++ docs/Makefile.in
+@@ -152,7 +152,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ 
+-SUBDIRS = reference tutorial
++SUBDIRS =
+ 
+ EXTRA_DIST = \
+ 	gmime-config.txt	\
diff --git a/mail/gmime2/files/patch-reference-Makefile.in b/mail/gmime2/files/patch-reference-Makefile.in
new file mode 100644
index 000000000000..c4cd763893ac
--- /dev/null
+++ b/mail/gmime2/files/patch-reference-Makefile.in
@@ -0,0 +1,11 @@
+--- docs/reference/Makefile.in.orig	Fri Dec 10 14:06:17 2004
++++ docs/reference/Makefile.in	Fri Dec 10 14:06:33 2004
+@@ -87,7 +87,7 @@
+ GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
+ GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
+ 
+-HTML_DIR = $(datadir)/gtk-doc/html
++HTML_DIR = @HTML_DIR@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
diff --git a/mail/gmime2/pkg-plist b/mail/gmime2/pkg-plist
index 07c1036edafc..c48ca56caf64 100644
--- a/mail/gmime2/pkg-plist
+++ b/mail/gmime2/pkg-plist
@@ -55,86 +55,5 @@ lib/libgmime-2.0.a
 lib/libgmime-2.0.so
 lib/libgmime-2.0.so.3
 libdata/pkgconfig/gmime-2.0.pc
-share/gtk-doc/html/gmime/CipherContexts.html
-share/gtk-doc/html/gmime/DataWrappers.html
-share/gtk-doc/html/gmime/Filters.html
-share/gtk-doc/html/gmime/Headers.html
-share/gtk-doc/html/gmime/InternetAddresses.html
-share/gtk-doc/html/gmime/MimeParts.html
-share/gtk-doc/html/gmime/Parsers.html
-share/gtk-doc/html/gmime/Sessions.html
-share/gtk-doc/html/gmime/Streams.html
-share/gtk-doc/html/gmime/ch01.html
-share/gtk-doc/html/gmime/classes.html
-share/gtk-doc/html/gmime/core.html
-share/gtk-doc/html/gmime/fundamentals.html
-share/gtk-doc/html/gmime/gmime-building.html
-share/gtk-doc/html/gmime/gmime-changes-2-0.html
-share/gtk-doc/html/gmime/gmime-changes-2-2.html
-share/gtk-doc/html/gmime/gmime-compiling.html
-share/gtk-doc/html/gmime/gmime-data-wrappers.html
-share/gtk-doc/html/gmime/gmime-filters.html
-share/gtk-doc/html/gmime/gmime-gmime-charset.html
-share/gtk-doc/html/gmime/gmime-gmime-cipher-context.html
-share/gtk-doc/html/gmime/gmime-gmime-content-type.html
-share/gtk-doc/html/gmime/gmime-gmime-data-wrapper.html
-share/gtk-doc/html/gmime/gmime-gmime-disposition.html
-share/gtk-doc/html/gmime/gmime-gmime-filter-basic.html
-share/gtk-doc/html/gmime/gmime-gmime-filter-best.html
-share/gtk-doc/html/gmime/gmime-gmime-filter-charset.html
-share/gtk-doc/html/gmime/gmime-gmime-filter-crlf.html
-share/gtk-doc/html/gmime/gmime-gmime-filter-enriched.html
-share/gtk-doc/html/gmime/gmime-gmime-filter-from.html
-share/gtk-doc/html/gmime/gmime-gmime-filter-gzip.html
-share/gtk-doc/html/gmime/gmime-gmime-filter-html.html
-share/gtk-doc/html/gmime/gmime-gmime-filter-md5.html
-share/gtk-doc/html/gmime/gmime-gmime-filter-strip.html
-share/gtk-doc/html/gmime/gmime-gmime-filter-windows.html
-share/gtk-doc/html/gmime/gmime-gmime-filter-yenc.html
-share/gtk-doc/html/gmime/gmime-gmime-filter.html
-share/gtk-doc/html/gmime/gmime-gmime-gpg-context.html
-share/gtk-doc/html/gmime/gmime-gmime-header.html
-share/gtk-doc/html/gmime/gmime-gmime-host-utils.html
-share/gtk-doc/html/gmime/gmime-gmime-iconv-utils.html
-share/gtk-doc/html/gmime/gmime-gmime-iconv.html
-share/gtk-doc/html/gmime/gmime-gmime-message-part.html
-share/gtk-doc/html/gmime/gmime-gmime-message-partial.html
-share/gtk-doc/html/gmime/gmime-gmime-message.html
-share/gtk-doc/html/gmime/gmime-gmime-multipart-encrypted.html
-share/gtk-doc/html/gmime/gmime-gmime-multipart-signed.html
-share/gtk-doc/html/gmime/gmime-gmime-multipart.html
-share/gtk-doc/html/gmime/gmime-gmime-object.html
-share/gtk-doc/html/gmime/gmime-gmime-param.html
-share/gtk-doc/html/gmime/gmime-gmime-parser.html
-share/gtk-doc/html/gmime/gmime-gmime-part.html
-share/gtk-doc/html/gmime/gmime-gmime-session-simple.html
-share/gtk-doc/html/gmime/gmime-gmime-session.html
-share/gtk-doc/html/gmime/gmime-gmime-stream-buffer.html
-share/gtk-doc/html/gmime/gmime-gmime-stream-cat.html
-share/gtk-doc/html/gmime/gmime-gmime-stream-file.html
-share/gtk-doc/html/gmime/gmime-gmime-stream-filter.html
-share/gtk-doc/html/gmime/gmime-gmime-stream-fs.html
-share/gtk-doc/html/gmime/gmime-gmime-stream-mem.html
-share/gtk-doc/html/gmime/gmime-gmime-stream-mmap.html
-share/gtk-doc/html/gmime/gmime-gmime-stream-null.html
-share/gtk-doc/html/gmime/gmime-gmime-stream.html
-share/gtk-doc/html/gmime/gmime-gmime-utils.html
-share/gtk-doc/html/gmime/gmime-gmime.html
-share/gtk-doc/html/gmime/gmime-internet-address.html
-share/gtk-doc/html/gmime/gmime-question-index.html
-share/gtk-doc/html/gmime/gmime-resources.html
-share/gtk-doc/html/gmime/gmime-streams.html
-share/gtk-doc/html/gmime/gmime.devhelp
-share/gtk-doc/html/gmime/gmime.html
-share/gtk-doc/html/gmime/home.png
-share/gtk-doc/html/gmime/index.html
-share/gtk-doc/html/gmime/index.sgml
-share/gtk-doc/html/gmime/left.png
-share/gtk-doc/html/gmime/right.png
-share/gtk-doc/html/gmime/style.css
-share/gtk-doc/html/gmime/up.png
-@dirrm share/gtk-doc/html/gmime
-@unexec rmdir %D/share/gtk-doc/html 2>/dev/null || true
-@unexec rmdir %D/share/gtk-doc 2>/dev/null || true
 @dirrm include/gmime-2.0/gmime
 @dirrm include/gmime-2.0