Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 22 Apr 2023 17:49:06 GMT
From:      Muhammad Moinur Rahman <bofh@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 2dac5e9c55c0 - main - textproc/docbookrx: Fix BUILD
Message-ID:  <202304221749.33MHn6ng037150@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=2dac5e9c55c0d6b735a89a8390512e9ef263c6f4

commit 2dac5e9c55c0d6b735a89a8390512e9ef263c6f4
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-04-22 17:48:04 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-04-22 17:48:38 +0000

    textproc/docbookrx: Fix BUILD
    
    - Pet portclippy
---
 textproc/docbookrx/Makefile | 33 ++++++++++++++-------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/textproc/docbookrx/Makefile b/textproc/docbookrx/Makefile
index a4649aa460e2..7c452fd07c91 100644
--- a/textproc/docbookrx/Makefile
+++ b/textproc/docbookrx/Makefile
@@ -17,20 +17,22 @@ RUN_DEPENDS=	rubygem-nokogiri>=1.8:textproc/rubygem-nokogiri
 
 USES=	ruby
 USE_GITHUB=	yes
-
-OPTIONS_DEFINE=	DOCS
-
 GH_ACCOUNT=	allanjude
 GH_PROJECT=	docbookrx
 GH_TAGNAME=	06cae39
-
-GEM_ENV+=	RB_USER_INSTALL=yes
 USE_LOCALE?=	en_US.UTF-8
-GEM_ENV+=	LANG=${USE_LOCALE} LC_ALL=${USE_LOCALE}
+GEM_ENV+=	RB_USER_INSTALL=yes LANG=${USE_LOCALE} LC_ALL=${USE_LOCALE}
+
+NO_ARCH=	yes
+
+OPTIONS_DEFINE=	DOCS
+
+DOCS_VARS=	RUBYGEM_ARGS+="--document rdoc,ri"
+DOCS_VARS_OFF=	RUBYGEM_ARGS+=--no-document
+
 RUBYGEM_ARGS=	-l --no-update-sources --ignore-dependencies \
 		--install-dir  ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER} \
 		--bindir=${STAGEDIR}${PREFIX}/bin
-
 RUBYGEMBIN=	${LOCALBASE}/bin/gem
 GEMS_BASE_DIR=	lib/ruby/gems/${RUBY_VER}
 GEMS_DIR=	${GEMS_BASE_DIR}/gems
@@ -39,14 +41,6 @@ CACHE_DIR=	${GEMS_BASE_DIR}/cache
 EXT_DIR=	${GEMS_BASE_DIR}/extensions
 GEM_LIB_DIR?=	${GEMS_DIR}/${PORTNAME}-${DISTVERSION}
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-RUBYGEM_ARGS+=	--document rdoc,ri
-.else
-RUBYGEM_ARGS+=	--no-document
-.endif
-
 do-build:
 	cd ${BUILD_WRKSRC} && ${SETENV} ${GEM_ENV} ${RUBYGEMBIN} build --force ${PORTNAME}.gemspec
 
@@ -60,15 +54,16 @@ do-install:
 	${RMDIR} ${STAGEDIR}${PREFIX}/${EXT_DIR} 2> /dev/null || ${TRUE}
 	${ECHO} bin/docbookrx >> ${TMPPLIST}
 	${ECHO} ${GEMS_BASE_DIR}/specifications/${PORTNAME}-${DISTVERSION}.gemspec >> ${TMPPLIST}
-.if ${PORT_OPTIONS:MDOCS}
-	${FIND} -ds ${STAGEDIR}${PREFIX}/${DOC_DIR} -type f -print | ${SED} -E -e \
-		's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST}
-.endif
 	${FIND} -ds ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR} -type f -print | ${SED} -E -e \
 		's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST}
 		@if [ -d ${STAGEDIR}${PREFIX}/${EXT_DIR} ]; then \
 			${FIND} -ds ${STAGEDIR}${PREFIX}/${EXT_DIR} -type f -print | ${SED} -E -e \
 			's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST} ; \
 		fi
+	${ECHO} '@dir ${GEMS_BASE_DIR}/plugins' >> ${TMPPLIST}
+
+do-install-DOCS-on:
+	${FIND} -ds ${STAGEDIR}${PREFIX}/${DOC_DIR} -type f -print | ${SED} -E -e \
+		's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST}
 
 .include <bsd.port.mk>



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