6 files changed, 36 insertions, 14 deletions

diff --git a/deskutils/gnome-blog/Makefile b/deskutils/gnome-blog/Makefile
index 3c961fd5f361..c0b7ca01da9e 100644
--- a/deskutils/gnome-blog/Makefile
+++ b/deskutils/gnome-blog/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomeblog
 PORTVERSION=	0.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-blog/0.7
@@ -16,17 +16,13 @@ DISTNAME=	gnome-blog-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME app to post to blogs
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_PYTHON=	yes
-
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack gnomeprefix
+USE_GNOME=	gnomehack gnomeprefix pygnome2
 CONFIGURE_ARGS=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/libs"
+		LDFLAGS="-L${LOCALBASE}/libs"
 
 .include <bsd.port.mk>
diff --git a/deskutils/gnome-blog/files/patch-Makefile.in b/deskutils/gnome-blog/files/patch-Makefile.in
new file mode 100644
index 000000000000..9d11f403c962
--- /dev/null
+++ b/deskutils/gnome-blog/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Sat May 15 14:18:59 2004
++++ Makefile.in	Sat May 15 14:20:07 2004
+@@ -794,6 +794,8 @@
+ @INTLTOOL_DESKTOP_RULE@
+ 
+ install-data-local:
++	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
++			    gconftool-2 --makefile-install-rule $(schema_DATA)
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/deskutils/gnome-blog/pkg-plist b/deskutils/gnome-blog/pkg-plist
index 6f0967ade713..88436f96deb2 100644
--- a/deskutils/gnome-blog/pkg-plist
+++ b/deskutils/gnome-blog/pkg-plist
@@ -1,5 +1,7 @@
 bin/blog_applet.py
 bin/gnome-blog-poster
+etc/gconf/gconf.xml.defaults/apps/gnome-blogger/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnome-blogger/%gconf.xml
 etc/gconf/schemas/gnomeblog.schemas
 %%PYTHON_SITELIBDIR%%/gnomeblog/MetaWeblog.py
 %%PYTHON_SITELIBDIR%%/gnomeblog/MetaWeblog.pyc
@@ -49,3 +51,5 @@ share/gnome/applications/gnome-blog.desktop
 share/gnome/gnome-2.0/ui/GNOME_BlogApplet.xml
 share/gnome/pixmaps/gnome-blog.png
 @dirrm %%PYTHON_SITELIBDIR%%/gnomeblog
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-blogger
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-blogger
diff --git a/deskutils/gnomeblog/Makefile b/deskutils/gnomeblog/Makefile
index 3c961fd5f361..c0b7ca01da9e 100644
--- a/deskutils/gnomeblog/Makefile
+++ b/deskutils/gnomeblog/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomeblog
 PORTVERSION=	0.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-blog/0.7
@@ -16,17 +16,13 @@ DISTNAME=	gnome-blog-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME app to post to blogs
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_PYTHON=	yes
-
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack gnomeprefix
+USE_GNOME=	gnomehack gnomeprefix pygnome2
 CONFIGURE_ARGS=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/libs"
+		LDFLAGS="-L${LOCALBASE}/libs"
 
 .include <bsd.port.mk>
diff --git a/deskutils/gnomeblog/files/patch-Makefile.in b/deskutils/gnomeblog/files/patch-Makefile.in
new file mode 100644
index 000000000000..9d11f403c962
--- /dev/null
+++ b/deskutils/gnomeblog/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Sat May 15 14:18:59 2004
++++ Makefile.in	Sat May 15 14:20:07 2004
+@@ -794,6 +794,8 @@
+ @INTLTOOL_DESKTOP_RULE@
+ 
+ install-data-local:
++	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
++			    gconftool-2 --makefile-install-rule $(schema_DATA)
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/deskutils/gnomeblog/pkg-plist b/deskutils/gnomeblog/pkg-plist
index 6f0967ade713..88436f96deb2 100644
--- a/deskutils/gnomeblog/pkg-plist
+++ b/deskutils/gnomeblog/pkg-plist
@@ -1,5 +1,7 @@
 bin/blog_applet.py
 bin/gnome-blog-poster
+etc/gconf/gconf.xml.defaults/apps/gnome-blogger/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnome-blogger/%gconf.xml
 etc/gconf/schemas/gnomeblog.schemas
 %%PYTHON_SITELIBDIR%%/gnomeblog/MetaWeblog.py
 %%PYTHON_SITELIBDIR%%/gnomeblog/MetaWeblog.pyc
@@ -49,3 +51,5 @@ share/gnome/applications/gnome-blog.desktop
 share/gnome/gnome-2.0/ui/GNOME_BlogApplet.xml
 share/gnome/pixmaps/gnome-blog.png
 @dirrm %%PYTHON_SITELIBDIR%%/gnomeblog
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-blogger
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-blogger