Bug 121883 - devel/viewvc: [PATCH]: update 1.0.4 -> 1.0.5, add WITH_MODPYTHON3
Summary: devel/viewvc: [PATCH]: update 1.0.4 -> 1.0.5, add WITH_MODPYTHON3
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Marcelo Araujo
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2008-03-19 21:40 UTC by Philip M. Gollucci
Modified: 2008-04-03 03:41 UTC (History)
1 user (show)

See Also:


Attachments
devel_viewvc.diff (2.16 KB, patch)
2008-03-19 21:40 UTC, Philip M. Gollucci
no flags Details | Diff
devel_viewvc.diff (7.74 KB, patch)
2008-04-01 06:01 UTC, Philip M. Gollucci
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Philip M. Gollucci 2008-03-19 21:40:00 UTC
Somewhat depends on:
http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/121160
Comment 1 pgollucci 2008-03-19 21:58:05 UTC
appologies, something is wrong with my /usr/bin/send-pr, I'll look into 
before sending anymore prs.

-- 
------------------------------------------------------------------------
Philip M. Gollucci (philip@ridecharge.com)
o:703.549.2050x206
Senior System Admin - Riderway, Inc.
http://riderway.com / http://ridecharge.com
1024D/EC88A0BF 0DE5 C55C 6BF3 B235 2DAB  B89E 1324 9B4F EC88 A0BF

Work like you don't need the money,
love like you'll never get hurt,
and dance like nobody's watching.
Comment 2 Marcelo Araujo freebsd_committer freebsd_triage 2008-03-19 22:25:24 UTC
Responsible Changed
From-To: gnats-admin->araujo

Should be auto-assigned to me.
Comment 3 Philip M. Gollucci 2008-04-01 06:01:41 UTC
1) This PR now superceeds ports/121160, please close at the same time.

2) Update 1.04 -> 1.05
    Update pkg-plist for new viewsvn template view
    (by default not used)

3) Conditionally bring in www/apache2{0,2} and/or www/mod_python3
    defaulting to off for both.

4) Claim maintainership
    See ports/121160

5) Document WITH_MODPYTHON3 in KNOBS
Comment 4 araujobsdport 2008-04-02 14:32:21 UTC
Hi Philip,

The last patch isn't applied well, You need to make more tests before
send to me this.
Please you should get the last revision of devel/viewvc into CVS and try
to apply this patch again!

Regards,

-- 
Marcelo Araujo            (__)
araujo@FreeBSD.org     \\\'',)
http://www.FreeBSD.org   \/  \ ^
Power To Server.         .\. /_)

Comment 5 Philip M. Gollucci 2008-04-02 18:32:13 UTC
Marcelo Araujo wrote:
> Hi Philip,
> 
> The last patch isn't applied well, You need to make more tests before
> send to me this.
> Please you should get the last revision of devel/viewvc into CVS and try
> to apply this patch again!
> 
> Regards,
> 
Sure it does: (I'd wagger, you were in the wrong directory when you 
applied it ?)

$ cd ~
$ fetch -o 121883.diff \
http://www.freebsd.org/cgi/query-pr.cgi?prp=121883-2-diff&n=/patch-2.diff

$ cd /space/portstrees/FreeBSD/ports
$ rm -rf KNOBS devel/viewvc
$ cvs up -dP -C KNOBS devel/viewvc
$ patch < ~/121883.diff

Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: KNOBS
|===================================================================
|RCS file: /home/ncvs/ports/KNOBS,v
|retrieving revision 1.26
|diff -u -r1.26 KNOBS
|--- KNOBS      27 Mar 2008 00:05:09 -0000      1.26
|+++ KNOBS      27 Mar 2008 04:11:11 -0000
--------------------------
Patching file KNOBS using Plan A...
Hunk #1 succeeded at 72.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: devel/viewvc/Makefile
|===================================================================
|RCS file: /home/ncvs/ports/devel/viewvc/Makefile,v
|retrieving revision 1.25
|diff -u -r1.25 Makefile
|--- devel/viewvc/Makefile      11 Apr 2007 10:37:04 -0000      1.25
|+++ devel/viewvc/Makefile      31 Mar 2008 23:56:28 -0000
--------------------------
Patching file devel/viewvc/Makefile using Plan A...
Hunk #1 succeeded at 6.
Hunk #2 succeeded at 32.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: devel/viewvc/distinfo
|===================================================================
|RCS file: /home/ncvs/ports/devel/viewvc/distinfo,v
|retrieving revision 1.14
|diff -u -r1.14 distinfo
|--- devel/viewvc/distinfo      11 Apr 2007 10:37:04 -0000      1.14
|+++ devel/viewvc/distinfo      31 Mar 2008 13:33:05 -0000
--------------------------
Patching file devel/viewvc/distinfo using Plan A...
Hunk #1 succeeded at 1.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: devel/viewvc/pkg-plist
|===================================================================
|RCS file: /home/ncvs/ports/devel/viewvc/pkg-plist,v
|retrieving revision 1.8
|diff -u -r1.8 pkg-plist
|--- devel/viewvc/pkg-plist     11 Apr 2007 10:37:05 -0000      1.8
|+++ devel/viewvc/pkg-plist     31 Mar 2008 23:45:21 -0000
--------------------------
Patching file devel/viewvc/pkg-plist using Plan A...
Hunk #1 succeeded at 122.
Hmm...  Ignoring the trailing garbage.
done


-- 
------------------------------------------------------------------------
Philip M. Gollucci (philip@ridecharge.com)
o:703.549.2050x206
Senior System Admin - Riderway, Inc.
http://riderway.com / http://ridecharge.com
1024D/EC88A0BF 0DE5 C55C 6BF3 B235 2DAB  B89E 1324 9B4F EC88 A0BF

Work like you don't need the money,
love like you'll never get hurt,
and dance like nobody's watching.
Comment 6 dfilter service freebsd_committer freebsd_triage 2008-04-03 03:39:41 UTC
araujo      2008-04-03 02:39:36 UTC

  FreeBSD ports repository

  Modified files:
    .                    KNOBS 
    devel/viewvc         Makefile distinfo pkg-plist 
  Log:
  - Update to 1.05. [2]
  - Pass maintainership to submitter. [1]
  - Add knob MODPYTHON3. [1]
  
  PR:             ports/121160 [1], ports/121883 [2]
  Submitted by:   Philip M. Gollucci <pgollucci@p6m7g8.com>
  
  Revision  Changes    Path
  1.27      +2 -1      ports/KNOBS
  1.26      +12 -5     ports/devel/viewvc/Makefile
  1.15      +3 -3      ports/devel/viewvc/distinfo
  1.9       +66 -0     ports/devel/viewvc/pkg-plist
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Comment 7 Marcelo Araujo freebsd_committer freebsd_triage 2008-04-03 03:41:17 UTC
State Changed
From-To: open->closed

Committed. Thanks!