From owner-svn-ports-head@FreeBSD.ORG Thu Oct 3 23:24:15 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 13653902; Thu, 3 Oct 2013 23:24:15 +0000 (UTC) (envelope-from wg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E565D264D; Thu, 3 Oct 2013 23:24:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r93NOEt0000702; Thu, 3 Oct 2013 23:24:14 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r93NOE9q000700; Thu, 3 Oct 2013 23:24:14 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201310032324.r93NOE9q000700@svn.freebsd.org> From: William Grzybowski Date: Thu, 3 Oct 2013 23:24:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329248 - head/mail/dbmail X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Oct 2013 23:24:15 -0000 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 (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 @@ -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 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%%