Fix packing list when NOPORTDOCS is defined.

Reported by:	QAT

2 files changed, 87 insertions, 88 deletions

diff --git a/mail/gmime24/Makefile b/mail/gmime24/Makefile
index 763b1585e338..80c718f45366 100644
--- a/mail/gmime24/Makefile
+++ b/mail/gmime24/Makefile
@@ -19,6 +19,7 @@ CONFLICTS=	gmime-1.0.*
 
 SLAVEDIRS=	mail/gmime2-sharp
 
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}24
 USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_GNOME?=	gnomehack gnometarget glib20
@@ -32,16 +33,14 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 
 LATEST_LINK?=	${PORTNAME}2
 
-PORTDOCS=	*
-
 post-patch:
 	@${REINPLACE_CMD} -e "s|stdint.h|inttypes.h|" ${WRKSRC}/zentimer.h
 
 post-install:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}24
+	@${MKDIR} ${DOCSDIR}/
 .for i in docs/reference/html/*
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}24
+	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/
 .endfor
 .endif
 
diff --git a/mail/gmime24/pkg-plist b/mail/gmime24/pkg-plist
index 7d2059b53c49..5c9ec6f70f3a 100644
--- a/mail/gmime24/pkg-plist
+++ b/mail/gmime24/pkg-plist
@@ -52,89 +52,89 @@ lib/libgmime-2.4.so
 lib/libgmime-2.4.la
 lib/libgmime-2.4.a
 libdata/pkgconfig/gmime-2.4.pc
-%%DOCSDIR%%24/CipherContexts.html
-%%DOCSDIR%%24/DataWrappers.html
-%%DOCSDIR%%24/Filters.html
-%%DOCSDIR%%24/Headers.html
-%%DOCSDIR%%24/InternetAddresses.html
-%%DOCSDIR%%24/MimeParts.html
-%%DOCSDIR%%24/Parsers.html
-%%DOCSDIR%%24/Sessions.html
-%%DOCSDIR%%24/Streams.html
-%%DOCSDIR%%24/ch01.html
-%%DOCSDIR%%24/classes.html
-%%DOCSDIR%%24/core.html
-%%DOCSDIR%%24/fundamentals.html
-%%DOCSDIR%%24/gmime-building.html
-%%DOCSDIR%%24/gmime-changes-2-0.html
-%%DOCSDIR%%24/gmime-changes-2-2.html
-%%DOCSDIR%%24/gmime-changes-2-4.html
-%%DOCSDIR%%24/gmime-compiling.html
-%%DOCSDIR%%24/gmime-data-wrappers.html
-%%DOCSDIR%%24/gmime-filters.html
-%%DOCSDIR%%24/gmime-gmime-charset.html
-%%DOCSDIR%%24/gmime-gmime-cipher-context.html
-%%DOCSDIR%%24/gmime-gmime-content-type.html
-%%DOCSDIR%%24/gmime-gmime-data-wrapper.html
-%%DOCSDIR%%24/gmime-gmime-disposition.html
-%%DOCSDIR%%24/gmime-gmime-encodings.html
-%%DOCSDIR%%24/gmime-gmime-filter-basic.html
-%%DOCSDIR%%24/gmime-gmime-filter-best.html
-%%DOCSDIR%%24/gmime-gmime-filter-charset.html
-%%DOCSDIR%%24/gmime-gmime-filter-crlf.html
-%%DOCSDIR%%24/gmime-gmime-filter-enriched.html
-%%DOCSDIR%%24/gmime-gmime-filter-from.html
-%%DOCSDIR%%24/gmime-gmime-filter-gzip.html
-%%DOCSDIR%%24/gmime-gmime-filter-html.html
-%%DOCSDIR%%24/gmime-gmime-filter-md5.html
-%%DOCSDIR%%24/gmime-gmime-filter-strip.html
-%%DOCSDIR%%24/gmime-gmime-filter-windows.html
-%%DOCSDIR%%24/gmime-gmime-filter-yenc.html
-%%DOCSDIR%%24/gmime-gmime-filter.html
-%%DOCSDIR%%24/gmime-gmime-gpg-context.html
-%%DOCSDIR%%24/gmime-gmime-header.html
-%%DOCSDIR%%24/gmime-gmime-iconv-utils.html
-%%DOCSDIR%%24/gmime-gmime-iconv.html
-%%DOCSDIR%%24/gmime-gmime-message-part.html
-%%DOCSDIR%%24/gmime.html
-%%DOCSDIR%%24/gmime-gmime-message-partial.html
-%%DOCSDIR%%24/gmime-gmime-message.html
-%%DOCSDIR%%24/gmime-gmime-multipart-encrypted.html
-%%DOCSDIR%%24/gmime-gmime-multipart-signed.html
-%%DOCSDIR%%24/gmime-gmime-multipart.html
-%%DOCSDIR%%24/gmime-gmime-object.html
-%%DOCSDIR%%24/gmime-gmime-param.html
-%%DOCSDIR%%24/gmime-gmime-parser.html
-%%DOCSDIR%%24/gmime-gmime-part.html
-%%DOCSDIR%%24/gmime-gmime-session-simple.html
-%%DOCSDIR%%24/gmime-gmime-session.html
-%%DOCSDIR%%24/gmime-gmime-stream-buffer.html
-%%DOCSDIR%%24/gmime-gmime-stream-cat.html
-%%DOCSDIR%%24/gmime.devhelp
-%%DOCSDIR%%24/gmime-gmime-stream-file.html
-%%DOCSDIR%%24/gmime-gmime-stream-filter.html
-%%DOCSDIR%%24/gmime-gmime-stream-fs.html
-%%DOCSDIR%%24/gmime-gmime-stream-mem.html
-%%DOCSDIR%%24/gmime-gmime-stream-mmap.html
-%%DOCSDIR%%24/gmime-gmime-stream-null.html
-%%DOCSDIR%%24/gmime-gmime-stream.html
-%%DOCSDIR%%24/gmime-gmime-utils.html
-%%DOCSDIR%%24/gmime-gmime.html
-%%DOCSDIR%%24/gmime-internet-address-group.html
-%%DOCSDIR%%24/gmime-internet-address-list.html
-%%DOCSDIR%%24/gmime-internet-address-mailbox.html
-%%DOCSDIR%%24/gmime-internet-address.html
-%%DOCSDIR%%24/home.png
-%%DOCSDIR%%24/gmime-question-index.html
-%%DOCSDIR%%24/gmime-resources.html
-%%DOCSDIR%%24/gmime-streams.html
-%%DOCSDIR%%24/gmime.devhelp2
-%%DOCSDIR%%24/index.html
-%%DOCSDIR%%24/index.sgml
-%%DOCSDIR%%24/left.png
-%%DOCSDIR%%24/right.png
-%%DOCSDIR%%24/style.css
-%%DOCSDIR%%24/up.png
-@dirrm %%DOCSDIR%%24
+%%PORTDOCS%%%%DOCSDIR%%/CipherContexts.html
+%%PORTDOCS%%%%DOCSDIR%%/DataWrappers.html
+%%PORTDOCS%%%%DOCSDIR%%/Filters.html
+%%PORTDOCS%%%%DOCSDIR%%/Headers.html
+%%PORTDOCS%%%%DOCSDIR%%/InternetAddresses.html
+%%PORTDOCS%%%%DOCSDIR%%/MimeParts.html
+%%PORTDOCS%%%%DOCSDIR%%/Parsers.html
+%%PORTDOCS%%%%DOCSDIR%%/Sessions.html
+%%PORTDOCS%%%%DOCSDIR%%/Streams.html
+%%PORTDOCS%%%%DOCSDIR%%/ch01.html
+%%PORTDOCS%%%%DOCSDIR%%/classes.html
+%%PORTDOCS%%%%DOCSDIR%%/core.html
+%%PORTDOCS%%%%DOCSDIR%%/fundamentals.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-building.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-changes-2-0.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-changes-2-2.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-changes-2-4.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-compiling.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-data-wrappers.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-filters.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-charset.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-cipher-context.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-content-type.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-data-wrapper.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-disposition.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-encodings.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-filter-basic.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-filter-best.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-filter-charset.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-filter-crlf.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-filter-enriched.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-filter-from.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-filter-gzip.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-filter-html.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-filter-md5.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-filter-strip.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-filter-windows.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-filter-yenc.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-filter.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-gpg-context.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-header.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-iconv-utils.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-iconv.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-message-part.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-message-partial.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-message.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-multipart-encrypted.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-multipart-signed.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-multipart.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-object.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-param.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-parser.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-part.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-session-simple.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-session.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-stream-buffer.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-stream-cat.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime.devhelp
+%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-stream-file.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-stream-filter.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-stream-fs.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-stream-mem.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-stream-mmap.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-stream-null.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-stream.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-utils.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-internet-address-group.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-internet-address-list.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-internet-address-mailbox.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-internet-address.html
+%%PORTDOCS%%%%DOCSDIR%%/home.png
+%%PORTDOCS%%%%DOCSDIR%%/gmime-question-index.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-resources.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-streams.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime.devhelp2
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/index.sgml
+%%PORTDOCS%%%%DOCSDIR%%/left.png
+%%PORTDOCS%%%%DOCSDIR%%/right.png
+%%PORTDOCS%%%%DOCSDIR%%/style.css
+%%PORTDOCS%%%%DOCSDIR%%/up.png
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/gmime-2.4/gmime
 @dirrm include/gmime-2.4