6 files changed, 109 insertions, 15 deletions

diff --git a/editors/mlview/Makefile b/editors/mlview/Makefile
index 5d5d70487428..a9a4ad046ea7 100644
--- a/editors/mlview/Makefile
+++ b/editors/mlview/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	mlview
-PORTVERSION=	0.7.1
-PORTREVISION=	1
+PORTVERSION=	0.8
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.7
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	barner@FreeBSD.org
@@ -24,13 +23,27 @@ USE_GMAKE=	yes
 USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
-USE_REINPLACE=yes
+USE_REINPLACE=	yes
 
 GCONF_SCHEMAS=	mlview.schemas
 
-post-patch:
-	@${REINPLACE_CMD} -e \
-		"s,mlview-app-icon.xpm,${PREFIX}/share/gnome/${PORTNAME}/mlview-app-icon.xpm," \
-		${WRKSRC}/mlview.desktop.in
+.include <bsd.port.pre.mk>
 
-.include <bsd.port.mk>
+# Autodetect dbus
+.if exists (${LOCALBASE}/lib/libdbus-1.so.1)
+WITH_DBUS=	yes
+.endif
+
+.if defined (WITH_DBUS)
+LIB_DEPENDS+=	dbus-1.1:${PORTSDIR}/devel/dbus
+CONFIGURE_ARGS+="--enable-dbus=yes"
+.endif
+
+pre-everything::
+.if !defined (WITH_DBUS)
+	${ECHO_CMD}
+	${ECHO_CMD} Re-run with -DWITH_DBUS in order to enable dbus support!
+	${ECHO_CMD}
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/editors/mlview/distinfo b/editors/mlview/distinfo
index ca954633a8af..b9e7dc0d1a33 100644
--- a/editors/mlview/distinfo
+++ b/editors/mlview/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/mlview-0.7.1.tar.bz2) = 85383331e5bb6d59293cee5b86595284
-SIZE (gnome2/mlview-0.7.1.tar.bz2) = 635825
+MD5 (gnome2/mlview-0.8.tar.bz2) = ffbf4dbbe32d8312ca516633bf57b921
+SIZE (gnome2/mlview-0.8.tar.bz2) = 728600
diff --git a/editors/mlview/files/patch-configure.in b/editors/mlview/files/patch-configure.in
new file mode 100644
index 000000000000..9041b93283ce
--- /dev/null
+++ b/editors/mlview/files/patch-configure.in
@@ -0,0 +1,11 @@
+--- configure.in.orig	Sat Jul 23 12:53:33 2005
++++ configure.in	Sat Jul 23 12:53:40 2005
+@@ -67,7 +67,7 @@
+ \* 10000 + $MLVIEW_MINOR_VERSION \
+ \* 100 + $MLVIEW_MICRO_VERSION`
+ 
+-MLVIEW_EXE=$prefix/bin/mlv
++MLVIEW_EXE=$prefix/bin/mlview
+ AC_SUBST(MLVIEW_VERSION_NUMBER)
+ AC_SUBST(MLVIEW_VERSION)
+ AC_SUBST(AC_PACKAGE_VERSION)
diff --git a/editors/mlview/files/patch-desktop.in b/editors/mlview/files/patch-desktop.in
new file mode 100644
index 000000000000..433fe9aea52a
--- /dev/null
+++ b/editors/mlview/files/patch-desktop.in
@@ -0,0 +1,19 @@
+--- mlview.desktop.in.orig	Sat Jun 25 14:57:05 2005
++++ mlview.desktop.in	Sat Jul 23 13:02:57 2005
+@@ -1,13 +1,13 @@
+ [Desktop Entry]
+-Version=0.9.4
++Version=0.8.0
+ Encoding=UTF-8
+ Type=Application
+ Name=MlView XML Editor
+ GenericName=MlView Generic XML Editor
+ Categories=Application;Development;
+ Comment=A generic simple XML editor for GNOME
+-Icon=mlview-app-icon.xpm
+-TryExec=mlv
++Icon=/usr/X11R6/share/gnome/pixmaps/mlview-app-icon.xpm
++TryExec=mlview
+ Exec=@MLVIEW_EXE@ %F
+ Terminal=false
+ 
diff --git a/editors/mlview/files/patch-src_mlview-service.c b/editors/mlview/files/patch-src_mlview-service.c
new file mode 100644
index 000000000000..c9bdba8f25cb
--- /dev/null
+++ b/editors/mlview/files/patch-src_mlview-service.c
@@ -0,0 +1,39 @@
+--- src/mlview-service.c.orig	Sat Jul 23 12:10:16 2005
++++ src/mlview-service.c	Sat Jul 23 12:23:14 2005
+@@ -282,23 +282,23 @@
+ 	service_name = g_strdup_printf ("%s.%s", 
+ 				        PRIVATE (a_this)->name,
+ 			                tab) ;
+-	service_result = dbus_bus_acquire_service 
++	service_result = dbus_bus_request_name 
+ 		(dbus_connection,
+ 		 service_name, 0, &dbus_error) ;
+ 
+ 	switch (service_result) {
+-		case DBUS_SERVICE_REPLY_PRIMARY_OWNER:
++		case DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER:
+ 			/*we started the service, OK*/
+ 			mlview_utils_trace_debug 
+ 				("Service name: %s registered\n",
+ 				 service_name) ;
+ 			status = register_dbus_objects (a_this) ;
+ 			break ;
+-		case DBUS_SERVICE_REPLY_ALREADY_OWNER:
++		case DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER:
+ 			/*we were already started as service. OK still*/
+ 			status = MLVIEW_OK ;
+ 			break ;
+-		case DBUS_SERVICE_REPLY_SERVICE_EXISTS:
++		case DBUS_REQUEST_NAME_REPLY_EXISTS:
+ 			/* 
+ 			 * an other process has been registered under
+ 			 * with the same service name. So we can't be registered
+@@ -312,7 +312,7 @@
+ 					 "moment") ;
+ 			}
+ 			goto try_service_name ;
+-		case DBUS_SERVICE_REPLY_IN_QUEUE:
++		case DBUS_REQUEST_NAME_REPLY_IN_QUEUE:
+ 			/*
+ 			 * our request is queued. (bus overcrowded ?) KO
+ 			 */
diff --git a/editors/mlview/pkg-plist b/editors/mlview/pkg-plist
index 60892642c1da..c8d1c5fbf731 100644
--- a/editors/mlview/pkg-plist
+++ b/editors/mlview/pkg-plist
@@ -1,22 +1,32 @@
-bin/mlv
+bin/mlview
+bin/mlviewctl
 lib/libmlview.a
 lib/libmlview.so
-lib/libmlview.so.7
+lib/libmlview.so.8
+lib/libmlviewdbusclient.a
+lib/libmlviewdbusclient.so.8
 share/gnome/applications/mlview.desktop
+share/gnome/application-registry/mlview.applications
+share/gnome/mime-info/mlview.keys
 share/gnome/mlview/main-menu-bar.xml
 share/gnome/mlview/main-toolbar.xml
-share/gnome/mlview/mlview-app-icon.png
-share/gnome/mlview/mlview-app-icon.xpm
 share/gnome/mlview/mlview-css-picker.glade
+share/gnome/mlview/mlview-dtd-schema.png
 share/gnome/mlview/mlview-dtd-choice-dtd-not-resolved.glade
 share/gnome/mlview/mlview-dtd-choice.glade
 share/gnome/mlview/mlview-main-app-win.glade
 share/gnome/mlview/mlview-main-app-win2.glade
+share/gnome/mlview/mlview-new-document.glade
+share/gnome/mlview/mlview-node-editor.glade
 share/gnome/mlview/mlview-preferences.glade
+share/gnome/mlview/mlview-rng-schema.png
 share/gnome/mlview/mlview-schemas-window.glade
+share/gnome/mlview/mlview-search-box.glade
 share/gnome/mlview/mlview-search-node.glade
 share/gnome/mlview/mlview-uri-dialog.glade
 share/gnome/mlview/mlview-validation-report.glade
+share/gnome/mlview/mlview-xsd-schema.png
+share/gnome/mlview/source-view-edit-menu.xml
 share/gnome/mlview/tree-view-edit-menu.xml
 share/gnome/mlview/xml-comment-node.png
 share/gnome/mlview/xml-element-node-open.png
@@ -26,6 +36,8 @@ share/gnome/mlview/xml-pi-node.png
 share/gnome/mlview/xml-root-open.png
 share/gnome/mlview/xml-root.png
 share/gnome/mlview/xml-text-node.png
+share/gnome/pixmaps/mlview-app-icon.png
+share/gnome/pixmaps/mlview-app-icon.xpm
 share/locale/az/LC_MESSAGES/mlview.mo
 share/locale/ca/LC_MESSAGES/mlview.mo
 share/locale/cs/LC_MESSAGES/mlview.mo