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 <[email protected]>
+# 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 <[email protected]> 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 <[email protected]> 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.
>>
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 <[email protected]>
+# 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