Bug 123964

Summary: Mk fix: bsd.linux-rpm.mk - Handling of NOPORTDOCS
Product: Ports & Packages Reporter: Ganael LAPLANCHE <ganael.laplanche>
Component: Individual Port(s)Assignee: freebsd-emulation mailing list <emulation>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff none

Description Ganael LAPLANCHE 2008-05-24 21:50:03 UTC
As discussed in this thread :

http://lists.freebsd.org/pipermail/freebsd-ports/2008-May/048724.html

bsd.linux-rpm.mk ignores PORTDOCS and NOPORTDOCS variables. A port using USE_LINUX_RPM will have *every* files in WRKDIR (including documentation) installed.

This leads to incorrect plist generation when both NOPORTDOCS and PORTDOCS are defined : the do-install target of bsd.linux-rpm.mk will unconditionally install documentation files, while the plist file will not include them if NOPORTDOCS is defined. When deinstalling the port, if NOPORTDOCS has been defined, documentation files are left installed.

The attached patch removes PORTDOCS from WRKDIR at pre-patch stage if NOPORTDOCS is defined, so that documentation files will not be installed.

Note : As far as I can see, 3 ports are involved in such a situation :
- archivers/linux-par2cmdline
- graphics/linux-png
- graphics/linux-png10

Fix: Patch attached with submission follows:
How-To-Repeat: cd /usr/ports/archivers/linux-par2cmdline
make -DNOPORTDOCS install
make -DNOPORTDOCS deinstall
ls /compat/linux/usr/share/doc/par2cmdline-0.4

The last command shows documentation has been installed and left behind after deinstallation.
Comment 1 Edwin Groothuis freebsd_committer 2008-05-24 21:50:09 UTC
Responsible Changed
From-To: freebsd-ports-bugs->emulation

bsd.linux-rpm.mk is emulation territory (via the GNATS Auto Assign Tool)
Comment 2 dfilter service freebsd_committer 2008-08-15 13:30:03 UTC
bsam        2008-08-15 12:29:42 UTC

  FreeBSD ports repository

  Modified files:
    Mk                   bsd.linux-rpm.mk 
  Log:
  Make bsd.linux-rpm.mk respect NOPORTDOCS variable.
  
  PR:             123964
  Submitted by:   Ganael Laplanche <ganael.laplanche at martymac.com>
  Discussed at:   emulation@
  
  Revision  Changes    Path
  1.13      +15 -1     ports/Mk/bsd.linux-rpm.mk
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Comment 3 Boris Samorodov freebsd_committer 2008-08-15 13:30:39 UTC
State Changed
From-To: open->closed

Committed, thanks!