Use URLS_ABSOLUTE=yes for non-html formats and during

"make package".

Suggested by:	den

share/mk/doc.common.mk

@@ -171,7 +171,13 @@ CLEANFILES+= ${XML_MIRRORS}.sort.tmp
 
 .if defined(URLS_ABSOLUTE)
 HTMLFLAGS+=	-ifreebsd.urls.absolute
-PRINTFLAGS+=	-ifreebsd.urls.absolute
 SGMLNORMFLAGS+=	-ifreebsd.urls.absolute
 NSGMLSFLAGS+=	-ifreebsd.urls.absolute
 .endif
+
+# for ascii and printable format, always use URLS_ABSOLUTE.
+PRINTFLAGS+=	-ifreebsd.urls.absolute
+HTMLTXTFLAGS+=	-ifreebsd.urls.absolute
+
+# for packages, always use URLS_ABSOLUTE.
+PKGMAKEFLAGS+=	URLS_ABSOLUTE=yes

share/mk/doc.docbook.mk

@@ -179,6 +179,8 @@ PDFTEX_DEF?=	${DOC_PREFIX}/share/web2c/pdftex.def
 
 HTMLOPTS?=	-ioutput.html -d ${DSLHTML} ${HTMLFLAGS}
 
+HTMLTXTOPTS?=	-ioutput.html -d ${DSLHTML} ${HTMLTXTFLAGS}
+
 PRINTOPTS?=	-ioutput.print -d ${DSLPRINT} ${PRINTFLAGS}
 
 .if defined(BOOK_OUTPUT)
@@ -488,7 +490,7 @@ ${DOC}.html: ${DOC}.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \
 # Special target to produce HTML with no images in it.
 .if ${STYLESHEET_TYPE} == "dsssl"
 ${DOC}.html-text: ${SRCS} ${INDEX_SGML} ${HTML_INDEX} ${LOCAL_IMAGES_TXT}
-	${JADE} -V nochunks ${HTMLOPTS} \
+	${JADE} -V nochunks ${HTMLTXTOPTS} \
 		${JADEOPTS} -t sgml ${MASTERDOC} > ${.TARGET} || \
 		(${RM} -f ${.TARGET} && false)
 .elif ${STYLESHEET_TYPE} == "xsl"
@@ -913,7 +915,10 @@ PKGDOCPFX!= realpath ${DOC_PREFIX}
 ${PACKAGES}/${.CURDIR:T}.${LANGCODE}.${_curformat}.${PKG_SUFFIX}:
 	${MKDIR} -p ${.OBJDIR}/pkg; \
 	(cd ${.CURDIR} && \
-		${MAKE} FORMATS=${_curformat} DOCDIR=${.OBJDIR}/pkg install); \
+		${MAKE} FORMATS=${_curformat} \
+			DOCDIR=${.OBJDIR}/pkg \
+			${PKGMAKEFLAGS} \
+			install); \
 	PKGSRCDIR=${.OBJDIR}/pkg/${.CURDIR:S/${PKGDOCPFX}\///}; \
 	/bin/ls -1 $$PKGSRCDIR > ${.OBJDIR}/PLIST.${_curformat}; \
 	${PKG_CREATE} -v -f ${.OBJDIR}/PLIST.${_curformat} \