-Update to 1.0.4.

-Correct the path of put *.desktop and icon.
-A bit clean up, such as reduce two tabs to one and etc.
-Change the maintainership to Tom McLaughlin <tmclaugh@sdf.lonestar.org>.

Approved by:	Christopher Nehren <apeiron@comcast.net> (maintainer)
Submitted by:	Tom McLaughlin <tmclaugh@sdf.lonestar.org>
Project by:	BSD# - http://forge.novell.com/modules/xfmod/project/?bsd-sharp

6 files changed, 55 insertions, 28 deletions

diff --git a/devel/monodoc/Makefile b/devel/monodoc/Makefile
index 28dc9a547d0c..a9f8323de934 100644
--- a/devel/monodoc/Makefile
+++ b/devel/monodoc/Makefile
@@ -6,24 +6,24 @@
 # $FreeBSD$
 #
 
-PORTNAME=		monodoc
-PORTVERSION=		1.0
-PORTREVISION=	1
-CATEGORIES=		devel gnome
-MASTER_SITES=		http://mono.ximian.com/archive/${PORTVERSION}/
+PORTNAME=	monodoc
+PORTVERSION=	1.0.4
+CATEGORIES=	devel gnome
+MASTER_SITES=	http://www.go-mono.com/archive/${PORTVERSION}/
 
-MAINTAINER=		apeiron@comcast.net
-COMMENT=		Documentation browser for Mono and Mono libraries
+MAINTAINER=	tmclaugh@sdf.lonestar.org
+COMMENT=	Documentation browser for Mono and Mono libraries
 
-BUILD_DEPENDS=		${LOCALBASE}/bin/mono:${PORTSDIR}/lang/mono \
-			${LOCALBASE}/libdata/pkgconfig/gtk-sharp.pc:${PORTSDIR}/x11-toolkits/gtk-sharp \
-			${LOCALBASE}/bin/lynx:${PORTSDIR}/www/lynx
-RUN_DEPENDS=		${BUILD_DEPENDS}
+BUILD_DEPENDS=	gapi-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp \
+		${LOCALBASE}/bin/lynx:${PORTSDIR}/www/lynx
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
-GNU_CONFIGURE=		yes
-USE_REINPLACE=		yes
-USE_GNOME=		gnomehack gnometarget
-USE_GMAKE=		yes
+USE_GNOME=	gnomehack gnometarget
+USE_X_PREFIX=	yes
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+
+USE_REINPLACE=	yes
 
 # Fix 'exec mono' not picking up libmap.conf settings.
 post-patch:
diff --git a/devel/monodoc/distinfo b/devel/monodoc/distinfo
index 4ebbd5282d7c..3f3fac1fac05 100644
--- a/devel/monodoc/distinfo
+++ b/devel/monodoc/distinfo
@@ -1,2 +1,2 @@
-MD5 (monodoc-1.0.tar.gz) = 6efe0e32178871ff34e72a183fe5e585
-SIZE (monodoc-1.0.tar.gz) = 10126356
+MD5 (monodoc-1.0.4.tar.gz) = 00314ffc609357979943e6152e3dcd6c
+SIZE (monodoc-1.0.4.tar.gz) = 9590384
diff --git a/devel/monodoc/files/patch-browser::Makefile.in b/devel/monodoc/files/patch-browser::Makefile.in
index a6ae8f239c91..06a2b1dd99cf 100644
--- a/devel/monodoc/files/patch-browser::Makefile.in
+++ b/devel/monodoc/files/patch-browser::Makefile.in
@@ -1,11 +1,24 @@
---- browser/Makefile.in.orig	Fri Aug 13 10:08:12 2004
-+++ browser/Makefile.in	Fri Aug 13 10:10:04 2004
-@@ -147,7 +147,7 @@
- 	$(srcdir)/Contributions.cs
- 
+--- browser/Makefile.in.orig	Wed Nov  3 00:09:42 2004
++++ browser/Makefile.in	Wed Nov  3 00:11:36 2004
+@@ -202,7 +202,7 @@
+ validate_sources = \
+ 	$(srcdir)/validate.cs
  
 -browser_assemblies = -pkg:gtkhtml-sharp -pkg:glade-sharp -r:System.Web.Services
-+browser_assemblies = `pkg-config --libs gtkhtml-sharp glade-sharp` -r:System.Web.Services
- 
++browser_assemblies = $(shell pkg-config --libs gtkhtml-sharp glade-sharp) -r:System.Web.Services
  EXTRA_DIST = \
  	$(monodoc_sources) $(assembler_sources) \
+ 	$(dump_sources) $(browser_sources) 	\
+@@ -465,10 +465,10 @@
+ 	scp tables.sql server.cs server.asmx monodoc.dll root@www.go-mono.com:
+ 
+ install-data-local:
+-	$(GACUTIL) /i monodoc.dll /f /package gtk-sharp /gacdir $(DESTDIR)$(libdir)
++	$(GACUTIL) /i monodoc.dll /f /package gtk-sharp /root $(DESTDIR)$(libdir) /gacdir $(DESTDIR)$(libdir)
+ 
+ uninstall-local:
+-	$(GACUTIL) /u monodoc /package gtk-sharp /gacdir $(DESTDIR)$(libdir)
++	$(GACUTIL) /u monodoc /package gtk-sharp /root $(DESTDIR)$(libdir) /gacdir $(DESTDIR)$(libdir)
+ # 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/devel/monodoc/files/patch-configure b/devel/monodoc/files/patch-configure
new file mode 100644
index 000000000000..81bd6ce27a27
--- /dev/null
+++ b/devel/monodoc/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Sat Oct 16 00:07:44 2004
++++ configure	Sat Oct 16 00:08:24 2004
+@@ -339,7 +339,7 @@
+ bindir='${exec_prefix}/bin'
+ sbindir='${exec_prefix}/sbin'
+ libexecdir='${exec_prefix}/libexec'
+-datadir='${prefix}/share'
++datadir='${prefix}/share/gnome'
+ sysconfdir='${prefix}/etc'
+ sharedstatedir='${prefix}/com'
+ localstatedir='${prefix}/var'
diff --git a/devel/monodoc/pkg-descr b/devel/monodoc/pkg-descr
index ed771e42db41..13cb50b940d5 100644
--- a/devel/monodoc/pkg-descr
+++ b/devel/monodoc/pkg-descr
@@ -4,3 +4,5 @@ documentation, and a documentation browser.
 
 The documentation browser consists of a library and two
 front-ends: a Gtk#-based one, and an ASP.NET-based version.
+
+WWW: http://www.mono-project.com
diff --git a/devel/monodoc/pkg-plist b/devel/monodoc/pkg-plist
index 48ce03d3507d..82e0f290f99b 100644
--- a/devel/monodoc/pkg-plist
+++ b/devel/monodoc/pkg-plist
@@ -1,10 +1,10 @@
 bin/mod
 bin/monodoc
-@unexec gacutil /u monodoc.dll /f /package monodoc /gacdir %D/lib > /dev/null || /usr/bin/true
 lib/mono/gac/monodoc/1.0.0.0__0738eb9f132ed756/monodoc.dll
-@exec gacutil /i monodoc.dll /f /package monodoc /gacdir %D/lib > /dev/null || /usr/bin/true
 lib/mono/gac/monodoc/1.0.0.0__0738eb9f132ed756/monodoc.dll.config
+@unexec gacutil /u monodoc.dll /f /package monodoc /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true
 lib/mono/gtk-sharp/monodoc.dll
+@exec gacutil /i monodoc.dll /f /package monodoc /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true
 lib/monodoc/assembler.exe
 lib/monodoc/browser.exe
 lib/monodoc/mod.exe
@@ -38,9 +38,10 @@ lib/monodoc/sources/nunit-docs.source
 lib/monodoc/sources/nunit-docs.tree
 lib/monodoc/sources/nunit-docs.zip
 lib/monodoc/updater.exe
+lib/monodoc/validate.exe
 libdata/pkgconfig/monodoc.pc
-share/applications/monodoc.desktop
-share/pixmaps/monodoc.png
+share/gnome/applications/monodoc.desktop
+share/gnome/pixmaps/monodoc.png
 @dirrm lib/mono/gac/monodoc/1.0.0.0__0738eb9f132ed756
 @dirrm lib/mono/gac/monodoc
 @dirrm lib/monodoc/sources