Bug 191957 - [ maintainer-update ] Update ports deskutils/calibre to 1.45.0
Summary: [ maintainer-update ] Update ports deskutils/calibre to 1.45.0
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: John Marino
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-07-18 18:49 UTC by rnejdl
Modified: 2014-08-06 21:53 UTC (History)
1 user (show)

See Also:


Attachments
calibre-1.45.0.diff (4.61 KB, patch)
2014-07-18 18:49 UTC, rnejdl
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description rnejdl 2014-07-18 18:49:44 UTC
Created attachment 144781 [details]
calibre-1.45.0.diff

This diff:
	Updates calibre to 1.45.0.
	Fixes prefx typo in calibre rc script
	Removes https://www.paypal.com/en_US/i/scr/pixel.gif link
	Removes http://www.calibre-ebooks.com/favicon.ico and uses local version instead.
Comment 1 commit-hook freebsd_committer freebsd_triage 2014-07-21 21:32:16 UTC
A commit references this bug:

Author: marino
Date: Mon Jul 21 21:31:29 UTC 2014
New revision: 362498
URL: http://svnweb.freebsd.org/changeset/ports/362498

Log:
  deskutils/calibre: Update version 1.44.0 => 1.45.0 plus clean-up

  The PR as provided did not pass stage checks.  Not only were there new
  installed files not represented in the pkg-plist, but patching the html
  files caused the .orig versions to be installed too.  That required
  a post-patch target to remove as well as the updated pkg-plist.

  A long standing issue that was non-fatal on FreeBSD but fatal on DragonFly
  involved the use of the calibre RC script.  The calibre.in template is
  filled in at ${WRKDIR}/calibre, the same exact location for the default
  configure directory.  FreeBSD handled that problem like this:

    "No write acces [sic] to /work/a/ports/deskutils/calibre/work/calibre
     using a temporary dir instead"

  But the error code returned by DragonFly caused this message there:
    "OSError: [Errno 20] Not a directory: '/wrkdirs/deskutils/calibre/
     work/calibre/global.py'"

  The solution was to set CALIBRE_CONFIG_DIRECTORY to another location.
  Strangely this directory is removed by the build later.

  Another change I made was to move XDG_CONFIG_HOME from
  ${STAGEDIR}/.config to ${WRKDIR}/xdg-config where it doesn't need to
  be deleted as a post-install step.  Strangely, this directory is empty
  after the build, so all this XDG_CONFIG_HOME can probably be removed
  completely.

  The remaining changes were wrapping lines to respect an 80-column limit
  and unmasking install commands.

  PR:		191957
  Submitted by:	maintainer (Rusty Nejdl)

Changes:
  head/deskutils/calibre/Makefile
  head/deskutils/calibre/distinfo
  head/deskutils/calibre/files/calibre.in
  head/deskutils/calibre/files/patch-calibre_browse.html
  head/deskutils/calibre/files/patch-calibre_content.py
  head/deskutils/calibre/files/patch-calibre_index.html
  head/deskutils/calibre/pkg-plist
Comment 2 John Marino freebsd_committer freebsd_triage 2014-07-21 21:36:22 UTC
Thanks.

As the commit message said, the changes to the pkg-plist were missing.  I don't know if it was simply forgotten or just not checked.

"make check-orphans" would have caught this.
Comment 3 rnejdl 2014-08-06 21:53:20 UTC
Marino,

My apologies for the commit having issues and I will work to improve in the future.  I had thought I had tested this amply using previous methods that have worked so am not sure why this failed but will figure it out.   Do understand that we are all volunteers and this is a side-side-side thing for many of us. 

Rusty