diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-09-16 04:14:16 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-09-16 04:14:16 +0800 |
| commit | ece4d747ce247b1adede8fe8827b978ab62e5f6d (patch) | |
| tree | 82373344f4f3e25febb97309d0e27260b2182c3a /devel | |
| parent | 23d2370f9c1134950d757e66f1b4b7443bff762c (diff) | |
| download | marcuscom-ports-ece4d747ce247b1adede8fe8827b978ab62e5f6d.tar marcuscom-ports-ece4d747ce247b1adede8fe8827b978ab62e5f6d.tar.gz marcuscom-ports-ece4d747ce247b1adede8fe8827b978ab62e5f6d.tar.bz2 marcuscom-ports-ece4d747ce247b1adede8fe8827b978ab62e5f6d.tar.lz marcuscom-ports-ece4d747ce247b1adede8fe8827b978ab62e5f6d.tar.xz marcuscom-ports-ece4d747ce247b1adede8fe8827b978ab62e5f6d.tar.zst marcuscom-ports-ece4d747ce247b1adede8fe8827b978ab62e5f6d.zip | |
Update Conflicts
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16187 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/libgdata06/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/devel/libgdata06/Makefile b/devel/libgdata06/Makefile index e4a922bb3..905b3e1ae 100644 --- a/devel/libgdata06/Makefile +++ b/devel/libgdata06/Makefile @@ -3,7 +3,7 @@ # Whom: Koop Mast <kwm@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/libgdata/Makefile,v 1.19 2011/04/30 20:43:16 mezz Exp $ +# $MCom: ports/devel/libgdata06/Makefile,v 1.1 2011/08/24 13:49:29 kwm Exp $ # PORTNAME= libgdata @@ -18,7 +18,7 @@ COMMENT= GLib based implimentation of the GData protocol BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection LIB_DEPENDS= soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup-gnome -CONFLICTS= libgdata-0.8.* +CONFLICTS= libgdata-0.10.* USE_BZIP2= yes USE_LDCONFIG= yes |