Now that I'm aware of this, make misc/bsdiff and security/freebsd-update use PLIST_FILES instead of pkg-plist. Fix: I think these patches do the job (of course, pkg-plist must be deleted from each port as well). If anything is wrong with these, please contact me; don't make corrections yourself.
Responsible Changed From-To: freebsd-ports-bugs->trevor I'll take this.
Colin Percival wrote: > +PLIST_FILES+= %%DOCSDIR%%/LICENSE %%DOCSDIR%%/README %%DOCSDIR%%/VERSION > +PLIST_DIRS+= %%DOCSDIR%% This looks like a case for PORTDOCS= LICENSE README VERSION
At 03:37 08/02/2004, Oliver Eikemeier wrote: >Colin Percival wrote: > >>+PLIST_FILES+= %%DOCSDIR%%/LICENSE %%DOCSDIR%%/README %%DOCSDIR%%/VERSION >>+PLIST_DIRS+= %%DOCSDIR%% > >This looks like a case for >PORTDOCS= LICENSE README VERSION It does, but I couldn't get it to generate a correct packing list using PORTDOCS. But it's entirely possible that I was doing something wrong. Colin Percival
Colin Percival wrote: > At 03:37 08/02/2004, Oliver Eikemeier wrote: > >> Colin Percival wrote: >> >>> +PLIST_FILES+= %%DOCSDIR%%/LICENSE %%DOCSDIR%%/README >>> %%DOCSDIR%%/VERSION >>> +PLIST_DIRS+= %%DOCSDIR%% >> >> This looks like a case for >> PORTDOCS= LICENSE README VERSION > > It does, but I couldn't get it to generate a > correct packing list using PORTDOCS. But it's > entirely possible that I was doing something > wrong. Could you sent me the generated PLIST?
There's a bug in bsd.port.mk 1.484 line 4895: find(1) doesn't support -not prior to 4.7, and support is broken in 4.7 and 5.0. This causes PORTDOCS invokations to fail silently on systems prior to Feb 2003. (Reported to eik@.) After this is fixed, I'll submit a PORTDOCSified patch for freebsd-update, so please don't touch that yet; but I think the bsdiff patch can be committed (and the bsdiff pkg-plist removed). Colin Percival
State Changed From-To: open->patched patch applied to bsdiff
Responsible Changed From-To: trevor->portmgr Submitter found a bug in the implementation of PORTDOCS in bsd.port.mk. I prepared this patch (untested). It ignores the remote possibility that a port might install a FIFO, socket, or device special file amid its documentation. Index: /usr/ports/Mk/bsd.port.mk =================================================================== RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v retrieving revision 1.484 diff -u -r1.484 bsd.port.mk --- /usr/ports/Mk/bsd.port.mk 4 Feb 2004 04:27:04 -0000 1.484 +++ /usr/ports/Mk/bsd.port.mk 21 Mar 2004 10:53:53 -0000 @@ -4892,7 +4892,7 @@ [ "`${SED} -En -e '/^@cw?d[ ]*/s,,,p' ${TMPPLIST} | ${TAIL} -n 1`" != "${PREFIX}" ]; then ${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}; fi - @${FIND} -P ${PORTDOCS:S/^/${DOCSDIR}//} -not -type d 2>/dev/null | + @${FIND} -P ${PORTDOCS:S/^/${DOCSDIR}//} -type f -o -type l 2>/dev/null | ${SED} -ne 's,^${PREFIX}/,,p' >> ${TMPPLIST} @${FIND} -P -d ${PORTDOCS:S/^/${DOCSDIR}//} -type d 2>/dev/null | ${SED} -ne 's,^${PREFIX}/,@dirrm ,p' >> ${TMPPLIST}
Trevor Johnson wrote: > I prepared this patch (untested). It ignores the remote possibility > that a port might install a FIFO, socket, or device special file > amid its documentation. Already fixed in PR 62627, thanks.
Responsible Changed From-To: portmgr->cperciva The PORTDOCS problem is fixed; grab my PR to remind myself to submit a patch to use this.
Responsible Changed From-To: cperciva->trevor Now that the PORTDOCS problem is fixed, I've attached a corrected patch for security/freebsd-update below. Once the ports freeze is over, could you commit this and remove security/freebsd-update/pkg-plist ?
State Changed From-To: patched->closed Committed, thanks!
Responsible Changed From-To: trevor->lofi Committed, thanks!