![[BACK]](/icons/cvsweb/back.gif){kind=icon}
Up to [local] / portstools
Request diff between arbitrary revisions
Default branch: MAIN
Revision 1.64 / (download) - annotate - [select for diffs], Fri Oct 19 04:03:09 2007 UTC (13 months, 2 weeks ago) by mezz
Branch: MAIN
CVS Tags: HEAD
Changes since 1.63: +10 -2
lines
Diff to previous 1.63 (colored)
- Add MC-UPDATING in it for install in /usr/ports/ and unmerge too if anyone use -U option. - Add portmaster in it.
Revision 1.63 / (download) - annotate - [select for diffs], Sat Aug 5 07:34:30 2006 UTC (2 years, 4 months ago) by marcus
Branch: MAIN
Changes since 1.62: +2 -2
lines
Diff to previous 1.62 (colored)
Change the default CVSUP_CMD to /usr/bin/csup.
Revision 1.62 / (download) - annotate - [select for diffs], Sat Aug 5 07:23:42 2006 UTC (2 years, 4 months ago) by marcus
Branch: MAIN
Changes since 1.61: +2 -2
lines
Diff to previous 1.61 (colored)
Bump MCVER to fix the patch merge issue. Suggested by: ahze
Revision 1.61 / (download) - annotate - [select for diffs], Fri Jun 2 05:57:41 2006 UTC (2 years, 6 months ago) by marcus
Branch: MAIN
Changes since 1.60: +3 -3
lines
Diff to previous 1.60 (colored)
Fix a bug were files ending with CVS would either not be merged correctly.
Revision 1.60 / (download) - annotate - [select for diffs], Thu Apr 6 04:55:48 2006 UTC (2 years, 8 months ago) by marcus
Branch: MAIN
Changes since 1.59: +4 -1
lines
Diff to previous 1.59 (colored)
Dereference SRCDIR and DESTDIR using realpath to ensure that both are fully-qualified paths.
Revision 1.59 / (download) - annotate - [select for diffs], Tue Mar 14 15:50:48 2006 UTC (2 years, 8 months ago) by marcus
Branch: MAIN
Changes since 1.58: +2 -2
lines
Diff to previous 1.58 (colored)
Fix a logic mistake that caused cvsup to fail in the general case.
Revision 1.58 / (download) - annotate - [select for diffs], Tue Mar 7 23:05:46 2006 UTC (2 years, 8 months ago) by marcus
Branch: MAIN
Changes since 1.57: +58 -22
lines
Diff to previous 1.57 (colored)
Properly add support for multiple MC modules when multiple marcusmerge commands are run in succession. Reported by: mezz Tested by: mezz
Revision 1.57 / (download) - annotate - [select for diffs], Tue Mar 7 05:40:02 2006 UTC (2 years, 9 months ago) by marcus
Branch: MAIN
Changes since 1.56: +2 -2
lines
Diff to previous 1.56 (colored)
Grrr...revert previous commit. The main cvsweb URL has a link to the pre-maid script plus a link to the man page.
Revision 1.56 / (download) - annotate - [select for diffs], Tue Mar 7 05:37:12 2006 UTC (2 years, 9 months ago) by marcus
Branch: MAIN
Changes since 1.55: +2 -2
lines
Diff to previous 1.55 (colored)
Point users to a ready-to-go version of marcusmerge to download.
Revision 1.55 / (download) - annotate - [select for diffs], Tue Mar 7 05:20:57 2006 UTC (2 years, 9 months ago) by marcus
Branch: MAIN
Changes since 1.54: +42 -35
lines
Diff to previous 1.54 (colored)
Fix some bugs in the new unmerge feature. Unmerge should not do the right thing even if all subtrees are merged at one. It should also not require SRCDIR and MODULE to be set.
Revision 1.54 / (download) - annotate - [select for diffs], Tue Mar 7 05:03:17 2006 UTC (2 years, 9 months ago) by marcus
Branch: MAIN
Changes since 1.53: +55 -11
lines
Diff to previous 1.53 (colored)
Add support for unmerging (-U command line option). That is, remove all ports that were merged into DESTDIR on the previous marcusmerge run. Additionally, an unmerge will be performed if -p or -a is specified. Some of this code was based on an earlier patch by mezz.
Revision 1.53 / (download) - annotate - [select for diffs], Tue Mar 7 04:25:52 2006 UTC (2 years, 9 months ago) by marcus
Branch: MAIN
Changes since 1.52: +21 -10
lines
Diff to previous 1.52 (colored)
* Fix a bug where MARCUSMERGE_DESTDIR is used in stead of just plain DESTDIR * Add support for a SUPUPDATE configuration option (-S) which uses ``make update'' instead of cvsup to update the ports tree Submitted by: Romain Tartiere <romain-tartiere@astase.com>
Revision 1.52 / (download) - annotate - [select for diffs], Fri Nov 25 02:09:43 2005 UTC (3 years ago) by marcus
Branch: MAIN
Changes since 1.51: +52 -59
lines
Diff to previous 1.51 (colored)
* Really add support for the -i option (fetch INDEX) * Convert getopt to the more modern getopts * Add a CVS_ARGS variable that defaults to -z3 so cvs commands can be further customized * Document CVS_ARGS in marcusmerge(8) Submitted by: mux
Revision 1.51 / (download) - annotate - [select for diffs], Tue Jun 28 05:47:54 2005 UTC (3 years, 5 months ago) by adamw
Branch: MAIN
Changes since 1.50: +1 -1
lines
Diff to previous 1.50 (colored)
$Id$ -> $MCom$
Revision 1.50 / (download) - annotate - [select for diffs], Wed Mar 23 04:03:36 2005 UTC (3 years, 8 months ago) by adamw
Branch: MAIN
Changes since 1.49: +21 -7
lines
Diff to previous 1.49 (colored)
Add a -b option to marcusmerge to merge from the ports-stable module. We might want to switch to long option names soon... we're running out of viable variable names ::P
Revision 1.49 / (download) - annotate - [select for diffs], Mon Feb 21 23:18:28 2005 UTC (3 years, 9 months ago) by marcus
Branch: MAIN
Changes since 1.48: +13 -1
lines
Diff to previous 1.48 (colored)
Add -i and fetchindex options to fetch the necessary INDEX file after running cvsup. Submitted by: Franz Klammer <klammer@webonaut.com>
Revision 1.48 / (download) - annotate - [select for diffs], Sun Feb 13 07:04:31 2005 UTC (3 years, 9 months ago) by marcus
Branch: MAIN
Changes since 1.47: +2 -2
lines
Diff to previous 1.47 (colored)
Bump cpoyright year to 2005.
Revision 1.47 / (download) - annotate - [select for diffs], Sun Feb 13 07:01:07 2005 UTC (3 years, 9 months ago) by marcus
Branch: MAIN
Changes since 1.46: +2 -1
lines
Diff to previous 1.46 (colored)
Delete the work subdirectory summarily since running a find through it would be quite painful.
Revision 1.46 / (download) - annotate - [select for diffs], Sun Feb 13 06:56:38 2005 UTC (3 years, 9 months ago) by marcus
Branch: MAIN
Changes since 1.45: +3 -2
lines
Diff to previous 1.45 (colored)
Only remove files in the old port directory, and only if they are not under an existing CVS subdirectory. This will make things easier for people who use CVS to manage their ports tree.
Revision 1.45 / (download) - annotate - [select for diffs], Sat Oct 23 02:21:48 2004 UTC (4 years, 1 month ago) by adamw
Branch: MAIN
Changes since 1.44: +3 -1
lines
Diff to previous 1.44 (colored)
By default, this script is named marcusmerge.sh, and many people will probably install it with that name. This means that `basename $0` is, by "default," set to "marcusmerge.sh". marcusmerge(8) says that the configuration file should be /usr/local/etc/marcusmerge.cfg, but, in the above instance, the script looks for /usr/local/etc/marcusmerge.sh.cfg. If /usr/local/etc/`basename $0`.cfg doesn't exist, the script will now trim off a trailing '.sh' and try again. It might be worth looking instead for everything up to the first '.', or up to the last '.', or something.
Revision 1.44 / (download) - annotate - [select for diffs], Sat Aug 7 00:08:17 2004 UTC (4 years, 3 months ago) by marcus
Branch: MAIN
Changes since 1.43: +2 -2
lines
Diff to previous 1.43 (colored)
Use fmt on the MCVER error to make it look better.
Revision 1.43 / (download) - annotate - [select for diffs], Sat Aug 7 00:06:41 2004 UTC (4 years, 3 months ago) by adamw
Branch: MAIN
Changes since 1.42: +2 -2
lines
Diff to previous 1.42 (colored)
Update MCVER. Reminded by: marcus
Revision 1.42 / (download) - annotate - [select for diffs], Fri Aug 6 22:51:47 2004 UTC (4 years, 3 months ago) by adamw
Branch: MAIN
Changes since 1.41: +73 -60
lines
Diff to previous 1.41 (colored)
* add support for an experimental ports module. Merge its contents in if given a '-x' switch. * miscellaneous string fixes. * only check the MCVER value if the MCVER file exists.
Revision 1.41 / (download) - annotate - [select for diffs], Mon Jul 26 00:51:14 2004 UTC (4 years, 4 months ago) by mezz
Branch: MAIN
Changes since 1.40: +2 -2
lines
Diff to previous 1.40 (colored)
Add -P to prunes the empty directories. Ok'ed by: marcus
Revision 1.40 / (download) - annotate - [select for diffs], Sat May 22 00:24:19 2004 UTC (4 years, 6 months ago) by adamw
Branch: MAIN
Changes since 1.39: +13 -8
lines
Diff to previous 1.39 (colored)
Allow the important variables to also be overridden with environment variables, ex. MARCUSMERGE_SRCDIR, MARCUSMERGE_VERBOSE, etc. This is of great use to those of us who run tinderboxed builds and blow away /usr/local/* with an automated script.
Revision 1.39 / (download) - annotate - [select for diffs], Sat Apr 3 18:11:03 2004 UTC (4 years, 8 months ago) by marcus
Branch: MAIN
Changes since 1.38: +6 -2
lines
Diff to previous 1.38 (colored)
Update the copyright year, and add another error check.
Revision 1.38 / (download) - annotate - [select for diffs], Thu Apr 1 06:54:49 2004 UTC (4 years, 8 months ago) by marcus
Branch: MAIN
Changes since 1.37: +9 -1
lines
Diff to previous 1.37 (colored)
Add some error checking to make sure we don't get ahead of ourselves, and really screw something up.
Revision 1.37 / (download) - annotate - [select for diffs], Sun Mar 14 21:59:15 2004 UTC (4 years, 8 months ago) by marcus
Branch: MAIN
Changes since 1.36: +2 -2
lines
Diff to previous 1.36 (colored)
Update the MCVER so people have to download the new marcusmerge with the new upgrade instructions.
Revision 1.36 / (download) - annotate - [select for diffs], Sun Mar 14 07:31:40 2004 UTC (4 years, 8 months ago) by marcus
Branch: MAIN
Changes since 1.35: +2 -2
lines
Diff to previous 1.35 (colored)
Add a more informative message on what to do after running marcusmerge.
Revision 1.35 / (download) - annotate - [select for diffs], Mon Mar 8 17:42:25 2004 UTC (4 years, 8 months ago) by marcus
Branch: MAIN
Changes since 1.34: +2 -2
lines
Diff to previous 1.34 (colored)
Sign the copyright over to the FreeBSD GNOME Team.
Revision 1.34 / (download) - annotate - [select for diffs], Tue Mar 2 17:42:17 2004 UTC (4 years, 9 months ago) by marcus
Branch: MAIN
Changes since 1.33: +2 -2
lines
Diff to previous 1.33 (colored)
Use && instead of a ';' to increase robustness.
Revision 1.33 / (download) - annotate - [select for diffs], Mon Jan 12 22:39:04 2004 UTC (4 years, 10 months ago) by marcus
Branch: MAIN
Changes since 1.32: +5 -5
lines
Diff to previous 1.32 (colored)
Properly quote arguments to -z.
Revision 1.32 / (download) - annotate - [select for diffs], Mon Jan 12 01:08:23 2004 UTC (4 years, 10 months ago) by marcus
Branch: MAIN
Changes since 1.31: +3 -27
lines
Diff to previous 1.31 (colored)
Allow for these files to use some of the same code, but to have that code generated on the fly, and embedded into these files.
Revision 1.31 / (download) - annotate - [select for diffs], Sun Jan 11 04:23:59 2004 UTC (4 years, 10 months ago) by marcus
Branch: MAIN
Changes since 1.30: +4 -2
lines
Diff to previous 1.30 (colored)
Correctly obtain the tmpfile, and return success.
Revision 1.30 / (download) - annotate - [select for diffs], Sun Jan 11 02:27:20 2004 UTC (4 years, 10 months ago) by marcus
Branch: MAIN
Changes since 1.29: +47 -47
lines
Diff to previous 1.29 (colored)
Bourne shell is not Perl. Define subroutines higher up in the script.
Revision 1.29 / (download) - annotate - [select for diffs], Sun Nov 2 05:07:35 2003 UTC (5 years, 1 month ago) by marcus
Branch: MAIN
Changes since 1.28: +1 -1
lines
Diff to previous 1.28 (colored)
Forced commit to note the new name of marcusmerge.
Revision 1.28 / (download) - annotate - [select for diffs], Thu Oct 30 03:27:17 2003 UTC (5 years, 1 month ago) by marcus
Branch: MAIN
Changes since 1.27: +5 -2
lines
Diff to previous 1.27 (colored)
Fix a bug where ${SCRIPTNAME} has not being set early enough. Also, correct
the documentation to properly reflect all the config file overrideable
variables.
Submitted by: Jeremy Messenger <mezz7@cox.net>
Revision 1.27 / (download) - annotate - [select for diffs], Sun Oct 26 20:02:09 2003 UTC (5 years, 1 month ago) by marcus
Branch: MAIN
Changes since 1.26: +2 -2
lines
Diff to previous 1.26 (colored)
Don't use make -C. It's cool and all, but it is not valid in FreeBSD 4.8.
Revision 1.26 / (download) - annotate - [select for diffs], Mon Oct 13 02:46:05 2003 UTC (5 years, 1 month ago) by marcus
Branch: MAIN
Changes since 1.25: +7 -7
lines
Diff to previous 1.25 (colored)
* Correctly call get_tmpfile * Don't create the temp file in get_tmpfile(). Do that right before we use it.
Revision 1.25 / (download) - annotate - [select for diffs], Sun Oct 12 21:06:49 2003 UTC (5 years, 1 month ago) by marcus
Branch: MAIN
Changes since 1.24: +2 -2
lines
Diff to previous 1.24 (colored)
Remove the -P from cvs checkout.
Revision 1.24 / (download) - annotate - [select for diffs], Sun Oct 12 21:03:51 2003 UTC (5 years, 1 month ago) by marcus
Branch: MAIN
Changes since 1.23: +144 -29
lines
Diff to previous 1.23 (colored)
* Add support for using the periodic tarball instead of CVS * marcusmerge now checks to see if it needs to be updated * Allow more variables to be overwritten in the marcusmerge.cfg file * Add the BSD license
Revision 1.23 / (download) - annotate - [select for diffs], Fri Aug 29 16:39:13 2003 UTC (5 years, 3 months ago) by marcus
Branch: MAIN
Changes since 1.22: +4 -2
lines
Diff to previous 1.22 (colored)
Allow the date to always be today.
Revision 1.22 / (download) - annotate - [select for diffs], Fri Aug 29 16:30:22 2003 UTC (5 years, 3 months ago) by marcus
Branch: MAIN
Changes since 1.21: +6 -2
lines
Diff to previous 1.21 (colored)
Make RMPORTS behave more like MOVED. This should help people wanting to test things.
Revision 1.21 / (download) - annotate - [select for diffs], Mon Jul 7 23:10:58 2003 UTC (5 years, 5 months ago) by marcus
Branch: MAIN
Changes since 1.20: +2 -2
lines
Diff to previous 1.20 (colored)
Make sure ${SRCDIR}/${MODULE} exists. If not, checkout ${MODULE} from
CVS.
Revision 1.20 / (download) - annotate - [select for diffs], Sat Jul 5 19:52:53 2003 UTC (5 years, 5 months ago) by marcus
Branch: MAIN
Changes since 1.19: +11 -11
lines
Diff to previous 1.19 (colored)
Update the main tree before removing stale ports.
Revision 1.19 / (download) - annotate - [select for diffs], Sat Jul 5 19:43:57 2003 UTC (5 years, 5 months ago) by marcus
Branch: MAIN
Changes since 1.18: +19 -17
lines
Diff to previous 1.18 (colored)
Change the workflow a bit. This actually gets the "marcusmerge from scratch" functionality working. Now, the SRCDIR should be the full path to the source directory _without_ the trailing module name. For example, if your SRCDIR used to be /home/marcus/src/marcuscom-cvs/ports, it should now be /home/marcus/src/marcuscom-cvs.
Revision 1.18 / (download) - annotate - [select for diffs], Thu Jul 3 15:39:55 2003 UTC (5 years, 5 months ago) by marcus
Branch: MAIN
Changes since 1.17: +3 -3
lines
Diff to previous 1.17 (colored)
Make sure we always look at the fully-qualified source directory.
Revision 1.17 / (download) - annotate - [select for diffs], Mon Jun 16 04:18:19 2003 UTC (5 years, 5 months ago) by marcus
Branch: MAIN
Changes since 1.16: +5 -2
lines
Diff to previous 1.16 (colored)
Attempt to auto-detect the supfile. Submitted by: Martin Klaffenboeck <martin.klaffenboeck@gmx.at>
Revision 1.16 / (download) - annotate - [select for diffs], Mon Jun 2 22:49:01 2003 UTC (5 years, 6 months ago) by marcus
Branch: MAIN
Changes since 1.15: +19 -4
lines
Diff to previous 1.15 (colored)
* Use basename $0 to get the script name * Add support for a config file * Add a -a option to do all the updating operations * Only spew cvsup messages if VERBOSE is set to yes Submitted by: Franz Klammer <klammer@webonaut.com>
Revision 1.15 / (download) - annotate - [select for diffs], Sat May 24 16:46:05 2003 UTC (5 years, 6 months ago) by marcus
Branch: MAIN
Changes since 1.14: +16 -8
lines
Diff to previous 1.14 (colored)
* Correct a few typos from the last commit * Add the ability to configure the module checked out from MarcusCom
Revision 1.14 / (download) - annotate - [select for diffs], Fri May 23 22:24:59 2003 UTC (5 years, 6 months ago) by marcus
Branch: MAIN
Changes since 1.13: +49 -7
lines
Diff to previous 1.13 (colored)
Enhance marcusmerge with the following: -p do a cvsup of the main ports tree -l run pkg_version -l"<" after marcusmerge to list the outdated ports Submitted by: Franz Klammer <klammer@webonaut.com>
Revision 1.13 / (download) - annotate - [select for diffs], Fri May 23 17:45:29 2003 UTC (5 years, 6 months ago) by marcus
Branch: MAIN
Changes since 1.12: +11 -1
lines
Diff to previous 1.12 (colored)
Add support for an RMPORTS file that tells marcusmerge to delete any obsolete port directories. Suggested by: Lars Eggert <larse@ISI.EDU>
Revision 1.12 / (download) - annotate - [select for diffs], Mon Apr 14 21:12:21 2003 UTC (5 years, 7 months ago) by marcus
Branch: MAIN
Changes since 1.11: +2 -2
lines
Diff to previous 1.11 (colored)
Add the -dP flags to cvs update to eliminate empty directories. Submitted by: Martin Klaffenboeck <martin.klaffenboeck@gmx.at>
Revision 1.11 / (download) - annotate - [select for diffs], Sun Apr 13 19:26:07 2003 UTC (5 years, 7 months ago) by marcus
Branch: MAIN
Changes since 1.10: +2 -2
lines
Diff to previous 1.10 (colored)
Fix a bug in merging the Mk files. Submitted by: Martin Klaffenboeck <martin.klaffenboeck@gmx.at>
Revision 1.10 / (download) - annotate - [select for diffs], Fri Apr 11 22:53:48 2003 UTC (5 years, 7 months ago) by marcus
Branch: MAIN
Changes since 1.9: +16 -1
lines
Diff to previous 1.9 (colored)
Merge any .mk files as well.
Revision 1.9 / (download) - annotate - [select for diffs], Thu Mar 13 03:49:09 2003 UTC (5 years, 8 months ago) by marcus
Branch: MAIN
Changes since 1.8: +2 -2
lines
Diff to previous 1.8 (colored)
Add -u to the usage.
Revision 1.8 / (download) - annotate - [select for diffs], Tue Mar 11 21:51:35 2003 UTC (5 years, 8 months ago) by marcus
Branch: MAIN
Changes since 1.7: +35 -3
lines
Diff to previous 1.7 (colored)
Add command line parsing via getopt. Default VERBOSE to no.
Revision 1.7 / (download) - annotate - [select for diffs], Mon Mar 10 00:03:44 2003 UTC (5 years, 8 months ago) by marcus
Branch: MAIN
Changes since 1.6: +5 -3
lines
Diff to previous 1.6 (colored)
Create a variable to hold the CVS root.
Revision 1.6 / (download) - annotate - [select for diffs], Wed Jan 22 22:57:02 2003 UTC (5 years, 10 months ago) by marcus
Branch: MAIN
Changes since 1.5: +11 -4
lines
Diff to previous 1.5 (colored)
Add some anti-foot shooting code. Submitted by: Martin Klaffenboeck <martin.klaffenboeck@gmx.at>
Revision 1.5 / (download) - annotate - [select for diffs], Sat Jan 18 20:59:41 2003 UTC (5 years, 10 months ago) by marcus
Branch: MAIN
Changes since 1.4: +2 -2
lines
Diff to previous 1.4 (colored)
s/cvz/cvs/ Submitted by: Martin Klaffenboeck <martin.klaffenboeck@gmx.at>
Revision 1.4 / (download) - annotate - [select for diffs], Fri Jan 17 21:18:17 2003 UTC (5 years, 10 months ago) by marcus
Branch: MAIN
Changes since 1.3: +3 -1
lines
Diff to previous 1.3 (colored)
Try to create the directories leading up to SRCDIR is they do not exist.
Revision 1.3 / (download) - annotate - [select for diffs], Fri Jan 17 17:13:03 2003 UTC (5 years, 10 months ago) by marcus
Branch: MAIN
Changes since 1.2: +25 -6
lines
Diff to previous 1.2 (colored)
Make the script smart enough to cvs the ports tree itself. Also, add a message after the script completes about running portupgrade. Submitted by: Martin Klaffenboeck <martin.klaffenboeck@gmx.at>
Revision 1.2 / (download) - annotate - [select for diffs], Sun Jan 12 21:59:03 2003 UTC (5 years, 10 months ago) by marcus
Branch: MAIN
Changes since 1.1: +2 -0
lines
Diff to previous 1.1 (colored)
Add an $Id$ tag.
Revision 1.1.1.1 / (download) - annotate - [select for diffs] (vendor branch), Sun Jan 12 21:58:28 2003 UTC (5 years, 10 months ago) by marcus
Branch: MarcusCom
CVS Tags: MC_20030112
Changes since 1.1: +0 -0
lines
Diff to previous 1.1 (colored)
Add marcusmerge, a script to merge the ports tree from my repository into /usr/ports. Contributions by: Franz Klammer <klammer@webonaut.com>
Revision 1.1 / (download) - annotate - [select for diffs], Sun Jan 12 21:58:28 2003 UTC (5 years, 10 months ago) by marcus
Branch: MAIN
Initial revision