Bug 193304 - [maintainer] update ports-mgmt/pkg_replace (more compatible "portupgrade")
Summary: [maintainer] update ports-mgmt/pkg_replace (more compatible "portupgrade")
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Alex Kozlov
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-09-04 06:04 UTC by Ken DEGUCHI
Modified: 2014-09-06 19:14 UTC (History)
2 users (show)

See Also:

Attachments
pkg_replace update 0.8.0 -> 20140721 (3.53 KB, patch)
2014-09-04 06:04 UTC, Ken DEGUCHI 		no flags Details | Diff
including "pkg-message.in". (3.83 KB, patch)
2014-09-04 06:13 UTC, Ken DEGUCHI 		no flags Details | Diff
pkg_replace update 0.8.0 -> 20140721 (3.88 KB, patch)
2014-09-05 00:57 UTC, Ken DEGUCHI 		no flags Details | Diff
pkg_replace update 0.8.0 -> 20140721 (cleanup Makefile) (3.86 KB, patch)
2014-09-05 06:18 UTC, Ken DEGUCHI 		no flags Details | Diff
Show Obsolete (3) View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Ken DEGUCHI 2014-09-04 06:04:37 UTC 
Created attachment 146762 [details]
pkg_replace update 0.8.0 -> 20140721

Update pkg_replace 0.8.0 -> 20140721.

pkg_replace-20140721 is more compatible "portupgrade" than previous version.
Comment 1 Ken DEGUCHI 2014-09-04 06:13:24 UTC 
Created attachment 146763 [details]
including "pkg-message.in".

Sorry, previous patch does not include "pkg-message.in".
Comment 2 John Marino freebsd_committer freebsd_triage 2014-09-04 17:58:21 UTC 
The USES line is missing a tab and the pkg-plist is now 4 entries long.

I recommend that you remove the pkg-plist completely and use PLIST_FILES, etc.

Can you make those changes and put pkg-message in a single patch (and obsolete these two patches)?
Comment 3 Ken DEGUCHI 2014-09-05 00:57:38 UTC 
Created attachment 146840 [details]
pkg_replace update 0.8.0 -> 20140721

OK, I made a patch as follows.

-Using PLIST_FILES instead of pkg-plist
-Add a tab to USES line
Comment 4 John Marino freebsd_committer freebsd_triage 2014-09-05 05:50:50 UTC 
This is really close, but it needs one more iteration.

minor:
You need to actually remove all the lines after "WWW: ..." on pkg-descr.  The package descriptions no longer reflect authors, maintainers, etc.  This is true across the tree and if seen those are removed when the port is update.

issue:
You used PLIST_FILES which is good, but you didn't use PLIST_DIRS or PLIST_DIRSTRY.  see https://www.freebsd.org/doc/en/books/porters-handbook/plist.html
Can you fix that?


preference:
Can you change this:
+.for i in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${i} \
+		${STAGEDIR}${DOCSDIR}/
+.endfor

to
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})

What you had worked but I don't like unnecessary loops.  And test that your change works.

Everything else looks fine.
Comment 5 Ken DEGUCHI 2014-09-05 06:18:13 UTC 
Created attachment 146843 [details]
pkg_replace update 0.8.0 -> 20140721 (cleanup Makefile)

Fix issues:

-Cleanup pkg-descr.
-Using PLIST_DIRSTRY.
-Fix unnecessary loop.
Comment 6 John Marino freebsd_committer freebsd_triage 2014-09-05 06:22:15 UTC 
Thanks, looks good.  I'm moving this to patch-ready pool
Comment 7 commit-hook freebsd_committer freebsd_triage 2014-09-06 18:52:06 UTC 
A commit references this bug:

Author: ak
Date: Sat Sep  6 18:51:47 UTC 2014
New revision: 367466
URL: http://svnweb.freebsd.org/changeset/ports/367466

Log:
  - Update to 20140721
    * Increase pkg_replace compatibility with portupgrade
  - Update MASTER_SITES
  - Remove support for pkg_tools
  - Use PLIST_FILES

  PR:	193304
  Submitted by:	Ken DEGUCHI <kdeguchi@sz.tokoha-u.ac.jp> (maintainer)

Changes:
  head/ports-mgmt/pkg_replace/Makefile
  head/ports-mgmt/pkg_replace/distinfo
  head/ports-mgmt/pkg_replace/files/
  head/ports-mgmt/pkg_replace/files/pkg-message.in
  head/ports-mgmt/pkg_replace/pkg-descr
  head/ports-mgmt/pkg_replace/pkg-plist