Bug 130869 - www/rt38 [patch] fix configuration handling on upgrade
Summary: www/rt38 [patch] fix configuration handling on upgrade
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: Wesley Shields
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2009-01-22 11:20 UTC by Angelo Turetta
Modified: 2009-02-13 14:31 UTC (History)
0 users

See Also:


Attachments
rt38-fix-siteconfig.diff (3.50 KB, patch)
2009-01-22 11:20 UTC, Angelo Turetta
no flags Details | Diff
rt38-patch.txt (9.17 KB, text/plain; x-unix-mode=0644)
2009-01-26 18:52 UTC, Steven Kreuzer
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description Angelo Turetta 2009-01-22 11:20:01 UTC
	The installation of a default RT_SiteConfig.pm is broken.
	Currently the install copies RT_SiteConfig.pm if it's not present, then the
	port's Makefile unconditionally copies RT_SiteConfig.pm to RT_SiteConfig.pm-dist.

	All is OK after first installation. After the first upgrade, the user's
	RT_SiteConfig.pm overwrites RT_SiteConfig.pm-dist. On the next upgrade,
	if no changes has been made to RT_SiteConfig.pm, the check included in pkg-plist
	will delete RT_SiteConfig.pm because it's identical to RT_SiteConfig.pm-dist.

Fix: The port should install a file called RT_SiteConfig.pm-dist, and only then copy
	it to RT_SiteConfig.pm if the latter doesn't exist.
	While fixing this, I also attended a couple of TODO items, deleting them from
	Makefile

	Suggested commit message:

	=======================================================
	- Fix erroneous removal of user's RT_SiteConfig.pm after second upgrade
	- Fix path of RT_SiteConfig.pm in various files
	- Fix creation of default RT_SiteConfig.pm in pkg-plist
	- Bump portrevision (pkg-plist changed)
	=======================================================

	Please beware: portrevision bump is not included in my patch
	NOTE: the first point may be worth a heads-up in UPDATING
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2009-01-22 11:20:16 UTC
Maintainer of www/rt38,

Please note that PR ports/130869 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/130869

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2009-01-22 11:20:18 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 3 Steven Kreuzer 2009-01-26 18:52:43 UTC
On Jan 22, 2009, at 6:20 AM, Edwin Groothuis wrote:

> Maintainer of www/rt38,
>
> Please note that PR ports/130869 has just been submitted.
>
> If it contains a patch for an upgrade, an enhancement or a bug fix
> you agree on, reply to this email stating that you approve the patch
> and a committer will take care of it.
>
> The full text of the PR can be found at:
>    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/130869
>
> --  
> Edwin Groothuis via the GNATS Auto Assign Tool
> edwin@FreeBSD.org

Patch looks good. I took his patch and combined it with one I have  
been sitting on

Please apply that patch which:

- Contains the modifications made by Angelo
- Contains a fix to a directory permissions issue caused by a patch I  
made for a previous PR
- Makes use of Macros for the apache user and group
- Starts to change the dependencies listing to use port names rather  
then checking if a file exists

Thanks

--
Steven Kreuzer
http://www.exit2shell.com/~skreuzer
Comment 4 Wesley Shields freebsd_committer freebsd_triage 2009-01-26 19:40:48 UTC
Responsible Changed
From-To: freebsd-ports-bugs->wxs

I'll take it.
Comment 5 dfilter service freebsd_committer freebsd_triage 2009-02-13 14:23:09 UTC
wxs         2009-02-13 14:22:58 UTC

  FreeBSD ports repository

  Modified files:
    www/rt38             Makefile Makefile.cpan distinfo pkg-plist 
    www/rt38/files       patch-Makefile.in pkg-message.in 
  Log:
  - Use WWWOWN and WWWGRP [1]
  - Switch to using package names rather than checking if a file exists
    for dependencies [1]
  - Fix directory permissions [1]
  - Update to 3.8.2 [2]
  - Add GraphViz OPTION (default on) [2]
  
  PR:             [1]: ports/130869
                  [2]: ports/131167
  Submitted by:   [1]: Angelo Turetta <aturetta@bestunion.it>
                  [2]: Jo Rhett <jrhett@netconsonance.com>
                  [2]: Boris Samorodov <bsam@ipt.ru>
  Approved by:    Steven Kreuzer <skreuzer@exit2shell.com> (maintainer)
  
  Revision  Changes    Path
  1.10      +14 -10    ports/www/rt38/Makefile
  1.3       +14 -14    ports/www/rt38/Makefile.cpan
  1.2       +3 -3      ports/www/rt38/distinfo
  1.4       +28 -4     ports/www/rt38/files/patch-Makefile.in
  1.5       +2 -2      ports/www/rt38/files/pkg-message.in
  1.6       +164 -84   ports/www/rt38/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 6 Wesley Shields freebsd_committer freebsd_triage 2009-02-13 14:31:54 UTC
State Changed
From-To: feedback->closed

Committed. Thanks!