Bug 143039 - devel/libmonetra and net/libproxy no longer conflict
Summary: devel/libmonetra and net/libproxy no longer conflict
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: freebsd-gnome (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-01-21 00:00 UTC by Mark Schleifer
Modified: 2010-01-23 19:50 UTC (History)
0 users

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Mark Schleifer 2010-01-21 00:00:18 UTC 
Diff for /ports/devel/libmonetra/pkg-plist between versions 1.8 and 1.9 removes the file causing the conflict: include/proxy.h 

Need to have conflict tag removed from Makefiles

Fix: 

Remove CONFLICT tags from: 

ports/devel/libmonetra/Makefile
ports/net/libproxy/Makefile
Comment 1 Mark Linimon freebsd_committer freebsd_triage 2010-01-21 01:38:08 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->gnome

net/libproxy is maintained by gnome@, so perhaps someone there can 
do this commit.
Comment 2 Joe Marcus Clarke freebsd_committer freebsd_triage 2010-01-23 19:45:58 UTC 
State Changed
From-To: open->closed

Committed, thanks!
Comment 3 dfilter service freebsd_committer freebsd_triage 2010-01-23 19:46:07 UTC 
marcus      2010-01-23 19:45:54 UTC

  FreeBSD ports repository

  Modified files:
    devel/libmonetra     Makefile 
    net/libproxy         Makefile 
  Log:
  Remove the CONFLICTS between libproxy and libmonetra.
  
  PR:             143039
  Submitted by:   Mark Schleifer <freebsd@schleifer.org>
  
  Revision  Changes    Path
  1.20      +0 -2      ports/devel/libmonetra/Makefile
  1.2       +0 -1      ports/net/libproxy/Makefile
_______________________________________________
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"