Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 23 Sep 2015 21:51:39 +0000 (UTC)
From:      Jung-uk Kim <jkim@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r397664 - head/databases/firebird25-server
Message-ID:  <201509232151.t8NLpdAC061979@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jkim
Date: Wed Sep 23 21:51:39 2015
New Revision: 397664
URL: https://svnweb.freebsd.org/changeset/ports/397664

Log:
  Fix option handling.
  
  PR:		197080

Modified:
  head/databases/firebird25-server/Makefile

Modified: head/databases/firebird25-server/Makefile
==============================================================================
--- head/databases/firebird25-server/Makefile	Wed Sep 23 21:34:34 2015	(r397663)
+++ head/databases/firebird25-server/Makefile	Wed Sep 23 21:51:39 2015	(r397664)
@@ -96,21 +96,18 @@ USES+=		libedit
 USE_LDCONFIG=	yes
 CLIENT_BIN=	gpre isql-fb qli
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DOCS
+
+DOCS_PORTDOCS=	*
 
-.if ${PORT_OPTIONS:MDOCS}
-PORTDOCS=	*
 FB_DOCS_FILES=	WhatsNew README.* Firebird* ReleaseNotes.pdf ambiguity.txt \
 		ods11-index-structure.html
 FB_DOCS_DIRS=	sql.extensions license upgrade
 .endif
-.endif
 
 MAKE_ENV+=	FIREBIRD_TMP="${WRKDIR}" FIREBIRD_LOCK="${WRKDIR}"
 MAKE_ARGS+=	PREFIX="${STAGEDIR}${PREFIX}"
 
-OPTIONS_DEFINE=	DOCS
-
 post-extract:
 	@${RM} -rf ${WRKSRC}/extern/icu
 
@@ -204,7 +201,7 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/gen/firebird/*.msg ${STAGEDIR}${DATADIR}
 
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@${ECHO_MSG} "===>   Installing documentation for ${PKGNAME}"
 	@${MKDIR} ${FB_DOCS_DIRS:S!^!${STAGEDIR}${DOCSDIR}/!}
 	@${INSTALL_DATA} ${FB_DOCS_FILES:S!^!${WRKSRC}/doc/!} ${STAGEDIR}${DOCSDIR}
@@ -213,6 +210,5 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/doc/license/* ${STAGEDIR}${DOCSDIR}/license
 	@${INSTALL_DATA} ${WRKSRC}/src/misc/upgrade/v2/* ${STAGEDIR}${DOCSDIR}/upgrade
 .endif
-.endif
 
 .include <bsd.port.post.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509232151.t8NLpdAC061979>