Bug 126705 - [patch] devel/bazaar Update neon dependancy
Summary: [patch] devel/bazaar Update neon dependancy
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: Josh Paetzel
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2008-08-21 07:30 UTC by Josh Paetzel <josh@tcbug.org>
Modified: 2009-03-01 04:00 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 Josh Paetzel <josh@tcbug.org> 2008-08-21 07:30:06 UTC 

devel/bazaar depends on www/neon26 which CONFLICTS with and is backwards compatable with neon28.  This patch updates the port to use neon26 if it's installed, otherwise depend on neon28

Fix: 

USE_GMAKE=     yes
 USE_GETTEXT=   yes--EN20PreVMhyBeYeaAssaoPeYlknHNRINPAAZauwb0J2kaLo4
Content-Type: text/plain; name="file.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="file.diff"

--- Makefile.old        2008-08-21 06:11:46.000000000 +0000
+++ Makefile    2008-08-21 06:17:17.000000000 +0000
@@ -19,8 +19,13 @@
                gdiff:${PORTSDIR}/textproc/diffutils \
                gtar:${PORTSDIR}/archivers/gtar
 RUN_DEPENDS=   ${BUILD_DEPENDS}
-LIB_DEPENDS=   neon.26:${PORTSDIR}/www/neon26 \
-               gpgme.17:${PORTSDIR}/security/gpgme
+LIB_DEPENDS=   gpgme.17:${PORTSDIR}/security/gpgme
+
+.if exists(${LOCALBASE}/lib/libneon.so.26)
+LIB_DEPENDS+=   neon.26:${PORTSDIR}/www/neon26
+.else
+LIB_DEPENDS+=   neon.28:${PORTSDIR}/www/neon28
+.endif
How-To-Repeat: 

Install something that pulls in neon28 (KDE, subversion, trac)

cd /usr/ports/devel/bazaar && make install

bombs due to CONFLICT between neon26 and the already installed neon28
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2008-08-21 07:30:17 UTC 
Maintainer of devel/bazaar,

Please note that PR ports/126705 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/126705

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2008-08-21 07:30:20 UTC 
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 3 Beech Rintoul freebsd_committer freebsd_triage 2008-09-09 05:53:49 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->jpaetzel

Submitter has gnats access
Comment 4 dfilter service freebsd_committer freebsd_triage 2009-03-01 02:38:29 UTC 
jpaetzel    2009-03-01 02:38:21 UTC

  FreeBSD ports repository

  Modified files:
    devel/bazaar         Makefile 
  Log:
  Update devel/bazaar to use neon28
  based on ports/126705
  
  PR:     ports/126705
  Approved by:    linimon (mentor)
  
  Revision  Changes    Path
  1.13      +2 -2      ports/devel/bazaar/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"
Comment 5 Josh Paetzel freebsd_committer freebsd_triage 2009-03-01 04:00:09 UTC 
State Changed
From-To: feedback->closed

patch committed with modifications