Is csup still working?

2013-01-10 Thread Mario Lobo
Hi;

I have 8-STABLE and I just did,

csup -L 2 src-supfile

with

*default host=cvsup.FreeBSD.org
*default release=cvs tag=RELENG_8

and it finished with:

 Edit src/usr.sbin/zzz/zzz.sh
  Add delta 1.2.32.2 2012.11.17.10.37.28 svnexp
Shutting down connection to server
Finished successfully

Can I trust this update to be correct, with the latest sources?

Thanks,

-- 
Mario Lobo
http://www.mallavoodoo.com.br
FreeBSD since 2.2.8 [not Pro-Audio YET!!] (99% winblows FREE)
 
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: Is csup still working?

2013-01-10 Thread Fleuriot Damien

On Jan 10, 2013, at 12:38 PM, Mario Lobo l...@bsd.com.br wrote:

 Hi;
 
 I have 8-STABLE and I just did,
 
 csup -L 2 src-supfile
 
 with
 
 *default host=cvsup.FreeBSD.org
 *default release=cvs tag=RELENG_8
 
 and it finished with:
 
 Edit src/usr.sbin/zzz/zzz.sh
  Add delta 1.2.32.2 2012.11.17.10.37.28 svnexp
 Shutting down connection to server
 Finished successfully
 
 Can I trust this update to be correct, with the latest sources?
 
 Thanks,
 
 -- 
 Mario Lobo
 http://www.mallavoodoo.com.br
 FreeBSD since 2.2.8 [not Pro-Audio YET!!] (99% winblows FREE)


Regarding the source tree, I've not found the notice for CVSup's retirement.

Regarding the ports tree, this is from Beat Gaetzi on 07/09/2012 dd/mm/ :

 For those reasons by February 28th 2013 the FreeBSD ports tree will
 no longer be exported to CVS. Therefore ports tree updates via CVS
 or CVSup will no longer available after that date.

___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


is csup broken?

2013-01-02 Thread Fbsd8

Been using same script for years to fetch selected port files.
Today I get error message
Unknown collection ports-sysutils

Running 9.1 and this worked in 2012

___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: is csup broken?

2013-01-02 Thread Polytropon
On Wed, 02 Jan 2013 10:14:17 -0500, Fbsd8 wrote:
 Been using same script for years to fetch selected port files.
 Today I get error message
 Unknown collection ports-sysutils
 
 Running 9.1 and this worked in 2012

Maybe this is related to the removal of CVS-related services
for obtaining src and ports?

Have you tried checking out via SVN which now is the desired
default method (even though it's not integrated in the base
install and the make scripting mechanism)?



-- 
Polytropon
Magdeburg, Germany
Happy FreeBSD user since 4.0
Andra moi ennepe, Mousa, ...
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: is csup broken?

2013-01-02 Thread Joe Altman
On Wed, Jan 02, 2013 at 04:20:25PM +0100, Polytropon wrote:
 
 Have you tried checking out via SVN which now is the desired
 default method (even though it's not integrated in the base
 install and the make scripting mechanism)?

ISTM that SVN is not the default method for users; but portsnap is the
preferred method for users.

Developers, OTOH, may find SVN useful.

http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/ports-using.html

http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/updating-upgrading-portsnap.html

I have no idea if the OP is a user or a developer; but I do know that at
least a cursory reading of the Handbook is a good idea, since the OP
question seems to be directly addressed in the Handbook.

Regards,

Joe
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: is csup broken?

2013-01-02 Thread Dimitri Yioulos
On Wednesday 02 January 2013 10:14:17 am Fbsd8 wrote:
 Been using same script for years to fetch selected port
 files. Today I get error message
 Unknown collection ports-sysutils

 Running 9.1 and this worked in 2012


It must have to do with the security incident that took 
place a couple of months ago.  It affects all package 
updates for 9.1 via pkg_add and csup, I guess.

Dimitri

-- 
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.

___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: is csup broken?

2013-01-02 Thread Fbsd8

Polytropon wrote:

On Wed, 02 Jan 2013 10:14:17 -0500, Fbsd8 wrote:

Been using same script for years to fetch selected port files.
Today I get error message
Unknown collection ports-sysutils

Running 9.1 and this worked in 2012


Maybe this is related to the removal of CVS-related services
for obtaining src and ports?

Have you tried checking out via SVN which now is the desired
default method (even though it's not integrated in the base
install and the make scripting mechanism)?





This is a catch 22 problem.

How can I use svn when it's not part of the 9.1 base release?
Have to csup it down first and csup is broken.

Really between a rock and a hard place.

What the heck are the Freebsd officials doing?

They really mucked up 9.1 release big time.

___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: is csup broken?

2013-01-02 Thread Fbsd8

Joe Altman wrote:

On Wed, Jan 02, 2013 at 04:20:25PM +0100, Polytropon wrote:

Have you tried checking out via SVN which now is the desired
default method (even though it's not integrated in the base
install and the make scripting mechanism)?


ISTM that SVN is not the default method for users; but portsnap is the
preferred method for users.

Developers, OTOH, may find SVN useful.

http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/ports-using.html

http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/updating-upgrading-portsnap.html

I have no idea if the OP is a user or a developer; but I do know that at
least a cursory reading of the Handbook is a good idea, since the OP
question seems to be directly addressed in the Handbook.

Regards,

Joe


As the OP I see no need to pollute my system with a complete ports tree 
when I only have to compile php5 to enable the apache module. Thats over 
kill in my book. Sure the handbook says to use portsnap but that still 
loads the complete ports tree. crazy.


My ports tree only has the ports I have to recompile to change defaults 
used in package. This approach saves disk and backup times.


___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: is csup broken?

2013-01-02 Thread Polytropon
On Wed, 02 Jan 2013 10:34:54 -0500, Fbsd8 wrote:
 Polytropon wrote:
  On Wed, 02 Jan 2013 10:14:17 -0500, Fbsd8 wrote:
  Been using same script for years to fetch selected port files.
  Today I get error message
  Unknown collection ports-sysutils
 
  Running 9.1 and this worked in 2012
  
  Maybe this is related to the removal of CVS-related services
  for obtaining src and ports?
  
  Have you tried checking out via SVN which now is the desired
  default method (even though it's not integrated in the base
  install and the make scripting mechanism)?
  
  
  
 
 This is a catch 22 problem.
 
 How can I use svn when it's not part of the 9.1 base release?
 Have to csup it down first and csup is broken.

You actually don't _have_ to use CSV.

You can install SVN from binary packages via the new pkg command
(pkgng instead of traditional pkg_* tools).

Or you can obtain a ports tree first with portsnap or from the
installation media you've been using, install svn from this,
and then continue using svn to obtain updates for ports (and
src, if you want).

However, you're right about the fact that svn isn't part of the
base installation (yet?) and it doesn't fully integrate with
what worked with CVS for many years.



-- 
Polytropon
Magdeburg, Germany
Happy FreeBSD user since 4.0
Andra moi ennepe, Mousa, ...
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: is csup broken?

2013-01-02 Thread Fbsd8

Dimitri Yioulos wrote:

On Wednesday 02 January 2013 10:14:17 am Fbsd8 wrote:

Been using same script for years to fetch selected port
files. Today I get error message
Unknown collection ports-sysutils

Running 9.1 and this worked in 2012



It must have to do with the security incident that took 
place a couple of months ago.  It affects all package 
updates for 9.1 via pkg_add and csup, I guess.


Dimitri


I am not talking about packages here.
subject says is csup broken?
I use csup to fetch individual ports not packages.
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: is csup broken?

2013-01-02 Thread Fbsd8

Polytropon wrote:

On Wed, 02 Jan 2013 10:34:54 -0500, Fbsd8 wrote:

Polytropon wrote:

On Wed, 02 Jan 2013 10:14:17 -0500, Fbsd8 wrote:

Been using same script for years to fetch selected port files.
Today I get error message
Unknown collection ports-sysutils

Running 9.1 and this worked in 2012

Maybe this is related to the removal of CVS-related services
for obtaining src and ports?

Have you tried checking out via SVN which now is the desired
default method (even though it's not integrated in the base
install and the make scripting mechanism)?




This is a catch 22 problem.

How can I use svn when it's not part of the 9.1 base release?
Have to csup it down first and csup is broken.


You actually don't _have_ to use CSV.

You can install SVN from binary packages via the new pkg command
(pkgng instead of traditional pkg_* tools).

Or you can obtain a ports tree first with portsnap or from the
installation media you've been using, install svn from this,
and then continue using svn to obtain updates for ports (and
src, if you want).

However, you're right about the fact that svn isn't part of the
base installation (yet?) and it doesn't fully integrate with
what worked with CVS for many years.





Still behind the 8 ball.

The new pkg is not part of the base in 9.1
and there is no ftp packages for 9.1 and the
disc1.iso media I installed from has no packages.

I'm fubarbed

Now I just had a port I maintain committed yesterday
and I have no way to test it to verify the port is working.

And doing a portsnap which may not contain my updated port
for a few days if ever until all the other problem are addressed.

This 9.1 release was released prematurely. It has more problems
them 5.0 had which had a re-release 2 weeks later to fix problems.

This is BAD public relations for FreeBSD.
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: is csup broken?

2013-01-02 Thread Polytropon
On Wed, 02 Jan 2013 11:08:24 -0500, Fbsd8 wrote:
 Polytropon wrote:
  On Wed, 02 Jan 2013 10:34:54 -0500, Fbsd8 wrote:
  Polytropon wrote:
  On Wed, 02 Jan 2013 10:14:17 -0500, Fbsd8 wrote:
  Been using same script for years to fetch selected port files.
  Today I get error message
  Unknown collection ports-sysutils
 
  Running 9.1 and this worked in 2012
  Maybe this is related to the removal of CVS-related services
  for obtaining src and ports?
 
  Have you tried checking out via SVN which now is the desired
  default method (even though it's not integrated in the base
  install and the make scripting mechanism)?
 
 
 
  This is a catch 22 problem.
 
  How can I use svn when it's not part of the 9.1 base release?
  Have to csup it down first and csup is broken.
  
  You actually don't _have_ to use CSV.
  
  You can install SVN from binary packages via the new pkg command
  (pkgng instead of traditional pkg_* tools).
  
  Or you can obtain a ports tree first with portsnap or from the
  installation media you've been using, install svn from this,
  and then continue using svn to obtain updates for ports (and
  src, if you want).
  
  However, you're right about the fact that svn isn't part of the
  base installation (yet?) and it doesn't fully integrate with
  what worked with CVS for many years.
  
  
 
 
 Still behind the 8 ball.
 
 The new pkg is not part of the base in 9.1
 and there is no ftp packages for 9.1 and the
 disc1.iso media I installed from has no packages.
 
 I'm fubarbed

There is an option, even thogh possibly considered unelegant
in your situation:

Install the ports tree from the installation media and then
install the svn port from that outdated ports tree. Afterwards
delete the ports tree and use svn to get the components you
need.



 Now I just had a port I maintain committed yesterday
 and I have no way to test it to verify the port is working.
 
 And doing a portsnap which may not contain my updated port
 for a few days if ever until all the other problem are addressed.

That's true - SVN (formerly CVS) provided you with ad hoc
changes to the ports tree, whereas portsnap provides a snapshot
that might not be enough up to date.

I'd really like to see a svn command being part of the base
installation, with integration into the comfortable make update
mechanism for ports and system sources so it can _really and
actually_ replace csup.



-- 
Polytropon
Magdeburg, Germany
Happy FreeBSD user since 4.0
Andra moi ennepe, Mousa, ...
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: is csup broken?

2013-01-02 Thread Mark Felder
On Wed, 2 Jan 2013 11:08:24 -0500
fb...@a1poweruser.com wrote:

 This 9.1 release was released prematurely. It has more problems
 them 5.0 had which had a re-release 2 weeks later to fix problems.

This is FUD. Stop being afraid of change.

Users use portsnap
Power users use svn

There's no use trying to cover everyone's edge cases. You'll never keep 
everyone happy.

 Now I just had a port I maintain committed yesterday
 and I have no way to test it to verify the port is working.

Please don't commit ports to the ports tree if you have not tested them!
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: is csup broken?

2013-01-02 Thread Fbsd8

Mark Felder wrote:

On Wed, 2 Jan 2013 11:08:24 -0500
fb...@a1poweruser.com wrote:


This 9.1 release was released prematurely. It has more problems
them 5.0 had which had a re-release 2 weeks later to fix problems.


This is FUD. Stop being afraid of change.

Users use portsnap
Power users use svn

There's no use trying to cover everyone's edge cases. You'll never keep 
everyone happy.


Now I just had a port I maintain committed yesterday
and I have no way to test it to verify the port is working.


Please don't commit ports to the ports tree if you have not tested them!


Hay cutting out part of the post to make things look different than they 
are is just wrong.

As the thread explains the situation which you conveniently cut out.

If my words were not clear. My port works at my end, but I also check 
that the comment port process does not get kinked messing up the port at 
the ports system end.

___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: is csup broken?

2013-01-02 Thread Joseph A. Nagy, Jr

On 01/02/13 10:08, Fbsd8 wrote:
snip

Still behind the 8 ball.


No, I'm sorry but that's you.


The new pkg is not part of the base in 9.1
and there is no ftp packages for 9.1 and the
disc1.iso media I installed from has no packages.


I don't know what crap you're talking, but if you would have installed 
the ports tree upon installation this wouldn't be an issue. Yes, you 
want to save space and cut down on back-up times, awesome goals, but you 
should have been following on the list and in the handbook where CVS has 
been deprecated (whether for good or bad, it's done) and portsnap/SVN 
are now the preferred methods.



I'm fubarbed


No, just too lazy to pull off a few extra steps for a one-off with 
portsnap or svn (which you will have to compile yourself, I'm afraid, 
though maybe someone will make a package for ya)



Now I just had a port I maintain committed yesterday
and I have no way to test it to verify the port is working.


And? Pull it in with svn. I use svn to keep tabs on tk85 (and I only 
pull in tk85) in my user folder and I use svn to update my ports tree 
nightly.



And doing a portsnap which may not contain my updated port
for a few days if ever until all the other problem are addressed.


portsnap shouldn't be affected by the pkgbeta site being down, someone 
else with more knowledge on the subject should feel free to correct me.



This 9.1 release was released prematurely. It has more problems
them 5.0 had which had a re-release 2 weeks later to fix problems.


Prematurely? Depending on what source you go to it's at least two months 
behind.



This is BAD public relations for FreeBSD.


Now there is some FUD for ya.

--
Yours in Christ,

Joseph A Nagy Jr
Whoever loves instruction loves knowledge, But he who hates correction
is stupid. -- Proverbs 12:1
Emails are not formal business letters, whatever businesses may want.
Original content CopyFree (F) under the OWL http://owl.apotheon.org
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: Next csup tool to fetch src/ and ports/

2012-11-29 Thread Mark Felder
On Wed, 28 Nov 2012 13:24:40 +0100
David Demelier demelier.da...@gmail.com wrote:

 I will need to use portsnap, to fetch ports build subversion and then I can
 fetch the src, fetch the ports again using svn this time, that's a little
 bit painful.
 
 Maybe we can try to write something like srcsnap with the same behavior /
 features as portsnap ?

I don't expect you'll find src available in anything simpler than svn.
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Next csup tool to fetch src/ and ports/

2012-11-28 Thread David Demelier
Hi,

I'm fan of csup, I've been using it for years, since 7.0-RELEASE, however
it will be disabled on February 2013..

I don't care about using portsnap instead, but how to fetch src/ then ?

I will need to use portsnap, to fetch ports build subversion and then I can
fetch the src, fetch the ports again using svn this time, that's a little
bit painful.

Maybe we can try to write something like srcsnap with the same behavior /
features as portsnap ?

Cheers,

-- 
Demelier David
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: Next csup tool to fetch src/ and ports/

2012-11-28 Thread Arthur Chance

On 11/28/12 12:24, David Demelier wrote:

Hi,

I'm fan of csup, I've been using it for years, since 7.0-RELEASE, however
it will be disabled on February 2013..

I don't care about using portsnap instead, but how to fetch src/ then ?

I will need to use portsnap, to fetch ports build subversion and then I can
fetch the src, fetch the ports again using svn this time, that's a little
bit painful.

Maybe we can try to write something like srcsnap with the same behavior /
features as portsnap ?


It's called freebsd-update. :-) Provided you're happy with RELEASE and 
don't want to track STABLE or CURRENT, you can use freebsd-update to 
update just /usr/src. Simply find the line in /etc/freebsd-update.conf 
that reads


Components src world kernel

and change it to read

Components src

and it will only touch /usr/src. If do you want to track anything other 
than RELEASE you'll have to use svn.

___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: csup to svn

2012-11-22 Thread Fbsd8

Paul Schmehl wrote:
--On November 21, 2012 8:11:05 PM -0500 Fbsd8 fb...@a1poweruser.com 
wrote:



snip


csup has category called base that checkouts all the pieces parts
making up the ports make environment. IE Files in /usr/ports 
directory


svn has no category called base

What is base called in svn category?




svn co svn://svn.freebsd.org/base/release/8.3.0 /usr/src

for example.

To see the various branches, go to the svnweb site.
http://svnweb.freebsd.org/

In general, the checkout command will pull whatever you ask for and put
it where you tell it to and save date in a .svn directory which then
allows you to run svn up from then on (unless you delete the .svn
directory structure) to upgrade your sources.



The base you have referenced in svn means kernel source.
The ports cvup has category named base.

There is no category named base in the svn ports category list.

Doing a cvup for category base builds the following
# /usr/ports ls
.cvsignore  GIDsLEGAL   Mk  Tools
CHANGES KNOBS   MOVED   README  UIDs
COPYRIGHT   LASTCOMMIT.txt  MakefileTemplates   UPDATING

How do I do same thing using svn?



What was base is now head.  To tell it to download only the files in 
head use:


svn co svn://svn.freebsd.org/ports/head /usr/ports svn_depth_files = 1



That did not work. But this did work

 svn co svn://svn.freebsd.org/ports/head /usr/ports --depth files
 svn co svn://svn.freebsd.org/ports/head/Mk /usr/ports/Mk
 svn co svn://svn.freebsd.org/ports/head/Templates /usr/ports/Templates
 svn co svn://svn.freebsd.org/ports/head/Tools /usr/ports/Tools



___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


csup to svn

2012-11-21 Thread Fbsd8

I use packages for all my ports.
But some times I have to use ports make files because I need to change 
the default configuration.


I use a custom csup script to just download the desired single port.

Since the CVSup/Csup service is being phased out as of February 28, 
2013, How can I duplicate this function using svn?


Following is a sample csup script I use to download a single port.


 #! /bin/sh
 # This script is used to download make files for ytree port.

 # Load script symbolic field with path  file name
 cvsupfile=/root/temp.work.file

 # Check to see if file exists  delete it if it does
 [ -e $cvsupfile ]  rm -f $cvsupfile

 # Load instream data to file
 cat  $cvsupfile EOD
 *default  base=/usr# create CVSup tree off /usr directory
 *default  release=cvs
 *default  delete use-rel-suffix# no compression, for DSL or t1 lines
 *default  host=cvsup11.FreeBSD.org #  Virginia
 *default tag=.  # set tag value to nulls to get most current version
 ports-misc
 EOD

 # Exec csup to download just the selected port make files
 cd /usr/ports/
 csup -g -L 2 -i ports/misc/ytree $cvsupfile

 # Delete file we are done with it
 rm -f $cvsupfile

 echo  Ytree port download completed.



___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: csup to svn

2012-11-21 Thread Anton Shterenlikht
Date: Wed, 21 Nov 2012 11:10:28 -0500
From: Fbsd8 fb...@a1poweruser.com

I use packages for all my ports.
But some times I have to use ports make files because I need to change 
the default configuration.

I use a custom csup script to just download the desired single port.

Since the CVSup/Csup service is being phased out as of February 28, 
2013, How can I duplicate this function using svn?

Following is a sample csup script I use to download a single port.


  #! /bin/sh
  # This script is used to download make files for ytree port.

  # Load script symbolic field with path  file name
  cvsupfile=/root/temp.work.file

  # Check to see if file exists  delete it if it does
  [ -e $cvsupfile ]  rm -f $cvsupfile

  # Load instream data to file
  cat  $cvsupfile EOD
  *default  base=/usr# create CVSup tree off /usr 
directory
  *default  release=cvs
  *default  delete use-rel-suffix# no compression, for DSL or t1 
lines
  *default  host=cvsup11.FreeBSD.org #  Virginia
  *default tag=.  # set tag value to nulls to get most current 
version
  ports-misc
  EOD

  # Exec csup to download just the selected port make files
  cd /usr/ports/
  csup -g -L 2 -i ports/misc/ytree $cvsupfile

  # Delete file we are done with it
  rm -f $cvsupfile

  echo  Ytree port download completed.

I would do:

# cd /usr/ports
# svn co svn://svn0.us-east.freebsd.org/ports/head/ .

This will populate your ports tree.
Then, you can update anything and everything,
e.g. the whole ports tree:

# svn up /usr/ports

or just a single port:

# svn up /usr/ports/misc/ytree

I think it's way simpler than your current method.
In my opinion, svn is way better (at least in this regard)
than csup.

Other useful thing that is easy with svn is reverting
port updates, e.g. when new ports don't build or give
other problems. For example, right now the latest sudo
doesn't work for me on ia64. So I do

# svn up /usr/ports
# svn up -r302692 /usr/ports/security/sudo

to build an older working version of sudo.

Anton

___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: csup to svn

2012-11-21 Thread Fbsd8

Anton Shterenlikht wrote:

Date: Wed, 21 Nov 2012 11:10:28 -0500
From: Fbsd8 fb...@a1poweruser.com

I use packages for all my ports.
	But some times I have to use ports make files because I need to change 
	the default configuration.


I use a custom csup script to just download the desired single port.

	Since the CVSup/Csup service is being phased out as of February 28, 
	2013, How can I duplicate this function using svn?


Following is a sample csup script I use to download a single port.


  #! /bin/sh
  # This script is used to download make files for ytree port.

  # Load script symbolic field with path  file name
  cvsupfile=/root/temp.work.file

  # Check to see if file exists  delete it if it does
  [ -e $cvsupfile ]  rm -f $cvsupfile

  # Load instream data to file
  cat  $cvsupfile EOD
  *default  base=/usr# create CVSup tree off /usr 
directory
  *default  release=cvs
  *default  delete use-rel-suffix# no compression, for DSL or t1 
lines
  *default  host=cvsup11.FreeBSD.org #  Virginia
  *default tag=.  # set tag value to nulls to get most current 
version
  ports-misc
  EOD

  # Exec csup to download just the selected port make files
  cd /usr/ports/
  csup -g -L 2 -i ports/misc/ytree $cvsupfile

  # Delete file we are done with it
  rm -f $cvsupfile

  echo  Ytree port download completed.

I would do:

# cd /usr/ports
# svn co svn://svn0.us-east.freebsd.org/ports/head/ .

This will populate your ports tree.
Then, you can update anything and everything,
e.g. the whole ports tree:

# svn up /usr/ports

or just a single port:

# svn up /usr/ports/misc/ytree

I think it's way simpler than your current method.
In my opinion, svn is way better (at least in this regard)
than csup.

Other useful thing that is easy with svn is reverting
port updates, e.g. when new ports don't build or give
other problems. For example, right now the latest sudo
doesn't work for me on ia64. So I do

# svn up /usr/ports
# svn up -r302692 /usr/ports/security/sudo

to build an older working version of sudo.

Anton




You missed to whole point of my question.
I don't want to maintain the WHOLE ports tree.
I only want to download selected single port.
My current ports tree only has 2 ports, apache22 and php5.
So your reply did not answer my question.
Thanks any how.


___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: csup to svn

2012-11-21 Thread Paul Schmehl
--On November 21, 2012 11:10:28 AM -0500 Fbsd8 fb...@a1poweruser.com 
wrote:



I use packages for all my ports.
But some times I have to use ports make files because I need to change
the default configuration.

I use a custom csup script to just download the desired single port.

Since the CVSup/Csup service is being phased out as of February 28, 2013,
How can I duplicate this function using svn?



cd /usr/ports/category
svn co svn://svn.freebsd.org/ports/head/category/port

--
Paul Schmehl, Senior Infosec Analyst
As if it wasn't already obvious, my opinions
are my own and not those of my employer.
***
It is as useless to argue with those who have
renounced the use of reason as to administer
medication to the dead. Thomas Jefferson
There are some ideas so wrong that only a very
intelligent person could believe in them. George Orwell

___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: csup to svn

2012-11-21 Thread Anton Shterenlikht
From fb...@a1poweruser.com Wed Nov 21 17:57:51 2012

Anton Shterenlikht wrote:
   Date: Wed, 21 Nov 2012 11:10:28 -0500
   From: Fbsd8 fb...@a1poweruser.com
 
   I use packages for all my ports.
   But some times I have to use ports make files because I need to 
change 
   the default configuration.
 
   I use a custom csup script to just download the desired single 
port.
 
   Since the CVSup/Csup service is being phased out as of February 
28, 
   2013, How can I duplicate this function using svn?
 
   Following is a sample csup script I use to download a single 
port.
 
 
 #! /bin/sh
 # This script is used to download make files for ytree port.
 
 # Load script symbolic field with path  file name
 cvsupfile=/root/temp.work.file
 
 # Check to see if file exists  delete it if it does
 [ -e $cvsupfile ]  rm -f $cvsupfile
 
 # Load instream data to file
 cat  $cvsupfile EOD
 *default  base=/usr# create CVSup tree off 
/usr directory
 *default  release=cvs
 *default  delete use-rel-suffix# no compression, for DSL 
or t1 lines
 *default  host=cvsup11.FreeBSD.org #  Virginia
 *default tag=.  # set tag value to nulls to get most 
current version
 ports-misc
 EOD
 
 # Exec csup to download just the selected port make files
 cd /usr/ports/
 csup -g -L 2 -i ports/misc/ytree $cvsupfile
 
 # Delete file we are done with it
 rm -f $cvsupfile
 
 echo  Ytree port download completed.
 
 I would do:
 
 # cd /usr/ports
 # svn co svn://svn0.us-east.freebsd.org/ports/head/ .
 
 This will populate your ports tree.
 Then, you can update anything and everything,
 e.g. the whole ports tree:
 
 # svn up /usr/ports
 
 or just a single port:
 
 # svn up /usr/ports/misc/ytree
 
 I think it's way simpler than your current method.
 In my opinion, svn is way better (at least in this regard)
 than csup.
 
 Other useful thing that is easy with svn is reverting
 port updates, e.g. when new ports don't build or give
 other problems. For example, right now the latest sudo
 doesn't work for me on ia64. So I do
 
 # svn up /usr/ports
 # svn up -r302692 /usr/ports/security/sudo
 
 to build an older working version of sudo.
 
 Anton
 
 

You missed to whole point of my question.
I don't want to maintain the WHOLE ports tree.
I only want to download selected single port.
My current ports tree only has 2 ports, apache22 and php5.
So your reply did not answer my question.
Thanks any how.

# mkdir apache22
# cd apache22/
# svn co svn://svn0.us-east.freebsd.org/ports/head/www/apache22 .
Adistinfo
Apkg-descr
AMakefile.doc
Afiles
Afiles/patch-Makefile.in
Afiles/patch-support__apachectl.in
Afiles/mpm-itk-20110321-01
Afiles/patch-configure.in
Afiles/patch-docs__conf__httpd.conf.in
Afiles/patch-docs__conf__extra__httpd-ssl.conf.in
Afiles/apache22.in
Afiles/no-accf.conf
Afiles/patch-support__ab.c
Afiles/patch-server__core.c
Afiles/patch-modules__proxy__mod_proxy_connect.c
Afiles/patch-docs__conf__extra__httpd-userdir.conf.in
Afiles/extra-patch-suexec_rsrclimit
Afiles/patch-support__log_server_status.in
Afiles/extra-patch-suexec_userdir
Afiles/htcacheclean.in
Afiles/patch-server__config.c
Afiles/patch-support__apxs.in
Afiles/mpm-itk-perdir-regex
Afiles/patch-support__envvars-std.in
Afiles/patch-support__Makefile.in
Afiles/mpm-itk-limits
Afiles/patch-config.layout
Apkg-message
AMakefile.modules
AMakefile.options
Apkg-plist
AMakefile
Checked out revision 307619.
# ls
.svnMakefile.modulesfiles   
pkg-plist
MakefileMakefile.optionspkg-descr
Makefile.docdistinfopkg-message
#

Anton

___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: csup to svn

2012-11-21 Thread Steve O'Hara-Smith
On Wed, 21 Nov 2012 12:52:14 -0500
Fbsd8 fb...@a1poweruser.com wrote:

 You missed to whole point of my question.
 I don't want to maintain the WHOLE ports tree.
 I only want to download selected single port.
 My current ports tree only has 2 ports, apache22 and php5.
 So your reply did not answer my question.
 Thanks any how.

This works

svn co svn://svn0.us-east.freebsd.org/ports/head/www/apache22 .

If you do it in /usr/ports/www/apache22 then the port winds up in a
sane place. Once you have it you can do svn up in /usr/ports/www/apache22 to
update it.

This will probably become intolerably clumsy for more than a
handful of ports.

-- 
Steve O'Hara-Smith at...@sohara.org
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: csup to svn

2012-11-21 Thread Paul Schmehl
--On November 21, 2012 6:04:00 PM + Steve O'Hara-Smith 
at...@sohara.org wrote:



On Wed, 21 Nov 2012 12:52:14 -0500
Fbsd8 fb...@a1poweruser.com wrote:


You missed to whole point of my question.
I don't want to maintain the WHOLE ports tree.
I only want to download selected single port.
My current ports tree only has 2 ports, apache22 and php5.
So your reply did not answer my question.
Thanks any how.


This works

svn co svn://svn0.us-east.freebsd.org/ports/head/www/apache22 .

If you do it in /usr/ports/www/apache22 then the port winds up in a
sane place.


No!  This will create an apache22 port in /usr/ports/www/apache22/apache22!

You want to checkout the port while you're in the category directory.

IOW, cd /usr/ports/www  svn co blah blah blah

If you want to do a category, cd /usr/ports/  svn co 
svn://svn.freebsd.org/ports/head/www



Once you have it you can do svn up in /usr/ports/www/apache22

to update it.

This will probably become intolerably clumsy for more than a
handful of ports.




--
Paul Schmehl, Senior Infosec Analyst
As if it wasn't already obvious, my opinions
are my own and not those of my employer.
***
It is as useless to argue with those who have
renounced the use of reason as to administer
medication to the dead. Thomas Jefferson
There are some ideas so wrong that only a very
intelligent person could believe in them. George Orwell

___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: csup to svn

2012-11-21 Thread Fbsd8

Paul Schmehl wrote:
--On November 21, 2012 6:04:00 PM + Steve O'Hara-Smith 
at...@sohara.org wrote:



On Wed, 21 Nov 2012 12:52:14 -0500
Fbsd8 fb...@a1poweruser.com wrote:


You missed to whole point of my question.
I don't want to maintain the WHOLE ports tree.
I only want to download selected single port.
My current ports tree only has 2 ports, apache22 and php5.
So your reply did not answer my question.
Thanks any how.


This works

svn co svn://svn0.us-east.freebsd.org/ports/head/www/apache22 .

If you do it in /usr/ports/www/apache22 then the port winds up in a
sane place.


No!  This will create an apache22 port in /usr/ports/www/apache22/apache22!

You want to checkout the port while you're in the category directory.

IOW, cd /usr/ports/www  svn co blah blah blah

If you want to do a category, cd /usr/ports/  svn co 
svn://svn.freebsd.org/ports/head/www



Once you have it you can do svn up in /usr/ports/www/apache22

to update it.

This will probably become intolerably clumsy for more than a
handful of ports.






Yeap thats the ticket. I tested this and it works also

svn co svn://svn.freebsd.org/ports/head/misc/ytree /usr/ports/misc/ytree

Don't have to change into target directory.


Another question

csup has category called base that checkouts all the pieces parts 
making up the ports make environment.


svn has no category called base

What is base called in svn category?




___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: csup to svn

2012-11-21 Thread Paul Schmehl

--On November 21, 2012 5:49:07 PM -0500 Fbsd8 fb...@a1poweruser.com wrote:


Paul Schmehl wrote:

--On November 21, 2012 6:04:00 PM + Steve O'Hara-Smith
at...@sohara.org wrote:


On Wed, 21 Nov 2012 12:52:14 -0500
Fbsd8 fb...@a1poweruser.com wrote:


You missed to whole point of my question.
I don't want to maintain the WHOLE ports tree.
I only want to download selected single port.
My current ports tree only has 2 ports, apache22 and php5.
So your reply did not answer my question.
Thanks any how.


This works

svn co svn://svn0.us-east.freebsd.org/ports/head/www/apache22 .

If you do it in /usr/ports/www/apache22 then the port winds up in a
sane place.


No!  This will create an apache22 port in
/usr/ports/www/apache22/apache22!

You want to checkout the port while you're in the category directory.

IOW, cd /usr/ports/www  svn co blah blah blah

If you want to do a category, cd /usr/ports/  svn co
svn://svn.freebsd.org/ports/head/www


Once you have it you can do svn up in /usr/ports/www/apache22

to update it.

This will probably become intolerably clumsy for more than a
handful of ports.






Yeap thats the ticket. I tested this and it works also

svn co svn://svn.freebsd.org/ports/head/misc/ytree /usr/ports/misc/ytree

Don't have to change into target directory.


Another question

csup has category called base that checkouts all the pieces parts
making up the ports make environment.

svn has no category called base

What is base called in svn category?




svn co svn://svn.freebsd.org/base/release/8.3.0 /usr/src

for example.

To see the various branches, go to the svnweb site. 
http://svnweb.freebsd.org/


In general, the checkout command will pull whatever you ask for and put it 
where you tell it to and save date in a .svn directory which then allows 
you to run svn up from then on (unless you delete the .svn directory 
structure) to upgrade your sources.













--
Paul Schmehl, Senior Infosec Analyst
As if it wasn't already obvious, my opinions
are my own and not those of my employer.
***
It is as useless to argue with those who have
renounced the use of reason as to administer
medication to the dead. Thomas Jefferson
There are some ideas so wrong that only a very
intelligent person could believe in them. George Orwell

___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: csup to svn

2012-11-21 Thread Fbsd8

snip


csup has category called base that checkouts all the pieces parts
making up the ports make environment. IE Files in /usr/ports directory

svn has no category called base

What is base called in svn category?




svn co svn://svn.freebsd.org/base/release/8.3.0 /usr/src

for example.

To see the various branches, go to the svnweb site. 
http://svnweb.freebsd.org/


In general, the checkout command will pull whatever you ask for and put 
it where you tell it to and save date in a .svn directory which then 
allows you to run svn up from then on (unless you delete the .svn 
directory structure) to upgrade your sources.




The base you have referenced in svn means kernel source.
The ports cvup has category named base.

There is no category named base in the svn ports category list.

Doing a cvup for category base builds the following
# /usr/ports ls
.cvsignore  GIDsLEGAL   Mk  Tools
CHANGES KNOBS   MOVED   README  UIDs
COPYRIGHT   LASTCOMMIT.txt  MakefileTemplates   UPDATING

How do I do same thing using svn?


___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: csup to svn

2012-11-21 Thread Paul Schmehl

--On November 21, 2012 8:11:05 PM -0500 Fbsd8 fb...@a1poweruser.com wrote:


snip


csup has category called base that checkouts all the pieces parts
making up the ports make environment. IE Files in /usr/ports directory

svn has no category called base

What is base called in svn category?




svn co svn://svn.freebsd.org/base/release/8.3.0 /usr/src

for example.

To see the various branches, go to the svnweb site.
http://svnweb.freebsd.org/

In general, the checkout command will pull whatever you ask for and put
it where you tell it to and save date in a .svn directory which then
allows you to run svn up from then on (unless you delete the .svn
directory structure) to upgrade your sources.



The base you have referenced in svn means kernel source.
The ports cvup has category named base.

There is no category named base in the svn ports category list.

Doing a cvup for category base builds the following
# /usr/ports ls
.cvsignore  GIDsLEGAL   Mk  Tools
CHANGES KNOBS   MOVED   README  UIDs
COPYRIGHT   LASTCOMMIT.txt  MakefileTemplates   UPDATING

How do I do same thing using svn?



What was base is now head.  To tell it to download only the files in head 
use:


svn co svn://svn.freebsd.org/ports/head /usr/ports svn_depth_files = 1








Paul Schmehl, Senior Infosec Analyst
As if it wasn't already obvious, my opinions
are my own and not those of my employer.
***
It is as useless to argue with those who have
renounced the use of reason as to administer
medication to the dead. Thomas Jefferson
There are some ideas so wrong that only a very
intelligent person could believe in them. George Orwell

___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: Recent security announcement and csup/cvsup?

2012-11-20 Thread Bas Smeelen
On 11/20/2012 12:45 PM, Mohacsi Janos wrote:
 Dear Ollivier and all,
 I have problem with the portsnap: I maintain a private repository 
 under the /usr/ports: There is a /usr/ports/tmp where I store new ports to 
 be tested, and submitted. The portsnap is removing unrecognized local files.
 With cvsup I don't have such a problem.
 I have no information about pkgng, whether I can maintain private 
 repository with pkgng or not?

I guess the best in this case is to switch to subversion.
http://wiki.freebsd.org/PortsSubversionPrimer



 Janos Mohacsi
 Head of HBONE+ project
 Network Engineer, Director Network and Multimedia
 NIIF/HUNGARNET, HUNGARY
 Co-chair of Hungarian IPv6 Forum
 Key 70EF9882: DEC2 C685 1ED4 C95A 145F  4300 6F64 7B00 70EF 9882

 On Tue, 20 Nov 2012, Ollivier Robert wrote:

 According to Gary Palmer on Sun, Nov 18, 2012 at 01:04:21PM -0500:
 In other words: while signed updates via freebsd-update and portsnap
 are great for a good chunk of users, they don't address everyones needs.

 Hopefully, with the move toward kngng, there will be less need of 
 portsnap (and /usr/ports for that matter).

 -- 
 Ollivier ROBERT -=- FreeBSD: The Power to Serve! -=- robe...@keltia.net
 In memoriam to Ondine, our 2nd child: http://ondine.keltia.net/ 



This e-mail message, including any attachment(s), is intended solely for the 
addressee or addressees. Any views or opinions presented herein are solely 
those of the author and do not necessarily represent those of OSE.

If you are not the intended recipient of this communication please return this 
e-mail message and the attachment(s) to the sender and delete and destroy all 
copies.

___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


svn vs csup usage question

2012-10-03 Thread Dennis Glatting
I often modify configuration files in the src and ports tree. Normally
this isn't a problem becuase csup determines which files changed and
pulled fresh copies from the repository.

I doin't see a svn mechansim to do that, for example: 

svn co -verify repo target

It appears the contents of .svn is all that is check on checkout and not
the files themselves.


___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: svn vs csup usage question

2012-10-03 Thread Trond Endrestøl
On Wed, 3 Oct 2012 04:56-0700, Dennis Glatting wrote:

 I often modify configuration files in the src and ports tree. Normally
 this isn't a problem becuase csup determines which files changed and
 pulled fresh copies from the repository.
 
 I doin't see a svn mechansim to do that, for example: 
 
   svn co -verify repo target
 
 It appears the contents of .svn is all that is check on checkout and not
 the files themselves.

Do you always checkout a complete source or ports tree?

Maybe svn update --accept X, for some useful value of X is what you 
want?

According to PDF manual for svn 1.7, page 251, physical PDF page 272, 
X can be one of:

postpone (p)
Take no resolution action at all and instead allow the conflicts to be 
recorded for future resolution.

edit (e)
Open each conflicted file in a text editor for manual resolution of 
line-based conflicts.

launch (l)
Launch an interactive merge conflict resolution tool for each 
conflicted file.

base
Choose the file that was the (unmodified) BASE revision before you 
tried to integrate changes from the server into your working
copy.

working
Assuming that you've manually handled the conflict resolution, choose 
the version of the file as it currently stands in your
working copy.

mine-full (mf)
Resolve conflicted files by preserving all local modifications and 
discarding all changes fetched from the server during the operation
which caused the conflict.

theirs-full (tf)
Resolve conflicted files by discarding all local modifications and 
integrating all changes fetched from the server during the operation
which caused the conflict.

mine-conflict (mc)
Resolve conflicted files by preferring local modifications over the 
changes fetched from the server in conflicting regions of
each file's content.

theirs-conflict (tc)
Resolve conflicted files by preferring the changes fetched from the 
server over local modifications in conflicting regions of
each file's content.

-- 
+---++
| Vennlig hilsen,   | Best regards,  |
| Trond Endrestøl,  | Trond Endrestøl,   |
| IT-ansvarlig, | System administrator,  |
| Fagskolen Innlandet,  | Gjøvik Technical College, Norway,  |
| tlf. mob.   952 62 567,   | Cellular...: +47 952 62 567,   |
| sentralbord 61 14 54 00.  | Switchboard: +47 61 14 54 00.  |
+---++___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org

Re: svn vs csup usage question

2012-10-03 Thread Dennis Glatting
On Wed, 2012-10-03 at 14:20 +0200, Trond Endrestøl wrote:
 On Wed, 3 Oct 2012 04:56-0700, Dennis Glatting wrote:
 
  I often modify configuration files in the src and ports tree. Normally
  this isn't a problem becuase csup determines which files changed and
  pulled fresh copies from the repository.
  
  I doin't see a svn mechansim to do that, for example: 
  
  svn co -verify repo target
  
  It appears the contents of .svn is all that is check on checkout and not
  the files themselves.
 
 Do you always checkout a complete source or ports tree?
 

I run this command:

svn co svn://svn.pki2.com/base/stable/9 /disk-2/src

The changes I make are quick hacks, such as changing comilation options
or minor code changes for test. They are (almost) never meant for
permanency. For example, last night I changed the compilation options
for the kernel from -O2 to -O simply to see if that has any impact on
the kernel/ZFS problems I am having. I suspect not, but it is worth a
try. I now want that file restored to its origional state. 


 Maybe svn update --accept X, for some useful value of X is what you 
 want?
 
 According to PDF manual for svn 1.7, page 251, physical PDF page 272, 
 X can be one of:
 
 postpone (p)
 Take no resolution action at all and instead allow the conflicts to be 
 recorded for future resolution.
 
 edit (e)
 Open each conflicted file in a text editor for manual resolution of 
 line-based conflicts.
 
 launch (l)
 Launch an interactive merge conflict resolution tool for each 
 conflicted file.
 
 base
 Choose the file that was the (unmodified) BASE revision before you 
 tried to integrate changes from the server into your working
 copy.
 
 working
 Assuming that you've manually handled the conflict resolution, choose 
 the version of the file as it currently stands in your
 working copy.
 
 mine-full (mf)
 Resolve conflicted files by preserving all local modifications and 
 discarding all changes fetched from the server during the operation
 which caused the conflict.
 
 theirs-full (tf)
 Resolve conflicted files by discarding all local modifications and 
 integrating all changes fetched from the server during the operation
 which caused the conflict.
 
 mine-conflict (mc)
 Resolve conflicted files by preferring local modifications over the 
 changes fetched from the server in conflicting regions of
 each file's content.
 
 theirs-conflict (tc)
 Resolve conflicted files by preferring the changes fetched from the 
 server over local modifications in conflicting regions of
 each file's content.
 
 -- 
 +---++
 | Vennlig hilsen,   | Best regards,  |
 | Trond Endrestøl,  | Trond Endrestøl,   |
 | IT-ansvarlig, | System administrator,  |
 | Fagskolen Innlandet,  | Gjøvik Technical College, Norway,  |
 | tlf. mob.   952 62 567,   | Cellular...: +47 952 62 567,   |
 | sentralbord 61 14 54 00.  | Switchboard: +47 61 14 54 00.  |
 +---++


___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: svn vs csup usage question

2012-10-03 Thread Trond Endrestøl
On Wed, 3 Oct 2012 10:57-0700, Dennis Glatting wrote:

 On Wed, 2012-10-03 at 14:20 +0200, Trond Endrestøl wrote:
  On Wed, 3 Oct 2012 04:56-0700, Dennis Glatting wrote:
  
   I often modify configuration files in the src and ports tree. Normally
   this isn't a problem becuase csup determines which files changed and
   pulled fresh copies from the repository.
   
   I doin't see a svn mechansim to do that, for example: 
   
 svn co -verify repo target
   
   It appears the contents of .svn is all that is check on checkout and not
   the files themselves.
  
  Do you always checkout a complete source or ports tree?
 
 I run this command:
 
   svn co svn://svn.pki2.com/base/stable/9 /disk-2/src
   
 The changes I make are quick hacks, such as changing comilation options
 or minor code changes for test. They are (almost) never meant for
 permanency. For example, last night I changed the compilation options
 for the kernel from -O2 to -O simply to see if that has any impact on
 the kernel/ZFS problems I am having. I suspect not, but it is worth a
 try. I now want that file restored to its origional state. 

Then the svn revert command is probably what you want.

  Maybe svn update --accept X, for some useful value of X is what you 
  want?
  
  According to PDF manual for svn 1.7, page 251, physical PDF page 272, 
  X can be one of:
  
  postpone (p)
  Take no resolution action at all and instead allow the conflicts to be 
  recorded for future resolution.
  
  edit (e)
  Open each conflicted file in a text editor for manual resolution of 
  line-based conflicts.
  
  launch (l)
  Launch an interactive merge conflict resolution tool for each 
  conflicted file.
  
  base
  Choose the file that was the (unmodified) BASE revision before you 
  tried to integrate changes from the server into your working
  copy.
  
  working
  Assuming that you've manually handled the conflict resolution, choose 
  the version of the file as it currently stands in your
  working copy.
  
  mine-full (mf)
  Resolve conflicted files by preserving all local modifications and 
  discarding all changes fetched from the server during the operation
  which caused the conflict.
  
  theirs-full (tf)
  Resolve conflicted files by discarding all local modifications and 
  integrating all changes fetched from the server during the operation
  which caused the conflict.
  
  mine-conflict (mc)
  Resolve conflicted files by preferring local modifications over the 
  changes fetched from the server in conflicting regions of
  each file's content.
  
  theirs-conflict (tc)
  Resolve conflicted files by preferring the changes fetched from the 
  server over local modifications in conflicting regions of
  each file's content.

-- 
+---++
| Vennlig hilsen,   | Best regards,  |
| Trond Endrestøl,  | Trond Endrestøl,   |
| IT-ansvarlig, | System administrator,  |
| Fagskolen Innlandet,  | Gjøvik Technical College, Norway,  |
| tlf. mob.   952 62 567,   | Cellular...: +47 952 62 567,   |
| sentralbord 61 14 54 00.  | Switchboard: +47 61 14 54 00.  |
+---++___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org

RE: What replaces csup?

2012-09-20 Thread Doug Sampson
  I also find portsnap slower than either
  csup or svn.
 
 That surprises me. Once the initial download and extract is done, I find
 portsnap fetch update to be miles faster than csup. However, each to
 his own, I suppose.

+1
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org

Re: What replaces csup?

2012-09-19 Thread Stas Verberkt

mer...@stonehenge.com schreef op :

Stas == Stas Verberkt lego...@legolasweb.nl writes:


Stas On a side note, using Git does mean that everyone has to
download a complete
Stas repository. This makes using a csup-like architecture quite
Stas heavy-weight.

The entire history of the Linux kernel since switching to git 5 years
ago is stored in a repo that is *less than half the size* of a single
current checkout.

The entire history of the XFree86 project ended up being a repo that 
was

only 2-3 times the size of the current checkout.

Seriously, don't be afraid of git simply because it has all the
history.  SVN is already worse because it has a single local backup
copy for every live file, 2x right there.

I may have been influenced here by the fact that, in KDE, the size 
became
a problem, due to the large amounts of binary content in the 
repositories

(artwork), which is, of course, not the case for FreeBSD.
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: What replaces csup?

2012-09-19 Thread pete wright
On Tue, Sep 18, 2012 at 6:41 AM, Warren Block wbl...@wonkity.com wrote:
 On Mon, 17 Sep 2012, pete wright wrote:

 On Mon, Sep 17, 2012 at 8:14 PM, Warren Block wbl...@wonkity.com wrote:


 csup updates just the files that have changed without all the overhead.
 svn
 export can get a copy of all the current files, but it copies all of them
 every time, not just the changes.


 yea i agree with you.  i wonder if it would be worth the effort of
 sharing a svn export via rsync or httpd to make fetching delta's
 easier and/or more efficient from a base install?


 It's an interesting idea.  If the repository files were directly accessible
 in a filesystem, that filesystem could be shared with rsyncd and some
 exclude settings without needing an export at all.  With svn bdb, the files
 are not directly accessible, but I don't know for fsfs. Probably not, so a
 periodic export would still be required.

i did some tinkering with this last night, with the thought of storing
an export in a zfs filesystem and eventually making it available
publicly via a jail.  my findings were that an export of the 9.1 relng
branch consumed ~750MB while a svn co consumed ~1.4G of disk space and
a full export took roughly 10-15mins.  i eventually decided that what
I was doing wasn't really needed by the wider end-user community.

after mulling this move from cvs/csup for a bit i came to the
conclusion that really the need for a source checkout is not as
important as it may have been several years ago.  freebsd-update is a
really great tool, and i reckon for a majority of users out there not
having to rebuild the kernel+world to get updates is a good thing(tm).
 i also reckon running a GENERIC kernel is appropriate in maybe %90 of
use-cases out there as well (i haven't had a need to build a custom
kernel on various server and workstation platforms since 2008'ish
frankly).

in this context, going the binary distribution route seems like a
really smart decision.  having a majority of your users basically
running the same builds of the world and kernel *should* decrease the
amount of support bandwidth needed to get people updated and running
current code.  i also reckon having more people running the same
binaries would be helpful in finding reproducible bugs and hopefully
squash them.

so back to my original point...for sites running many systems, or
sites requiring specific builds - mirroring the source tree locally is
still very doable, and fortunately there are many well known ways to
do this (svn co, svn export, skv, etc..).  you could even argue that
having a svn checkout may make patching bugs easier as you could just
import a svn diff, rebuild and test.  i also feel, personally, that it
is nice to allow someone else build the kernel+world and let me grab
binary updates as needed.  now i can spend my clock cycles on more
important tasks, like building packages for my pkgng repo :)


-pete

-- 
pete wright
www.nycbug.org
@nomadlogicLA
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: What replaces csup?

2012-09-19 Thread pete wright
On Tue, Sep 18, 2012 at 5:44 AM, Stas Verberkt lego...@legolasweb.nl wrote:
 Jerry schreef op :

 On Tue, 18 Sep 2012 05:00:08 -0700
 Michael Sierchio articulated:

 We are really behind the curve here.  Git assumes (correctly) that
 disk space is inexpensive, much cheaper per byte than network
 bandwidth.  By the time we adopt SVN completely, every serious project
 I know of will have moved from subversion to git.


 If you are going to make a sweeping change anyway, it makes no sense to
 do it in a half–assed manned. However, it does appear that in all too
 many instances, FreeBSD plays follow the leader rather then taking the
 bulls by the horns and getting ahead of the curve. I am sure I'll be
 hearing from the baby steps choir now. In any event, a comprehensive
 side-by-side evaluation of the two should be done by an impartial party.

 We should not be forgetting that Git and Subversion represent two different
 workflows. The latter stands for a centralistic development cycle, and the
 former for a distributed manner. Thus, this type of choice does not really
 have to do with big or small steps and leading of following, but more about
 the production cycle you want to have.
 If we were to use a Git-like system, the releng team would (probably) be in
 control on which patches are excepted from the pool of suggested changesets
 by the community of developers. This community would be more free in the
 manner in which they experiment, and there would be a less strong
 differentiation between committers and other people suggesting updates. On
 the other hand, our current approach has a controlled group of committers
 and the releng team only has the additional power of setting the schedule
 and taking the snapshot that becomes the release. (Gravely simplified.)
 It is a matter of taste.


+1

one thing worth noting is that developers have been using mercurial
for quite a bit of time now for FreeBSD development(1), to take
advantage of the distributed model of that SCM.  yet having the main
tree under CVS in the past, and SVN currently, makes sense to me.  i
feel that it results in a cleaner public tree that is easier to
navigate.  so fortunately the project has been able to take advantage
of both of of these philosophies of SCM.

-pete

(1) http://wiki.freebsd.org/LocalMercurial


-- 
pete wright
www.nycbug.org
@nomadlogicLA
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: What replaces csup?

2012-09-19 Thread Walter Hurry
On Mon, 17 Sep 2012 21:26:45 -0600, Warren Block wrote:

 For ports, it's probably worth saving the distfile directory along with
 local diffs.  Move it back into place after the svn checkout of the
 ports tree.

PMFJI. Newbie here: What's wrong with using SVN for src, and portsnap for 
ports?

Thanks.

___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: What replaces csup?

2012-09-19 Thread Robert Huff

Walter Hurry writes:

  PMFJI. Newbie here: What's wrong with using SVN for src, and
  portsnap for ports?

_Wrong_?  Nothing.
But a lot of people like the idea of using the same tool to
solve nearly identical problems.
Your experience may diverga.



Robert Huff

___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: What replaces csup?

2012-09-19 Thread Warren Block

On Wed, 19 Sep 2012, Walter Hurry wrote:


On Mon, 17 Sep 2012 21:26:45 -0600, Warren Block wrote:


For ports, it's probably worth saving the distfile directory along with
local diffs.  Move it back into place after the svn checkout of the
ports tree.


PMFJI. Newbie here: What's wrong with using SVN for src, and portsnap for
ports?


That's another way.  If there are any local changes to the ports tree, 
portsnap will overwrite them.  I also find portsnap slower than either 
csup or svn.

___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: What replaces csup?

2012-09-19 Thread pete wright
On Wed, Sep 19, 2012 at 1:11 PM, Walter Hurry walterhu...@gmail.com wrote:
 On Mon, 17 Sep 2012 21:26:45 -0600, Warren Block wrote:

 For ports, it's probably worth saving the distfile directory along with
 local diffs.  Move it back into place after the svn checkout of the
 ports tree.

 PMFJI. Newbie here: What's wrong with using SVN for src, and portsnap for
 ports?


my personal issue is the fact that csup and portsnap are both part of
the base system whereas svn would require installation via ports or
the pkg utility.  it is frankly a minor inconvenience - and hopefully
there will be a csup like utility for svn available in base one day.

-pete

-- 
pete wright
www.nycbug.org
@nomadlogicLA
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: What replaces csup?

2012-09-19 Thread Walter Hurry
On Wed, 19 Sep 2012 16:18:02 -0600, Warren Block wrote:

 I also find portsnap slower than either
 csup or svn.

That surprises me. Once the initial download and extract is done, I find 
portsnap fetch update to be miles faster than csup. However, each to 
his own, I suppose.

___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: What replaces csup?

2012-09-18 Thread Stas Verberkt

Warren Block schreef op :

The difference is that a local svn checkout has all the commit
history. A comparison recently showed 700-some megabytes more space
used by the svn checkout.


Although I believe the checkouts are bigger, I do not think they have
all the commit history. This is where SVN and CVS differ from systems
like Git or Mercury, which have all the history in a local working
copy. I think the overhead of SVN consists of backups and cached
copies of the previous revision, but I am not quite sure.
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: What replaces csup?

2012-09-18 Thread Michael Sierchio
We are really behind the curve here.  Git assumes (correctly) that
disk space is inexpensive, much cheaper per byte than network
bandwidth.  By the time we adopt SVN completely, every serious project
I know of will have moved from subversion to git. ;-)

- M

On Tue, Sep 18, 2012 at 12:33 AM, Stas Verberkt lego...@legolasweb.nl wrote:
 Warren Block schreef op :

 The difference is that a local svn checkout has all the commit
 history. A comparison recently showed 700-some megabytes more space
 used by the svn checkout.

 Although I believe the checkouts are bigger, I do not think they have
 all the commit history. This is where SVN and CVS differ from systems
 like Git or Mercury, which have all the history in a local working
 copy. I think the overhead of SVN consists of backups and cached
 copies of the previous revision, but I am not quite sure.

 ___
 freebsd-questions@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/freebsd-questions
 To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: What replaces csup?

2012-09-18 Thread Jerry
On Tue, 18 Sep 2012 05:00:08 -0700
Michael Sierchio articulated:

 We are really behind the curve here.  Git assumes (correctly) that
 disk space is inexpensive, much cheaper per byte than network
 bandwidth.  By the time we adopt SVN completely, every serious project
 I know of will have moved from subversion to git.

If you are going to make a sweeping change anyway, it makes no sense to
do it in a half–assed manned. However, it does appear that in all too
many instances, FreeBSD plays follow the leader rather then taking the
bulls by the horns and getting ahead of the curve. I am sure I'll be
hearing from the baby steps choir now. In any event, a comprehensive
side-by-side evaluation of the two should be done by an impartial party.

-- 
Jerry ♔

Disclaimer: off-list followups get on-list replies or get ignored.
Please do not ignore the Reply-To header.
__

___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: What replaces csup?

2012-09-18 Thread Mark Felder
On Tue, 18 Sep 2012 07:00:08 -0500, Michael Sierchio ku...@tenebras.com  
wrote:



We are really behind the curve here.  Git assumes (correctly) that
disk space is inexpensive, much cheaper per byte than network
bandwidth.  By the time we adopt SVN completely, every serious project
I know of will have moved from subversion to git.


Git is available in a hush-hush unsupported fashion for ports and source.  
I'll warn you: it will take you forever to pull it.

___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: What replaces csup?

2012-09-18 Thread Stas Verberkt

Jerry schreef op :

On Tue, 18 Sep 2012 05:00:08 -0700
Michael Sierchio articulated:


We are really behind the curve here.  Git assumes (correctly) that
disk space is inexpensive, much cheaper per byte than network
bandwidth.  By the time we adopt SVN completely, every serious 
project

I know of will have moved from subversion to git.


If you are going to make a sweeping change anyway, it makes no sense 
to

do it in a half–assed manned. However, it does appear that in all too
many instances, FreeBSD plays follow the leader rather then taking 
the

bulls by the horns and getting ahead of the curve. I am sure I'll be
hearing from the baby steps choir now. In any event, a 
comprehensive
side-by-side evaluation of the two should be done by an impartial 
party.


We should not be forgetting that Git and Subversion represent two 
different
workflows. The latter stands for a centralistic development cycle, and 
the
former for a distributed manner. Thus, this type of choice does not 
really
have to do with big or small steps and leading of following, but more 
about

the production cycle you want to have.
If we were to use a Git-like system, the releng team would (probably) 
be in
control on which patches are excepted from the pool of suggested 
changesets
by the community of developers. This community would be more free in 
the

manner in which they experiment, and there would be a less strong
differentiation between committers and other people suggesting 
updates. On
the other hand, our current approach has a controlled group of 
committers
and the releng team only has the additional power of setting the 
schedule

and taking the snapshot that becomes the release. (Gravely simplified.)
It is a matter of taste.

On a side note, using Git does mean that everyone has to download a 
complete
repository. This makes using a csup-like architecture quite 
heavy-weight.


Stas

___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: What replaces csup?

2012-09-18 Thread Arthur Chance

On 09/18/12 13:00, Michael Sierchio wrote:

We are really behind the curve here.  Git assumes (correctly) that
disk space is inexpensive, much cheaper per byte than network
bandwidth.  By the time we adopt SVN completely, every serious project
I know of will have moved from subversion to git. ;-)


It's worth reading this

http://wiki.freebsd.org/GitDrawbacks

___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: What replaces csup?

2012-09-18 Thread Warren Block

On Tue, 18 Sep 2012, Stas Verberkt wrote:


Warren Block schreef op :

The difference is that a local svn checkout has all the commit
history. A comparison recently showed 700-some megabytes more space
used by the svn checkout.


Although I believe the checkouts are bigger, I do not think they have
all the commit history. This is where SVN and CVS differ from systems
like Git or Mercury, which have all the history in a local working
copy. I think the overhead of SVN consists of backups and cached
copies of the previous revision, but I am not quite sure.


You're right.  'svn blame', for instance, retrieves the history from the 
repository.  So it's not as bad as it could be... but that 700M number 
was from a ports tree checkout.  My source checkout shows 869M in .svn. 
That's a pretty large chunk of bandwidth for data that is useless to 
someone who just wants to do a buildworld, as opposed to actually 
working on the source.

___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: What replaces csup?

2012-09-18 Thread Warren Block

On Mon, 17 Sep 2012, pete wright wrote:


On Mon, Sep 17, 2012 at 8:14 PM, Warren Block wbl...@wonkity.com wrote:


csup updates just the files that have changed without all the overhead. svn
export can get a copy of all the current files, but it copies all of them
every time, not just the changes.



yea i agree with you.  i wonder if it would be worth the effort of
sharing a svn export via rsync or httpd to make fetching delta's
easier and/or more efficient from a base install?


It's an interesting idea.  If the repository files were directly 
accessible in a filesystem, that filesystem could be shared with rsyncd 
and some exclude settings without needing an export at all.  With svn 
bdb, the files are not directly accessible, but I don't know for fsfs. 
Probably not, so a periodic export would still be required.

___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: What replaces csup?

2012-09-18 Thread Jerry
On Tue, 18 Sep 2012 14:44:46 +0200
Stas Verberkt articulated:

 We should not be forgetting that Git and Subversion represent two 
 different
 workflows. The latter stands for a centralistic development cycle,
 and the
 former for a distributed manner. Thus, this type of choice does not 
 really
 have to do with big or small steps and leading of following, but more 
 about
 the production cycle you want to have.
 If we were to use a Git-like system, the releng team would (probably) 
 be in
 control on which patches are excepted from the pool of suggested 
 changesets
 by the community of developers. This community would be more free in 
 the
 manner in which they experiment, and there would be a less strong
 differentiation between committers and other people suggesting 
 updates. On
 the other hand, our current approach has a controlled group of 
 committers
 and the releng team only has the additional power of setting the 
 schedule
 and taking the snapshot that becomes the release. (Gravely
 simplified.) It is a matter of taste.
 
 On a side note, using Git does mean that everyone has to download a 
 complete
 repository. This makes using a csup-like architecture quite 
 heavy-weight.

I found the information at this URL
http://wiki.freebsd.org/GitConversion quite interesting, especially
the numbers under the Speed Comparisons heading at the end.

-- 
Jerry ♔

Disclaimer: off-list followups get on-list replies or get ignored.
Please do not ignore the Reply-To header.
__
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: What replaces csup?

2012-09-18 Thread Robert Huff

Warren Block writes:

  You're right.  'svn blame', for instance, retrieves the history
  from the repository.  So it's not as bad as it could be... but
  that 700M number was from a ports tree checkout.  My source
  checkout shows 869M in .svn.  That's a pretty large chunk of
  bandwidth for data that is useless to someone who just wants to
  do a buildworld, as opposed to actually working on the source.

Having no idea about what's inside the black box ... it would
be nice to be able to specify a default level of commit retireval
with overrides on a per-subtree basis.


Robert Huff

___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: What replaces csup?

2012-09-18 Thread Randal L. Schwartz
 Stas == Stas Verberkt lego...@legolasweb.nl writes:

Stas On a side note, using Git does mean that everyone has to download a 
complete
Stas repository. This makes using a csup-like architecture quite
Stas heavy-weight.

The entire history of the Linux kernel since switching to git 5 years
ago is stored in a repo that is *less than half the size* of a single
current checkout.

The entire history of the XFree86 project ended up being a repo that was
only 2-3 times the size of the current checkout.

Seriously, don't be afraid of git simply because it has all the
history.  SVN is already worse because it has a single local backup
copy for every live file, 2x right there.

-- 
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
mer...@stonehenge.com URL:http://www.stonehenge.com/merlyn/
Smalltalk/Perl/Unix consulting, Technical writing, Comedy, etc. etc.
See http://methodsandmessages.posterous.com/ for Smalltalk discussion
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: What replaces csup?

2012-09-18 Thread Tijl Coosemans
On 18-09-2012 14:00, Michael Sierchio wrote:
 We are really behind the curve here.  Git assumes (correctly) that
 disk space is inexpensive, much cheaper per byte than network
 bandwidth.  By the time we adopt SVN completely, every serious project
 I know of will have moved from subversion to git. ;-)

I have both a git and svn checkout of FreeBSD current and while git
contains the full history it takes up less disk space (about 30%):

540M.git
759M.svn



signature.asc
Description: OpenPGP digital signature


What replaces csup?

2012-09-17 Thread Paul Schmehl
Now that we're switching to svn, is there a utility analogous to csup for 
fetching source?  Is that utility available for 8.3?  (I'm assuming 
subversion will become part of base in 9.x.)


--
Paul Schmehl, Senior Infosec Analyst
As if it wasn't already obvious, my opinions
are my own and not those of my employer.
***
It is as useless to argue with those who have
renounced the use of reason as to administer
medication to the dead. Thomas Jefferson
There are some ideas so wrong that only a very
intelligent person could believe in them. George Orwell

___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: What replaces csup?

2012-09-17 Thread Julian H. Stacey
Hi,
Reference:
 From: Paul Schmehl pschmehl_li...@tx.rr.com 
 Reply-to: Paul Schmehl pschmehl_li...@tx.rr.com 
 Date: Mon, 17 Sep 2012 09:45:23 -0500 
 Message-id:   D97788AE24B7FFB0C79AA6FB@localhost 

Paul Schmehl wrote:
 Now that we're switching to svn, is there a utility analogous to csup for 
 fetching source?  Is that utility available for 8.3?  

 (I'm assuming 
 subversion will become part of base in 9.x.)

No. Reporting what I read today in a...@freebsd.org :
Subject: Re: Fallout from the CVS discussion ...
Summary: some say subversion is changing too fast, they'll leave in ports.

Cheers,
Julian
-- 
Julian Stacey, BSD Unix Linux C Sys Eng Consultant, Munich http://berklix.com
 Reply below not above, like a play script.  Indent old text with  .
 Send plain text. Not: HTML, multipart/alternative, base64, quoted-printable.
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: What replaces csup?

2012-09-17 Thread Walter Hurry
On Mon, 17 Sep 2012 09:45:23 -0500, Paul Schmehl wrote:

 Now that we're switching to svn, is there a utility analogous to csup
 for fetching source?  Is that utility available for 8.3?  (I'm assuming
 subversion will become part of base in 9.x.)

9.1-RC1 here. Subversion is still in ports at the moment.

___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: What replaces csup?

2012-09-17 Thread Paul Schmehl
--On September 17, 2012 11:23:09 PM + Walter Hurry 
walterhu...@gmail.com wrote:



On Mon, 17 Sep 2012 09:45:23 -0500, Paul Schmehl wrote:


Now that we're switching to svn, is there a utility analogous to csup
for fetching source?  Is that utility available for 8.3?  (I'm assuming
subversion will become part of base in 9.x.)


9.1-RC1 here. Subversion is still in ports at the moment.



Does csup use subversion now?  Or do we need to use something else to fetch 
source?


Paul Schmehl, Senior Infosec Analyst
As if it wasn't already obvious, my opinions
are my own and not those of my employer.
***
It is as useless to argue with those who have
renounced the use of reason as to administer
medication to the dead. Thomas Jefferson
There are some ideas so wrong that only a very
intelligent person could believe in them. George Orwell

___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: What replaces csup?

2012-09-17 Thread Robert Huff

Paul Schmehl writes:

  Does csup use subversion now?  Or do we need to use something
  else to fetch source?

As I understand it, for the average user c(vs)up and subversion
serve the same function using different methods (both in terms of
identifying what files need to be fetched and actually fetching
them).  At this level of discussion they are mutually exclusive.
I have switched from csup to subversion for ports and docs.
After modest preparation it was essentially painless.


Robert Huff



___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: What replaces csup?

2012-09-17 Thread Paul Schmehl
--On September 17, 2012 8:42:33 PM -0400 Robert Huff roberth...@rcn.com 
wrote:




Paul Schmehl writes:


 Does csup use subversion now?  Or do we need to use something
 else to fetch source?


As I understand it, for the average user c(vs)up and subversion
serve the same function using different methods (both in terms of
identifying what files need to be fetched and actually fetching
them).  At this level of discussion they are mutually exclusive.
I have switched from csup to subversion for ports and docs.
After modest preparation it was essentially painless.



Are these modest preparations documented somewhere?

Paul Schmehl, Senior Infosec Analyst
As if it wasn't already obvious, my opinions
are my own and not those of my employer.
***
It is as useless to argue with those who have
renounced the use of reason as to administer
medication to the dead. Thomas Jefferson
There are some ideas so wrong that only a very
intelligent person could believe in them. George Orwell

___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: What replaces csup?

2012-09-17 Thread Warren Block

On Mon, 17 Sep 2012, Robert Huff wrote:



Paul Schmehl writes:


 Does csup use subversion now?  Or do we need to use something
 else to fetch source?


As I understand it, for the average user c(vs)up and subversion
serve the same function using different methods (both in terms of
identifying what files need to be fetched and actually fetching
them).  At this level of discussion they are mutually exclusive.
I have switched from csup to subversion for ports and docs.
After modest preparation it was essentially painless.


The difference is that a local svn checkout has all the commit history. 
A comparison recently showed 700-some megabytes more space used by the 
svn checkout.


csup updates just the files that have changed without all the overhead. 
svn export can get a copy of all the current files, but it copies all of 
them every time, not just the changes.


An svnup program was under development, but I don't know the present 
status.

___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: What replaces csup?

2012-09-17 Thread Warren Block

On Mon, 17 Sep 2012, Paul Schmehl wrote:

--On September 17, 2012 8:42:33 PM -0400 Robert Huff roberth...@rcn.com 
wrote:




Paul Schmehl writes:


 Does csup use subversion now?  Or do we need to use something
 else to fetch source?


As I understand it, for the average user c(vs)up and subversion
serve the same function using different methods (both in terms of
identifying what files need to be fetched and actually fetching
them).  At this level of discussion they are mutually exclusive.
I have switched from csup to subversion for ports and docs.
After modest preparation it was essentially painless.



Are these modest preparations documented somewhere?


For source, save any local diffs somewhere, delete /usr/src, install svn 
from ports, svn checkout the version you want, patch from the diffs. 
Same for docs.  Example checkout of 9-STABLE:

  svn checkout svn://svn0.us-west.FreeBSD.org/base/stable/9 /usr/src

For ports, it's probably worth saving the distfile directory along with 
local diffs.  Move it back into place after the svn checkout of the 
ports tree.


After that, it's just svn up to update the appropriate directory.  If 
something changes in the archive that conflicts with local patches, svn 
will let you know and try to help merge the remote and local changes.

Example update of source checked out as above:
  svn up /usr/src
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: What replaces csup?

2012-09-17 Thread pete wright
On Mon, Sep 17, 2012 at 8:14 PM, Warren Block wbl...@wonkity.com wrote:
 On Mon, 17 Sep 2012, Robert Huff wrote:


 Paul Schmehl writes:

  Does csup use subversion now?  Or do we need to use something
  else to fetch source?


 As I understand it, for the average user c(vs)up and subversion
 serve the same function using different methods (both in terms of
 identifying what files need to be fetched and actually fetching
 them).  At this level of discussion they are mutually exclusive.
 I have switched from csup to subversion for ports and docs.
 After modest preparation it was essentially painless.


 The difference is that a local svn checkout has all the commit history. A
 comparison recently showed 700-some megabytes more space used by the svn
 checkout.

 csup updates just the files that have changed without all the overhead. svn
 export can get a copy of all the current files, but it copies all of them
 every time, not just the changes.


yea i agree with you.  i wonder if it would be worth the effort of
sharing a svn export via rsync or httpd to make fetching delta's
easier and/or more efficient from a base install?

-pete


-- 
pete wright
www.nycbug.org
@nomadlogicLA
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: [solved]: to move csup 90 to subversion 91rc

2012-09-04 Thread Robert Huff

Darrel writes:

  Also, on my amd64 kernel I had to remove 'device atapicam'.
  
  The failed kernel build might be a bug, perhaps I should file a
  report.

As far as I know, this is completely unrelated to
subversion/c(v)sup.  Please check for other issues.


Robert Huff


___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: to move csup 90 to subversion 91rc

2012-09-03 Thread Matthew Seaman
On 02/09/2012 23:43, Darrel wrote:
 Hello,
 
 If my csup file looks about like this:
 
 *default host=this_working_mirror
 *default base=/var/db
 *default prefix=/usr
 *default release=cvs tag=RELENG_9_0
 *default delete use-rel-suffix
 
 and my machine now has devel/subversion
 
 what is the quickest way to get the new release candidate sources with svn?
 
 Then, can I simply build{w,k}, install{w,k} as before?

I'm not sure if svn can be made to 'take over' a tree of files already
obtained by non-svn means.  I believe not.  Therefore to get hold of
9.1rc do:

  # cd /usr
  # mv src src.old
  # svn co http://svn.freebsd.org/base/releng/9.1 src

and then later on to update your tree with any changes from upstream:

  # svn up

Note: the first time you update from a SVN tree, you'll get a lot of
mergemaster false positives, because the format of the $FreeBSD$ VCS id
string is different.  Use of 'mergemaster -F' is recommended.

Et voilà.

Cheers,

Matthew


-- 
Dr Matthew J Seaman MA, D.Phil.
PGP: http://www.infracaninophile.co.uk/pgpkey




signature.asc
Description: OpenPGP digital signature


[solved]: to move csup 90 to subversion 91rc

2012-09-03 Thread Darrel
Thanks, Matthew- and especially for mentioning to use -F on the first 
subsequent run of mergemaster.




 svn co http://svn.freebsd.org/base/releng/9.1 src



For ports would it be better to match -fbsd91, like this:
svn co http://svn.freebsd.org/ports/releng/9.1 ports

or can the most recent ports be run with a release, like this:
svn co http://svn.freebsd.org/ports/head ports

Someone off of the list recommended something like this:

svn co svn://svn.penx.com/base/releng/9.1 /usr/src
svn co svn://svn.penx.com/ports/head /usr/ports

Darrel
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: [solved]: to move csup 90 to subversion 91rc

2012-09-03 Thread Lowell Gilbert
Darrel levi...@iglou.com writes:

 Thanks, Matthew- and especially for mentioning to use -F on the first
 subsequent run of mergemaster.


  svn co http://svn.freebsd.org/base/releng/9.1 src


 For ports would it be better to match -fbsd91, like this:
 svn co http://svn.freebsd.org/ports/releng/9.1 ports

 or can the most recent ports be run with a release, like this:
 svn co http://svn.freebsd.org/ports/head ports

 Someone off of the list recommended something like this:

 svn co svn://svn.penx.com/base/releng/9.1 /usr/src
 svn co svn://svn.penx.com/ports/head /usr/ports

I would expect ports to still be best with head, as I haven't heard
anything about branching it.

I'm not sure whether there's any equivalent to tracking RELENG_9 (as
opposed to tracking RELENG_9_1) under the branching scheme being used
with subversion.
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: [solved]: to move csup 90 to subversion 91rc

2012-09-03 Thread Matthew Seaman

Darrel levi...@iglou.com wrote:
 For ports would it be better to match -fbsd91, like this:
 svn co http://svn.freebsd.org/ports/releng/9.1 ports

404.  There are no branches in the ports, in exactly the same
way that there wasn't a RELENG_9 tag you could use in a ports supfile.

Head is the only option with ports.

On 03/09/2012 17:29, Lowell Gilbert wrote:
 I'm not sure whether there's any equivalent to tracking RELENG_9 (as
 opposed to tracking RELENG_9_1) under the branching scheme being used
 with subversion.

stable/9 is the SVN equivalent of RELENG_9


Cheers,

Matthew


-- 
Dr Matthew J Seaman MA, D.Phil.
PGP: http://www.infracaninophile.co.uk/pgpkey




signature.asc
Description: OpenPGP digital signature


Re: [solved]: to move csup 90 to subversion 91rc

2012-09-03 Thread Lowell Gilbert
Matthew Seaman matt...@freebsd.org writes:

 On 03/09/2012 17:29, Lowell Gilbert wrote:
 I'm not sure whether there's any equivalent to tracking RELENG_9 (as
 opposed to tracking RELENG_9_1) under the branching scheme being used
 with subversion.

 stable/9 is the SVN equivalent of RELENG_9

Ah, yes, that makes sense. I hadn't looked higher than the releng part
of the path. 

Is anyone working on documenting this for the cutting edge section of
the Handbook? I could take a shot at it myself, but I likely couldn't
produce anything intelligible for beginners (at least, not before 9.1 is
out).
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: [solved]: to move csup 90 to subversion 91rc

2012-09-03 Thread Robert Huff

Lowell Gilbert writes:

  Is anyone working on documenting this for the cutting edge
  section of the Handbook? I could take a shot at it myself, but I
  likely couldn't produce anything intelligible for beginners (at
  least, not before 9.1 is out).

That would be hugely appreciated; none of the current
references (I'm aware of) carry the imprimitur of the Handbook.


Robert Huff


___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: [solved]: to move csup 90 to subversion 91rc

2012-09-03 Thread Darrel


On Mon, 3 Sep 2012, Lowell Gilbert wrote:


Matthew Seaman matt...@freebsd.org writes:


On 03/09/2012 17:29, Lowell Gilbert wrote:

I'm not sure whether there's any equivalent to tracking RELENG_9 (as
opposed to tracking RELENG_9_1) under the branching scheme being used
with subversion.


stable/9 is the SVN equivalent of RELENG_9


Ah, yes, that makes sense. I hadn't looked higher than the releng part
of the path.

Is anyone working on documenting this for the cutting edge section of
the Handbook? I could take a shot at it myself, but I likely couldn't
produce anything intelligible for beginners (at least, not before 9.1 is
out).



If you do decide to write a new section, I could possibly offer help on 
dumbing it down.  :)  At least with the English version.


Darrel
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: [solved]: to move csup 90 to subversion 91rc

2012-09-03 Thread Darrel



For ports would it be better to match -fbsd91, like this:
svn co http://svn.freebsd.org/ports/releng/9.1 ports



On 03/09/2012 17:29, Lowell Gilbert wrote:

I'm not sure whether there's any equivalent to tracking RELENG_9 (as
opposed to tracking RELENG_9_1) under the branching scheme being used
with subversion.


stable/9 is the SVN equivalent of RELENG_9




Could I then run:

svn co svn://svn.freebsd.org/ports/releng/[ 91 9.1] /usr/ports/

or | and

svn co svn://svn.freebsd.org/ports/stable/9 /usr/ports/ ?

Since in the past several years I installed minimal fbsd and then used 
portsnap for ports, so I was not aware that -head was the only option for 
ports- is that what Lowell was pointing out?


It turns out that mergemaster would have been alright in my case, due to 
.mergemasterrc, I can not recall why this was selected, comments are 
welcomed:


# cat .mergemasterrc
FREEBSD_ID=YES
VERBOSE=YES
AUTO_INSTALL=YES
RUN_UPDATES=YES
COMP_CONFS=YES
PRESERVE_FILES_DIR=/var/tmp/mergemaster/preserved-files-`date 
+%y%m%d-%H%M%S`

DELETE_STALE_RC_FILES=YES

Kind regards,
Darrel
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: [solved]: to move csup 90 to subversion 91rc

2012-09-03 Thread Matthew Seaman
On 03/09/2012 19:00, Darrel wrote:
 Could I then run:
 
 svn co svn://svn.freebsd.org/ports/releng/[ 91 9.1] /usr/ports/

 or | and
 
 svn co svn://svn.freebsd.org/ports/stable/9 /usr/ports/ ?
 

Why don't you try it and see?  All you'll get is an error message
essentially saying 'file not found.'

Simply put, there isn't a path ports/releng/9.1 or ports/stable/9 in
the FreeBSD SVN repository.  Look here if you don't believe me:

http://svnweb.freebsd.org/

Click on 'ports' and look at the subdirectories under there.

The *only* bit of the SVN repository that follows the branching
structure you seem so enamoured of is base -- the system sources.
Get that clear in your head, and you will have a much better time of it.

Cheers,

Matthew

-- 
Dr Matthew J Seaman MA, D.Phil.
PGP: http://www.infracaninophile.co.uk/pgpkey




signature.asc
Description: OpenPGP digital signature


Re: [solved]: to move csup 90 to subversion 91rc

2012-09-03 Thread Lowell Gilbert
Darrel levi...@iglou.com writes:

 For ports would it be better to match -fbsd91, like this:
 svn co http://svn.freebsd.org/ports/releng/9.1 ports


 On 03/09/2012 17:29, Lowell Gilbert wrote:
 I'm not sure whether there's any equivalent to tracking RELENG_9 (as
 opposed to tracking RELENG_9_1) under the branching scheme being used
 with subversion.

 stable/9 is the SVN equivalent of RELENG_9



 Could I then run:

 svn co svn://svn.freebsd.org/ports/releng/[ 91 9.1] /usr/ports/

 or | and

 svn co svn://svn.freebsd.org/ports/stable/9 /usr/ports/ ?

No.

 Since in the past several years I installed minimal fbsd and then used
 portsnap for ports, so I was not aware that -head was the only option
 for ports- is that what Lowell was pointing out?

Yes. There is never any branching in the ports tree. The latest (i.e.,
head) version is, at any given time, expected to work for all (then)
supported versions of the base system.

This is not a change -- this has always been the case, and the current
(cvsup-centric) text in the Handbook describes it explicitly.

 It turns out that mergemaster would have been alright in my case, due
 to .mergemasterrc, I can not recall why this was selected, comments
 are welcomed:

 # cat .mergemasterrc
 FREEBSD_ID=YES

Equivalent to -F.

 VERBOSE=YES
 AUTO_INSTALL=YES
 RUN_UPDATES=YES
 COMP_CONFS=YES
 PRESERVE_FILES_DIR=/var/tmp/mergemaster/preserved-files-`date +%y%m%d-%H%M%S`
 DELETE_STALE_RC_FILES=YES

A reasonable set of defaults, although I prefer a little more human
interaction on major changes. Why it would have been alright(sic) in
your case isn't clear, because you don't describe the alternative, but
the manual for mergemaster(8) almost certainly has the answer.
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: [solved]: to move csup 90 to subversion 91rc

2012-09-03 Thread Darrel


On Mon, 3 Sep 2012, Matthew Seaman wrote:


On 03/09/2012 19:00, Darrel wrote:

Could I then run:

svn co svn://svn.freebsd.org/ports/releng/[ 91 9.1] /usr/ports/

or | and

svn co svn://svn.freebsd.org/ports/stable/9 /usr/ports/ ?



Why don't you try it and see?  All you'll get is an error message
essentially saying 'file not found.'



After reading so many of your intelligent posts, then I typically default 
to believing in your methods.


To get svn:// to work then the fileserver, i.e.,  -fbsd9 and at the moment 
becoming -fbsd91 required service svn added outbound in pf.conf.  The 
gateway is -obsd51 and needed the port number out in pf.conf, since svn is 
not included in /etc/services.  :)



Simply put, there isn't a path ports/releng/9.1 or ports/stable/9 in
the FreeBSD SVN repository.  Look here if you don't believe me:

http://svnweb.freebsd.org/

Click on 'ports' and look at the subdirectories under there.

The *only* bit of the SVN repository that follows the branching
structure you seem so enamoured of is base -- the system sources.
Get that clear in your head, and you will have a much better time of it.


The releases seem neat to me because fbsd reports to have security 
officers tracking the specified version.  I am not necessarily enamoured 
with it.  I have followed -stable and -current before.


I can use portsnap as before, or experiment.  I might try:

svn co svn://svn.freebsd.org/ports /usr/ports

I probably know everything for my purposes at this point.

As the fileserver is building, some of the points seem obvious now. 
Thanks to you and Lowell.


Darrel
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: [solved]: to move csup 90 to subversion 91rc

2012-09-03 Thread Darrel




stable/9 is the SVN equivalent of RELENG_9


src only, understood now.  Thanks, Matthew.


Yes. There is never any branching in the ports tree. The latest (i.e.,
head) version is, at any given time, expected to work for all (then)
supported versions of the base system.

This is not a change -- this has always been the case, and the current
(cvsup-centric) text in the Handbook describes it explicitly.



same as nbsd, then.  I probably need to read fbsd handbook again


It turns out that mergemaster would have been alright in my case, due
to .mergemasterrc, I can not recall why this was selected, comments
are welcomed:

# cat .mergemasterrc
FREEBSD_ID=YES


Equivalent to -F.


VERBOSE=YES
AUTO_INSTALL=YES
RUN_UPDATES=YES
COMP_CONFS=YES
PRESERVE_FILES_DIR=/var/tmp/mergemaster/preserved-files-`date +%y%m%d-%H%M%S`
DELETE_STALE_RC_FILES=YES


A reasonable set of defaults, although I prefer a little more human
interaction on major changes. Why it would have been alright(sic) in
your case isn't clear, because you don't describe the alternative, but
the manual for mergemaster(8) almost certainly has the answer.



Hopefully not to have bored you too much, Matthew's mention of -F with 
mergemaster solved this problem of conversion from csup to svn- yet as you 
saw it was already in my .mergemasterrc  , that is why I wrote that it 
would have been alright.


I like human interaction in every case where it is beneficial.  If you 
want to send some guidance, it is welcomed.  Other than that, I will let 
it be and also study the manual again; i.e. man 8 mergemaster.


Kind regards,
Darrel
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: [solved]: to move csup 90 to subversion 91rc

2012-09-03 Thread Lowell Gilbert
Darrel levi...@iglou.com writes:

 On Mon, 3 Sep 2012, Lowell Gilbert wrote:

 Matthew Seaman matt...@freebsd.org writes:

 On 03/09/2012 17:29, Lowell Gilbert wrote:
 I'm not sure whether there's any equivalent to tracking RELENG_9 (as
 opposed to tracking RELENG_9_1) under the branching scheme being used
 with subversion.

 stable/9 is the SVN equivalent of RELENG_9

 Ah, yes, that makes sense. I hadn't looked higher than the releng part
 of the path.

 Is anyone working on documenting this for the cutting edge section of
 the Handbook? I could take a shot at it myself, but I likely couldn't
 produce anything intelligible for beginners (at least, not before 9.1 is
 out).


 If you do decide to write a new section, I could possibly offer help
 on dumbing it down.  :)  At least with the English version.

http://www.freebsd.org/cgi/query-pr.cgi?pr=171292

I don't think dumbing it down is an issue. What I may have left out
that beginners wouldn't think of... more of a concern.
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: [solved]: to move csup 90 to subversion 91rc

2012-09-03 Thread Darrel



Is anyone working on documenting this for the cutting edge section of
the Handbook? I could take a shot at it myself, but I likely couldn't
produce anything intelligible for beginners (at least, not before 9.1 is
out).



If you do decide to write a new section, I could possibly offer help
on dumbing it down.  :)  At least with the English version.


http://www.freebsd.org/cgi/query-pr.cgi?pr=171292

I don't think dumbing it down is an issue. What I may have left out
that beginners wouldn't think of... more of a concern.



I apologize- that comment was intended to be taken with a grain of salt.

As I am asking just now changing from csup to svn, it seems like I might 
have the insight of a beginner in this instance.


- considering my file server:
It appears that buildkernel is going well.  Next, I will decide whether to 
keep /usr/ports with portsnap or move ports to svn as well.


Peace be to you,
Darrel
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: [solved]: to move csup 90 to subversion 91rc

2012-09-03 Thread Robert Huff

Darrel writes:

  Next, I will decide whether to keep /usr/ports with portsnap or
  move ports to svn as well.

I just did this (ports and docs) and  - modulo an error on my
part - it has been remarkably painless.  (Make sure you eradicate
all vesitges of c(v)sup activity.)


Robert Huff

___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: [solved]: to move csup 90 to subversion 91rc

2012-09-03 Thread Darrel



 Next, I will decide whether to keep /usr/ports with portsnap or
 move ports to svn as well.


I just did this (ports and docs) and  - modulo an error on my
part - it has been remarkably painless.  (Make sure you eradicate
all vesitges of c(v)sup activity.


Hello Robert,

Other than  my csup-file, I found these:

/home/var.db/sup/src-all/checkouts.cvs:RELENG_9
/home/var.db/sup/src-all/checkouts.cvs:RELENG_9_0
/.snap
/home/.snap
/home/var.db/portsnap
/home/var.db/portsnap/*
/tmp/.snap
/usr/.snap
/var/.snap

Also, on my amd64 kernel I had to remove 'device atapicam'.

The failed kernel build might be a bug, perhaps I should file a report.

Thank you,
Darrel
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: [solved]: to move csup 90 to subversion 91rc

2012-09-03 Thread Darrel


On Mon, 3 Sep 2012, Darrel wrote:




 Next, I will decide whether to keep /usr/ports with portsnap or
 move ports to svn as well.


I just did this (ports and docs) and  - modulo an error on my
part - it has been remarkably painless.  (Make sure you eradicate
all vesitges of c(v)sup activity.


Hello Robert,

Other than  my csup-file, I found these:

/home/var.db/sup/src-all/checkouts.cvs:RELENG_9
/home/var.db/sup/src-all/checkouts.cvs:RELENG_9_0
/.snap
/home/.snap
/home/var.db/portsnap
/home/var.db/portsnap/*
/tmp/.snap
/usr/.snap
/var/.snap

Also, on my amd64 kernel I had to remove 'device atapicam'.

The failed kernel build might be a bug, perhaps I should file a report.

Thank you,
Darrel



I found these files as well:

/var/db/portsnap/
/var/db/sup/

Darrel
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


to move csup 90 to subversion 91rc

2012-09-02 Thread Darrel

Hello,

If my csup file looks about like this:

*default host=this_working_mirror
*default base=/var/db
*default prefix=/usr
*default release=cvs tag=RELENG_9_0
*default delete use-rel-suffix

and my machine now has devel/subversion

what is the quickest way to get the new release candidate sources with 
svn?


Then, can I simply build{w,k}, install{w,k} as before?

Regards,
Darrel
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: freebsd-update and csup - I'm going around in circles.

2012-08-17 Thread Walter Hurry
On Fri, 17 Aug 2012 01:48:18 +0200, Polytropon wrote:

 snip problem and comprehensive answer 

That's really helpful. Very many thanks, Polytropon.


___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


freebsd-update and csup - I'm going around in circles.

2012-08-16 Thread Walter Hurry
Please forgive me if this is a daft question; I am quite new to FreeBSD.

I have read the handbook assiduously and am attempting to follow it. This 
is 9.0-RELEASE-p3, by the way.

Every time I run freebsd-update fetch it says it wants to update the 
following 5 source files as part of updating to 9.0-RELEASE-p4:

/usr/src/sys/amd64/amd64/trap.c
/usr/src/sys/conf/newvers.sh
/usr/src/sys/netinet/tcp_input.c
/usr/src/sys/netinet6/in6.c
/usr/src/sys/netinet6/ip6_input.c

So I run freebsd-update install and they are updated happily.

But when I run csup with my standard-supfile, it puts the same 5 files 
back to where they were.

What am I missing, or doing wrong?

___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: freebsd-update and csup - I'm going around in circles.

2012-08-16 Thread Polytropon
On Thu, 16 Aug 2012 21:24:37 + (UTC), Walter Hurry wrote:
 Every time I run freebsd-update fetch it says it wants to update the 
 following 5 source files as part of updating to 9.0-RELEASE-p4:
 
 /usr/src/sys/amd64/amd64/trap.c
 /usr/src/sys/conf/newvers.sh
 /usr/src/sys/netinet/tcp_input.c
 /usr/src/sys/netinet6/in6.c
 /usr/src/sys/netinet6/ip6_input.c
 
 So I run freebsd-update install and they are updated happily.
 
 But when I run csup with my standard-supfile, it puts the same 5 files 
 back to where they were.

Not and. Why are you mixing tools here? You're shooting
your own foot. :-)

You use _either_ freebsd-update to update your system the binary
way, _or_ you use csup to update your sources and then compile
your system from that sources.

Solution: Don't use csup. :-)

Side note: Check your update configuration files so they reflect
the proper branch you want to follow. With freebsd-update you
follow the -RELEASE-pX branch, with csup you can

a) follow -RELEASE-pX
b) follow -STABLE
c) follow -CURRENT

Note that you should not mix those! You can always switch branches
when using the source code based method (csup), but you should not
do so using freebsd-update.

An example configuration to follow -RELEASE-pX using the csup
method with make update would look like this:

% cat /etc/sup/release.sup 
*default host=cvsup.freebsd.org
*default base=/var/db
*default prefix=/usr
*default release=cvs tag=RELENG_9_0
*default delete use-rel-suffix
*default compress
src-all

Together with the selection in /etc/make.conf:

SUP_UPDATE= YES
SUP=/usr/bin/csup
SUPFLAGS=   -L 2
SUPHOST=cvsup.freebsd.org
SUPFILE=/etc/sup/release.sup
PORTSSUPFILE=   /etc/sup/ports.sup
DOCSUPFILE= /etc/sup/doc.sup
DOC_LANG=   en_US.ISO8859-1 de_DE.ISO8859-1

you can easily control the process.

(Sidenote: I also have /etc/sup/stable.sup which looks like the
example provided, but has tag=RELENG_9 in it. You could also use
tag=RELENG_9_0_0_RELEASE to revert back to 9.0-RELEASE.)



You can find an example for what the CVS tags mean here:
http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/cvs-tags.html



-- 
Polytropon
Magdeburg, Germany
Happy FreeBSD user since 4.0
Andra moi ennepe, Mousa, ...
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


difference between cvsup and csup?

2011-12-11 Thread Foo JH

Hello guys,

I notice FreeBSD is now using (and probably has been for a while) csup 
instead of cvsup. The parameters looking identical - at least from the 
no-gui perspective.


Can anyone advise what the difference is, and perhaps educate me on how 
this came to be?


Thanks.
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: difference between cvsup and csup?

2011-12-11 Thread Michael Powell
Foo JH wrote:

 Hello guys,
 
 I notice FreeBSD is now using (and probably has been for a while) csup
 instead of cvsup. The parameters looking identical - at least from the
 no-gui perspective.
 
 Can anyone advise what the difference is, and perhaps educate me on how
 this came to be?
 

I'm certainly not any kind of expert, but please note by examining the 
dependencies you will notice cvsup requires ezm3. This is a portable version 
of Modula-3 ( http://en.wikipedia.org/wiki/Modula-3 ), upon which cvsup is 
designed.

Csup is a rewrite of cvsup in the C language, and as such can be included as 
part of the base operating system. It is only linked against a few system 
libraries. This also means it can be built using the same tools and system 
compiler whenever the system itself is updated. 

Csup is faster, built-in, and has no third party dependencies. Theoretically 
it should have less potential for problems. Cvsup is a third party port, 
which itself depends on other third party ports.

-Mike



___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: difference between cvsup and csup?

2011-12-11 Thread Kevin Kinsey
On Mon, Dec 12, 2011 at 09:54:25AM +0800, Foo JH wrote:
 Hello guys,
 
 I notice FreeBSD is now using (and probably has been for a while) csup 
 instead of cvsup. The parameters looking identical - at least from the 
 no-gui perspective.
 
 Can anyone advise what the difference is, and perhaps educate me on how 
 this came to be?
 
csup is a re-write of cvsup that's written in C, so it can be included
in the base system without requiring installation of Modula3 (the
language cvsup was written in).  There may also be licensing diffs?
(I'm not sure about that off the top of my head).

Hope this helps.

Kevin Kinsey
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: difference between cvsup and csup?

2011-12-11 Thread Robert Huff

Michael Powell writes:

  Csup is a rewrite of cvsup in the C language, and as such can be
  included as part of the base operating system. It is only linked
  against a few system libraries. This also means it can be built
  using the same tools and system compiler whenever the system
  itself is updated.
  
  Csup is faster, built-in, and has no third party
  dependencies. Theoretically it should have less potential for
  problems. Cvsup is a third party port, which itself depends on
  other third party ports.

I believe there are a couple of obscure functionalities that
cvsup has that csup does not.  If you're asking this question, you
(probably) don't have to worry about them.
For the general user, csup is a drop-in replacement.  My
expereince - as a general user - supports this.


Robert Huff

___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: difference between cvsup and csup?

2011-12-11 Thread Manolis Kiagias

On 12/12/2011 7:39 πμ, Robert Huff wrote:

Michael Powell writes:


  Csup is a rewrite of cvsup in the C language, and as such can be
  included as part of the base operating system. It is only linked
  against a few system libraries. This also means it can be built
  using the same tools and system compiler whenever the system
  itself is updated.

  Csup is faster, built-in, and has no third party
  dependencies. Theoretically it should have less potential for
  problems. Cvsup is a third party port, which itself depends on
  other third party ports.

I believe there are a couple of obscure functionalities that
cvsup has that csup does not.  If you're asking this question, you
(probably) don't have to worry about them.
For the general user, csup is a drop-in replacement.  My
expereince - as a general user - supports this.


Robert Huff



It used to be (some versions ago) that csup only handled checkout mode 
and not CVS mode (that is, a mode of operation that allows you to mirror 
a complete CVS repository which in effect allows you to checkout and 
commit locally to your copy). This was for me the only reason to keep 
cvsup around. But csup has caught up with this functionality eliminating 
the need to install and use cvsup, esp. since csup is part of the base 
system.

___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: csup: How do I know I have correct version?

2011-10-23 Thread Thomas Mueller
from Matthew Seaman m.sea...@infracaninophile.co.uk:

 Don't define PORTSSUPFILE in /etc/make.conf if you're using portsnap(1).
  Apart from anything else, typing 'make update' in /usr/src will attempt
 to cvsup not just the system sources but as well any of PORTS, DOC where
 you've defined a ...SUPFILE.
 
 In fact, without PORTSUPFILE defined in /etc/make.conf typing 'make
 update' in /usr/ports will invoke portsnap for you, so long as you
 obtained the ports tree by 'portsnap fetch extract' originally.
 
 Cheers,
 
 Matthew

Now I know better how 'make update' works, though I looked at that target in 
/usr/src/Makefile.

I find from experience that updating ports by two different means makes a mess 
or at least doesn't work.

In 9.0-BETA1, I tried 'portsnap fetch update' some time after having installed 
the ports tree from the bsdinstall.

That didn't work, and I had to 'portsnap fetch' and 'portsnap extract' as if I 
had never installed the ports tree from the bsdinstall.

I guess then I can install the docs by 'csup /usr/share/examples/doc-supfile' ? 
 

That would be simpler and easier than installing misc/freebsd-doc-en from the 
ports.

Tom

___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: csup: How do I know I have correct version?

2011-10-22 Thread Thomas Mueller
From: Damien Fleuriot m...@my.gd:

  Maybe also I should put this releng9-supfile in a safer place where
  it won't be deleted by the next installation/upgrade?

 
 Indeed you should.
 
 
 From my /etc/make.conf:
 SUP_UPDATE= yes
 SUP=/usr/bin/csup
 SUPFLAGS=   -zgL 2
 SUPHOST=cvsup1.fr.freebsd.org
 SUPFILE=/etc/cvsup/stable-supfile
 PORTSSUPFILE=   /etc/cvsup/ports-supfile
 DOCSUPFILE= /etc/cvsup/doc-supfile



 Then, you just have to copy the sample supfiles to /etc/cvsup/

Then how do you update the system source, ports tree or doc?
Something with 'make'?  'make update' ?

For ports, I run
portsnap fetch update

For system source, I run 
csup /usr/share/examples/releng9-supfile

though I subsequently moved the releng9-supfile to /myconfig .


from Matthew Seaman m.sea...@infracaninophile.co.uk:

 The file you want is /usr/src/sys/conf/newvers.sh  This is a script that
 edits version information into various source code files.  The bit you
 need is near the top of the file -- just following line 33:
 
 33  TYPE=FreeBSD
 34  REVISION=9.0
 35  BRANCH=RC1
 36  if [ X${BRANCH_OVERRIDE} != X ]; then
 37  BRANCH=${BRANCH_OVERRIDE}
 38  fi
 39  RELEASE=${REVISION}-${BRANCH}
 40  VERSION=${TYPE} ${RELEASE}
 41  SYSDIR=$(dirname $0)/..
 
 Unfortunately the value want is RELEASE, which is assembled from parts,
 so not trivially grep'able.  But you can easily see the REVISION is set
 to 9.0 and BRANCH is RC1 so the whole things comes to 9.0-RC1.  Simple.

That's the file I was looking for, I was not familiar with that particular file 
name.

It's easy to find a needle in the haystack when somebody points it out to me!  
My thanks!

  Maybe also I should put this releng9-supfile in a safer place where
  it won't be deleted by the next installation/upgrade?
  
 No -- you shouldn't need to worry about that.  The name
 'releng9-supfile' you chose doesn't match anything produced by the
 system, so it won't be overwritten.  (Not that you shouldn't keep a
 backup somewhere -- that's only sensible.)
 
 Hmmm actually you have highlighted a small omission in the
 procedures for branching RELENG_9 and RELENG_9_0 -- the cvsup example
 supfiles  /usr/src/share/examples/{stable,standard}-supfile should be
 updated to match the branch they are installed from.  In your case both
 of those files should use the RELENG_9 tag, but that hasn't been
 commmitted yet.
  
 Cheers
 
 Matthew

Good point.  I had to make the little modification in the stable-supfile to 
accommodate RELENG_9 .

Since my current efforts are directed toward a working FreeBSD 9.0 system, I am 
not currently doing anything with 10-current.

Tom

___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: csup: How do I know I have correct version?

2011-10-22 Thread Matthew Seaman
On 22/10/2011 10:22, Thomas Mueller wrote:
 From: Damien Fleuriot m...@my.gd:

  From my /etc/make.conf:
  SUP_UPDATE= yes
  SUP=/usr/bin/csup
  SUPFLAGS=   -zgL 2
  SUPHOST=cvsup1.fr.freebsd.org
  SUPFILE=/etc/cvsup/stable-supfile
  PORTSSUPFILE=   /etc/cvsup/ports-supfile
  DOCSUPFILE= /etc/cvsup/doc-supfile
 
 
  Then, you just have to copy the sample supfiles to /etc/cvsup/
 Then how do you update the system source, ports tree or doc?
 Something with 'make'?  'make update' ?

make update is the correct command.

 For ports, I run
 portsnap fetch update
 
 For system source, I run 
 csup /usr/share/examples/releng9-supfile
 
 though I subsequently moved the releng9-supfile to /myconfig .

Don't define PORTSSUPFILE in /etc/make.conf if you're using portsnap(1).
 Apart from anything else, typing 'make update' in /usr/src will attempt
to cvsup not just the system sources but as well any of PORTS, DOC where
you've defined a ...SUPFILE.

In fact, without PORTSUPFILE defined in /etc/make.conf typing 'make
update' in /usr/ports will invoke portsnap for you, so long as you
obtained the ports tree by 'portsnap fetch extract' originally.

Cheers,

Matthew

-- 
Dr Matthew J Seaman MA, D.Phil.   7 Priory Courtyard
  Flat 3
PGP: http://www.infracaninophile.co.uk/pgpkey Ramsgate
JID: matt...@infracaninophile.co.uk   Kent, CT11 9PW



signature.asc
Description: OpenPGP digital signature


csup: How do I know I have correct version?

2011-10-21 Thread Thomas Mueller
After I run 

csup /usr/share/examples/releng9-supfile

how do I know I have the correct version, like 9.0-BETA3 or 9.0-RC1?

I can't find any such information explicitly anywhere under /usr/src .

This releng9-supfile was made from stable-supfile by changing RELENG_8 to 
RELENG_9 in the line

*default release=cvs tag=RELENG_8

I've been following the emailing lists current, questions and ports, 
noticed the heads-up that HEAD was going to 10-current.

Maybe also I should put this releng9-supfile in a safer place where 
it won't be deleted by the next installation/upgrade?

Tom

___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: csup: How do I know I have correct version?

2011-10-21 Thread Damien Fleuriot
On 10/21/11 11:27 AM, Thomas Mueller wrote:
 After I run 
 
 csup /usr/share/examples/releng9-supfile
 
 how do I know I have the correct version, like 9.0-BETA3 or 9.0-RC1?
 
 I can't find any such information explicitly anywhere under /usr/src .
 
 This releng9-supfile was made from stable-supfile by changing RELENG_8 to 
 RELENG_9 in the line
 
 *default release=cvs tag=RELENG_8
 
 I've been following the emailing lists current, questions and ports, 
 noticed the heads-up that HEAD was going to 10-current.
 
 Maybe also I should put this releng9-supfile in a safer place where 
 it won't be deleted by the next installation/upgrade?
 

Indeed you should.


From my /etc/make.conf:
SUP_UPDATE= yes
SUP=/usr/bin/csup
SUPFLAGS=   -zgL 2
SUPHOST=cvsup1.fr.freebsd.org
SUPFILE=/etc/cvsup/stable-supfile
PORTSSUPFILE=   /etc/cvsup/ports-supfile
DOCSUPFILE= /etc/cvsup/doc-supfile



Then, you just have to copy the sample supfiles to /etc/cvsup/
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Re: csup: How do I know I have correct version?

2011-10-21 Thread Matthew Seaman
On 21/10/2011 10:27, Thomas Mueller wrote:
 After I run 
 
 csup /usr/share/examples/releng9-supfile
 
 how do I know I have the correct version, like 9.0-BETA3 or 9.0-RC1?

So long as you're confident that you have actually downloaded the
sources from the RELENG_9 branch, then you can be confident that the
system version will be one of those -- at the moment, you'll get 9.0-RC1
but over time this will eventually change to 9.0-STABLE.

 I can't find any such information explicitly anywhere under /usr/src .

The file you want is /usr/src/sys/conf/newvers.sh  This is a script that
edits version information into various source code files.  The bit you
need is near the top of the file -- just following line 33:

33  TYPE=FreeBSD
34  REVISION=9.0
35  BRANCH=RC1
36  if [ X${BRANCH_OVERRIDE} != X ]; then
37  BRANCH=${BRANCH_OVERRIDE}
38  fi
39  RELEASE=${REVISION}-${BRANCH}
40  VERSION=${TYPE} ${RELEASE}
41  SYSDIR=$(dirname $0)/..

Unfortunately the value want is RELEASE, which is assembled from parts,
so not trivially grep'able.  But you can easily see the REVISION is set
to 9.0 and BRANCH is RC1 so the whole things comes to 9.0-RC1.  Simple.

 This releng9-supfile was made from stable-supfile by changing RELENG_8 to 
 RELENG_9 in the line
 
 *default release=cvs tag=RELENG_8
 
 I've been following the emailing lists current, questions and ports, 
 noticed the heads-up that HEAD was going to 10-current.
 
 Maybe also I should put this releng9-supfile in a safer place where 
 it won't be deleted by the next installation/upgrade?

No -- you shouldn't need to worry about that.  The name
'releng9-supfile' you chose doesn't match anything produced by the
system, so it won't be overwritten.  (Not that you shouldn't keep a
backup somewhere -- that's only sensible.)

Hmmm actually you have highlighted a small omission in the
procedures for branching RELENG_9 and RELENG_9_0 -- the cvsup example
supfiles  /usr/src/share/examples/{stable,standard}-supfile should be
updated to match the branch they are installed from.  In your case both
of those files should use the RELENG_9 tag, but that hasn't been
commmitted yet.

Cheers

Matthew

-- 
Dr Matthew J Seaman MA, D.Phil.   7 Priory Courtyard
  Flat 3
PGP: http://www.infracaninophile.co.uk/pgpkey Ramsgate
JID: matt...@infracaninophile.co.uk   Kent, CT11 9PW



signature.asc
Description: OpenPGP digital signature


Re: Using csup and -i switch

2011-07-19 Thread b. f.
 Hello,

 I updated all my ports recently but I have submitted a PR for
 audio/musicpd for a simple patch. I would like to update only my
 audio/musicpd on all my machines so I tried the following:

 markand at Groseille ~ $ sudo csup -i audio/musicpd /etc/ports-supfile
 Connected to 193.51.24.2
 Updating collection ports-all/cvs
 Finished successfully

 According to man csup(1) -i should update only files or directory
 matching the pattern but as you can see here nothing is updated ..


According to csup(1), the patterns used with -i are interpreted
relative to the collection's prefix directory.  Probably, then, you
need to use ports/audio/musicpd as your pattern.

b.
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


Using csup and -i switch

2011-07-18 Thread David Demelier

Hello,

I updated all my ports recently but I have submitted a PR for 
audio/musicpd for a simple patch. I would like to update only my 
audio/musicpd on all my machines so I tried the following:


markand@Groseille ~ $ sudo csup -i audio/musicpd /etc/ports-supfile
Connected to 193.51.24.2
Updating collection ports-all/cvs
Finished successfully

According to man csup(1) -i should update only files or directory 
matching the pattern but as you can see here nothing is updated ..


If you have any clue.

Cheers,

--
David Demelier
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org


  1   2   3   >