4 files changed, 68 insertions, 11 deletions

diff --git a/devel/giggle/Makefile b/devel/giggle/Makefile
index bb647d4e09d0..825e4135feb1 100644
--- a/devel/giggle/Makefile
+++ b/devel/giggle/Makefile
@@ -6,16 +6,17 @@
 #
 
 PORTNAME=	giggle
-PORTVERSION=	0.4
+PORTVERSION=	0.4.91
 CATEGORIES=	devel
-MASTER_SITES=	http://ftp.imendio.com/${MASTER_SITE_SUBDIR}/
-MASTER_SITE_SUBDIR=	pub/imendio/giggle/src
+MASTER_SITES=	GNOME
 
 MAINTAINER=	wahjava@gmail.com
 COMMENT=	GTK+ frontend for git version control system
 
-BUILD_DEPENDS=	git:${PORTSDIR}/devel/git
+BUILD_DEPENDS=	git:${PORTSDIR}/devel/git \
+		${SITE_PERL}/mach/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
 RUN_DEPENDS=	git:${PORTSDIR}/devel/git
+OPTIONS=	EDS	"Evolution Data Server support"	on
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -26,4 +27,12 @@ INSTALLS_ICONS=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if defined(WITHOUT_EDS)
+CONFIGURE_ARGS+=	--disable-evolution-data-server
+.elif defined(WITH_EDS)
+BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/libebook-1.2.pc:${PORTSDIR}/databases/evolution-data-server
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/giggle/distinfo b/devel/giggle/distinfo
index 996d59cfa5f6..e05e56bc4bd6 100644
--- a/devel/giggle/distinfo
+++ b/devel/giggle/distinfo
@@ -1,3 +1,3 @@
-MD5 (giggle-0.4.tar.gz) = 695b381d42de8338626068dfa5341406
-SHA256 (giggle-0.4.tar.gz) = e46399530676a9a2473473471c0ee8a3c417923756867c83c1f70653c13409ad
-SIZE (giggle-0.4.tar.gz) = 539885
+MD5 (giggle-0.4.91.tar.gz) = ea88213fa3c9cbf5c571dd17b0e430ea
+SHA256 (giggle-0.4.91.tar.gz) = 7ff4c5b7d679795c8e202c70c499481e53bfce9b0222ac1f34d02413dfb4b49f
+SIZE (giggle-0.4.91.tar.gz) = 561049
diff --git a/devel/giggle/pkg-descr b/devel/giggle/pkg-descr
index a5f2669cfb4c..a17216ad734d 100644
--- a/devel/giggle/pkg-descr
+++ b/devel/giggle/pkg-descr
@@ -1,4 +1,4 @@
 Giggle is a graphical frontend for the git 
 directory tracker (think of gitk on GTK+).
 
-WWW:	http://developer.imendio.com/projects/giggle
+WWW:	http://live.gnome.org/giggle
diff --git a/devel/giggle/pkg-plist b/devel/giggle/pkg-plist
index 98b3813de5ea..791fd6b3e553 100644
--- a/devel/giggle/pkg-plist
+++ b/devel/giggle/pkg-plist
@@ -1,21 +1,69 @@
 bin/giggle
-lib/libgiggle-0.4.so
+include/giggle/libgiggle-git/giggle-git-add-ref.h
+include/giggle/libgiggle-git/giggle-git-add.h
+include/giggle/libgiggle-git/giggle-git-authors.h
+include/giggle/libgiggle-git/giggle-git-blame.h
+include/giggle/libgiggle-git/giggle-git-cat-file.h
+include/giggle/libgiggle-git/giggle-git-commit.h
+include/giggle/libgiggle-git/giggle-git-config-read.h
+include/giggle/libgiggle-git/giggle-git-config-write.h
+include/giggle/libgiggle-git/giggle-git-config.h
+include/giggle/libgiggle-git/giggle-git-delete-ref.h
+include/giggle/libgiggle-git/giggle-git-diff-tree.h
+include/giggle/libgiggle-git/giggle-git-diff.h
+include/giggle/libgiggle-git/giggle-git-enums.h
+include/giggle/libgiggle-git/giggle-git-ignore.h
+include/giggle/libgiggle-git/giggle-git-list-files.h
+include/giggle/libgiggle-git/giggle-git-list-tree.h
+include/giggle/libgiggle-git/giggle-git-log.h
+include/giggle/libgiggle-git/giggle-git-refs.h
+include/giggle/libgiggle-git/giggle-git-remote-list.h
+include/giggle/libgiggle-git/giggle-git-revisions.h
+include/giggle/libgiggle-git/giggle-git.h
+include/giggle/libgiggle/giggle-enums.h
+include/giggle/libgiggle/giggle-marshal.h
+lib/giggle/plugins/libpersonal-details.la
+lib/giggle/plugins/libpersonal-details.so
+lib/giggle/plugins/libpersonal-details.so.0
+lib/giggle/plugins/personal-details.xml
+lib/libgiggle-0.4.91.so
+lib/libgiggle-git-0.4.91.so
+lib/libgiggle-git.la
+lib/libgiggle-git.so
 lib/libgiggle.la
 lib/libgiggle.so
 share/applications/giggle.desktop
 %%DATADIR%%/glade/main-window.glade
+share/icons/hicolor/16x16/apps/giggle-branch.png
+share/icons/hicolor/16x16/apps/giggle-history-view.png
+share/icons/hicolor/16x16/apps/giggle-remote.png
+share/icons/hicolor/16x16/apps/giggle-scm-git.png
+share/icons/hicolor/16x16/apps/giggle-scm-svn.png
+share/icons/hicolor/16x16/apps/giggle-tag.png
 share/icons/hicolor/16x16/apps/giggle.png
+share/icons/hicolor/22x22/apps/giggle-history-view.png
 share/icons/hicolor/22x22/apps/giggle.png
+share/icons/hicolor/24x24/apps/giggle-history-view.png
+share/icons/hicolor/24x24/apps/giggle.png
+share/icons/hicolor/32x32/apps/giggle-history-view.png
 share/icons/hicolor/32x32/apps/giggle.png
+share/icons/hicolor/48x48/apps/giggle-scm-svn.png
 share/icons/hicolor/48x48/apps/giggle.png
 share/icons/hicolor/scalable/apps/giggle.svg
 share/locale/ca/LC_MESSAGES/giggle.mo
 share/locale/de/LC_MESSAGES/giggle.mo
+share/locale/en_GB/LC_MESSAGES/giggle.mo
 share/locale/es/LC_MESSAGES/giggle.mo
 share/locale/fr/LC_MESSAGES/giggle.mo
+share/locale/ja/LC_MESSAGES/giggle.mo
 share/locale/pl/LC_MESSAGES/giggle.mo
 share/locale/sv/LC_MESSAGES/giggle.mo
 share/locale/vi/LC_MESSAGES/giggle.mo
-@dirrmtry share/applications
 @dirrm %%DATADIR%%/glade
 @dirrm %%DATADIR%%
+@dirrmtry share/applications
+@dirrm lib/giggle/plugins
+@dirrm lib/giggle
+@dirrm include/giggle/libgiggle-git
+@dirrm include/giggle/libgiggle
+@dirrm include/giggle