Page MenuHomeFreeBSD
Differential D55637 Diff 173179 textproc/groff/Makefile

Changeset View

Standalone View

View Options

textproc/groff/Makefile

PORTNAME= groff PORTNAME= groff
DISTVERSION= 1.23.0 DISTVERSION= 1.24.0
PORTREVISION= 5
CATEGORIES= textproc CATEGORIES= textproc
MASTER_SITES= GNU MASTER_SITES= GNU
MAINTAINER= ports@FreeBSD.org MAINTAINER= alven@FreeBSD.org
COMMENT= Software typesetting package COMMENT= Software typesetting package
WWW= https://www.gnu.org/software/groff/ WWW= https://www.gnu.org/software/groff/
LICENSE= GPLv3 LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= gsfonts>=0:print/gsfonts \ BUILD_DEPENDS= gsfonts>=0:print/gsfonts \
psselect:print/psutils psselect:print/psutils
RUN_DEPENDS= psselect:print/psutils RUN_DEPENDS= psselect:print/psutils
USES= cpe gmake iconv:wchar_t makeinfo perl5 USES= cpe gmake iconv:wchar_t perl5
CPE_VENDOR= gnu CPE_VENDOR= gnu
USE_CXXSTD= gnu++98 USE_CXXSTD= gnu++98
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-awk=/usr/bin/awk \ CONFIGURE_ARGS+= --with-urw-fonts-dir=${LOCALBASE}/share/ghostscript/fonts/ \
--with-urw-fonts-dir=${LOCALBASE}/share/ghostscript/fonts/ \
--without-gs \ --without-gs \
--without-x \ --without-x
pnmcrop=missing \
pnmcut=missing \
pnmtopng=missing \
pnmtops=missing \
psselect=missing
vvdUnsubmitted
Not Done
Inline Actions

I can't say anything about the correctness of this change.

vvd: I can't say anything about the correctness of this change.
alvenAuthorUnsubmitted
Done
Inline Actions

I've read configure- and Make-files and didn't find any mentions of 'missing' programs, so decided this is safe to remove...
About awk, I remember it uses standard awk by default and builds without it.
About makeinfo:

Building groff no longer requires the makeinfo command.  Since groff
   1.23.0, we ship groff's Texinfo manual in several formats as part of
   groff's distribution archive [0].

[0] https://cgit.git.savannah.gnu.org/cgit/groff.git/tree/NEWS?h=1.24.0

alven: I've read configure- and Make-files and didn't find any mentions of 'missing' programs, so…
# Canonicalize to A4 if set. # Canonicalize to A4 if set.
.if defined(A4) || (defined(PAPERSIZE) && ${PAPERSIZE:tu} == "A4") .if defined(A4) || (defined(PAPERSIZE) && ${PAPERSIZE:tu} == "A4")
PAPERSIZE= A4 PAPERSIZE= A4
.endif .endif
.if defined(PAPERSIZE) .if defined(PAPERSIZE)
CONFIGURE_ENV+= PAGE=${PAPERSIZE} CONFIGURE_ENV+= PAGE=${PAPERSIZE}
.endif .endif
MAKE_JOBS_UNSAFE= yes
CONFLICTS= heirloom-doctools ja-groff CONFLICTS= heirloom-doctools ja-groff
DATADIR= ${PREFIX}/share/${PORTNAME}/${DISTVERSION} DATADIR= ${PREFIX}/share/${PORTNAME}/${DISTVERSION}
DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${DISTVERSION} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${DISTVERSION}
EXAMPLESDIR= ${DOCSDIR}/examples
vvdUnsubmitted
Not Done
Inline Actions

Switch from custom to canonical EXAMPLESDIR

Why?
DOCSDIR have DISTVERSION in dir name, but default EXAMPLESDIR doesn't have.

vvd: > Switch from custom to canonical EXAMPLESDIR Why? DOCSDIR have DISTVERSION in dir name, but…
alvenAuthorUnsubmitted
Done
Inline Actions

This port is rather unusual as it install it's data and docs into versioned directories. And also installs examples in a subdirectory of ${DOCSDIR}.
I tried to make things work in more streamlined and BSD-standard way, moving examples from this subdir into common standard ${EXAMPLESDIR}.
In theory, I could try to do the same trick also with versioned docs and possibly, even ${DATADIR} (but here not sure, so prefered not to even try).
MAKE_JOBS_UNSAFE isn't needed for build anymore as it builds OK without it now.

alven: This port is rather unusual as it install it's data and docs into versioned directories. And…
INFO= groff INFO= groff
PORTDOCS= *
PORTEXAMPLES= *
OPTIONS_DEFINE= UCHARDET OPTIONS_DEFINE= DOCS EXAMPLES UCHARDET
OPTIONS_DEFAULT= UCHARDET OPTIONS_DEFAULT= UCHARDET
UCHARDET_DESC= Automatic encoding detection in preconv(1) UCHARDET_DESC= Automatic encoding detection in preconv(1)
UCHARDET_LIB_DEPENDS= libuchardet.so:textproc/uchardet UCHARDET_LIB_DEPENDS= libuchardet.so:textproc/uchardet
UCHARDET_USES= pkgconfig UCHARDET_USES= pkgconfig
UCHARDET_CONFIGURE_OFF= --with-uchardet=no UCHARDET_CONFIGURE_OFF= --with-uchardet=no
post-install: post-install:
${INSTALL_DATA} ${FILESDIR}/mdoc.local ${STAGEDIR}${PREFIX}/share/groff/site-tmac ${INSTALL_DATA} ${FILESDIR}/mdoc.local ${STAGEDIR}${PREFIX}/share/groff/site-tmac
${REINPLACE_CMD} -i "" -e "s/missing/gs/" ${STAGEDIR}${DATADIR}/font/devhtml/DESC ${REINPLACE_CMD} -i "" -e "s/missing/gs/" ${STAGEDIR}${DATADIR}/font/devhtml/DESC
${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
cd ${STAGEDIR}${DOCSDIR}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
vvdUnsubmitted
Not Done
Inline Actions

CONFIGURE_ENV after CONFIGURE_ARGS look better for me.

vvd: CONFIGURE_ENV after CONFIGURE_ARGS look better for me.
alvenAuthorUnsubmitted
Done
Inline Actions

Well, I could easily move it there, as you like.

alven: Well, I could easily move it there, as you like.
${RM} -r ${STAGEDIR}${DOCSDIR}/examples
vvdUnsubmitted
Not Done
Inline Actions

Do this in post-install-EXAMPLES-on goal.

vvd: Do this in `post-install-EXAMPLES-on` goal.
alvenAuthorUnsubmitted
Done
Inline Actions

Well, I'll try to do this.

alven: Well, I'll try to do this.
alvenAuthorUnsubmitted
Done
Inline Actions

Actually, I tried to do what you adviced me, but realised, that as this port have examples installed into subdir of ${DOCSDIR}, this makes implicit dependence EXAMPLES on DOCS, whis is hard to notice and deal with.
So I just decided to streamline things first in post-install doing all the splitting, and only then remove docs/examples/both following usual logic of options. This feels really "orthogonal" to me, and it worked well.
I know, your decision is likely better, I may be just don't understand you now. Could you, please, share your version how it should look like for me to understand your plan? Thanks! And thanks for the whole review, of course! :)

alven: Actually, I tried to do what you adviced me, but realised, that as this port have examples…
vvdUnsubmitted
Not Done
Inline Actions
@@ -1,5 +1,6 @@
 PORTNAME=      groff
 DISTVERSION=   1.24.0
+PORTREVISION=  1
 CATEGORIES=    textproc
 MASTER_SITES=  GNU

@@ -30,12 +31,12 @@ PAPERSIZE=  A4
 .if defined(PAPERSIZE)
 CONFIGURE_ENV+=        PAGE=${PAPERSIZE}
 .endif
+MAKE_ARGS=     datasubdir=${DATADIR} \
+               docdir=${DOCSDIR} \
+               exampledir=${EXAMPLESDIR}

 CONFLICTS=     heirloom-doctools ja-groff

-DATADIR=       ${PREFIX}/share/${PORTNAME}/${DISTVERSION}
-DOCSDIR=       ${PREFIX}/share/doc/${PORTNAME}-${DISTVERSION}
-
 INFO=          groff
 PORTDOCS=      *
 PORTEXAMPLES=  *
@@ -52,12 +53,10 @@ UCHARDET_CONFIGURE_OFF=     --with-uchardet=no
 post-install:
        ${INSTALL_DATA} ${FILESDIR}/mdoc.local ${STAGEDIR}${PREFIX}/share/groff/site-tmac
        ${REINPLACE_CMD} -i "" -e "s/missing/gs/" ${STAGEDIR}${DATADIR}/font/devhtml/DESC
+       ${RLN} . ${STAGEDIR}${DATADIR}/current

-       ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-       cd ${STAGEDIR}${DOCSDIR}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
-       ${RM} -r ${STAGEDIR}${DOCSDIR}/examples
-
-       ${RLN} ${STAGEDIR}${EXAMPLESDIR}/mom/mom-pdf.pdf ${STAGEDIR}${DOCSDIR}/pdf
+post-install-DOCS-on:
+       ${LN} -f ${STAGEDIR}${EXAMPLESDIR}/mom/mom-pdf.pdf ${STAGEDIR}${DOCSDIR}/pdf

 post-install-DOCS-off:
        ${RM} -r ${STAGEDIR}${DOCSDIR}
vvd: ``` @@ -1,5 +1,6 @@ PORTNAME= groff DISTVERSION= 1.24.0 +PORTREVISION= 1 CATEGORIES=…
alvenAuthorUnsubmitted
Done
Inline Actions

Thank you, Vladimir! You are a real friend, always kind and ready to help.
I really like and appreciate your patch, and would like to have enough knowledge to write such patches myself sometimes.

alven: Thank you, Vladimir! You are a real friend, always kind and ready to help. I really like and…
${RLN} ${STAGEDIR}${EXAMPLESDIR}/mom/mom-pdf.pdf ${STAGEDIR}${DOCSDIR}/pdf
vvdUnsubmitted
Not Done
Inline Actions

Do this in post-install-DOCS-on goal.

vvd: Do this in `post-install-DOCS-on` goal.
alvenAuthorUnsubmitted
Done
Inline Actions

Well, I'll try to do this.

alven: Well, I'll try to do this.
post-install-DOCS-off:
${RM} -r ${STAGEDIR}${DOCSDIR}
post-install-EXAMPLES-off:
${RM} -r ${STAGEDIR}${EXAMPLESDIR}
.include <bsd.port.mk> .include <bsd.port.mk>