Updating pkg_add_it(1) to release 1.3. This release includes a lot of new features, and a was completely rewritten. pkg-message was added to the port as well. Fix: Patch attached with submission follows:
Please use the patch attached to this reply. The original one contained a non-compressed tarball of the code, so I've compressed it now, so distinfo has changed as well. Regards, Marin -- Marin Atanasov Nikolov dnaeon AT gmail DOT com daemon AT unix-heaven DOT org http://www.unix-heaven.org/
Responsible Changed From-To: freebsd-ports-bugs->sunpoet I will take it.
Hi, After checking your patch, I found one thing might be incorrect in your pat= ch. PKG_RELEASE in pkg_add_it.conf is used for PKG_URL. Currently we have only the following package directories: lftp ftp.freebsd.org:/pub/FreeBSD/ports/amd64> ls lrwxrwx--x 1 110 1002 15 Oct 23 2006 packages -> packages-stable drwxrwxr-x 95 110 1002 2048 Nov 15 00:34 packages-6-stable drwxrwxr-x 3 110 1002 2048 Mar 06 2008 packages-6.2-releas= e drwxrwxr-x 95 110 1002 2048 Nov 14 17:37 packages-7-stable drwxrwxr-x 93 110 1002 2048 Mar 14 2010 packages-7.3-releas= e drwxrwxr-x 95 110 1002 2048 Nov 17 22:08 packages-8-stable drwxrwxr-x 94 110 1002 2048 Jul 12 04:00 packages-8.1-releas= e drwxrwxr-x 94 110 1002 2048 Nov 08 14:16 packages-9-current lrwxr-xr-x 1 110 1002 17 Aug 28 2009 packages-current -> packages-8-stable lrwxr-xr-x 1 110 1002 17 Jan 30 2010 packages-stable -> packages-8-stable Take myself for example, I'm using RELENG_8 which is 8.1-STABLE now. That means PKG_RELEASE will be 8.1-stable, but it should be 8-stable to make PKG_URL available. This can be solved by a sed substitution as follows. PKG_RELEASE!=3D ${UNAME} -r | ${CUT} -d- -f1,2 | ${SED} -e 's|\.[0-9]*-STABLE|-STABLE|' post-patch: ${REINPLACE_CMD} -e 's|@PKG_ARCH@|${ARCH}|' \ -e 's|@PKG_RELEASE@|${PKG_RELEASE:L}|' ${WRKSRC}/pkg_add_it= .conf But I do not know how to deal with RELENG_x_y cases, e.g. 8.0-RELEASE-p2 -> 8.1-release Would you please check it? Thanks. Regards, sunpoet --=20 =C2=A0 Sunpoet Po-Chuan Hsieh <sunpoet at sunpoet.net> <sunpoet at FreeBSD.= org> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 4096R/CC57E36B 8AD8 68F2 7D2B 0A10 7E9B = 8CC0 DC44 247E CC57 E36B =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 http://people.FreeBSD.org/~sunpoet/pgpkeys.txt
State Changed From-To: open->feedback Ask for maintainer fix.
On Thu, Nov 18, 2010 at 4:54 PM, Sunpoet Po-Chuan Hsieh <sunpoet@freebsd.org> wrote: > Hi, Hello Sunpoet, > > After checking your patch, I found one thing might be incorrect in your patch. > > PKG_RELEASE in pkg_add_it.conf is used for PKG_URL. > Currently we have only the following package directories: > > lftp ftp.freebsd.org:/pub/FreeBSD/ports/amd64> ls > lrwxrwx--x 1 110 1002 15 Oct 23 2006 packages -> > packages-stable > drwxrwxr-x 95 110 1002 2048 Nov 15 00:34 packages-6-stable > drwxrwxr-x 3 110 1002 2048 Mar 06 2008 packages-6.2-release > drwxrwxr-x 95 110 1002 2048 Nov 14 17:37 packages-7-stable > drwxrwxr-x 93 110 1002 2048 Mar 14 2010 packages-7.3-release > drwxrwxr-x 95 110 1002 2048 Nov 17 22:08 packages-8-stable > drwxrwxr-x 94 110 1002 2048 Jul 12 04:00 packages-8.1-release > drwxrwxr-x 94 110 1002 2048 Nov 08 14:16 packages-9-current > lrwxr-xr-x 1 110 1002 17 Aug 28 2009 > packages-current -> packages-8-stable > lrwxr-xr-x 1 110 1002 17 Jan 30 2010 > packages-stable -> packages-8-stable > > Take myself for example, I'm using RELENG_8 which is 8.1-STABLE now. > That means PKG_RELEASE will be 8.1-stable, but it should be 8-stable > to make PKG_URL available. > This can be solved by a sed substitution as follows. > > PKG_RELEASE!= ${UNAME} -r | ${CUT} -d- -f1,2 | ${SED} -e > 's|\.[0-9]*-STABLE|-STABLE|' > post-patch: > ${REINPLACE_CMD} -e 's|@PKG_ARCH@|${ARCH}|' \ > -e 's|@PKG_RELEASE@|${PKG_RELEASE:L}|' ${WRKSRC}/pkg_add_it.conf > Thanks for the above suggestion, I've included this in the attached patch. > But I do not know how to deal with RELENG_x_y cases, e.g. > 8.0-RELEASE-p2 -> 8.1-release > Would you please check it? > Thanks. Unfortunately I don't think that this can be done in a smart way, so that the proper RELENG_x_y branches are matched, since pkg_add_it(1) doesn't know how to track the different branches. For example pkg_add(1), doesn't know that either, when on a 8.0-RELEASE-p2 system you want to `pkg_add -r <some-pkg>`, since there is no 8.0-release package directory, but you can always set PACKAGESITE to point to the proper directory. In pkg_add_it(1) the above is done via setting PKG_RELEASE. Since RELENG_x_y branches cannot be tracked by the tool, that was one of the reasons why I've included pkg-message, so right after installation users are invited to edit PKG_RELEASE if needed. Regards, Marin > > Regards, > sunpoet > -- > Sunpoet Po-Chuan Hsieh <sunpoet at sunpoet.net> <sunpoet at FreeBSD.org> > 4096R/CC57E36B 8AD8 68F2 7D2B 0A10 7E9B 8CC0 DC44 247E CC57 E36B > http://people.FreeBSD.org/~sunpoet/pgpkeys.txt > -- Marin Atanasov Nikolov dnaeon AT gmail DOT com daemon AT unix-heaven DOT org http://www.unix-heaven.org/
Hello Sunpoet, I've re-sent the mail again, because it seems that the new patch was not properly received. > PKG_RELEASE!= ${UNAME} -r | ${CUT} -d- -f1,2 | ${SED} -e > 's|\.[0-9]*-STABLE|-STABLE|' > post-patch: > ${REINPLACE_CMD} -e 's|@PKG_ARCH@|${ARCH}|' \ > -e 's|@PKG_RELEASE@|${PKG_RELEASE:L}|' ${WRKSRC}/pkg_add_it.conf > Thanks for the above suggestion, I've included this in the attached patch. > But I do not know how to deal with RELENG_x_y cases, e.g. > 8.0-RELEASE-p2 -> 8.1-release > Would you please check it? > Thanks. Unfortunately I don't think that this can be done in a smart way, so that the proper RELENG_x_y branches are matched, since pkg_add_it(1) doesn't know how to track the different branches. For example pkg_add(1), doesn't know that either, when on a 8.0-RELEASE-p2 system you want to `pkg_add -r <some-pkg>`, since there is no 8.0-release package directory, but you can always set PACKAGESITE to point to the proper directory. In pkg_add_it(1) the above is done via setting PKG_RELEASE. Since RELENG_x_y branches cannot be tracked by the tool, that was one of the reasons why I've included pkg-message, so right after installation users are invited to edit PKG_RELEASE if needed. Regards, Marin -- Marin Atanasov Nikolov dnaeon AT gmail DOT com daemon AT unix-heaven DOT org http://www.unix-heaven.org/
sunpoet 2010-11-27 14:14:05 UTC FreeBSD ports repository Modified files: ports-mgmt/pkg_add_it Makefile distinfo pkg-descr Added files: ports-mgmt/pkg_add_it pkg-message Log: - Update to 1.3 PR: ports/152222 Submitted by: Marin Atanasov Nikolov <dnaeon@gmail.com> (maintainer) Revision Changes Path 1.4 +22 -6 ports/ports-mgmt/pkg_add_it/Makefile 1.4 +2 -3 ports/ports-mgmt/pkg_add_it/distinfo 1.3 +15 -11 ports/ports-mgmt/pkg_add_it/pkg-descr 1.1 +13 -0 ports/ports-mgmt/pkg_add_it/pkg-message (new) _______________________________________________ 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"
State Changed From-To: feedback->closed Committed, with minor changes. Thanks!