Update devel/tkcvs from 6.0 to 8.2.3

classic Classic list List threaded Threaded
10 messages Options
Reply | Threaded
Open this post in threaded view
|

Update devel/tkcvs from 6.0 to 8.2.3

currellberry
From the Changelog it appears that tkcvs 6.0 is somewhere around 20
years old -- upstream has changed a lot in the interim.

NOTE: this change additionally requires you to manually delete the
patches folder in devel/tkcvs.  No patches are needed on the new
version, because the new installer lets you specify the destination
directory from the command line. I couldn't figure out how to make cvs
make a patch which showed the folder deletion!  I am a beginner at CVS
and at Porting, so please let me know if there is something I should
be doing differently.

Thanks,
Currell

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/tkcvs/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- Makefile 22 Jan 2015 18:41:16 -0000 1.33
+++ Makefile 18 Mar 2018 03:17:00 -0000
@@ -1,15 +1,18 @@
 # $OpenBSD: Makefile,v 1.33 2015/01/22 18:41:16 naddy Exp $

-COMMENT= graphical frontend to CVS
-DISTNAME= tkcvs-6.0
-REVISION = 5
+COMMENT= graphical frontend to CVS and SVN
+DISTNAME= tkcvs-8.2.3
+REVISION = 6
 CATEGORIES= devel

 MAINTAINER= Todd T. Fries <[hidden email]>

+# License GPLv2 only
 PERMIT_PACKAGE_CDROM= Yes

-MASTER_SITES= http://www.neosoft.com/tcl/ftparchive/sorted/packages-7.6/apps/tkcvs-6.0/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tkcvs/} \
+ http://www.twobarleycorns.net/
+

 MODULES= x11/tk
 RUN_DEPENDS= ${MODTK_RUN_DEPENDS}
@@ -18,11 +21,7 @@ BUILD_DEPENDS= ${RUN_DEPENDS}
 NO_BUILD= Yes
 NO_TEST= Yes

-pre-configure:
- @${MODTCL_TCLSH_ADJ} ${WRKSRC}/tkcvs/cvscheck.blank
- @${SUBST_CMD} ${WRKSRC}/tkcvs/doinstall
-
 do-install:
- cd $(WRKSRC)/tkcvs; ./doinstall
+ cd ${WRKSRC} && $(MODTCL_BIN) ./doinstall.tcl -nox ${PREFIX}

 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/tkcvs/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 18 Jan 2015 03:13:48 -0000 1.4
+++ distinfo 18 Mar 2018 03:17:00 -0000
@@ -1,2 +1,2 @@
-SHA256 (tkcvs-6.0.tar.gz) = PfT5mVOrZD5/mxg6zDHNJbt5CpKdlgKePwl+XhH4KXI=
-SIZE (tkcvs-6.0.tar.gz) = 102022
+SHA256 (tkcvs-8.2.3.tar.gz) = S/sp3Z/7u8Hm5hHhx3KvdF10LTNueXvwVtv3ARa44yo=
+SIZE (tkcvs-8.2.3.tar.gz) = 570910
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/devel/tkcvs/pkg/DESCR,v
retrieving revision 1.2
diff -u -p -r1.2 DESCR
--- pkg/DESCR 15 Apr 2010 13:27:47 -0000 1.2
+++ pkg/DESCR 18 Mar 2018 03:17:00 -0000
@@ -1,35 +1,15 @@
-README for tkCVS release 6.0
+TkCVS is a Tcl/Tk-based graphical interface to the CVS and Subversion
+configuration management systems. It will also help with RCS. The
user interface
+is consistent across Unix/Linux, Windows, and MacOS X. TkDiff is included for
+browsing and merging your changes.
+
+It shows the status of the files in the current working directory,
and has tools
+for tagging, merging, importing, exporting, checking in/out, and other user
+operations.
+
+TkCVS also aids in browsing the repository. For Subversion, the repository tree
+is browsed like an ordinary file tree. For CVS, the CVSROOT/modules file is
+read. TkCVS extends CVS with a method to produce a "user friendly" listing of
+modules by using special comments in the CVSROOT/modules file.

-tkCVS is a Tk based graphical interface to the CVS configuration
-management system.  It includes facilities for providing "user
-friendly" names to modules and directories within the repository, and
-provides a facility to interactively browse the repository looking for
-modules and directories.
-
-Some of the features of tkCVS include:
-
--       File and directory browser, with optional display of hidden
- files, and display of the current directory's location within
- the CVS tree.
-
--       Push-button based check-in / check-out of CVS modules.  Ability
- to add and delete files from the repository also using push
- buttons.
-
--       Module tree browser, and reports showing the structure of the
- CVS modules tree.  Individual modules or entire directory trees
- may be checked out using the browser.
-
--       Updating of files from the repository when they change.
-
--       Tagging and branching of files from the file browser, and tagging
- and branching of modules from the module browser.
-
--       Exporting a CVS module or directory from the repository for
- delivery off-site.
-
-- Creation of patch files between two releases of a module, or
- between a release and the current (head) version.
-
-- Viewing of diff and status listings for currently checked out
- modules.
+TkCVS is free and open-source.
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/tkcvs/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST 8 Feb 2014 14:57:35 -0000 1.8
+++ pkg/PLIST 18 Mar 2018 03:17:00 -0000
@@ -1,48 +1,128 @@
-@comment $OpenBSD: PLIST,v 1.8 2014/02/08 14:57:35 espie Exp $
+@comment $OpenBSD$
 @conflict tkdiff-*
-@conflict kde-dev-scripts-*
-bin/cvscheck
 bin/tkcvs
 bin/tkdiff
-libdata/tkcvs/
-libdata/tkcvs/bindings.tcl
-libdata/tkcvs/bitmaps/
-libdata/tkcvs/bitmaps/add.xbm
-libdata/tkcvs/bitmaps/check.xbm
-libdata/tkcvs/bitmaps/checkin.xbm
-libdata/tkcvs/bitmaps/clean.xbm
-libdata/tkcvs/bitmaps/clear.xbm
-libdata/tkcvs/bitmaps/delete.xbm
-libdata/tkcvs/bitmaps/diff.xbm
-libdata/tkcvs/bitmaps/import.xbm
-libdata/tkcvs/bitmaps/logfile.xbm
-libdata/tkcvs/bitmaps/notebook.xbm
-libdata/tkcvs/bitmaps/refresh.xbm
-libdata/tkcvs/bitmaps/remove.xbm
-libdata/tkcvs/bitmaps/tkcvs16.xbm
-libdata/tkcvs/bitmaps/tkcvs32.xbm
-libdata/tkcvs/bitmaps/tkcvs32_mask.xbm
-libdata/tkcvs/bitmaps/tree16.xbm
-libdata/tkcvs/bitmaps/update.xbm
-libdata/tkcvs/checkout.tcl
-libdata/tkcvs/commit.tcl
-libdata/tkcvs/cvs.tcl
-libdata/tkcvs/errors.tcl
-libdata/tkcvs/filebrowse.tcl
-libdata/tkcvs/help.tcl
-libdata/tkcvs/import.tcl
-libdata/tkcvs/logcanvas.tcl
-libdata/tkcvs/merge.tcl
-libdata/tkcvs/modules.tcl
-libdata/tkcvs/reports.tcl
-libdata/tkcvs/search.tcl
-libdata/tkcvs/static.tcl
-libdata/tkcvs/tag.tcl
-libdata/tkcvs/tclIndex
-libdata/tkcvs/tkcvs_def.tcl
-libdata/tkcvs/tooltips.tcl
-libdata/tkcvs/update.tcl
-libdata/tkcvs/venget.tcl
-libdata/tkcvs/workdir.tcl
-@man man/mann/tkcvs.n
-@man man/mann/tkdiff.n
+lib/tkcvs/
+lib/tkcvs/annotate.tcl
+lib/tkcvs/bitmaps/
+lib/tkcvs/bitmaps/add.gif
+lib/tkcvs/bitmaps/adir.gif
+lib/tkcvs/bitmaps/amod.gif
+lib/tkcvs/bitmaps/anglerfish_med.gif
+lib/tkcvs/bitmaps/annotate.gif
+lib/tkcvs/bitmaps/annotate.xbm
+lib/tkcvs/bitmaps/arrow_dn.gif
+lib/tkcvs/bitmaps/arrow_hl_dn.gif
+lib/tkcvs/bitmaps/arrow_hl_up.gif
+lib/tkcvs/bitmaps/arrow_up.gif
+lib/tkcvs/bitmaps/branch.gif
+lib/tkcvs/bitmaps/branch.xbm
+lib/tkcvs/bitmaps/branchtag.gif
+lib/tkcvs/bitmaps/check.gif
+lib/tkcvs/bitmaps/checkin.gif
+lib/tkcvs/bitmaps/checkout.gif
+lib/tkcvs/bitmaps/checkout_opts.gif
+lib/tkcvs/bitmaps/conflict.gif
+lib/tkcvs/bitmaps/cvs-says.xbm
+lib/tkcvs/bitmaps/cvsdir.gif
+lib/tkcvs/bitmaps/delete.gif
+lib/tkcvs/bitmaps/delete_red.gif
+lib/tkcvs/bitmaps/diff.gif
+lib/tkcvs/bitmaps/dir.gif
+lib/tkcvs/bitmaps/dir_minus.gif
+lib/tkcvs/bitmaps/dir_new.gif
+lib/tkcvs/bitmaps/dir_ok.gif
+lib/tkcvs/bitmaps/dir_ood.gif
+lib/tkcvs/bitmaps/dir_plus.gif
+lib/tkcvs/bitmaps/dir_ques.gif
+lib/tkcvs/bitmaps/dirbranch.gif
+lib/tkcvs/bitmaps/dirbranch.xbm
+lib/tkcvs/bitmaps/edit.gif
+lib/tkcvs/bitmaps/export.gif
+lib/tkcvs/bitmaps/fileedit.gif
+lib/tkcvs/bitmaps/files.gif
+lib/tkcvs/bitmaps/fileview.gif
+lib/tkcvs/bitmaps/folder.gif
+lib/tkcvs/bitmaps/folderopen.gif
+lib/tkcvs/bitmaps/import.gif
+lib/tkcvs/bitmaps/link.gif
+lib/tkcvs/bitmaps/link_mod.gif
+lib/tkcvs/bitmaps/link_modml.gif
+lib/tkcvs/bitmaps/link_modol.gif
+lib/tkcvs/bitmaps/link_ok.gif
+lib/tkcvs/bitmaps/link_okml.gif
+lib/tkcvs/bitmaps/link_okol.gif
+lib/tkcvs/bitmaps/link_plus.gif
+lib/tkcvs/bitmaps/link_ques.gif
+lib/tkcvs/bitmaps/locked.gif
+lib/tkcvs/bitmaps/log.gif
+lib/tkcvs/bitmaps/loop-ball.gif
+lib/tkcvs/bitmaps/loop-glasses.gif
+lib/tkcvs/bitmaps/man.gif
+lib/tkcvs/bitmaps/mdir.gif
+lib/tkcvs/bitmaps/mod.gif
+lib/tkcvs/bitmaps/modbrowse.gif
+lib/tkcvs/bitmaps/modbrowse_cvs.gif
+lib/tkcvs/bitmaps/modbrowse_svn.gif
+lib/tkcvs/bitmaps/newmerge.gif
+lib/tkcvs/bitmaps/newmerge_simple.gif
+lib/tkcvs/bitmaps/paper.gif
+lib/tkcvs/bitmaps/patchfile.gif
+lib/tkcvs/bitmaps/rcsdir.gif
+lib/tkcvs/bitmaps/rdiff.gif
+lib/tkcvs/bitmaps/remove.gif
+lib/tkcvs/bitmaps/stat_conf.gif
+lib/tkcvs/bitmaps/stat_ex.gif
+lib/tkcvs/bitmaps/stat_kb.gif
+lib/tkcvs/bitmaps/stat_merge.gif
+lib/tkcvs/bitmaps/stat_minus.gif
+lib/tkcvs/bitmaps/stat_mod.gif
+lib/tkcvs/bitmaps/stat_modml.gif
+lib/tkcvs/bitmaps/stat_modol.gif
+lib/tkcvs/bitmaps/stat_ok.gif
+lib/tkcvs/bitmaps/stat_okml.gif
+lib/tkcvs/bitmaps/stat_okol.gif
+lib/tkcvs/bitmaps/stat_ood.gif
+lib/tkcvs/bitmaps/stat_plus.gif
+lib/tkcvs/bitmaps/stat_plus_kb.gif
+lib/tkcvs/bitmaps/stat_ques.gif
+lib/tkcvs/bitmaps/svndir.gif
+lib/tkcvs/bitmaps/tag.gif
+lib/tkcvs/bitmaps/tags.gif
+lib/tkcvs/bitmaps/ticklefish48.gif
+lib/tkcvs/bitmaps/ticklefish_med.gif
+lib/tkcvs/bitmaps/tkcvs-help.xbm
+lib/tkcvs/bitmaps/tkcvs48.xbm
+lib/tkcvs/bitmaps/trace.xbm
+lib/tkcvs/bitmaps/unedit.gif
+lib/tkcvs/bitmaps/unlocked.gif
+lib/tkcvs/bitmaps/updir.gif
+lib/tkcvs/bitmaps/who.gif
+lib/tkcvs/branch_diagram.tcl
+lib/tkcvs/cvs.tcl
+lib/tkcvs/dialog.tcl
+lib/tkcvs/diff.tcl
+lib/tkcvs/dircanvas.tcl
+lib/tkcvs/errors.tcl
+lib/tkcvs/exec.tcl
+lib/tkcvs/filebrowse.tcl
+lib/tkcvs/gen_log.tcl
+lib/tkcvs/help.tcl
+lib/tkcvs/import.tcl
+lib/tkcvs/import2.tcl
+lib/tkcvs/joincanvas.tcl
+lib/tkcvs/modbrowse.tcl
+lib/tkcvs/modtree.tcl
+lib/tkcvs/modules.tcl
+lib/tkcvs/picklist.tcl
+lib/tkcvs/rcs.tcl
+lib/tkcvs/style_params.tcl
+lib/tkcvs/svn-import.tcl
+lib/tkcvs/svn.tcl
+lib/tkcvs/tclIndex
+lib/tkcvs/tkcvs_def.tcl
+lib/tkcvs/tooltips.tcl
+lib/tkcvs/ui_misc.tcl
+lib/tkcvs/vendor_merge.tcl
+lib/tkcvs/workdir.tcl
+@man man/man1/tkcvs.1

tkcvs_update_to_8.2.3.patch (9K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: Update devel/tkcvs from 6.0 to 8.2.3

Landry Breuil-5
On Sat, Mar 17, 2018 at 11:35:14PM -0400, Currell Berry wrote:

> From the Changelog it appears that tkcvs 6.0 is somewhere around 20
> years old -- upstream has changed a lot in the interim.
>
> NOTE: this change additionally requires you to manually delete the
> patches folder in devel/tkcvs.  No patches are needed on the new
> version, because the new installer lets you specify the destination
> directory from the command line. I couldn't figure out how to make cvs
> make a patch which showed the folder deletion!  I am a beginner at CVS
> and at Porting, so please let me know if there is something I should
> be doing differently.

Minor things:
- you cant "delete" a folder in CVS, you just remove the files in it,
  cvs diff will show them deleted, and cvs up -P will delete the dir
from you local checkout
- this port has a maintainer, so when sending diffs for such port it's
  required to cc him
- i suppose you're removing the @conflict on kde-dev-scripts because
  cvscheck is gone from the PLIST - in that case better telling it
instead of having ppl reading the diff trying to figure out why :) - and
in that case the @conflict tkcvs-* in kde-dev-scripts should also be
removed
- when updating to a new version you should remove REVISION
- Tk, CVS and subversion - such a win combination :)

Reply | Threaded
Open this post in threaded view
|

Re: Update devel/tkcvs from 6.0 to 8.2.3

Landry Breuil-5
On Sun, Mar 18, 2018 at 09:21:13AM +0100, Landry Breuil wrote:

> On Sat, Mar 17, 2018 at 11:35:14PM -0400, Currell Berry wrote:
> > From the Changelog it appears that tkcvs 6.0 is somewhere around 20
> > years old -- upstream has changed a lot in the interim.
> >
> > NOTE: this change additionally requires you to manually delete the
> > patches folder in devel/tkcvs.  No patches are needed on the new
> > version, because the new installer lets you specify the destination
> > directory from the command line. I couldn't figure out how to make cvs
> > make a patch which showed the folder deletion!  I am a beginner at CVS
> > and at Porting, so please let me know if there is something I should
> > be doing differently.
>
> Minor things:
> - you cant "delete" a folder in CVS, you just remove the files in it,
>   cvs diff will show them deleted, and cvs up -P will delete the dir
> from you local checkout
> - this port has a maintainer, so when sending diffs for such port it's
>   required to cc him
> - i suppose you're removing the @conflict on kde-dev-scripts because
>   cvscheck is gone from the PLIST - in that case better telling it
> instead of having ppl reading the diff trying to figure out why :) - and
> in that case the @conflict tkcvs-* in kde-dev-scripts should also be
> removed
> - when updating to a new version you should remove REVISION
> - Tk, CVS and subversion - such a win combination :)
>
Oh, and as is it wont start:

/usr/local/bin/tkcvs[4]: wish: not found

'wish' as a binary itself doesnt exist by default, so you need to use
MODTCL_WISH_ADJ as an additional command in do-install to 'fix' the
interpreted used by the scripts.

do-install:
        cd ${WRKSRC} && ${MODTCL_WISH_ADJ} tkcvs/tkcvs.tcl tkdiff/tkdiff.tcl
        cd ${WRKSRC} && $(MODTCL_BIN) ./doinstall.tcl -nox ${PREFIX}

Maybe http://www.twobarleycorns.net/ could be used as HOMEPAGE too.

Reply | Threaded
Open this post in threaded view
|

Re: Update devel/tkcvs from 6.0 to 8.2.3

currellberry
Ok, thank you for the helpful feedback.  I will implement the changes
and cc the maintainer on the next revision of the patch later today.

-- Currell

On Sun, Mar 18, 2018 at 4:34 AM, Landry Breuil <[hidden email]> wrote:

> On Sun, Mar 18, 2018 at 09:21:13AM +0100, Landry Breuil wrote:
>> On Sat, Mar 17, 2018 at 11:35:14PM -0400, Currell Berry wrote:
>> > From the Changelog it appears that tkcvs 6.0 is somewhere around 20
>> > years old -- upstream has changed a lot in the interim.
>> >
>> > NOTE: this change additionally requires you to manually delete the
>> > patches folder in devel/tkcvs.  No patches are needed on the new
>> > version, because the new installer lets you specify the destination
>> > directory from the command line. I couldn't figure out how to make cvs
>> > make a patch which showed the folder deletion!  I am a beginner at CVS
>> > and at Porting, so please let me know if there is something I should
>> > be doing differently.
>>
>> Minor things:
>> - you cant "delete" a folder in CVS, you just remove the files in it,
>>   cvs diff will show them deleted, and cvs up -P will delete the dir
>> from you local checkout
>> - this port has a maintainer, so when sending diffs for such port it's
>>   required to cc him
>> - i suppose you're removing the @conflict on kde-dev-scripts because
>>   cvscheck is gone from the PLIST - in that case better telling it
>> instead of having ppl reading the diff trying to figure out why :) - and
>> in that case the @conflict tkcvs-* in kde-dev-scripts should also be
>> removed
>> - when updating to a new version you should remove REVISION
>> - Tk, CVS and subversion - such a win combination :)
>>
> Oh, and as is it wont start:
>
> /usr/local/bin/tkcvs[4]: wish: not found
>
> 'wish' as a binary itself doesnt exist by default, so you need to use
> MODTCL_WISH_ADJ as an additional command in do-install to 'fix' the
> interpreted used by the scripts.
>
> do-install:
>         cd ${WRKSRC} && ${MODTCL_WISH_ADJ} tkcvs/tkcvs.tcl tkdiff/tkdiff.tcl
>         cd ${WRKSRC} && $(MODTCL_BIN) ./doinstall.tcl -nox ${PREFIX}
>
> Maybe http://www.twobarleycorns.net/ could be used as HOMEPAGE too.
>

Reply | Threaded
Open this post in threaded view
|

Re: Update devel/tkcvs from 6.0 to 8.2.3

currellberry
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

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
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.

If anyone sees any further problems please let me know and I will do
my best to correct them.

Thank you,
Currell

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/tkcvs/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- Makefile 22 Jan 2015 18:41:16 -0000 1.33
+++ Makefile 18 Mar 2018 18:52:11 -0000
@@ -1,15 +1,20 @@
 # $OpenBSD: Makefile,v 1.33 2015/01/22 18:41:16 naddy Exp $

-COMMENT= graphical frontend to CVS
-DISTNAME= tkcvs-6.0
-REVISION = 5
+COMMENT= graphical frontend to CVS and SVN
+DISTNAME= tkcvs-8.2.3
+REVISION = 0
 CATEGORIES= devel

 MAINTAINER= Todd T. Fries <[hidden email]>

+# License GPLv2 only
 PERMIT_PACKAGE_CDROM= Yes

-MASTER_SITES= http://www.neosoft.com/tcl/ftparchive/sorted/packages-7.6/apps/tkcvs-6.0/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tkcvs/} \
+ http://www.twobarleycorns.net/
+
+HOMEPAGE= http://www.twobarleycorns.net/tkcvs.html
+

 MODULES= x11/tk
 RUN_DEPENDS= ${MODTK_RUN_DEPENDS}
@@ -18,11 +23,8 @@ BUILD_DEPENDS= ${RUN_DEPENDS}
 NO_BUILD= Yes
 NO_TEST= Yes

-pre-configure:
- @${MODTCL_TCLSH_ADJ} ${WRKSRC}/tkcvs/cvscheck.blank
- @${SUBST_CMD} ${WRKSRC}/tkcvs/doinstall
-
 do-install:
- cd $(WRKSRC)/tkcvs; ./doinstall
+ cd ${WRKSRC} && ${MODTCL_WISH_ADJ} tkcvs/tkcvs.tcl tkdiff/tkdiff
+ cd ${WRKSRC} && $(MODTCL_BIN) ./doinstall.tcl -nox ${PREFIX}

 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/tkcvs/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 18 Jan 2015 03:13:48 -0000 1.4
+++ distinfo 18 Mar 2018 18:52:11 -0000
@@ -1,2 +1,2 @@
-SHA256 (tkcvs-6.0.tar.gz) = PfT5mVOrZD5/mxg6zDHNJbt5CpKdlgKePwl+XhH4KXI=
-SIZE (tkcvs-6.0.tar.gz) = 102022
+SHA256 (tkcvs-8.2.3.tar.gz) = S/sp3Z/7u8Hm5hHhx3KvdF10LTNueXvwVtv3ARa44yo=
+SIZE (tkcvs-8.2.3.tar.gz) = 570910
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/devel/tkcvs/pkg/DESCR,v
retrieving revision 1.2
diff -u -p -r1.2 DESCR
--- pkg/DESCR 15 Apr 2010 13:27:47 -0000 1.2
+++ pkg/DESCR 18 Mar 2018 18:52:11 -0000
@@ -1,35 +1,15 @@
-README for tkCVS release 6.0
+TkCVS is a Tcl/Tk-based graphical interface to the CVS and Subversion
+configuration management systems. It will also help with RCS. The
user interface
+is consistent across Unix/Linux, Windows, and MacOS X. TkDiff is included for
+browsing and merging your changes.
+
+It shows the status of the files in the current working directory,
and has tools
+for tagging, merging, importing, exporting, checking in/out, and other user
+operations.
+
+TkCVS also aids in browsing the repository. For Subversion, the repository tree
+is browsed like an ordinary file tree. For CVS, the CVSROOT/modules file is
+read. TkCVS extends CVS with a method to produce a "user friendly" listing of
+modules by using special comments in the CVSROOT/modules file.

-tkCVS is a Tk based graphical interface to the CVS configuration
-management system.  It includes facilities for providing "user
-friendly" names to modules and directories within the repository, and
-provides a facility to interactively browse the repository looking for
-modules and directories.
-
-Some of the features of tkCVS include:
-
--       File and directory browser, with optional display of hidden
- files, and display of the current directory's location within
- the CVS tree.
-
--       Push-button based check-in / check-out of CVS modules.  Ability
- to add and delete files from the repository also using push
- buttons.
-
--       Module tree browser, and reports showing the structure of the
- CVS modules tree.  Individual modules or entire directory trees
- may be checked out using the browser.
-
--       Updating of files from the repository when they change.
-
--       Tagging and branching of files from the file browser, and tagging
- and branching of modules from the module browser.
-
--       Exporting a CVS module or directory from the repository for
- delivery off-site.
-
-- Creation of patch files between two releases of a module, or
- between a release and the current (head) version.
-
-- Viewing of diff and status listings for currently checked out
- modules.
+TkCVS is free and open-source.
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/tkcvs/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST 8 Feb 2014 14:57:35 -0000 1.8
+++ pkg/PLIST 18 Mar 2018 18:52:11 -0000
@@ -1,48 +1,128 @@
-@comment $OpenBSD: PLIST,v 1.8 2014/02/08 14:57:35 espie Exp $
+@comment $OpenBSD$
 @conflict tkdiff-*
-@conflict kde-dev-scripts-*
-bin/cvscheck
 bin/tkcvs
 bin/tkdiff
-libdata/tkcvs/
-libdata/tkcvs/bindings.tcl
-libdata/tkcvs/bitmaps/
-libdata/tkcvs/bitmaps/add.xbm
-libdata/tkcvs/bitmaps/check.xbm
-libdata/tkcvs/bitmaps/checkin.xbm
-libdata/tkcvs/bitmaps/clean.xbm
-libdata/tkcvs/bitmaps/clear.xbm
-libdata/tkcvs/bitmaps/delete.xbm
-libdata/tkcvs/bitmaps/diff.xbm
-libdata/tkcvs/bitmaps/import.xbm
-libdata/tkcvs/bitmaps/logfile.xbm
-libdata/tkcvs/bitmaps/notebook.xbm
-libdata/tkcvs/bitmaps/refresh.xbm
-libdata/tkcvs/bitmaps/remove.xbm
-libdata/tkcvs/bitmaps/tkcvs16.xbm
-libdata/tkcvs/bitmaps/tkcvs32.xbm
-libdata/tkcvs/bitmaps/tkcvs32_mask.xbm
-libdata/tkcvs/bitmaps/tree16.xbm
-libdata/tkcvs/bitmaps/update.xbm
-libdata/tkcvs/checkout.tcl
-libdata/tkcvs/commit.tcl
-libdata/tkcvs/cvs.tcl
-libdata/tkcvs/errors.tcl
-libdata/tkcvs/filebrowse.tcl
-libdata/tkcvs/help.tcl
-libdata/tkcvs/import.tcl
-libdata/tkcvs/logcanvas.tcl
-libdata/tkcvs/merge.tcl
-libdata/tkcvs/modules.tcl
-libdata/tkcvs/reports.tcl
-libdata/tkcvs/search.tcl
-libdata/tkcvs/static.tcl
-libdata/tkcvs/tag.tcl
-libdata/tkcvs/tclIndex
-libdata/tkcvs/tkcvs_def.tcl
-libdata/tkcvs/tooltips.tcl
-libdata/tkcvs/update.tcl
-libdata/tkcvs/venget.tcl
-libdata/tkcvs/workdir.tcl
-@man man/mann/tkcvs.n
-@man man/mann/tkdiff.n
+lib/tkcvs/
+lib/tkcvs/annotate.tcl
+lib/tkcvs/bitmaps/
+lib/tkcvs/bitmaps/add.gif
+lib/tkcvs/bitmaps/adir.gif
+lib/tkcvs/bitmaps/amod.gif
+lib/tkcvs/bitmaps/anglerfish_med.gif
+lib/tkcvs/bitmaps/annotate.gif
+lib/tkcvs/bitmaps/annotate.xbm
+lib/tkcvs/bitmaps/arrow_dn.gif
+lib/tkcvs/bitmaps/arrow_hl_dn.gif
+lib/tkcvs/bitmaps/arrow_hl_up.gif
+lib/tkcvs/bitmaps/arrow_up.gif
+lib/tkcvs/bitmaps/branch.gif
+lib/tkcvs/bitmaps/branch.xbm
+lib/tkcvs/bitmaps/branchtag.gif
+lib/tkcvs/bitmaps/check.gif
+lib/tkcvs/bitmaps/checkin.gif
+lib/tkcvs/bitmaps/checkout.gif
+lib/tkcvs/bitmaps/checkout_opts.gif
+lib/tkcvs/bitmaps/conflict.gif
+lib/tkcvs/bitmaps/cvs-says.xbm
+lib/tkcvs/bitmaps/cvsdir.gif
+lib/tkcvs/bitmaps/delete.gif
+lib/tkcvs/bitmaps/delete_red.gif
+lib/tkcvs/bitmaps/diff.gif
+lib/tkcvs/bitmaps/dir.gif
+lib/tkcvs/bitmaps/dir_minus.gif
+lib/tkcvs/bitmaps/dir_new.gif
+lib/tkcvs/bitmaps/dir_ok.gif
+lib/tkcvs/bitmaps/dir_ood.gif
+lib/tkcvs/bitmaps/dir_plus.gif
+lib/tkcvs/bitmaps/dir_ques.gif
+lib/tkcvs/bitmaps/dirbranch.gif
+lib/tkcvs/bitmaps/dirbranch.xbm
+lib/tkcvs/bitmaps/edit.gif
+lib/tkcvs/bitmaps/export.gif
+lib/tkcvs/bitmaps/fileedit.gif
+lib/tkcvs/bitmaps/files.gif
+lib/tkcvs/bitmaps/fileview.gif
+lib/tkcvs/bitmaps/folder.gif
+lib/tkcvs/bitmaps/folderopen.gif
+lib/tkcvs/bitmaps/import.gif
+lib/tkcvs/bitmaps/link.gif
+lib/tkcvs/bitmaps/link_mod.gif
+lib/tkcvs/bitmaps/link_modml.gif
+lib/tkcvs/bitmaps/link_modol.gif
+lib/tkcvs/bitmaps/link_ok.gif
+lib/tkcvs/bitmaps/link_okml.gif
+lib/tkcvs/bitmaps/link_okol.gif
+lib/tkcvs/bitmaps/link_plus.gif
+lib/tkcvs/bitmaps/link_ques.gif
+lib/tkcvs/bitmaps/locked.gif
+lib/tkcvs/bitmaps/log.gif
+lib/tkcvs/bitmaps/loop-ball.gif
+lib/tkcvs/bitmaps/loop-glasses.gif
+lib/tkcvs/bitmaps/man.gif
+lib/tkcvs/bitmaps/mdir.gif
+lib/tkcvs/bitmaps/mod.gif
+lib/tkcvs/bitmaps/modbrowse.gif
+lib/tkcvs/bitmaps/modbrowse_cvs.gif
+lib/tkcvs/bitmaps/modbrowse_svn.gif
+lib/tkcvs/bitmaps/newmerge.gif
+lib/tkcvs/bitmaps/newmerge_simple.gif
+lib/tkcvs/bitmaps/paper.gif
+lib/tkcvs/bitmaps/patchfile.gif
+lib/tkcvs/bitmaps/rcsdir.gif
+lib/tkcvs/bitmaps/rdiff.gif
+lib/tkcvs/bitmaps/remove.gif
+lib/tkcvs/bitmaps/stat_conf.gif
+lib/tkcvs/bitmaps/stat_ex.gif
+lib/tkcvs/bitmaps/stat_kb.gif
+lib/tkcvs/bitmaps/stat_merge.gif
+lib/tkcvs/bitmaps/stat_minus.gif
+lib/tkcvs/bitmaps/stat_mod.gif
+lib/tkcvs/bitmaps/stat_modml.gif
+lib/tkcvs/bitmaps/stat_modol.gif
+lib/tkcvs/bitmaps/stat_ok.gif
+lib/tkcvs/bitmaps/stat_okml.gif
+lib/tkcvs/bitmaps/stat_okol.gif
+lib/tkcvs/bitmaps/stat_ood.gif
+lib/tkcvs/bitmaps/stat_plus.gif
+lib/tkcvs/bitmaps/stat_plus_kb.gif
+lib/tkcvs/bitmaps/stat_ques.gif
+lib/tkcvs/bitmaps/svndir.gif
+lib/tkcvs/bitmaps/tag.gif
+lib/tkcvs/bitmaps/tags.gif
+lib/tkcvs/bitmaps/ticklefish48.gif
+lib/tkcvs/bitmaps/ticklefish_med.gif
+lib/tkcvs/bitmaps/tkcvs-help.xbm
+lib/tkcvs/bitmaps/tkcvs48.xbm
+lib/tkcvs/bitmaps/trace.xbm
+lib/tkcvs/bitmaps/unedit.gif
+lib/tkcvs/bitmaps/unlocked.gif
+lib/tkcvs/bitmaps/updir.gif
+lib/tkcvs/bitmaps/who.gif
+lib/tkcvs/branch_diagram.tcl
+lib/tkcvs/cvs.tcl
+lib/tkcvs/dialog.tcl
+lib/tkcvs/diff.tcl
+lib/tkcvs/dircanvas.tcl
+lib/tkcvs/errors.tcl
+lib/tkcvs/exec.tcl
+lib/tkcvs/filebrowse.tcl
+lib/tkcvs/gen_log.tcl
+lib/tkcvs/help.tcl
+lib/tkcvs/import.tcl
+lib/tkcvs/import2.tcl
+lib/tkcvs/joincanvas.tcl
+lib/tkcvs/modbrowse.tcl
+lib/tkcvs/modtree.tcl
+lib/tkcvs/modules.tcl
+lib/tkcvs/picklist.tcl
+lib/tkcvs/rcs.tcl
+lib/tkcvs/style_params.tcl
+lib/tkcvs/svn-import.tcl
+lib/tkcvs/svn.tcl
+lib/tkcvs/tclIndex
+lib/tkcvs/tkcvs_def.tcl
+lib/tkcvs/tooltips.tcl
+lib/tkcvs/ui_misc.tcl
+lib/tkcvs/vendor_merge.tcl
+lib/tkcvs/workdir.tcl
+@man man/man1/tkcvs.1


Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/kde4/dev-scripts/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 9 Jul 2014 20:03:23 -0000 1.3
+++ pkg/PLIST 18 Mar 2018 18:59:43 -0000
@@ -1,6 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.3 2014/07/09 20:03:23 zhuk Exp $
 @conflict kdesdk-<4.11
-@conflict tkcvs-*
 bin/adddebug
 bin/build-progress.sh
 bin/cheatmake


On Sun, Mar 18, 2018 at 8:43 AM, Currell Berry <[hidden email]> wrote:

> Ok, thank you for the helpful feedback.  I will implement the changes
> and cc the maintainer on the next revision of the patch later today.
>
> -- Currell
>
> On Sun, Mar 18, 2018 at 4:34 AM, Landry Breuil <[hidden email]> wrote:
>> On Sun, Mar 18, 2018 at 09:21:13AM +0100, Landry Breuil wrote:
>>> On Sat, Mar 17, 2018 at 11:35:14PM -0400, Currell Berry wrote:
>>> > From the Changelog it appears that tkcvs 6.0 is somewhere around 20
>>> > years old -- upstream has changed a lot in the interim.
>>> >
>>> > NOTE: this change additionally requires you to manually delete the
>>> > patches folder in devel/tkcvs.  No patches are needed on the new
>>> > version, because the new installer lets you specify the destination
>>> > directory from the command line. I couldn't figure out how to make cvs
>>> > make a patch which showed the folder deletion!  I am a beginner at CVS
>>> > and at Porting, so please let me know if there is something I should
>>> > be doing differently.
>>>
>>> Minor things:
>>> - you cant "delete" a folder in CVS, you just remove the files in it,
>>>   cvs diff will show them deleted, and cvs up -P will delete the dir
>>> from you local checkout
>>> - this port has a maintainer, so when sending diffs for such port it's
>>>   required to cc him
>>> - i suppose you're removing the @conflict on kde-dev-scripts because
>>>   cvscheck is gone from the PLIST - in that case better telling it
>>> instead of having ppl reading the diff trying to figure out why :) - and
>>> in that case the @conflict tkcvs-* in kde-dev-scripts should also be
>>> removed
>>> - when updating to a new version you should remove REVISION
>>> - Tk, CVS and subversion - such a win combination :)
>>>
>> Oh, and as is it wont start:
>>
>> /usr/local/bin/tkcvs[4]: wish: not found
>>
>> 'wish' as a binary itself doesnt exist by default, so you need to use
>> MODTCL_WISH_ADJ as an additional command in do-install to 'fix' the
>> interpreted used by the scripts.
>>
>> do-install:
>>         cd ${WRKSRC} && ${MODTCL_WISH_ADJ} tkcvs/tkcvs.tcl tkdiff/tkdiff.tcl
>>         cd ${WRKSRC} && $(MODTCL_BIN) ./doinstall.tcl -nox ${PREFIX}
>>
>> Maybe http://www.twobarleycorns.net/ could be used as HOMEPAGE too.
>>

tkcvs_8.2.3_patch_v2.patch (9K) Download Attachment
kde-dev-scripts.patch (459 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: Update devel/tkcvs from 6.0 to 8.2.3

Landry Breuil-5
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

Reply | Threaded
Open this post in threaded view
|

Re: Update devel/tkcvs from 6.0 to 8.2.3

currellberry
Thank you for your help -- here is another revision of the patches --
the first one for tkcvs and the second one for kde4/dev-scripts.

-- Currell

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/tkcvs/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- Makefile 22 Jan 2015 18:41:16 -0000 1.33
+++ Makefile 19 Mar 2018 01:18:44 -0000
@@ -1,15 +1,19 @@
 # $OpenBSD: Makefile,v 1.33 2015/01/22 18:41:16 naddy Exp $

-COMMENT= graphical frontend to CVS
-DISTNAME= tkcvs-6.0
-REVISION = 5
+COMMENT= graphical frontend to CVS and SVN
+DISTNAME= tkcvs-8.2.3
 CATEGORIES= devel

 MAINTAINER= Todd T. Fries <[hidden email]>

+# License GPLv2 only
 PERMIT_PACKAGE_CDROM= Yes

-MASTER_SITES= http://www.neosoft.com/tcl/ftparchive/sorted/packages-7.6/apps/tkcvs-6.0/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tkcvs/} \
+ http://www.twobarleycorns.net/
+
+HOMEPAGE= http://www.twobarleycorns.net/tkcvs.html
+

 MODULES= x11/tk
 RUN_DEPENDS= ${MODTK_RUN_DEPENDS}
@@ -18,11 +22,8 @@ BUILD_DEPENDS= ${RUN_DEPENDS}
 NO_BUILD= Yes
 NO_TEST= Yes

-pre-configure:
- @${MODTCL_TCLSH_ADJ} ${WRKSRC}/tkcvs/cvscheck.blank
- @${SUBST_CMD} ${WRKSRC}/tkcvs/doinstall
-
 do-install:
- cd $(WRKSRC)/tkcvs; ./doinstall
+ cd ${WRKSRC} && $(MODTCL_BIN) ./doinstall.tcl -nox ${PREFIX}
+ cd ${PREFIX}/bin && ${MODTCL_WISH_ADJ} tkcvs tkdiff

 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/tkcvs/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 18 Jan 2015 03:13:48 -0000 1.4
+++ distinfo 19 Mar 2018 01:18:44 -0000
@@ -1,2 +1,2 @@
-SHA256 (tkcvs-6.0.tar.gz) = PfT5mVOrZD5/mxg6zDHNJbt5CpKdlgKePwl+XhH4KXI=
-SIZE (tkcvs-6.0.tar.gz) = 102022
+SHA256 (tkcvs-8.2.3.tar.gz) = S/sp3Z/7u8Hm5hHhx3KvdF10LTNueXvwVtv3ARa44yo=
+SIZE (tkcvs-8.2.3.tar.gz) = 570910
Index: patches/patch-tkcvs_cvs_tcl
===================================================================
RCS file: patches/patch-tkcvs_cvs_tcl
diff -N patches/patch-tkcvs_cvs_tcl
--- patches/patch-tkcvs_cvs_tcl 26 Oct 2007 20:44:35 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-tkcvs_cvs_tcl,v 1.1 2007/10/26 20:44:35 ajacoutot Exp $
---- tkcvs/cvs.tcl.orig Sat May 25 04:54:58 1996
-+++ tkcvs/cvs.tcl Fri Oct 26 22:41:28 2007
-@@ -285,7 +285,7 @@ proc cvs_commit {revision comment args} {
-       # -sj
-       set errstr "You must select files to be committed with CVS version"
-       set errstr "$errstr $cvscfg(cvsver)."
--      set errstr "$errstr\n\nEither select a list of files or upgrade
-+      set errstr "$errstr\n\nEither select a list of files or upgrade"
-       set errstr "$errstr your CVS to version 1.3"
-       cvserror "$errstr"
-       return
Index: patches/patch-tkcvs_doinstall
===================================================================
RCS file: patches/patch-tkcvs_doinstall
diff -N patches/patch-tkcvs_doinstall
--- patches/patch-tkcvs_doinstall 13 Mar 2009 13:36:57 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,131 +0,0 @@
-$OpenBSD: patch-tkcvs_doinstall,v 1.2 2009/03/13 13:36:57 sthen Exp $
---- tkcvs/doinstall.orig Tue Jan  9 21:17:52 1996
-+++ tkcvs/doinstall Fri Mar 13 13:28:27 2009
-@@ -2,39 +2,32 @@
- #
- # $Id: patch-tkcvs_doinstall,v 1.2 2009/03/13 13:36:57 sthen Exp $
- #
--
-+PATH=/bin:/usr/bin:/sbin:/usr/sbin:${LOCALBASE}/bin
- # Some rational and reasonable defaults.
-
--INSTALLDIR=/usr/local/lib
--BINDIR=/usr/local/bin
--MANDIR=/usr/local/man/mann
-+INSTALLDIR=${LOCALBASE}/libdata
-+BINDIR=${LOCALBASE}/bin
-+MANDIR=${LOCALBASE}/man/mann
-
- INSTALL_PROG=./install-sh
-
- # This must be an X based editor -- do NOT use vi except via an xterm
- # or shelltool.
-
--EDITOR=nedit
-+EDITOR=xedit
-
- # Find a Tk interpreter.
-
--WISH=`which wish4.0`
--if [ ! -f $WISH ]; then
--  WISH=`which wish4.1`
--fi
--if [ ! -f $WISH ]; then
-+WISH=${MODTK_BIN}
-+if [ ! -f ${WISH} ]
-+then
-   echo "I cant find a Tk interpreter on your system"
-   exit 1
- fi
-
- # Find where the global bitmaps are.
-
--for GDIR in /usr/include/X11/bitmaps
/usr/openwin/include/X11/bitmaps /usr/X11/include/bitmaps
/usr/include/bitmaps /usr/local/include/bitmaps
--do
--  if [ -d "$GDIR" ]; then
--    break
--  fi
--done
-+GDIR=${X11BASE}/include/X11/bitmaps
- if [ ! -d "$GDIR" ]; then
-   echo "Enter the directory where your X11 bitmaps are stored:"
-   GDIR=`line`
-@@ -46,15 +39,15 @@ fi
-
- # Find out where we want the system installed.
-
--if [ ! -d "$INSTALLDIR" ]; then
-+if [ ! -d "${DESTDIR}$INSTALLDIR" ]; then
-   echo "Enter the top level installation directory:"
-   INSTALLDIR=`line`
--  mkdir -p $INSTALLDIR
--  if [ ! -d $INSTALLDIR ]; then
-+  mkdir -p ${DESTDIR}$INSTALLDIR
-+  if [ ! -d ${DESTDIR}$INSTALLDIR ]; then
-     echo "I cant create that directory"
-     exit 1
-   fi
--  if [ ! -w $INSTALLDIR ]; then
-+  if [ ! -w ${DESTDIR}$INSTALLDIR ]; then
-     echo "I cant write to that directory"
-     exit 1
-   fi
-@@ -62,25 +55,25 @@ fi
-
- # Some directories we have to create.
-
--LDIR=${INSTALLDIR}/bitmaps
-+LDIR=${INSTALLDIR}/tkcvs/bitmaps
- TCDIR=${INSTALLDIR}/tkcvs
--mkdir -p $LDIR $TCDIR
-+mkdir -p ${DESTDIR}$LDIR ${DESTDIR}$TCDIR
- for dir in $LDIR $TCDIR
- do
--  if [ ! -d $dir ]; then
-+  if [ ! -d ${DESTDIR}$dir ]; then
-     echo "I cant create the directory $dir"
-     exit 1
-   fi
- done
-
--if [ ! -d "$BINDIR" ]; then
-+if [ ! -d ${DESTDIR}"$BINDIR" ]; then
-   echo "Enter the directory where you want the programs to be stored:"
-   BINDIR=`line`
--  if [ ! -d "$BINDIR" ]; then
-+  if [ ! -d ${DESTDIR}"$BINDIR" ]; then
-     echo "I cant find that directory"
-     exit 1
-   fi
--  if [ ! -w "$BINDIR" ]; then
-+  if [ ! -w ${DESTDIR}"$BINDIR" ]; then
-     echo "I cant write to that directory"
-     exit 1
-   fi
-@@ -94,21 +87,21 @@ do
-       -e "/GDIR/ s;;$GDIR;g" \
-       -e "/EDITOR/ s;;$EDITOR;g" \
-       -e "/TCDIR/ s;;$TCDIR;g" ${file}.blank >$file
--    $INSTALL_PROG -m 555 $file $BINDIR
-+    $INSTALL_PROG -m 555 $file ${DESTDIR}$BINDIR
-     rm -f $file
-   fi
- done
-
- for f in *.n ../tkdiff/*.n
- do
--        $INSTALL_PROG -m 444 $f $MANDIR
-+        $INSTALL_PROG -m 444 $f ${DESTDIR}$MANDIR
- done
- for f in *.tcl
- do
--        $INSTALL_PROG -m 444 $f $TCDIR
-+        $INSTALL_PROG -m 444 $f ${DESTDIR}$TCDIR
- done
- for f in ../bitmaps/*.xbm
- do
--        $INSTALL_PROG -m 444 $f $LDIR
-+        $INSTALL_PROG -m 444 $f ${DESTDIR}$LDIR
- done
--$INSTALL_PROG -m 444 tclIndex $TCDIR
-+$INSTALL_PROG -m 444 tclIndex ${DESTDIR}$TCDIR
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/devel/tkcvs/pkg/DESCR,v
retrieving revision 1.2
diff -u -p -r1.2 DESCR
--- pkg/DESCR 15 Apr 2010 13:27:47 -0000 1.2
+++ pkg/DESCR 19 Mar 2018 01:18:44 -0000
@@ -1,35 +1,15 @@
-README for tkCVS release 6.0
+TkCVS is a Tcl/Tk-based graphical interface to the CVS and Subversion
+configuration management systems. It will also help with RCS. The
user interface
+is consistent across Unix/Linux, Windows, and MacOS X. TkDiff is included for
+browsing and merging your changes.
+
+It shows the status of the files in the current working directory,
and has tools
+for tagging, merging, importing, exporting, checking in/out, and other user
+operations.
+
+TkCVS also aids in browsing the repository. For Subversion, the repository tree
+is browsed like an ordinary file tree. For CVS, the CVSROOT/modules file is
+read. TkCVS extends CVS with a method to produce a "user friendly" listing of
+modules by using special comments in the CVSROOT/modules file.

-tkCVS is a Tk based graphical interface to the CVS configuration
-management system.  It includes facilities for providing "user
-friendly" names to modules and directories within the repository, and
-provides a facility to interactively browse the repository looking for
-modules and directories.
-
-Some of the features of tkCVS include:
-
--       File and directory browser, with optional display of hidden
- files, and display of the current directory's location within
- the CVS tree.
-
--       Push-button based check-in / check-out of CVS modules.  Ability
- to add and delete files from the repository also using push
- buttons.
-
--       Module tree browser, and reports showing the structure of the
- CVS modules tree.  Individual modules or entire directory trees
- may be checked out using the browser.
-
--       Updating of files from the repository when they change.
-
--       Tagging and branching of files from the file browser, and tagging
- and branching of modules from the module browser.
-
--       Exporting a CVS module or directory from the repository for
- delivery off-site.
-
-- Creation of patch files between two releases of a module, or
- between a release and the current (head) version.
-
-- Viewing of diff and status listings for currently checked out
- modules.
+TkCVS is free and open-source.
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/tkcvs/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST 8 Feb 2014 14:57:35 -0000 1.8
+++ pkg/PLIST 19 Mar 2018 01:18:44 -0000
@@ -1,48 +1,128 @@
-@comment $OpenBSD: PLIST,v 1.8 2014/02/08 14:57:35 espie Exp $
+@comment $OpenBSD$
 @conflict tkdiff-*
-@conflict kde-dev-scripts-*
-bin/cvscheck
 bin/tkcvs
 bin/tkdiff
-libdata/tkcvs/
-libdata/tkcvs/bindings.tcl
-libdata/tkcvs/bitmaps/
-libdata/tkcvs/bitmaps/add.xbm
-libdata/tkcvs/bitmaps/check.xbm
-libdata/tkcvs/bitmaps/checkin.xbm
-libdata/tkcvs/bitmaps/clean.xbm
-libdata/tkcvs/bitmaps/clear.xbm
-libdata/tkcvs/bitmaps/delete.xbm
-libdata/tkcvs/bitmaps/diff.xbm
-libdata/tkcvs/bitmaps/import.xbm
-libdata/tkcvs/bitmaps/logfile.xbm
-libdata/tkcvs/bitmaps/notebook.xbm
-libdata/tkcvs/bitmaps/refresh.xbm
-libdata/tkcvs/bitmaps/remove.xbm
-libdata/tkcvs/bitmaps/tkcvs16.xbm
-libdata/tkcvs/bitmaps/tkcvs32.xbm
-libdata/tkcvs/bitmaps/tkcvs32_mask.xbm
-libdata/tkcvs/bitmaps/tree16.xbm
-libdata/tkcvs/bitmaps/update.xbm
-libdata/tkcvs/checkout.tcl
-libdata/tkcvs/commit.tcl
-libdata/tkcvs/cvs.tcl
-libdata/tkcvs/errors.tcl
-libdata/tkcvs/filebrowse.tcl
-libdata/tkcvs/help.tcl
-libdata/tkcvs/import.tcl
-libdata/tkcvs/logcanvas.tcl
-libdata/tkcvs/merge.tcl
-libdata/tkcvs/modules.tcl
-libdata/tkcvs/reports.tcl
-libdata/tkcvs/search.tcl
-libdata/tkcvs/static.tcl
-libdata/tkcvs/tag.tcl
-libdata/tkcvs/tclIndex
-libdata/tkcvs/tkcvs_def.tcl
-libdata/tkcvs/tooltips.tcl
-libdata/tkcvs/update.tcl
-libdata/tkcvs/venget.tcl
-libdata/tkcvs/workdir.tcl
-@man man/mann/tkcvs.n
-@man man/mann/tkdiff.n
+lib/tkcvs/
+lib/tkcvs/annotate.tcl
+lib/tkcvs/bitmaps/
+lib/tkcvs/bitmaps/add.gif
+lib/tkcvs/bitmaps/adir.gif
+lib/tkcvs/bitmaps/amod.gif
+lib/tkcvs/bitmaps/anglerfish_med.gif
+lib/tkcvs/bitmaps/annotate.gif
+lib/tkcvs/bitmaps/annotate.xbm
+lib/tkcvs/bitmaps/arrow_dn.gif
+lib/tkcvs/bitmaps/arrow_hl_dn.gif
+lib/tkcvs/bitmaps/arrow_hl_up.gif
+lib/tkcvs/bitmaps/arrow_up.gif
+lib/tkcvs/bitmaps/branch.gif
+lib/tkcvs/bitmaps/branch.xbm
+lib/tkcvs/bitmaps/branchtag.gif
+lib/tkcvs/bitmaps/check.gif
+lib/tkcvs/bitmaps/checkin.gif
+lib/tkcvs/bitmaps/checkout.gif
+lib/tkcvs/bitmaps/checkout_opts.gif
+lib/tkcvs/bitmaps/conflict.gif
+lib/tkcvs/bitmaps/cvs-says.xbm
+lib/tkcvs/bitmaps/cvsdir.gif
+lib/tkcvs/bitmaps/delete.gif
+lib/tkcvs/bitmaps/delete_red.gif
+lib/tkcvs/bitmaps/diff.gif
+lib/tkcvs/bitmaps/dir.gif
+lib/tkcvs/bitmaps/dir_minus.gif
+lib/tkcvs/bitmaps/dir_new.gif
+lib/tkcvs/bitmaps/dir_ok.gif
+lib/tkcvs/bitmaps/dir_ood.gif
+lib/tkcvs/bitmaps/dir_plus.gif
+lib/tkcvs/bitmaps/dir_ques.gif
+lib/tkcvs/bitmaps/dirbranch.gif
+lib/tkcvs/bitmaps/dirbranch.xbm
+lib/tkcvs/bitmaps/edit.gif
+lib/tkcvs/bitmaps/export.gif
+lib/tkcvs/bitmaps/fileedit.gif
+lib/tkcvs/bitmaps/files.gif
+lib/tkcvs/bitmaps/fileview.gif
+lib/tkcvs/bitmaps/folder.gif
+lib/tkcvs/bitmaps/folderopen.gif
+lib/tkcvs/bitmaps/import.gif
+lib/tkcvs/bitmaps/link.gif
+lib/tkcvs/bitmaps/link_mod.gif
+lib/tkcvs/bitmaps/link_modml.gif
+lib/tkcvs/bitmaps/link_modol.gif
+lib/tkcvs/bitmaps/link_ok.gif
+lib/tkcvs/bitmaps/link_okml.gif
+lib/tkcvs/bitmaps/link_okol.gif
+lib/tkcvs/bitmaps/link_plus.gif
+lib/tkcvs/bitmaps/link_ques.gif
+lib/tkcvs/bitmaps/locked.gif
+lib/tkcvs/bitmaps/log.gif
+lib/tkcvs/bitmaps/loop-ball.gif
+lib/tkcvs/bitmaps/loop-glasses.gif
+lib/tkcvs/bitmaps/man.gif
+lib/tkcvs/bitmaps/mdir.gif
+lib/tkcvs/bitmaps/mod.gif
+lib/tkcvs/bitmaps/modbrowse.gif
+lib/tkcvs/bitmaps/modbrowse_cvs.gif
+lib/tkcvs/bitmaps/modbrowse_svn.gif
+lib/tkcvs/bitmaps/newmerge.gif
+lib/tkcvs/bitmaps/newmerge_simple.gif
+lib/tkcvs/bitmaps/paper.gif
+lib/tkcvs/bitmaps/patchfile.gif
+lib/tkcvs/bitmaps/rcsdir.gif
+lib/tkcvs/bitmaps/rdiff.gif
+lib/tkcvs/bitmaps/remove.gif
+lib/tkcvs/bitmaps/stat_conf.gif
+lib/tkcvs/bitmaps/stat_ex.gif
+lib/tkcvs/bitmaps/stat_kb.gif
+lib/tkcvs/bitmaps/stat_merge.gif
+lib/tkcvs/bitmaps/stat_minus.gif
+lib/tkcvs/bitmaps/stat_mod.gif
+lib/tkcvs/bitmaps/stat_modml.gif
+lib/tkcvs/bitmaps/stat_modol.gif
+lib/tkcvs/bitmaps/stat_ok.gif
+lib/tkcvs/bitmaps/stat_okml.gif
+lib/tkcvs/bitmaps/stat_okol.gif
+lib/tkcvs/bitmaps/stat_ood.gif
+lib/tkcvs/bitmaps/stat_plus.gif
+lib/tkcvs/bitmaps/stat_plus_kb.gif
+lib/tkcvs/bitmaps/stat_ques.gif
+lib/tkcvs/bitmaps/svndir.gif
+lib/tkcvs/bitmaps/tag.gif
+lib/tkcvs/bitmaps/tags.gif
+lib/tkcvs/bitmaps/ticklefish48.gif
+lib/tkcvs/bitmaps/ticklefish_med.gif
+lib/tkcvs/bitmaps/tkcvs-help.xbm
+lib/tkcvs/bitmaps/tkcvs48.xbm
+lib/tkcvs/bitmaps/trace.xbm
+lib/tkcvs/bitmaps/unedit.gif
+lib/tkcvs/bitmaps/unlocked.gif
+lib/tkcvs/bitmaps/updir.gif
+lib/tkcvs/bitmaps/who.gif
+lib/tkcvs/branch_diagram.tcl
+lib/tkcvs/cvs.tcl
+lib/tkcvs/dialog.tcl
+lib/tkcvs/diff.tcl
+lib/tkcvs/dircanvas.tcl
+lib/tkcvs/errors.tcl
+lib/tkcvs/exec.tcl
+lib/tkcvs/filebrowse.tcl
+lib/tkcvs/gen_log.tcl
+lib/tkcvs/help.tcl
+lib/tkcvs/import.tcl
+lib/tkcvs/import2.tcl
+lib/tkcvs/joincanvas.tcl
+lib/tkcvs/modbrowse.tcl
+lib/tkcvs/modtree.tcl
+lib/tkcvs/modules.tcl
+lib/tkcvs/picklist.tcl
+lib/tkcvs/rcs.tcl
+lib/tkcvs/style_params.tcl
+lib/tkcvs/svn-import.tcl
+lib/tkcvs/svn.tcl
+lib/tkcvs/tclIndex
+lib/tkcvs/tkcvs_def.tcl
+lib/tkcvs/tooltips.tcl
+lib/tkcvs/ui_misc.tcl
+lib/tkcvs/vendor_merge.tcl
+lib/tkcvs/workdir.tcl
+@man man/man1/tkcvs.1


Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/kde4/dev-scripts/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 9 Jul 2014 20:03:23 -0000 1.3
+++ pkg/PLIST 18 Mar 2018 18:59:43 -0000
@@ -1,6 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.3 2014/07/09 20:03:23 zhuk Exp $
 @conflict kdesdk-<4.11
-@conflict tkcvs-*
 bin/adddebug
 bin/build-progress.sh
 bin/cheatmake







On Sun, Mar 18, 2018 at 3:31 PM, Landry Breuil <[hidden email]> wrote:

> 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
>

tkcvs_8.2.3_patch_v3.patch (14K) Download Attachment
kde-dev-scripts.patch (459 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: Update devel/tkcvs from 6.0 to 8.2.3

Stuart Henderson
On 2018/03/18 21:25, Currell Berry wrote:
> Thank you for your help -- here is another revision of the patches --
> the first one for tkcvs and the second one for kde4/dev-scripts.

There's not much point including a copy of tkdiff here, it's identical
to the standalone one. Let's remove it in favour of a dep and get rid
of the conflict.

Couple of other tweaks: rewrap DESCR (no more lines but flows better),
put HOMEPAGE in the normal place, use https, drop the "only" from
license information as it's not clear in the distfile (it's not done
correctly anyway as there's no copyright assignment but at least the
intent is clear - and v6.0 that we have in tree has nothing in the
distfile at all except for a small piece of code reused from something
else so what's in-tree now is wrong for sure).



Index: devel/tkcvs/Makefile
===================================================================
RCS file: /cvs/ports/devel/tkcvs/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- devel/tkcvs/Makefile 22 Jan 2015 18:41:16 -0000 1.33
+++ devel/tkcvs/Makefile 19 Mar 2018 10:26:33 -0000
@@ -1,28 +1,30 @@
 # $OpenBSD: Makefile,v 1.33 2015/01/22 18:41:16 naddy Exp $
 
 COMMENT= graphical frontend to CVS
-DISTNAME= tkcvs-6.0
-REVISION = 5
+DISTNAME= tkcvs-8.2.3
 CATEGORIES= devel
 
+HOMEPAGE= https://www.twobarleycorns.net/tkcvs.html
+
 MAINTAINER= Todd T. Fries <[hidden email]>
 
+# GPLv2
 PERMIT_PACKAGE_CDROM= Yes
 
-MASTER_SITES= http://www.neosoft.com/tcl/ftparchive/sorted/packages-7.6/apps/tkcvs-6.0/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tkcvs/} \
+ https://www.twobarleycorns.net/
 
 MODULES= x11/tk
-RUN_DEPENDS= ${MODTK_RUN_DEPENDS}
-BUILD_DEPENDS= ${RUN_DEPENDS}
+BUILD_DEPENDS= ${MODTK_RUN_DEPENDS}
+RUN_DEPENDS= ${MODTK_RUN_DEPENDS} \
+ devel/tkdiff
 
 NO_BUILD= Yes
 NO_TEST= Yes
 
-pre-configure:
- @${MODTCL_TCLSH_ADJ} ${WRKSRC}/tkcvs/cvscheck.blank
- @${SUBST_CMD} ${WRKSRC}/tkcvs/doinstall
-
 do-install:
- cd $(WRKSRC)/tkcvs; ./doinstall
+ cd ${WRKSRC} && $(MODTCL_BIN) ./doinstall.tcl -nox ${PREFIX}
+ rm ${PREFIX}/bin/tkdiff
+ cd ${PREFIX}/bin && ${MODTCL_WISH_ADJ} tkcvs
 
 .include <bsd.port.mk>
Index: devel/tkcvs/distinfo
===================================================================
RCS file: /cvs/ports/devel/tkcvs/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- devel/tkcvs/distinfo 18 Jan 2015 03:13:48 -0000 1.4
+++ devel/tkcvs/distinfo 19 Mar 2018 10:26:33 -0000
@@ -1,2 +1,2 @@
-SHA256 (tkcvs-6.0.tar.gz) = PfT5mVOrZD5/mxg6zDHNJbt5CpKdlgKePwl+XhH4KXI=
-SIZE (tkcvs-6.0.tar.gz) = 102022
+SHA256 (tkcvs-8.2.3.tar.gz) = S/sp3Z/7u8Hm5hHhx3KvdF10LTNueXvwVtv3ARa44yo=
+SIZE (tkcvs-8.2.3.tar.gz) = 570910
Index: devel/tkcvs/patches/patch-tkcvs_cvs_tcl
===================================================================
RCS file: devel/tkcvs/patches/patch-tkcvs_cvs_tcl
diff -N devel/tkcvs/patches/patch-tkcvs_cvs_tcl
--- devel/tkcvs/patches/patch-tkcvs_cvs_tcl 26 Oct 2007 20:44:35 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-tkcvs_cvs_tcl,v 1.1 2007/10/26 20:44:35 ajacoutot Exp $
---- tkcvs/cvs.tcl.orig Sat May 25 04:54:58 1996
-+++ tkcvs/cvs.tcl Fri Oct 26 22:41:28 2007
-@@ -285,7 +285,7 @@ proc cvs_commit {revision comment args} {
-       # -sj
-       set errstr "You must select files to be committed with CVS version"
-       set errstr "$errstr $cvscfg(cvsver)."
--      set errstr "$errstr\n\nEither select a list of files or upgrade
-+      set errstr "$errstr\n\nEither select a list of files or upgrade"
-       set errstr "$errstr your CVS to version 1.3"
-       cvserror "$errstr"
-       return
Index: devel/tkcvs/patches/patch-tkcvs_doinstall
===================================================================
RCS file: devel/tkcvs/patches/patch-tkcvs_doinstall
diff -N devel/tkcvs/patches/patch-tkcvs_doinstall
--- devel/tkcvs/patches/patch-tkcvs_doinstall 13 Mar 2009 13:36:57 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,131 +0,0 @@
-$OpenBSD: patch-tkcvs_doinstall,v 1.2 2009/03/13 13:36:57 sthen Exp $
---- tkcvs/doinstall.orig Tue Jan  9 21:17:52 1996
-+++ tkcvs/doinstall Fri Mar 13 13:28:27 2009
-@@ -2,39 +2,32 @@
- #
- # $Id: patch-tkcvs_doinstall,v 1.2 2009/03/13 13:36:57 sthen Exp $
- #
--
-+PATH=/bin:/usr/bin:/sbin:/usr/sbin:${LOCALBASE}/bin
- # Some rational and reasonable defaults.
-
--INSTALLDIR=/usr/local/lib
--BINDIR=/usr/local/bin
--MANDIR=/usr/local/man/mann
-+INSTALLDIR=${LOCALBASE}/libdata
-+BINDIR=${LOCALBASE}/bin
-+MANDIR=${LOCALBASE}/man/mann
-
- INSTALL_PROG=./install-sh
-
- # This must be an X based editor -- do NOT use vi except via an xterm
- # or shelltool.
-
--EDITOR=nedit
-+EDITOR=xedit
-
- # Find a Tk interpreter.
-  
--WISH=`which wish4.0`
--if [ ! -f $WISH ]; then
--  WISH=`which wish4.1`
--fi
--if [ ! -f $WISH ]; then
-+WISH=${MODTK_BIN}
-+if [ ! -f ${WISH} ]
-+then
-   echo "I cant find a Tk interpreter on your system"
-   exit 1
- fi
-
- # Find where the global bitmaps are.
-
--for GDIR in /usr/include/X11/bitmaps /usr/openwin/include/X11/bitmaps /usr/X11/include/bitmaps /usr/include/bitmaps /usr/local/include/bitmaps
--do
--  if [ -d "$GDIR" ]; then
--    break
--  fi
--done
-+GDIR=${X11BASE}/include/X11/bitmaps
- if [ ! -d "$GDIR" ]; then
-   echo "Enter the directory where your X11 bitmaps are stored:"
-   GDIR=`line`
-@@ -46,15 +39,15 @@ fi
-
- # Find out where we want the system installed.
-
--if [ ! -d "$INSTALLDIR" ]; then
-+if [ ! -d "${DESTDIR}$INSTALLDIR" ]; then
-   echo "Enter the top level installation directory:"
-   INSTALLDIR=`line`
--  mkdir -p $INSTALLDIR
--  if [ ! -d $INSTALLDIR ]; then
-+  mkdir -p ${DESTDIR}$INSTALLDIR
-+  if [ ! -d ${DESTDIR}$INSTALLDIR ]; then
-     echo "I cant create that directory"
-     exit 1
-   fi
--  if [ ! -w $INSTALLDIR ]; then
-+  if [ ! -w ${DESTDIR}$INSTALLDIR ]; then
-     echo "I cant write to that directory"
-     exit 1
-   fi
-@@ -62,25 +55,25 @@ fi
-
- # Some directories we have to create.
-
--LDIR=${INSTALLDIR}/bitmaps
-+LDIR=${INSTALLDIR}/tkcvs/bitmaps
- TCDIR=${INSTALLDIR}/tkcvs
--mkdir -p $LDIR $TCDIR
-+mkdir -p ${DESTDIR}$LDIR ${DESTDIR}$TCDIR
- for dir in $LDIR $TCDIR
- do
--  if [ ! -d $dir ]; then
-+  if [ ! -d ${DESTDIR}$dir ]; then
-     echo "I cant create the directory $dir"
-     exit 1
-   fi
- done
-
--if [ ! -d "$BINDIR" ]; then
-+if [ ! -d ${DESTDIR}"$BINDIR" ]; then
-   echo "Enter the directory where you want the programs to be stored:"
-   BINDIR=`line`
--  if [ ! -d "$BINDIR" ]; then
-+  if [ ! -d ${DESTDIR}"$BINDIR" ]; then
-     echo "I cant find that directory"
-     exit 1
-   fi
--  if [ ! -w "$BINDIR" ]; then
-+  if [ ! -w ${DESTDIR}"$BINDIR" ]; then
-     echo "I cant write to that directory"
-     exit 1
-   fi
-@@ -94,21 +87,21 @@ do
-       -e "/GDIR/ s;;$GDIR;g" \
-       -e "/EDITOR/ s;;$EDITOR;g" \
-       -e "/TCDIR/ s;;$TCDIR;g" ${file}.blank >$file
--    $INSTALL_PROG -m 555 $file $BINDIR
-+    $INSTALL_PROG -m 555 $file ${DESTDIR}$BINDIR
-     rm -f $file
-   fi
- done
-
- for f in *.n ../tkdiff/*.n
- do
--        $INSTALL_PROG -m 444 $f $MANDIR
-+        $INSTALL_PROG -m 444 $f ${DESTDIR}$MANDIR
- done
- for f in *.tcl
- do
--        $INSTALL_PROG -m 444 $f $TCDIR
-+        $INSTALL_PROG -m 444 $f ${DESTDIR}$TCDIR
- done
- for f in ../bitmaps/*.xbm
- do
--        $INSTALL_PROG -m 444 $f $LDIR
-+        $INSTALL_PROG -m 444 $f ${DESTDIR}$LDIR
- done
--$INSTALL_PROG -m 444 tclIndex $TCDIR
-+$INSTALL_PROG -m 444 tclIndex ${DESTDIR}$TCDIR
Index: devel/tkcvs/pkg/DESCR
===================================================================
RCS file: /cvs/ports/devel/tkcvs/pkg/DESCR,v
retrieving revision 1.2
diff -u -p -r1.2 DESCR
--- devel/tkcvs/pkg/DESCR 15 Apr 2010 13:27:47 -0000 1.2
+++ devel/tkcvs/pkg/DESCR 19 Mar 2018 10:26:33 -0000
@@ -1,35 +1,14 @@
-README for tkCVS release 6.0
+TkCVS is a Tcl/Tk-based graphical interface to the CVS and Subversion
+configuration management systems. It will also help with RCS. The user
+interface is consistent across Unix/Linux, Windows, and MacOS X.
+
+It shows the status of the files in the current working directory, and
+has tools for tagging, merging, importing, exporting, checking in/out,
+and other user operations.
+
+TkCVS also aids in browsing the repository. For Subversion, the repository
+tree is browsed like an ordinary file tree. For CVS, the CVSROOT/modules
+file is read. TkCVS extends CVS with a method to produce a "user friendly"
+listing of modules by using special comments in the CVSROOT/modules file.
 
-tkCVS is a Tk based graphical interface to the CVS configuration
-management system.  It includes facilities for providing "user
-friendly" names to modules and directories within the repository, and
-provides a facility to interactively browse the repository looking for
-modules and directories.
-
-Some of the features of tkCVS include:
-
--       File and directory browser, with optional display of hidden
- files, and display of the current directory's location within
- the CVS tree.
-
--       Push-button based check-in / check-out of CVS modules.  Ability
- to add and delete files from the repository also using push
- buttons.
-
--       Module tree browser, and reports showing the structure of the
- CVS modules tree.  Individual modules or entire directory trees
- may be checked out using the browser.
-
--       Updating of files from the repository when they change.
-
--       Tagging and branching of files from the file browser, and tagging
- and branching of modules from the module browser.
-
--       Exporting a CVS module or directory from the repository for
- delivery off-site.
-
-- Creation of patch files between two releases of a module, or
- between a release and the current (head) version.
-
-- Viewing of diff and status listings for currently checked out
- modules.
+TkCVS is free and open-source.
Index: devel/tkcvs/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/tkcvs/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- devel/tkcvs/pkg/PLIST 8 Feb 2014 14:57:35 -0000 1.8
+++ devel/tkcvs/pkg/PLIST 19 Mar 2018 10:26:33 -0000
@@ -1,48 +1,126 @@
 @comment $OpenBSD: PLIST,v 1.8 2014/02/08 14:57:35 espie Exp $
-@conflict tkdiff-*
-@conflict kde-dev-scripts-*
-bin/cvscheck
 bin/tkcvs
-bin/tkdiff
-libdata/tkcvs/
-libdata/tkcvs/bindings.tcl
-libdata/tkcvs/bitmaps/
-libdata/tkcvs/bitmaps/add.xbm
-libdata/tkcvs/bitmaps/check.xbm
-libdata/tkcvs/bitmaps/checkin.xbm
-libdata/tkcvs/bitmaps/clean.xbm
-libdata/tkcvs/bitmaps/clear.xbm
-libdata/tkcvs/bitmaps/delete.xbm
-libdata/tkcvs/bitmaps/diff.xbm
-libdata/tkcvs/bitmaps/import.xbm
-libdata/tkcvs/bitmaps/logfile.xbm
-libdata/tkcvs/bitmaps/notebook.xbm
-libdata/tkcvs/bitmaps/refresh.xbm
-libdata/tkcvs/bitmaps/remove.xbm
-libdata/tkcvs/bitmaps/tkcvs16.xbm
-libdata/tkcvs/bitmaps/tkcvs32.xbm
-libdata/tkcvs/bitmaps/tkcvs32_mask.xbm
-libdata/tkcvs/bitmaps/tree16.xbm
-libdata/tkcvs/bitmaps/update.xbm
-libdata/tkcvs/checkout.tcl
-libdata/tkcvs/commit.tcl
-libdata/tkcvs/cvs.tcl
-libdata/tkcvs/errors.tcl
-libdata/tkcvs/filebrowse.tcl
-libdata/tkcvs/help.tcl
-libdata/tkcvs/import.tcl
-libdata/tkcvs/logcanvas.tcl
-libdata/tkcvs/merge.tcl
-libdata/tkcvs/modules.tcl
-libdata/tkcvs/reports.tcl
-libdata/tkcvs/search.tcl
-libdata/tkcvs/static.tcl
-libdata/tkcvs/tag.tcl
-libdata/tkcvs/tclIndex
-libdata/tkcvs/tkcvs_def.tcl
-libdata/tkcvs/tooltips.tcl
-libdata/tkcvs/update.tcl
-libdata/tkcvs/venget.tcl
-libdata/tkcvs/workdir.tcl
-@man man/mann/tkcvs.n
-@man man/mann/tkdiff.n
+lib/tkcvs/
+lib/tkcvs/annotate.tcl
+lib/tkcvs/bitmaps/
+lib/tkcvs/bitmaps/add.gif
+lib/tkcvs/bitmaps/adir.gif
+lib/tkcvs/bitmaps/amod.gif
+lib/tkcvs/bitmaps/anglerfish_med.gif
+lib/tkcvs/bitmaps/annotate.gif
+lib/tkcvs/bitmaps/annotate.xbm
+lib/tkcvs/bitmaps/arrow_dn.gif
+lib/tkcvs/bitmaps/arrow_hl_dn.gif
+lib/tkcvs/bitmaps/arrow_hl_up.gif
+lib/tkcvs/bitmaps/arrow_up.gif
+lib/tkcvs/bitmaps/branch.gif
+lib/tkcvs/bitmaps/branch.xbm
+lib/tkcvs/bitmaps/branchtag.gif
+lib/tkcvs/bitmaps/check.gif
+lib/tkcvs/bitmaps/checkin.gif
+lib/tkcvs/bitmaps/checkout.gif
+lib/tkcvs/bitmaps/checkout_opts.gif
+lib/tkcvs/bitmaps/conflict.gif
+lib/tkcvs/bitmaps/cvs-says.xbm
+lib/tkcvs/bitmaps/cvsdir.gif
+lib/tkcvs/bitmaps/delete.gif
+lib/tkcvs/bitmaps/delete_red.gif
+lib/tkcvs/bitmaps/diff.gif
+lib/tkcvs/bitmaps/dir.gif
+lib/tkcvs/bitmaps/dir_minus.gif
+lib/tkcvs/bitmaps/dir_new.gif
+lib/tkcvs/bitmaps/dir_ok.gif
+lib/tkcvs/bitmaps/dir_ood.gif
+lib/tkcvs/bitmaps/dir_plus.gif
+lib/tkcvs/bitmaps/dir_ques.gif
+lib/tkcvs/bitmaps/dirbranch.gif
+lib/tkcvs/bitmaps/dirbranch.xbm
+lib/tkcvs/bitmaps/edit.gif
+lib/tkcvs/bitmaps/export.gif
+lib/tkcvs/bitmaps/fileedit.gif
+lib/tkcvs/bitmaps/files.gif
+lib/tkcvs/bitmaps/fileview.gif
+lib/tkcvs/bitmaps/folder.gif
+lib/tkcvs/bitmaps/folderopen.gif
+lib/tkcvs/bitmaps/import.gif
+lib/tkcvs/bitmaps/link.gif
+lib/tkcvs/bitmaps/link_mod.gif
+lib/tkcvs/bitmaps/link_modml.gif
+lib/tkcvs/bitmaps/link_modol.gif
+lib/tkcvs/bitmaps/link_ok.gif
+lib/tkcvs/bitmaps/link_okml.gif
+lib/tkcvs/bitmaps/link_okol.gif
+lib/tkcvs/bitmaps/link_plus.gif
+lib/tkcvs/bitmaps/link_ques.gif
+lib/tkcvs/bitmaps/locked.gif
+lib/tkcvs/bitmaps/log.gif
+lib/tkcvs/bitmaps/loop-ball.gif
+lib/tkcvs/bitmaps/loop-glasses.gif
+lib/tkcvs/bitmaps/man.gif
+lib/tkcvs/bitmaps/mdir.gif
+lib/tkcvs/bitmaps/mod.gif
+lib/tkcvs/bitmaps/modbrowse.gif
+lib/tkcvs/bitmaps/modbrowse_cvs.gif
+lib/tkcvs/bitmaps/modbrowse_svn.gif
+lib/tkcvs/bitmaps/newmerge.gif
+lib/tkcvs/bitmaps/newmerge_simple.gif
+lib/tkcvs/bitmaps/paper.gif
+lib/tkcvs/bitmaps/patchfile.gif
+lib/tkcvs/bitmaps/rcsdir.gif
+lib/tkcvs/bitmaps/rdiff.gif
+lib/tkcvs/bitmaps/remove.gif
+lib/tkcvs/bitmaps/stat_conf.gif
+lib/tkcvs/bitmaps/stat_ex.gif
+lib/tkcvs/bitmaps/stat_kb.gif
+lib/tkcvs/bitmaps/stat_merge.gif
+lib/tkcvs/bitmaps/stat_minus.gif
+lib/tkcvs/bitmaps/stat_mod.gif
+lib/tkcvs/bitmaps/stat_modml.gif
+lib/tkcvs/bitmaps/stat_modol.gif
+lib/tkcvs/bitmaps/stat_ok.gif
+lib/tkcvs/bitmaps/stat_okml.gif
+lib/tkcvs/bitmaps/stat_okol.gif
+lib/tkcvs/bitmaps/stat_ood.gif
+lib/tkcvs/bitmaps/stat_plus.gif
+lib/tkcvs/bitmaps/stat_plus_kb.gif
+lib/tkcvs/bitmaps/stat_ques.gif
+lib/tkcvs/bitmaps/svndir.gif
+lib/tkcvs/bitmaps/tag.gif
+lib/tkcvs/bitmaps/tags.gif
+lib/tkcvs/bitmaps/ticklefish48.gif
+lib/tkcvs/bitmaps/ticklefish_med.gif
+lib/tkcvs/bitmaps/tkcvs-help.xbm
+lib/tkcvs/bitmaps/tkcvs48.xbm
+lib/tkcvs/bitmaps/trace.xbm
+lib/tkcvs/bitmaps/unedit.gif
+lib/tkcvs/bitmaps/unlocked.gif
+lib/tkcvs/bitmaps/updir.gif
+lib/tkcvs/bitmaps/who.gif
+lib/tkcvs/branch_diagram.tcl
+lib/tkcvs/cvs.tcl
+lib/tkcvs/dialog.tcl
+lib/tkcvs/diff.tcl
+lib/tkcvs/dircanvas.tcl
+lib/tkcvs/errors.tcl
+lib/tkcvs/exec.tcl
+lib/tkcvs/filebrowse.tcl
+lib/tkcvs/gen_log.tcl
+lib/tkcvs/help.tcl
+lib/tkcvs/import.tcl
+lib/tkcvs/import2.tcl
+lib/tkcvs/joincanvas.tcl
+lib/tkcvs/modbrowse.tcl
+lib/tkcvs/modtree.tcl
+lib/tkcvs/modules.tcl
+lib/tkcvs/picklist.tcl
+lib/tkcvs/rcs.tcl
+lib/tkcvs/style_params.tcl
+lib/tkcvs/svn-import.tcl
+lib/tkcvs/svn.tcl
+lib/tkcvs/tclIndex
+lib/tkcvs/tkcvs_def.tcl
+lib/tkcvs/tooltips.tcl
+lib/tkcvs/ui_misc.tcl
+lib/tkcvs/vendor_merge.tcl
+lib/tkcvs/workdir.tcl
+@man man/man1/tkcvs.1
Index: devel/tkdiff/Makefile
===================================================================
RCS file: /cvs/ports/devel/tkdiff/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- devel/tkdiff/Makefile 9 Nov 2013 18:22:02 -0000 1.14
+++ devel/tkdiff/Makefile 19 Mar 2018 10:26:33 -0000
@@ -3,7 +3,7 @@
 COMMENT= graphical front-end to the diff program
 
 DISTNAME= tkdiff-4.2
-REVISION = 0
+REVISION = 1
 CATEGORIES= devel sysutils
 
 HOMEPAGE= http://tkdiff.sourceforge.net/
Index: devel/tkdiff/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/tkdiff/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- devel/tkdiff/pkg/PLIST 10 Jan 2007 18:02:27 -0000 1.2
+++ devel/tkdiff/pkg/PLIST 19 Mar 2018 10:26:33 -0000
@@ -1,3 +1,2 @@
 @comment $OpenBSD: PLIST,v 1.2 2007/01/10 18:02:27 bernd Exp $
-@conflict tkcvs-*
 bin/tkdiff
Index: x11/kde4/dev-scripts/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde4/dev-scripts/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- x11/kde4/dev-scripts/Makefile 17 Oct 2014 18:29:23 -0000 1.8
+++ x11/kde4/dev-scripts/Makefile 19 Mar 2018 10:26:33 -0000
@@ -2,6 +2,7 @@
 
 COMMENT = KDE development helper scripts
 DISTNAME = kde-dev-scripts-${MODKDE4_VERSION}
+REVISION = 0
 
 CATEGORIES = devel
 HOMEPAGE = http://projects.kde.org/projects/kde/kdesdk/kde-dev-scripts
Index: x11/kde4/dev-scripts/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/kde4/dev-scripts/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- x11/kde4/dev-scripts/pkg/PLIST 9 Jul 2014 20:03:23 -0000 1.3
+++ x11/kde4/dev-scripts/pkg/PLIST 19 Mar 2018 10:26:33 -0000
@@ -1,6 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.3 2014/07/09 20:03:23 zhuk Exp $
 @conflict kdesdk-<4.11
-@conflict tkcvs-*
 bin/adddebug
 bin/build-progress.sh
 bin/cheatmake

Reply | Threaded
Open this post in threaded view
|

Re: Update devel/tkcvs from 6.0 to 8.2.3

Todd T. Fries-2
Feel free to take maintainership also, I'm not using this anymore.

Thanks,

Penned by Stuart Henderson on 20180319  5:35.24, we have:
| On 2018/03/18 21:25, Currell Berry wrote:
| > Thank you for your help -- here is another revision of the patches --
| > the first one for tkcvs and the second one for kde4/dev-scripts.
|
| There's not much point including a copy of tkdiff here, it's identical
| to the standalone one. Let's remove it in favour of a dep and get rid
| of the conflict.
|
| Couple of other tweaks: rewrap DESCR (no more lines but flows better),
| put HOMEPAGE in the normal place, use https, drop the "only" from
| license information as it's not clear in the distfile (it's not done
| correctly anyway as there's no copyright assignment but at least the
| intent is clear - and v6.0 that we have in tree has nothing in the
| distfile at all except for a small piece of code reused from something
| else so what's in-tree now is wrong for sure).
|
|
|
| Index: devel/tkcvs/Makefile
| ===================================================================
| RCS file: /cvs/ports/devel/tkcvs/Makefile,v
| retrieving revision 1.33
| diff -u -p -r1.33 Makefile
| --- devel/tkcvs/Makefile 22 Jan 2015 18:41:16 -0000 1.33
| +++ devel/tkcvs/Makefile 19 Mar 2018 10:26:33 -0000
| @@ -1,28 +1,30 @@
|  # $OpenBSD: Makefile,v 1.33 2015/01/22 18:41:16 naddy Exp $
|  
|  COMMENT= graphical frontend to CVS
| -DISTNAME= tkcvs-6.0
| -REVISION = 5
| +DISTNAME= tkcvs-8.2.3
|  CATEGORIES= devel
|  
| +HOMEPAGE= https://www.twobarleycorns.net/tkcvs.html
| +
|  MAINTAINER= Todd T. Fries <[hidden email]>
|  
| +# GPLv2
|  PERMIT_PACKAGE_CDROM= Yes
|  
| -MASTER_SITES= http://www.neosoft.com/tcl/ftparchive/sorted/packages-7.6/apps/tkcvs-6.0/
| +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tkcvs/} \
| + https://www.twobarleycorns.net/
|  
|  MODULES= x11/tk
| -RUN_DEPENDS= ${MODTK_RUN_DEPENDS}
| -BUILD_DEPENDS= ${RUN_DEPENDS}
| +BUILD_DEPENDS= ${MODTK_RUN_DEPENDS}
| +RUN_DEPENDS= ${MODTK_RUN_DEPENDS} \
| + devel/tkdiff
|  
|  NO_BUILD= Yes
|  NO_TEST= Yes
|  
| -pre-configure:
| - @${MODTCL_TCLSH_ADJ} ${WRKSRC}/tkcvs/cvscheck.blank
| - @${SUBST_CMD} ${WRKSRC}/tkcvs/doinstall
| -
|  do-install:
| - cd $(WRKSRC)/tkcvs; ./doinstall
| + cd ${WRKSRC} && $(MODTCL_BIN) ./doinstall.tcl -nox ${PREFIX}
| + rm ${PREFIX}/bin/tkdiff
| + cd ${PREFIX}/bin && ${MODTCL_WISH_ADJ} tkcvs
|  
|  .include <bsd.port.mk>
| Index: devel/tkcvs/distinfo
| ===================================================================
| RCS file: /cvs/ports/devel/tkcvs/distinfo,v
| retrieving revision 1.4
| diff -u -p -r1.4 distinfo
| --- devel/tkcvs/distinfo 18 Jan 2015 03:13:48 -0000 1.4
| +++ devel/tkcvs/distinfo 19 Mar 2018 10:26:33 -0000
| @@ -1,2 +1,2 @@
| -SHA256 (tkcvs-6.0.tar.gz) = PfT5mVOrZD5/mxg6zDHNJbt5CpKdlgKePwl+XhH4KXI=
| -SIZE (tkcvs-6.0.tar.gz) = 102022
| +SHA256 (tkcvs-8.2.3.tar.gz) = S/sp3Z/7u8Hm5hHhx3KvdF10LTNueXvwVtv3ARa44yo=
| +SIZE (tkcvs-8.2.3.tar.gz) = 570910
| Index: devel/tkcvs/patches/patch-tkcvs_cvs_tcl
| ===================================================================
| RCS file: devel/tkcvs/patches/patch-tkcvs_cvs_tcl
| diff -N devel/tkcvs/patches/patch-tkcvs_cvs_tcl
| --- devel/tkcvs/patches/patch-tkcvs_cvs_tcl 26 Oct 2007 20:44:35 -0000 1.1
| +++ /dev/null 1 Jan 1970 00:00:00 -0000
| @@ -1,12 +0,0 @@
| -$OpenBSD: patch-tkcvs_cvs_tcl,v 1.1 2007/10/26 20:44:35 ajacoutot Exp $
| ---- tkcvs/cvs.tcl.orig Sat May 25 04:54:58 1996
| -+++ tkcvs/cvs.tcl Fri Oct 26 22:41:28 2007
| -@@ -285,7 +285,7 @@ proc cvs_commit {revision comment args} {
| -       # -sj
| -       set errstr "You must select files to be committed with CVS version"
| -       set errstr "$errstr $cvscfg(cvsver)."
| --      set errstr "$errstr\n\nEither select a list of files or upgrade
| -+      set errstr "$errstr\n\nEither select a list of files or upgrade"
| -       set errstr "$errstr your CVS to version 1.3"
| -       cvserror "$errstr"
| -       return
| Index: devel/tkcvs/patches/patch-tkcvs_doinstall
| ===================================================================
| RCS file: devel/tkcvs/patches/patch-tkcvs_doinstall
| diff -N devel/tkcvs/patches/patch-tkcvs_doinstall
| --- devel/tkcvs/patches/patch-tkcvs_doinstall 13 Mar 2009 13:36:57 -0000 1.2
| +++ /dev/null 1 Jan 1970 00:00:00 -0000
| @@ -1,131 +0,0 @@
| -$OpenBSD: patch-tkcvs_doinstall,v 1.2 2009/03/13 13:36:57 sthen Exp $
| ---- tkcvs/doinstall.orig Tue Jan  9 21:17:52 1996
| -+++ tkcvs/doinstall Fri Mar 13 13:28:27 2009
| -@@ -2,39 +2,32 @@
| - #
| - # $Id: patch-tkcvs_doinstall,v 1.2 2009/03/13 13:36:57 sthen Exp $
| - #
| --
| -+PATH=/bin:/usr/bin:/sbin:/usr/sbin:${LOCALBASE}/bin
| - # Some rational and reasonable defaults.
| -
| --INSTALLDIR=/usr/local/lib
| --BINDIR=/usr/local/bin
| --MANDIR=/usr/local/man/mann
| -+INSTALLDIR=${LOCALBASE}/libdata
| -+BINDIR=${LOCALBASE}/bin
| -+MANDIR=${LOCALBASE}/man/mann
| -
| - INSTALL_PROG=./install-sh
| -
| - # This must be an X based editor -- do NOT use vi except via an xterm
| - # or shelltool.
| -
| --EDITOR=nedit
| -+EDITOR=xedit
| -
| - # Find a Tk interpreter.
| -  
| --WISH=`which wish4.0`
| --if [ ! -f $WISH ]; then
| --  WISH=`which wish4.1`
| --fi
| --if [ ! -f $WISH ]; then
| -+WISH=${MODTK_BIN}
| -+if [ ! -f ${WISH} ]
| -+then
| -   echo "I cant find a Tk interpreter on your system"
| -   exit 1
| - fi
| -
| - # Find where the global bitmaps are.
| -
| --for GDIR in /usr/include/X11/bitmaps /usr/openwin/include/X11/bitmaps /usr/X11/include/bitmaps /usr/include/bitmaps /usr/local/include/bitmaps
| --do
| --  if [ -d "$GDIR" ]; then
| --    break
| --  fi
| --done
| -+GDIR=${X11BASE}/include/X11/bitmaps
| - if [ ! -d "$GDIR" ]; then
| -   echo "Enter the directory where your X11 bitmaps are stored:"
| -   GDIR=`line`
| -@@ -46,15 +39,15 @@ fi
| -
| - # Find out where we want the system installed.
| -
| --if [ ! -d "$INSTALLDIR" ]; then
| -+if [ ! -d "${DESTDIR}$INSTALLDIR" ]; then
| -   echo "Enter the top level installation directory:"
| -   INSTALLDIR=`line`
| --  mkdir -p $INSTALLDIR
| --  if [ ! -d $INSTALLDIR ]; then
| -+  mkdir -p ${DESTDIR}$INSTALLDIR
| -+  if [ ! -d ${DESTDIR}$INSTALLDIR ]; then
| -     echo "I cant create that directory"
| -     exit 1
| -   fi
| --  if [ ! -w $INSTALLDIR ]; then
| -+  if [ ! -w ${DESTDIR}$INSTALLDIR ]; then
| -     echo "I cant write to that directory"
| -     exit 1
| -   fi
| -@@ -62,25 +55,25 @@ fi
| -
| - # Some directories we have to create.
| -
| --LDIR=${INSTALLDIR}/bitmaps
| -+LDIR=${INSTALLDIR}/tkcvs/bitmaps
| - TCDIR=${INSTALLDIR}/tkcvs
| --mkdir -p $LDIR $TCDIR
| -+mkdir -p ${DESTDIR}$LDIR ${DESTDIR}$TCDIR
| - for dir in $LDIR $TCDIR
| - do
| --  if [ ! -d $dir ]; then
| -+  if [ ! -d ${DESTDIR}$dir ]; then
| -     echo "I cant create the directory $dir"
| -     exit 1
| -   fi
| - done
| -
| --if [ ! -d "$BINDIR" ]; then
| -+if [ ! -d ${DESTDIR}"$BINDIR" ]; then
| -   echo "Enter the directory where you want the programs to be stored:"
| -   BINDIR=`line`
| --  if [ ! -d "$BINDIR" ]; then
| -+  if [ ! -d ${DESTDIR}"$BINDIR" ]; then
| -     echo "I cant find that directory"
| -     exit 1
| -   fi
| --  if [ ! -w "$BINDIR" ]; then
| -+  if [ ! -w ${DESTDIR}"$BINDIR" ]; then
| -     echo "I cant write to that directory"
| -     exit 1
| -   fi
| -@@ -94,21 +87,21 @@ do
| -       -e "/GDIR/ s;;$GDIR;g" \
| -       -e "/EDITOR/ s;;$EDITOR;g" \
| -       -e "/TCDIR/ s;;$TCDIR;g" ${file}.blank >$file
| --    $INSTALL_PROG -m 555 $file $BINDIR
| -+    $INSTALL_PROG -m 555 $file ${DESTDIR}$BINDIR
| -     rm -f $file
| -   fi
| - done
| -
| - for f in *.n ../tkdiff/*.n
| - do
| --        $INSTALL_PROG -m 444 $f $MANDIR
| -+        $INSTALL_PROG -m 444 $f ${DESTDIR}$MANDIR
| - done
| - for f in *.tcl
| - do
| --        $INSTALL_PROG -m 444 $f $TCDIR
| -+        $INSTALL_PROG -m 444 $f ${DESTDIR}$TCDIR
| - done
| - for f in ../bitmaps/*.xbm
| - do
| --        $INSTALL_PROG -m 444 $f $LDIR
| -+        $INSTALL_PROG -m 444 $f ${DESTDIR}$LDIR
| - done
| --$INSTALL_PROG -m 444 tclIndex $TCDIR
| -+$INSTALL_PROG -m 444 tclIndex ${DESTDIR}$TCDIR
| Index: devel/tkcvs/pkg/DESCR
| ===================================================================
| RCS file: /cvs/ports/devel/tkcvs/pkg/DESCR,v
| retrieving revision 1.2
| diff -u -p -r1.2 DESCR
| --- devel/tkcvs/pkg/DESCR 15 Apr 2010 13:27:47 -0000 1.2
| +++ devel/tkcvs/pkg/DESCR 19 Mar 2018 10:26:33 -0000
| @@ -1,35 +1,14 @@
| -README for tkCVS release 6.0
| +TkCVS is a Tcl/Tk-based graphical interface to the CVS and Subversion
| +configuration management systems. It will also help with RCS. The user
| +interface is consistent across Unix/Linux, Windows, and MacOS X.
| +
| +It shows the status of the files in the current working directory, and
| +has tools for tagging, merging, importing, exporting, checking in/out,
| +and other user operations.
| +
| +TkCVS also aids in browsing the repository. For Subversion, the repository
| +tree is browsed like an ordinary file tree. For CVS, the CVSROOT/modules
| +file is read. TkCVS extends CVS with a method to produce a "user friendly"
| +listing of modules by using special comments in the CVSROOT/modules file.
|  
| -tkCVS is a Tk based graphical interface to the CVS configuration
| -management system.  It includes facilities for providing "user
| -friendly" names to modules and directories within the repository, and
| -provides a facility to interactively browse the repository looking for
| -modules and directories.
| -
| -Some of the features of tkCVS include:
| -
| --       File and directory browser, with optional display of hidden
| - files, and display of the current directory's location within
| - the CVS tree.
| -
| --       Push-button based check-in / check-out of CVS modules.  Ability
| - to add and delete files from the repository also using push
| - buttons.
| -
| --       Module tree browser, and reports showing the structure of the
| - CVS modules tree.  Individual modules or entire directory trees
| - may be checked out using the browser.
| -
| --       Updating of files from the repository when they change.
| -
| --       Tagging and branching of files from the file browser, and tagging
| - and branching of modules from the module browser.
| -
| --       Exporting a CVS module or directory from the repository for
| - delivery off-site.
| -
| -- Creation of patch files between two releases of a module, or
| - between a release and the current (head) version.
| -
| -- Viewing of diff and status listings for currently checked out
| - modules.
| +TkCVS is free and open-source.
| Index: devel/tkcvs/pkg/PLIST
| ===================================================================
| RCS file: /cvs/ports/devel/tkcvs/pkg/PLIST,v
| retrieving revision 1.8
| diff -u -p -r1.8 PLIST
| --- devel/tkcvs/pkg/PLIST 8 Feb 2014 14:57:35 -0000 1.8
| +++ devel/tkcvs/pkg/PLIST 19 Mar 2018 10:26:33 -0000
| @@ -1,48 +1,126 @@
|  @comment $OpenBSD: PLIST,v 1.8 2014/02/08 14:57:35 espie Exp $
| -@conflict tkdiff-*
| -@conflict kde-dev-scripts-*
| -bin/cvscheck
|  bin/tkcvs
| -bin/tkdiff
| -libdata/tkcvs/
| -libdata/tkcvs/bindings.tcl
| -libdata/tkcvs/bitmaps/
| -libdata/tkcvs/bitmaps/add.xbm
| -libdata/tkcvs/bitmaps/check.xbm
| -libdata/tkcvs/bitmaps/checkin.xbm
| -libdata/tkcvs/bitmaps/clean.xbm
| -libdata/tkcvs/bitmaps/clear.xbm
| -libdata/tkcvs/bitmaps/delete.xbm
| -libdata/tkcvs/bitmaps/diff.xbm
| -libdata/tkcvs/bitmaps/import.xbm
| -libdata/tkcvs/bitmaps/logfile.xbm
| -libdata/tkcvs/bitmaps/notebook.xbm
| -libdata/tkcvs/bitmaps/refresh.xbm
| -libdata/tkcvs/bitmaps/remove.xbm
| -libdata/tkcvs/bitmaps/tkcvs16.xbm
| -libdata/tkcvs/bitmaps/tkcvs32.xbm
| -libdata/tkcvs/bitmaps/tkcvs32_mask.xbm
| -libdata/tkcvs/bitmaps/tree16.xbm
| -libdata/tkcvs/bitmaps/update.xbm
| -libdata/tkcvs/checkout.tcl
| -libdata/tkcvs/commit.tcl
| -libdata/tkcvs/cvs.tcl
| -libdata/tkcvs/errors.tcl
| -libdata/tkcvs/filebrowse.tcl
| -libdata/tkcvs/help.tcl
| -libdata/tkcvs/import.tcl
| -libdata/tkcvs/logcanvas.tcl
| -libdata/tkcvs/merge.tcl
| -libdata/tkcvs/modules.tcl
| -libdata/tkcvs/reports.tcl
| -libdata/tkcvs/search.tcl
| -libdata/tkcvs/static.tcl
| -libdata/tkcvs/tag.tcl
| -libdata/tkcvs/tclIndex
| -libdata/tkcvs/tkcvs_def.tcl
| -libdata/tkcvs/tooltips.tcl
| -libdata/tkcvs/update.tcl
| -libdata/tkcvs/venget.tcl
| -libdata/tkcvs/workdir.tcl
| -@man man/mann/tkcvs.n
| -@man man/mann/tkdiff.n
| +lib/tkcvs/
| +lib/tkcvs/annotate.tcl
| +lib/tkcvs/bitmaps/
| +lib/tkcvs/bitmaps/add.gif
| +lib/tkcvs/bitmaps/adir.gif
| +lib/tkcvs/bitmaps/amod.gif
| +lib/tkcvs/bitmaps/anglerfish_med.gif
| +lib/tkcvs/bitmaps/annotate.gif
| +lib/tkcvs/bitmaps/annotate.xbm
| +lib/tkcvs/bitmaps/arrow_dn.gif
| +lib/tkcvs/bitmaps/arrow_hl_dn.gif
| +lib/tkcvs/bitmaps/arrow_hl_up.gif
| +lib/tkcvs/bitmaps/arrow_up.gif
| +lib/tkcvs/bitmaps/branch.gif
| +lib/tkcvs/bitmaps/branch.xbm
| +lib/tkcvs/bitmaps/branchtag.gif
| +lib/tkcvs/bitmaps/check.gif
| +lib/tkcvs/bitmaps/checkin.gif
| +lib/tkcvs/bitmaps/checkout.gif
| +lib/tkcvs/bitmaps/checkout_opts.gif
| +lib/tkcvs/bitmaps/conflict.gif
| +lib/tkcvs/bitmaps/cvs-says.xbm
| +lib/tkcvs/bitmaps/cvsdir.gif
| +lib/tkcvs/bitmaps/delete.gif
| +lib/tkcvs/bitmaps/delete_red.gif
| +lib/tkcvs/bitmaps/diff.gif
| +lib/tkcvs/bitmaps/dir.gif
| +lib/tkcvs/bitmaps/dir_minus.gif
| +lib/tkcvs/bitmaps/dir_new.gif
| +lib/tkcvs/bitmaps/dir_ok.gif
| +lib/tkcvs/bitmaps/dir_ood.gif
| +lib/tkcvs/bitmaps/dir_plus.gif
| +lib/tkcvs/bitmaps/dir_ques.gif
| +lib/tkcvs/bitmaps/dirbranch.gif
| +lib/tkcvs/bitmaps/dirbranch.xbm
| +lib/tkcvs/bitmaps/edit.gif
| +lib/tkcvs/bitmaps/export.gif
| +lib/tkcvs/bitmaps/fileedit.gif
| +lib/tkcvs/bitmaps/files.gif
| +lib/tkcvs/bitmaps/fileview.gif
| +lib/tkcvs/bitmaps/folder.gif
| +lib/tkcvs/bitmaps/folderopen.gif
| +lib/tkcvs/bitmaps/import.gif
| +lib/tkcvs/bitmaps/link.gif
| +lib/tkcvs/bitmaps/link_mod.gif
| +lib/tkcvs/bitmaps/link_modml.gif
| +lib/tkcvs/bitmaps/link_modol.gif
| +lib/tkcvs/bitmaps/link_ok.gif
| +lib/tkcvs/bitmaps/link_okml.gif
| +lib/tkcvs/bitmaps/link_okol.gif
| +lib/tkcvs/bitmaps/link_plus.gif
| +lib/tkcvs/bitmaps/link_ques.gif
| +lib/tkcvs/bitmaps/locked.gif
| +lib/tkcvs/bitmaps/log.gif
| +lib/tkcvs/bitmaps/loop-ball.gif
| +lib/tkcvs/bitmaps/loop-glasses.gif
| +lib/tkcvs/bitmaps/man.gif
| +lib/tkcvs/bitmaps/mdir.gif
| +lib/tkcvs/bitmaps/mod.gif
| +lib/tkcvs/bitmaps/modbrowse.gif
| +lib/tkcvs/bitmaps/modbrowse_cvs.gif
| +lib/tkcvs/bitmaps/modbrowse_svn.gif
| +lib/tkcvs/bitmaps/newmerge.gif
| +lib/tkcvs/bitmaps/newmerge_simple.gif
| +lib/tkcvs/bitmaps/paper.gif
| +lib/tkcvs/bitmaps/patchfile.gif
| +lib/tkcvs/bitmaps/rcsdir.gif
| +lib/tkcvs/bitmaps/rdiff.gif
| +lib/tkcvs/bitmaps/remove.gif
| +lib/tkcvs/bitmaps/stat_conf.gif
| +lib/tkcvs/bitmaps/stat_ex.gif
| +lib/tkcvs/bitmaps/stat_kb.gif
| +lib/tkcvs/bitmaps/stat_merge.gif
| +lib/tkcvs/bitmaps/stat_minus.gif
| +lib/tkcvs/bitmaps/stat_mod.gif
| +lib/tkcvs/bitmaps/stat_modml.gif
| +lib/tkcvs/bitmaps/stat_modol.gif
| +lib/tkcvs/bitmaps/stat_ok.gif
| +lib/tkcvs/bitmaps/stat_okml.gif
| +lib/tkcvs/bitmaps/stat_okol.gif
| +lib/tkcvs/bitmaps/stat_ood.gif
| +lib/tkcvs/bitmaps/stat_plus.gif
| +lib/tkcvs/bitmaps/stat_plus_kb.gif
| +lib/tkcvs/bitmaps/stat_ques.gif
| +lib/tkcvs/bitmaps/svndir.gif
| +lib/tkcvs/bitmaps/tag.gif
| +lib/tkcvs/bitmaps/tags.gif
| +lib/tkcvs/bitmaps/ticklefish48.gif
| +lib/tkcvs/bitmaps/ticklefish_med.gif
| +lib/tkcvs/bitmaps/tkcvs-help.xbm
| +lib/tkcvs/bitmaps/tkcvs48.xbm
| +lib/tkcvs/bitmaps/trace.xbm
| +lib/tkcvs/bitmaps/unedit.gif
| +lib/tkcvs/bitmaps/unlocked.gif
| +lib/tkcvs/bitmaps/updir.gif
| +lib/tkcvs/bitmaps/who.gif
| +lib/tkcvs/branch_diagram.tcl
| +lib/tkcvs/cvs.tcl
| +lib/tkcvs/dialog.tcl
| +lib/tkcvs/diff.tcl
| +lib/tkcvs/dircanvas.tcl
| +lib/tkcvs/errors.tcl
| +lib/tkcvs/exec.tcl
| +lib/tkcvs/filebrowse.tcl
| +lib/tkcvs/gen_log.tcl
| +lib/tkcvs/help.tcl
| +lib/tkcvs/import.tcl
| +lib/tkcvs/import2.tcl
| +lib/tkcvs/joincanvas.tcl
| +lib/tkcvs/modbrowse.tcl
| +lib/tkcvs/modtree.tcl
| +lib/tkcvs/modules.tcl
| +lib/tkcvs/picklist.tcl
| +lib/tkcvs/rcs.tcl
| +lib/tkcvs/style_params.tcl
| +lib/tkcvs/svn-import.tcl
| +lib/tkcvs/svn.tcl
| +lib/tkcvs/tclIndex
| +lib/tkcvs/tkcvs_def.tcl
| +lib/tkcvs/tooltips.tcl
| +lib/tkcvs/ui_misc.tcl
| +lib/tkcvs/vendor_merge.tcl
| +lib/tkcvs/workdir.tcl
| +@man man/man1/tkcvs.1
| Index: devel/tkdiff/Makefile
| ===================================================================
| RCS file: /cvs/ports/devel/tkdiff/Makefile,v
| retrieving revision 1.14
| diff -u -p -r1.14 Makefile
| --- devel/tkdiff/Makefile 9 Nov 2013 18:22:02 -0000 1.14
| +++ devel/tkdiff/Makefile 19 Mar 2018 10:26:33 -0000
| @@ -3,7 +3,7 @@
|  COMMENT= graphical front-end to the diff program
|  
|  DISTNAME= tkdiff-4.2
| -REVISION = 0
| +REVISION = 1
|  CATEGORIES= devel sysutils
|  
|  HOMEPAGE= http://tkdiff.sourceforge.net/
| Index: devel/tkdiff/pkg/PLIST
| ===================================================================
| RCS file: /cvs/ports/devel/tkdiff/pkg/PLIST,v
| retrieving revision 1.2
| diff -u -p -r1.2 PLIST
| --- devel/tkdiff/pkg/PLIST 10 Jan 2007 18:02:27 -0000 1.2
| +++ devel/tkdiff/pkg/PLIST 19 Mar 2018 10:26:33 -0000
| @@ -1,3 +1,2 @@
|  @comment $OpenBSD: PLIST,v 1.2 2007/01/10 18:02:27 bernd Exp $
| -@conflict tkcvs-*
|  bin/tkdiff
| Index: x11/kde4/dev-scripts/Makefile
| ===================================================================
| RCS file: /cvs/ports/x11/kde4/dev-scripts/Makefile,v
| retrieving revision 1.8
| diff -u -p -r1.8 Makefile
| --- x11/kde4/dev-scripts/Makefile 17 Oct 2014 18:29:23 -0000 1.8
| +++ x11/kde4/dev-scripts/Makefile 19 Mar 2018 10:26:33 -0000
| @@ -2,6 +2,7 @@
|  
|  COMMENT = KDE development helper scripts
|  DISTNAME = kde-dev-scripts-${MODKDE4_VERSION}
| +REVISION = 0
|  
|  CATEGORIES = devel
|  HOMEPAGE = http://projects.kde.org/projects/kde/kdesdk/kde-dev-scripts
| Index: x11/kde4/dev-scripts/pkg/PLIST
| ===================================================================
| RCS file: /cvs/ports/x11/kde4/dev-scripts/pkg/PLIST,v
| retrieving revision 1.3
| diff -u -p -r1.3 PLIST
| --- x11/kde4/dev-scripts/pkg/PLIST 9 Jul 2014 20:03:23 -0000 1.3
| +++ x11/kde4/dev-scripts/pkg/PLIST 19 Mar 2018 10:26:33 -0000
| @@ -1,6 +1,5 @@
|  @comment $OpenBSD: PLIST,v 1.3 2014/07/09 20:03:23 zhuk Exp $
|  @conflict kdesdk-<4.11
| -@conflict tkcvs-*
|  bin/adddebug
|  bin/build-progress.sh
|  bin/cheatmake

--
Todd T. Fries . http://todd.fries.net/pgp.txt . @unix2mars . github:toddfries

Reply | Threaded
Open this post in threaded view
|

Re: Update devel/tkcvs from 6.0 to 8.2.3

currellberry
On Mon, Mar 19, 2018 at 12:31 PM, Todd T. Fries <[hidden email]> wrote:

> Feel free to take maintainership also, I'm not using this anymore.
>
> Thanks,
>
> Penned by Stuart Henderson on 20180319  5:35.24, we have:
> | On 2018/03/18 21:25, Currell Berry wrote:
> | > Thank you for your help -- here is another revision of the patches --
> | > the first one for tkcvs and the second one for kde4/dev-scripts.
> |
> | There's not much point including a copy of tkdiff here, it's identical
> | to the standalone one. Let's remove it in favour of a dep and get rid
> | of the conflict.
> |
> | Couple of other tweaks: rewrap DESCR (no more lines but flows better),
> | put HOMEPAGE in the normal place, use https, drop the "only" from
> | license information as it's not clear in the distfile (it's not done
> | correctly anyway as there's no copyright assignment but at least the
> | intent is clear - and v6.0 that we have in tree has nothing in the
> | distfile at all except for a small piece of code reused from something
> | else so what's in-tree now is wrong for sure).
> |
> |

Ok @Todd I'll give it a go at being maintainer for this if that's ok
with others.

Below is another version of the patch incorporating the new feedback.
Note that the patch below also includes the small changes to the
tkdiff port and the kde-dev-scripts port removing their respective
@conflicts with tkcvs.

-Currell

Index: devel/tkcvs/Makefile
===================================================================
RCS file: /cvs/ports/devel/tkcvs/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- devel/tkcvs/Makefile 22 Jan 2015 18:41:16 -0000 1.33
+++ devel/tkcvs/Makefile 20 Mar 2018 01:53:01 -0000
@@ -1,28 +1,28 @@
 # $OpenBSD: Makefile,v 1.33 2015/01/22 18:41:16 naddy Exp $

-COMMENT= graphical frontend to CVS
-DISTNAME= tkcvs-6.0
-REVISION = 5
+COMMENT= graphical frontend to CVS and SVN
+DISTNAME= tkcvs-8.2.3
 CATEGORIES= devel

-MAINTAINER= Todd T. Fries <[hidden email]>
+HOMEPAGE= https://www.twobarleycorns.net/tkcvs.html

+MAINTAINER= Currell Berry <[hidden email]>
+
+# License GPLv2
 PERMIT_PACKAGE_CDROM= Yes

-MASTER_SITES= http://www.neosoft.com/tcl/ftparchive/sorted/packages-7.6/apps/tkcvs-6.0/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tkcvs/} \
+ https://www.twobarleycorns.net/

 MODULES= x11/tk
-RUN_DEPENDS= ${MODTK_RUN_DEPENDS}
+RUN_DEPENDS= ${MODTK_RUN_DEPENDS} devel/tkdiff
 BUILD_DEPENDS= ${RUN_DEPENDS}

 NO_BUILD= Yes
 NO_TEST= Yes

-pre-configure:
- @${MODTCL_TCLSH_ADJ} ${WRKSRC}/tkcvs/cvscheck.blank
- @${SUBST_CMD} ${WRKSRC}/tkcvs/doinstall
-
 do-install:
- cd $(WRKSRC)/tkcvs; ./doinstall
+ cd ${WRKSRC} && $(MODTCL_BIN) ./doinstall.tcl -nox ${PREFIX}
+ cd ${PREFIX}/bin && ${MODTCL_WISH_ADJ} tkcvs

 .include <bsd.port.mk>
Index: devel/tkcvs/distinfo
===================================================================
RCS file: /cvs/ports/devel/tkcvs/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- devel/tkcvs/distinfo 18 Jan 2015 03:13:48 -0000 1.4
+++ devel/tkcvs/distinfo 20 Mar 2018 01:53:01 -0000
@@ -1,2 +1,2 @@
-SHA256 (tkcvs-6.0.tar.gz) = PfT5mVOrZD5/mxg6zDHNJbt5CpKdlgKePwl+XhH4KXI=
-SIZE (tkcvs-6.0.tar.gz) = 102022
+SHA256 (tkcvs-8.2.3.tar.gz) = S/sp3Z/7u8Hm5hHhx3KvdF10LTNueXvwVtv3ARa44yo=
+SIZE (tkcvs-8.2.3.tar.gz) = 570910
Index: devel/tkcvs/patches/patch-doinstall_tcl
===================================================================
RCS file: devel/tkcvs/patches/patch-doinstall_tcl
diff -N devel/tkcvs/patches/patch-doinstall_tcl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devel/tkcvs/patches/patch-doinstall_tcl 20 Mar 2018 01:53:01 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+don't install integrated tkdiff -- instead we depend on the tkdiff package.
+Index: doinstall.tcl
+--- doinstall.tcl.orig
++++ doinstall.tcl
+@@ -69,12 +69,12 @@ proc doinstall { INSTALLROOT } {
+   set destfile [file join $BINDIR $TKCVS]
+   puts "Installing $TKCVS in $BINDIR"
+   file copy -force [file join tkcvs tkcvs.tcl] [file join $BINDIR $TKCVS]
+-  puts "Installing $TKDIFF in $BINDIR"
+-  file copy -force [file join tkdiff tkdiff] [file join $BINDIR $TKDIFF]
++  # puts "Installing $TKDIFF in $BINDIR"
++  # file copy -force [file join tkdiff tkdiff] [file join $BINDIR $TKDIFF]
+
+   if {$tcl_platform(platform) == "unix"} {
+     file attributes $destfile -permissions 0755
+-    file attributes [file join $BINDIR $TKDIFF] -permissions 0755
++    # file attributes [file join $BINDIR $TKDIFF] -permissions 0755
+     file mkdir $MANDIR
+     puts "Installing manpage tkcvs.1 in $MANDIR"
+     file copy -force [file join tkcvs tkcvs.1] $MANDIR
Index: devel/tkcvs/patches/patch-tkcvs_cvs_tcl
===================================================================
RCS file: devel/tkcvs/patches/patch-tkcvs_cvs_tcl
diff -N devel/tkcvs/patches/patch-tkcvs_cvs_tcl
--- devel/tkcvs/patches/patch-tkcvs_cvs_tcl 26 Oct 2007 20:44:35 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-tkcvs_cvs_tcl,v 1.1 2007/10/26 20:44:35 ajacoutot Exp $
---- tkcvs/cvs.tcl.orig Sat May 25 04:54:58 1996
-+++ tkcvs/cvs.tcl Fri Oct 26 22:41:28 2007
-@@ -285,7 +285,7 @@ proc cvs_commit {revision comment args} {
-       # -sj
-       set errstr "You must select files to be committed with CVS version"
-       set errstr "$errstr $cvscfg(cvsver)."
--      set errstr "$errstr\n\nEither select a list of files or upgrade
-+      set errstr "$errstr\n\nEither select a list of files or upgrade"
-       set errstr "$errstr your CVS to version 1.3"
-       cvserror "$errstr"
-       return
Index: devel/tkcvs/patches/patch-tkcvs_doinstall
===================================================================
RCS file: devel/tkcvs/patches/patch-tkcvs_doinstall
diff -N devel/tkcvs/patches/patch-tkcvs_doinstall
--- devel/tkcvs/patches/patch-tkcvs_doinstall 13 Mar 2009 13:36:57 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,131 +0,0 @@
-$OpenBSD: patch-tkcvs_doinstall,v 1.2 2009/03/13 13:36:57 sthen Exp $
---- tkcvs/doinstall.orig Tue Jan  9 21:17:52 1996
-+++ tkcvs/doinstall Fri Mar 13 13:28:27 2009
-@@ -2,39 +2,32 @@
- #
- # $Id: patch-tkcvs_doinstall,v 1.2 2009/03/13 13:36:57 sthen Exp $
- #
--
-+PATH=/bin:/usr/bin:/sbin:/usr/sbin:${LOCALBASE}/bin
- # Some rational and reasonable defaults.
-
--INSTALLDIR=/usr/local/lib
--BINDIR=/usr/local/bin
--MANDIR=/usr/local/man/mann
-+INSTALLDIR=${LOCALBASE}/libdata
-+BINDIR=${LOCALBASE}/bin
-+MANDIR=${LOCALBASE}/man/mann
-
- INSTALL_PROG=./install-sh
-
- # This must be an X based editor -- do NOT use vi except via an xterm
- # or shelltool.
-
--EDITOR=nedit
-+EDITOR=xedit
-
- # Find a Tk interpreter.
-
--WISH=`which wish4.0`
--if [ ! -f $WISH ]; then
--  WISH=`which wish4.1`
--fi
--if [ ! -f $WISH ]; then
-+WISH=${MODTK_BIN}
-+if [ ! -f ${WISH} ]
-+then
-   echo "I cant find a Tk interpreter on your system"
-   exit 1
- fi
-
- # Find where the global bitmaps are.
-
--for GDIR in /usr/include/X11/bitmaps
/usr/openwin/include/X11/bitmaps /usr/X11/include/bitmaps
/usr/include/bitmaps /usr/local/include/bitmaps
--do
--  if [ -d "$GDIR" ]; then
--    break
--  fi
--done
-+GDIR=${X11BASE}/include/X11/bitmaps
- if [ ! -d "$GDIR" ]; then
-   echo "Enter the directory where your X11 bitmaps are stored:"
-   GDIR=`line`
-@@ -46,15 +39,15 @@ fi
-
- # Find out where we want the system installed.
-
--if [ ! -d "$INSTALLDIR" ]; then
-+if [ ! -d "${DESTDIR}$INSTALLDIR" ]; then
-   echo "Enter the top level installation directory:"
-   INSTALLDIR=`line`
--  mkdir -p $INSTALLDIR
--  if [ ! -d $INSTALLDIR ]; then
-+  mkdir -p ${DESTDIR}$INSTALLDIR
-+  if [ ! -d ${DESTDIR}$INSTALLDIR ]; then
-     echo "I cant create that directory"
-     exit 1
-   fi
--  if [ ! -w $INSTALLDIR ]; then
-+  if [ ! -w ${DESTDIR}$INSTALLDIR ]; then
-     echo "I cant write to that directory"
-     exit 1
-   fi
-@@ -62,25 +55,25 @@ fi
-
- # Some directories we have to create.
-
--LDIR=${INSTALLDIR}/bitmaps
-+LDIR=${INSTALLDIR}/tkcvs/bitmaps
- TCDIR=${INSTALLDIR}/tkcvs
--mkdir -p $LDIR $TCDIR
-+mkdir -p ${DESTDIR}$LDIR ${DESTDIR}$TCDIR
- for dir in $LDIR $TCDIR
- do
--  if [ ! -d $dir ]; then
-+  if [ ! -d ${DESTDIR}$dir ]; then
-     echo "I cant create the directory $dir"
-     exit 1
-   fi
- done
-
--if [ ! -d "$BINDIR" ]; then
-+if [ ! -d ${DESTDIR}"$BINDIR" ]; then
-   echo "Enter the directory where you want the programs to be stored:"
-   BINDIR=`line`
--  if [ ! -d "$BINDIR" ]; then
-+  if [ ! -d ${DESTDIR}"$BINDIR" ]; then
-     echo "I cant find that directory"
-     exit 1
-   fi
--  if [ ! -w "$BINDIR" ]; then
-+  if [ ! -w ${DESTDIR}"$BINDIR" ]; then
-     echo "I cant write to that directory"
-     exit 1
-   fi
-@@ -94,21 +87,21 @@ do
-       -e "/GDIR/ s;;$GDIR;g" \
-       -e "/EDITOR/ s;;$EDITOR;g" \
-       -e "/TCDIR/ s;;$TCDIR;g" ${file}.blank >$file
--    $INSTALL_PROG -m 555 $file $BINDIR
-+    $INSTALL_PROG -m 555 $file ${DESTDIR}$BINDIR
-     rm -f $file
-   fi
- done
-
- for f in *.n ../tkdiff/*.n
- do
--        $INSTALL_PROG -m 444 $f $MANDIR
-+        $INSTALL_PROG -m 444 $f ${DESTDIR}$MANDIR
- done
- for f in *.tcl
- do
--        $INSTALL_PROG -m 444 $f $TCDIR
-+        $INSTALL_PROG -m 444 $f ${DESTDIR}$TCDIR
- done
- for f in ../bitmaps/*.xbm
- do
--        $INSTALL_PROG -m 444 $f $LDIR
-+        $INSTALL_PROG -m 444 $f ${DESTDIR}$LDIR
- done
--$INSTALL_PROG -m 444 tclIndex $TCDIR
-+$INSTALL_PROG -m 444 tclIndex ${DESTDIR}$TCDIR
Index: devel/tkcvs/pkg/DESCR
===================================================================
RCS file: /cvs/ports/devel/tkcvs/pkg/DESCR,v
retrieving revision 1.2
diff -u -p -r1.2 DESCR
--- devel/tkcvs/pkg/DESCR 15 Apr 2010 13:27:47 -0000 1.2
+++ devel/tkcvs/pkg/DESCR 20 Mar 2018 01:53:01 -0000
@@ -1,35 +1,15 @@
-README for tkCVS release 6.0
+TkCVS is a Tcl/Tk-based graphical interface to the CVS and Subversion
+configuration management systems. It will also help with RCS. The user
+interface is consistent across Unix/Linux, Windows, and MacOS X. It
+integrates with TkDiff for browsing and merging changes.
+
+It shows the status of the files in the current working directory, and has
+tools for tagging, merging, importing, exporting, checking in/out, and other
+user operations.
+
+TkCVS also aids in browsing the repository. For Subversion, the repository
+tree is browsed like an ordinary file tree. For CVS, the CVSROOT/modules
+file is read. TkCVS extends CVS with a method to produce a "user friendly"
+listing of modules by using special comments in the CVSROOT/modules file.

-tkCVS is a Tk based graphical interface to the CVS configuration
-management system.  It includes facilities for providing "user
-friendly" names to modules and directories within the repository, and
-provides a facility to interactively browse the repository looking for
-modules and directories.
-
-Some of the features of tkCVS include:
-
--       File and directory browser, with optional display of hidden
- files, and display of the current directory's location within
- the CVS tree.
-
--       Push-button based check-in / check-out of CVS modules.  Ability
- to add and delete files from the repository also using push
- buttons.
-
--       Module tree browser, and reports showing the structure of the
- CVS modules tree.  Individual modules or entire directory trees
- may be checked out using the browser.
-
--       Updating of files from the repository when they change.
-
--       Tagging and branching of files from the file browser, and tagging
- and branching of modules from the module browser.
-
--       Exporting a CVS module or directory from the repository for
- delivery off-site.
-
-- Creation of patch files between two releases of a module, or
- between a release and the current (head) version.
-
-- Viewing of diff and status listings for currently checked out
- modules.
+TkCVS is free and open-source.
Index: devel/tkcvs/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/tkcvs/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- devel/tkcvs/pkg/PLIST 8 Feb 2014 14:57:35 -0000 1.8
+++ devel/tkcvs/pkg/PLIST 20 Mar 2018 01:53:01 -0000
@@ -1,48 +1,126 @@
-@comment $OpenBSD: PLIST,v 1.8 2014/02/08 14:57:35 espie Exp $
-@conflict tkdiff-*
-@conflict kde-dev-scripts-*
-bin/cvscheck
+@comment $OpenBSD$
 bin/tkcvs
-bin/tkdiff
-libdata/tkcvs/
-libdata/tkcvs/bindings.tcl
-libdata/tkcvs/bitmaps/
-libdata/tkcvs/bitmaps/add.xbm
-libdata/tkcvs/bitmaps/check.xbm
-libdata/tkcvs/bitmaps/checkin.xbm
-libdata/tkcvs/bitmaps/clean.xbm
-libdata/tkcvs/bitmaps/clear.xbm
-libdata/tkcvs/bitmaps/delete.xbm
-libdata/tkcvs/bitmaps/diff.xbm
-libdata/tkcvs/bitmaps/import.xbm
-libdata/tkcvs/bitmaps/logfile.xbm
-libdata/tkcvs/bitmaps/notebook.xbm
-libdata/tkcvs/bitmaps/refresh.xbm
-libdata/tkcvs/bitmaps/remove.xbm
-libdata/tkcvs/bitmaps/tkcvs16.xbm
-libdata/tkcvs/bitmaps/tkcvs32.xbm
-libdata/tkcvs/bitmaps/tkcvs32_mask.xbm
-libdata/tkcvs/bitmaps/tree16.xbm
-libdata/tkcvs/bitmaps/update.xbm
-libdata/tkcvs/checkout.tcl
-libdata/tkcvs/commit.tcl
-libdata/tkcvs/cvs.tcl
-libdata/tkcvs/errors.tcl
-libdata/tkcvs/filebrowse.tcl
-libdata/tkcvs/help.tcl
-libdata/tkcvs/import.tcl
-libdata/tkcvs/logcanvas.tcl
-libdata/tkcvs/merge.tcl
-libdata/tkcvs/modules.tcl
-libdata/tkcvs/reports.tcl
-libdata/tkcvs/search.tcl
-libdata/tkcvs/static.tcl
-libdata/tkcvs/tag.tcl
-libdata/tkcvs/tclIndex
-libdata/tkcvs/tkcvs_def.tcl
-libdata/tkcvs/tooltips.tcl
-libdata/tkcvs/update.tcl
-libdata/tkcvs/venget.tcl
-libdata/tkcvs/workdir.tcl
-@man man/mann/tkcvs.n
-@man man/mann/tkdiff.n
+lib/tkcvs/
+lib/tkcvs/annotate.tcl
+lib/tkcvs/bitmaps/
+lib/tkcvs/bitmaps/add.gif
+lib/tkcvs/bitmaps/adir.gif
+lib/tkcvs/bitmaps/amod.gif
+lib/tkcvs/bitmaps/anglerfish_med.gif
+lib/tkcvs/bitmaps/annotate.gif
+lib/tkcvs/bitmaps/annotate.xbm
+lib/tkcvs/bitmaps/arrow_dn.gif
+lib/tkcvs/bitmaps/arrow_hl_dn.gif
+lib/tkcvs/bitmaps/arrow_hl_up.gif
+lib/tkcvs/bitmaps/arrow_up.gif
+lib/tkcvs/bitmaps/branch.gif
+lib/tkcvs/bitmaps/branch.xbm
+lib/tkcvs/bitmaps/branchtag.gif
+lib/tkcvs/bitmaps/check.gif
+lib/tkcvs/bitmaps/checkin.gif
+lib/tkcvs/bitmaps/checkout.gif
+lib/tkcvs/bitmaps/checkout_opts.gif
+lib/tkcvs/bitmaps/conflict.gif
+lib/tkcvs/bitmaps/cvs-says.xbm
+lib/tkcvs/bitmaps/cvsdir.gif
+lib/tkcvs/bitmaps/delete.gif
+lib/tkcvs/bitmaps/delete_red.gif
+lib/tkcvs/bitmaps/diff.gif
+lib/tkcvs/bitmaps/dir.gif
+lib/tkcvs/bitmaps/dir_minus.gif
+lib/tkcvs/bitmaps/dir_new.gif
+lib/tkcvs/bitmaps/dir_ok.gif
+lib/tkcvs/bitmaps/dir_ood.gif
+lib/tkcvs/bitmaps/dir_plus.gif
+lib/tkcvs/bitmaps/dir_ques.gif
+lib/tkcvs/bitmaps/dirbranch.gif
+lib/tkcvs/bitmaps/dirbranch.xbm
+lib/tkcvs/bitmaps/edit.gif
+lib/tkcvs/bitmaps/export.gif
+lib/tkcvs/bitmaps/fileedit.gif
+lib/tkcvs/bitmaps/files.gif
+lib/tkcvs/bitmaps/fileview.gif
+lib/tkcvs/bitmaps/folder.gif
+lib/tkcvs/bitmaps/folderopen.gif
+lib/tkcvs/bitmaps/import.gif
+lib/tkcvs/bitmaps/link.gif
+lib/tkcvs/bitmaps/link_mod.gif
+lib/tkcvs/bitmaps/link_modml.gif
+lib/tkcvs/bitmaps/link_modol.gif
+lib/tkcvs/bitmaps/link_ok.gif
+lib/tkcvs/bitmaps/link_okml.gif
+lib/tkcvs/bitmaps/link_okol.gif
+lib/tkcvs/bitmaps/link_plus.gif
+lib/tkcvs/bitmaps/link_ques.gif
+lib/tkcvs/bitmaps/locked.gif
+lib/tkcvs/bitmaps/log.gif
+lib/tkcvs/bitmaps/loop-ball.gif
+lib/tkcvs/bitmaps/loop-glasses.gif
+lib/tkcvs/bitmaps/man.gif
+lib/tkcvs/bitmaps/mdir.gif
+lib/tkcvs/bitmaps/mod.gif
+lib/tkcvs/bitmaps/modbrowse.gif
+lib/tkcvs/bitmaps/modbrowse_cvs.gif
+lib/tkcvs/bitmaps/modbrowse_svn.gif
+lib/tkcvs/bitmaps/newmerge.gif
+lib/tkcvs/bitmaps/newmerge_simple.gif
+lib/tkcvs/bitmaps/paper.gif
+lib/tkcvs/bitmaps/patchfile.gif
+lib/tkcvs/bitmaps/rcsdir.gif
+lib/tkcvs/bitmaps/rdiff.gif
+lib/tkcvs/bitmaps/remove.gif
+lib/tkcvs/bitmaps/stat_conf.gif
+lib/tkcvs/bitmaps/stat_ex.gif
+lib/tkcvs/bitmaps/stat_kb.gif
+lib/tkcvs/bitmaps/stat_merge.gif
+lib/tkcvs/bitmaps/stat_minus.gif
+lib/tkcvs/bitmaps/stat_mod.gif
+lib/tkcvs/bitmaps/stat_modml.gif
+lib/tkcvs/bitmaps/stat_modol.gif
+lib/tkcvs/bitmaps/stat_ok.gif
+lib/tkcvs/bitmaps/stat_okml.gif
+lib/tkcvs/bitmaps/stat_okol.gif
+lib/tkcvs/bitmaps/stat_ood.gif
+lib/tkcvs/bitmaps/stat_plus.gif
+lib/tkcvs/bitmaps/stat_plus_kb.gif
+lib/tkcvs/bitmaps/stat_ques.gif
+lib/tkcvs/bitmaps/svndir.gif
+lib/tkcvs/bitmaps/tag.gif
+lib/tkcvs/bitmaps/tags.gif
+lib/tkcvs/bitmaps/ticklefish48.gif
+lib/tkcvs/bitmaps/ticklefish_med.gif
+lib/tkcvs/bitmaps/tkcvs-help.xbm
+lib/tkcvs/bitmaps/tkcvs48.xbm
+lib/tkcvs/bitmaps/trace.xbm
+lib/tkcvs/bitmaps/unedit.gif
+lib/tkcvs/bitmaps/unlocked.gif
+lib/tkcvs/bitmaps/updir.gif
+lib/tkcvs/bitmaps/who.gif
+lib/tkcvs/branch_diagram.tcl
+lib/tkcvs/cvs.tcl
+lib/tkcvs/dialog.tcl
+lib/tkcvs/diff.tcl
+lib/tkcvs/dircanvas.tcl
+lib/tkcvs/errors.tcl
+lib/tkcvs/exec.tcl
+lib/tkcvs/filebrowse.tcl
+lib/tkcvs/gen_log.tcl
+lib/tkcvs/help.tcl
+lib/tkcvs/import.tcl
+lib/tkcvs/import2.tcl
+lib/tkcvs/joincanvas.tcl
+lib/tkcvs/modbrowse.tcl
+lib/tkcvs/modtree.tcl
+lib/tkcvs/modules.tcl
+lib/tkcvs/picklist.tcl
+lib/tkcvs/rcs.tcl
+lib/tkcvs/style_params.tcl
+lib/tkcvs/svn-import.tcl
+lib/tkcvs/svn.tcl
+lib/tkcvs/tclIndex
+lib/tkcvs/tkcvs_def.tcl
+lib/tkcvs/tooltips.tcl
+lib/tkcvs/ui_misc.tcl
+lib/tkcvs/vendor_merge.tcl
+lib/tkcvs/workdir.tcl
+@man man/man1/tkcvs.1
Index: devel/tkdiff/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/tkdiff/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- devel/tkdiff/pkg/PLIST 10 Jan 2007 18:02:27 -0000 1.2
+++ devel/tkdiff/pkg/PLIST 20 Mar 2018 01:53:01 -0000
@@ -1,3 +1,2 @@
 @comment $OpenBSD: PLIST,v 1.2 2007/01/10 18:02:27 bernd Exp $
-@conflict tkcvs-*
 bin/tkdiff
Index: x11/kde4/dev-scripts/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/kde4/dev-scripts/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- x11/kde4/dev-scripts/pkg/PLIST 9 Jul 2014 20:03:23 -0000 1.3
+++ x11/kde4/dev-scripts/pkg/PLIST 20 Mar 2018 01:53:01 -0000
@@ -1,6 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.3 2014/07/09 20:03:23 zhuk Exp $
 @conflict kdesdk-<4.11
-@conflict tkcvs-*
 bin/adddebug
 bin/build-progress.sh
 bin/cheatmake