On Sun, Mar 18, 2018 at 03:07:14PM -0400, Currell Berry wrote:
> Below is a revised version of the patch which corrects the issues you
> pointed out -- sorry for my mistakes. However I still have an issue
> with making the patch removing the patchfiles -- I removed only the
> files but left the directory intact as you specified, and ran
>
> $cvs diff . > ~/tkcvs_8.2.3_patch_v2.patch
> cvs server: Diffing .
> cvs server: Diffing patches
> cvs server: cannot find patches/patch-tkcvs_cvs_tcl
> cvs server: cannot find patches/patch-tkcvs_doinstall
> cvs server: Diffing pkg
You need to remove the file itself, and then mark it for removal in cvs.
ie
rm patches/patch-tkcvs_cvs_tcl
cvs rm patches/patch-tkcvs_cvs_tcl
(or in a single command: cvs rm -f patches/patch-tkcvs_cvs_tcl)
Then it'll show up in cvs diff.
> It prints out the above output at the terminal but still does not
> include anything in the patch showing to delete the files.
>
> Issues resolved:
>
> 1. maintainer copied on this email
> 2. yes, the reason the @conflict with kde-dev-scripts-* is gone is
> because /bin/cvscheck is no longer included with tkcvs, so the PLIST
> no longer overlaps that of x11/kde4/dev-scripts. Below the main patch
> I've now included a small patch to x11/kde4/dev-scripts which removes
> the @conflict with tkcvs on that side.
> 3. revision reset to 0
No need, you can remove the line completely. When there's no REVISION,
it's unset (ie pkgname is tkcvs-8.2.3), and when needed it starts at 0
(then tkcvs-8.2.3p0). Cf packages-specs(7) and bsd.port.mk(5) if you
want to read up more about that.
> 4. HOMEPAGE added
> 5. added the ${MODTCL_WISH_ADJ} invocation as you specified with a
> slight tweak to account for the fact that the doinstall.tcl script
> copies tkdiff, not tkdiff.tcl in to /usr/local/bin/tkdiff - sorry for
> this omission earlier, I had set up a wish symlink on my machine and I
> should have remembered it.
The other option is to fix the shebangs *after* running doinstall.tcl,
that's what i ended up doing (after figuring out which file was
installed between tkcvs, tkcvs.tcl, tkdiff & tkdiff.tcl .. :)
do-install:
cd ${WRKSRC} && $(MODTCL_BIN) ./doinstall.tcl -nox ${PREFIX}
cd ${PREFIX}/bin && ${MODTCL_WISH_ADJ} tkcvs tkdiff
Other that this the diff looks good to me.
Landry