svn commit: r329248 - head/mail/dbmail

[William Grzybowski]

Author: wg
Date: Thu Oct  3 23:24:14 2013
New Revision: 329248
URL: http://svnweb.freebsd.org/changeset/ports/329248

Log:
  mail/dbmail: fix DOCS option
  
  - Fix DOCS option [1] (based on)
  
  PR:		ports/182566 [1]
  Submitted by:	Alan Hicks <ahicks p-o.co.uk> (maintainer) [1]

Modified:
  head/mail/dbmail/Makefile
  head/mail/dbmail/pkg-plist

Modified: head/mail/dbmail/Makefile
==============================================================================
--- head/mail/dbmail/Makefile	Thu Oct  3 23:18:52 2013	(r329247)
+++ head/mail/dbmail/Makefile	Thu Oct  3 23:24:14 2013	(r329248)
@@ -36,10 +36,11 @@ SHEBANG_FILES=	man/fixsp.pl
 CFLAGS+=	-fPIC ${PTHREAD_CFLAGS}
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CONFIGURE_ARGS+=	--with-zdb=${LOCALBASE} --sysconfdir=${LOCALBASE}/etc
+CONFIGURE_ARGS+=	--with-zdb=${LOCALBASE} --sysconfdir=${LOCALBASE}/etc --enable-manpages
+
 MAKE_ARGS+=	mandir=${MANPREFIX}/man
 
-PORTDOCS=	AUTHORS BUGS INSTALL THANKS UPGRADING
+DOCS=		AUTHORS BUGS INSTALL THANKS UPGRADING
 
 .include <bsd.port.options.mk>
 
@@ -73,10 +74,6 @@ PLIST_SUB+=	LDAP="@comment "
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-acinclude.m4
 .endif
 
-.if ${PORT_OPTIONS:MDOCS}
-CONFIGURE_ARGS+=	--enable-manpages
-.endif
-
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/dbmail.conf ${STAGEDIR}${PREFIX}/etc/dbmail.conf-dist
 	@${MKDIR} ${STAGEDIR}${DATADIR}
@@ -87,7 +84,7 @@ post-install:
 	done
 	@${MKDIR} ${STAGEDIR}${PIDDIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
-	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} * ${STAGEDIR}${DOCSDIR})
+	${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
+	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>

Modified: head/mail/dbmail/pkg-plist
==============================================================================
--- head/mail/dbmail/pkg-plist	Thu Oct  3 23:18:52 2013	(r329247)
+++ head/mail/dbmail/pkg-plist	Thu Oct  3 23:24:14 2013	(r329248)
@@ -71,6 +71,22 @@ sbin/dbmail-util
 %%DATADIR%%/sqlite/3_0_2-3_1_0.sqlite
 %%DATADIR%%/sqlite/create_tables.sqlite
 %%DATADIR%%/sqlite/trigger.tmpl.sql
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/BUGS
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/README.aliases
+%%PORTDOCS%%%%DOCSDIR%%/README.exim
+%%PORTDOCS%%%%DOCSDIR%%/README.filters
+%%PORTDOCS%%%%DOCSDIR%%/README.http
+%%PORTDOCS%%%%DOCSDIR%%/README.ldap
+%%PORTDOCS%%%%DOCSDIR%%/README.postfix
+%%PORTDOCS%%%%DOCSDIR%%/README.qmail
+%%PORTDOCS%%%%DOCSDIR%%/README.sieve
+%%PORTDOCS%%%%DOCSDIR%%/README.smtp
+%%PORTDOCS%%%%DOCSDIR%%/README.solaris
+%%PORTDOCS%%%%DOCSDIR%%/README.usermap
+%%PORTDOCS%%%%DOCSDIR%%/THANKS
+%%PORTDOCS%%%%DOCSDIR%%/UPGRADING
 @dirrm %%DATADIR%%/sqlite
 @dirrm %%DATADIR%%/postgresql
 @dirrm %%DATADIR%%/oracle
@@ -80,3 +96,4 @@ sbin/dbmail-util
 @exec mkdir -p %%PIDDIR%%
 @exec chown %%DBMAIL_USER%%:%%DBMAIL_GROUP%% %%PIDDIR%%
 @dirrmtry %%PIDDIR%%
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%