6 files changed, 108 insertions, 41 deletions

diff --git a/deskutils/mcatalog/Makefile b/deskutils/mcatalog/Makefile
index 75845a41141b..8ab2714b10c0 100644
--- a/deskutils/mcatalog/Makefile
+++ b/deskutils/mcatalog/Makefile
@@ -3,23 +3,37 @@
 # Whom:					Mezz <mezz@FreeBSD.org>
 #
 # $FreeBSD$
+#   $Id: Makefile,v 1.9 2005/10/22 06:02:34 tmclau02 Exp $
 #
 
 PORTNAME=	mcatalog
-PORTVERSION=	0.0.6
+PORTVERSION=	0.2
 PORTREVISION=	1
 CATEGORIES=	deskutils gnome
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	mcatalog
+MASTER_SITES=	http://www.mcatalog.net/releases/
 
 MAINTAINER=	bsd-sharp-list@forge.novell.com
 COMMENT=	An application for catalogue films and books
 
-BUILD_DEPENDS=	gapi-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp10
+BUILD_DEPENDS=	gapi2-parser:${PORTSDIR}/x11-toolkits/gtk-sharp20 \
+		${X11BASE}/libdata/pkgconfig/evolution-sharp.pc:${PORTSDIR}/mail/evolution-sharp \
+		${X11BASE}/libdata/pkgconfig/gecko-sharp-2.0.pc:${PORTSDIR}/www/gecko-sharp20
 LIB_DEPENDS=	sqlite.2:${PORTSDIR}/databases/sqlite2
-RUN_DEPENDS=	gapi-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp10
+RUN_DEPENDS=	gapi2-parser:${PORTSDIR}/x11-toolkits/gtk-sharp20 \
+		${X11BASE}/libdata/pkgconfig/evolution-sharp.pc:${PORTSDIR}/mail/evolution-sharp \
+		${X11BASE}/libdata/pkgconfig/gecko-sharp-2.0.pc:${PORTSDIR}/www/gecko-sharp20
 
-USE_GNOME=	gnomeprefix gnomehack gconf2
+.if !defined(WITH_MOZILLA)
+MOZILLA=	mozilla
+.else
+.if ${WITH_MOZILLA}=="firefox"
+MOZILLA=	firefox
+.else
+MOZILLA=	mozilla
+.endif
+.endif
+
+USE_GNOME=	gnomeprefix gnomehack gconf2 intlhack
 USE_GMAKE=	yes
 USE_X_PREFIX=   yes
 USE_LIBTOOL_VER=15
@@ -29,11 +43,21 @@ CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 DOCS=		AUTHORS COPYING ChangeLog NEWS README TODO
 GCONF_SCHEMAS=	mcatalog.schemas
 
-BROKEN="doesn't build with Mono 1.1.7 yet"
+pre-everything::
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} " By default ${PORTNAME} uses www/mozilla for html rendering, but you can"
+	@${ECHO_MSG} " change this by defining WITH_MOZILLA to one of the following values:"
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "  firefox       "
+	@${ECHO_MSG} ""
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/pixmaps/mcatalog|/pixmaps|g' \
 		${WRKSRC}/images/Makefile.in
+	@${REINPLACE_CMD} -e 's|@prefix@/share|${PREFIX}/share/gnome|g' \
+		${WRKSRC}/mcatalog.desktop.in
+	@${REINPLACE_CMD} -e 's|%%MOZILLA%%|${X11BASE}/lib/${MOZILLA}|g' \
+		${WRKSRC}/src/mcatalog.in
 
 .ifndef (NOPORTDOCS)
 post-install:
@@ -43,4 +67,5 @@ post-install:
 .endfor
 .endif
 
+.include "${.CURDIR}/../../lang/mono/bsd.mono.mk"
 .include <bsd.port.mk>
diff --git a/deskutils/mcatalog/distinfo b/deskutils/mcatalog/distinfo
index c0f2d008f429..b16ad6bb6f90 100644
--- a/deskutils/mcatalog/distinfo
+++ b/deskutils/mcatalog/distinfo
@@ -1,2 +1,2 @@
-MD5 (mcatalog-0.0.6.tar.gz) = a7212bff2285f7c7a007b893e48a809f
-SIZE (mcatalog-0.0.6.tar.gz) = 458505
+MD5 (mcatalog-0.2.tar.gz) = 2b88fda7c47b808ab38b80ba63ba2fd6
+SIZE (mcatalog-0.2.tar.gz) = 584389
diff --git a/deskutils/mcatalog/files/patch-src::Defines.cs.in b/deskutils/mcatalog/files/patch-src::Defines.cs.in
index 9238d9dbfc20..ce9beac641fa 100644
--- a/deskutils/mcatalog/files/patch-src::Defines.cs.in
+++ b/deskutils/mcatalog/files/patch-src::Defines.cs.in
@@ -1,13 +1,14 @@
---- src/Defines.cs.in.orig	Sun Oct 24 23:22:12 2004
-+++ src/Defines.cs.in	Sun Oct 24 23:24:03 2004
-@@ -9,8 +9,8 @@
+--- src/Defines.cs.in.orig	Sun Aug  7 13:40:06 2005
++++ src/Defines.cs.in	Sun Aug  7 13:40:44 2005
+@@ -9,9 +9,9 @@
  
  public class Defines {
  	public static string VERSION = "@version@";
 -	public static string DATADIR = "@prefix@/share";
 +	public static string DATADIR = "@prefix@/share/gnome";
  	public static string APP_DATADIR = DATADIR + "/mcatalog";
- 	public static string IMAGE_DATADIR = DATADIR + "/pixmaps/mcatalog";
+ 	public static string IMAGE_DATADIR = APP_DATADIR + "/pixmaps";
+ 	public static string TEMPLATES_DATADIR = APP_DATADIR + "/templates";
 -	public static string GNOME_LOCALE_DIR = DATADIR + "/locale";
 +	public static string GNOME_LOCALE_DIR = "@prefix@/share/locale";
  }
diff --git a/deskutils/mcatalog/files/patch-src::Makefile.in b/deskutils/mcatalog/files/patch-src::Makefile.in
deleted file mode 100644
index b4b8cff3a965..000000000000
--- a/deskutils/mcatalog/files/patch-src::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig	Sun Oct 24 22:54:23 2004
-+++ src/Makefile.in	Sun Oct 24 22:55:42 2004
-@@ -152,7 +152,7 @@
- MCATALOG_CSFILES =  	$(MCATALOG_ORIGINAL_CSFILES)				$(srcdir)/Defines.cs
- 
- 
--ASSEMBLIES =  	/r:System.Data					/r:System.Web.Services				/r:Mono.Data.SqliteClient			/r:Mono.Posix					/pkg:gtkhtml-sharp				/pkg:glade-sharp				/pkg:gconf-sharp
-+ASSEMBLIES =  	/r:System.Data					/r:System.Web.Services				/r:Mono.Data.SqliteClient			/r:Mono.Posix					$(shell pkg-config --libs gtkhtml-sharp glade-sharp gconf-sharp)
- 
- 
- RESOURCES =  	/resource:$(top_srcdir)/resources/mainwindow.glade,mainwindow.glade 				/resource:$(top_srcdir)/resources/themeselection.glade,themeselection.glade			/resource:$(top_srcdir)/resources/films.png,films.png 						/resource:$(top_srcdir)/resources/Database.sql,Database.sql 					/resource:$(top_srcdir)/resources/books.png,books.png 						/resource:$(top_srcdir)/resources/template_items_books.html,template_items_books.html 		/resource:$(top_srcdir)/resources/overviewbg.png,overviewbg.png 				/resource:$(top_srcdir)/resources/overviewbgnp.png,overviewbgnp.png 				/resource:$(top_srcdir)/resources/overview.png,overview.png 					/resource:$(top_srcdir)/resources/list.png,list.png 						/resource:$(top_srcdir)/resources/dialogaddbook.glade,dialogaddbook.glade 			/resource:$(top_srcdir)/resources/bigstar.png,bigstar.png 					/resource:$(top_srcdir)/resources/littlestar.png,littlestar.png 				/resource:$(top_srcdir)/resources/dialogaddfilm.glade,dialogaddfilm.glade 			/resource:$(top_srcdir)/resources/template_items_films.html,template_items_films.html 		/resource:$(top_srcdir)/resources/empty.png,empty.png 						/resource:$(top_srcdir)/resources/borrowed.png,borrowed.png 					/resource:$(top_srcdir)/resources/music.png,music.png
diff --git a/deskutils/mcatalog/files/patch-src_mcatalog.in b/deskutils/mcatalog/files/patch-src_mcatalog.in
new file mode 100644
index 000000000000..0962d28a10a0
--- /dev/null
+++ b/deskutils/mcatalog/files/patch-src_mcatalog.in
@@ -0,0 +1,16 @@
+--- src/mcatalog.in.orig	Sun Aug  7 14:51:42 2005
++++ src/mcatalog.in	Sun Aug  7 14:51:49 2005
+@@ -1,6 +1,12 @@
+ #!/bin/sh
+ 
+-export LD_LIBRARY_PATH="@prefix@/lib/mcatalog:$LD_LIBRARY_PATH"
++MOZILLA_HOME=%%MOZILLA%%
++export MOZILLA_HOME
++ 
++MOZILLA_FIVE_HOME=%%MOZILLA%%
++export MOZILLA_FIVE_HOME
++
++export LD_LIBRARY_PATH="@prefix@/lib/mcatalog:%%MOZILLA%%:$LD_LIBRARY_PATH"
+ EXE_TO_RUN="@prefix@/lib/mcatalog/mcatalog.exe"
+ 
+ mono $EXE_TO_RUN "$@"
diff --git a/deskutils/mcatalog/pkg-plist b/deskutils/mcatalog/pkg-plist
index 94058d7ef204..abd5e068fc63 100644
--- a/deskutils/mcatalog/pkg-plist
+++ b/deskutils/mcatalog/pkg-plist
@@ -8,27 +8,63 @@ lib/mcatalog/mcatalog.exe
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 share/gnome/application-registry/mcatalog.applications
 share/gnome/applications/mcatalog.desktop
-share/gnome/pixmaps/mcatalog.png
-share/gnome/pixmaps/mcatalog/default/background.jpg
-share/gnome/pixmaps/mcatalog/default/shelf.png
-share/gnome/pixmaps/mcatalog/grass/background.jpg
-share/gnome/pixmaps/mcatalog/grass/shelf.png
-share/gnome/pixmaps/mcatalog/leather/background.jpg
-share/gnome/pixmaps/mcatalog/leather/shelf.png
-share/gnome/pixmaps/mcatalog/metal/background.jpg
-share/gnome/pixmaps/mcatalog/metal/shelf.png
-share/gnome/pixmaps/mcatalog/wood/background.jpg
-share/gnome/pixmaps/mcatalog/wood/shelf.png
+share/gnome/mcatalog/pixmaps/bigstar.png
+share/gnome/mcatalog/pixmaps/borrowed.png
+share/gnome/mcatalog/pixmaps/default/background.jpg
+share/gnome/mcatalog/pixmaps/default/shelf.png
+share/gnome/mcatalog/pixmaps/grass/background.jpg
+share/gnome/mcatalog/pixmaps/grass/shelf.png
+share/gnome/mcatalog/pixmaps/leather/background.jpg
+share/gnome/mcatalog/pixmaps/leather/shelf.png
+share/gnome/mcatalog/pixmaps/littlestar.png
+share/gnome/mcatalog/pixmaps/logo.png
+share/gnome/mcatalog/pixmaps/mcatalog.png
+share/gnome/mcatalog/pixmaps/metal/background.jpg
+share/gnome/mcatalog/pixmaps/metal/shelf.png
+share/gnome/mcatalog/pixmaps/shelfbg.png
+share/gnome/mcatalog/pixmaps/shelfbgnp.png
+share/gnome/mcatalog/pixmaps/wood/background.jpg
+share/gnome/mcatalog/pixmaps/wood/shelf.png
+share/gnome/mcatalog/templates/albums_printable.html
+share/gnome/mcatalog/templates/albums_printable.png
+share/gnome/mcatalog/templates/albums_printable.rc
+share/gnome/mcatalog/templates/albums_simple.html
+share/gnome/mcatalog/templates/albums_simple.png
+share/gnome/mcatalog/templates/albums_simple.rc
+share/gnome/mcatalog/templates/books_printable.html
+share/gnome/mcatalog/templates/books_printable.png
+share/gnome/mcatalog/templates/books_printable.rc
+share/gnome/mcatalog/templates/books_simple.html
+share/gnome/mcatalog/templates/books_simple.png
+share/gnome/mcatalog/templates/books_simple.rc
+share/gnome/mcatalog/templates/films_printable.html
+share/gnome/mcatalog/templates/films_printable.png
+share/gnome/mcatalog/templates/films_printable.rc
+share/gnome/mcatalog/templates/films_simple.html
+share/gnome/mcatalog/templates/films_simple.png
+share/gnome/mcatalog/templates/films_simple.rc
 share/locale/cs/LC_MESSAGES/mcatalog.mo
 share/locale/de/LC_MESSAGES/mcatalog.mo
+share/locale/en_CA/LC_MESSAGES/mcatalog.mo
+share/locale/en_GB/LC_MESSAGES/mcatalog.mo
 share/locale/es/LC_MESSAGES/mcatalog.mo
+share/locale/fr/LC_MESSAGES/mcatalog.mo
 share/locale/hu/LC_MESSAGES/mcatalog.mo
 share/locale/it/LC_MESSAGES/mcatalog.mo
-@dirrm share/gnome/pixmaps/mcatalog/wood
-@dirrm share/gnome/pixmaps/mcatalog/metal
-@dirrm share/gnome/pixmaps/mcatalog/leather
-@dirrm share/gnome/pixmaps/mcatalog/grass
-@dirrm share/gnome/pixmaps/mcatalog/default
-@dirrm share/gnome/pixmaps/mcatalog
+share/locale/nl/LC_MESSAGES/mcatalog.mo
+share/locale/pt_BR/LC_MESSAGES/mcatalog.mo
+share/locale/rw/LC_MESSAGES/mcatalog.mo
+share/locale/sv/LC_MESSAGES/mcatalog.mo
+share/locale/zh_CN/LC_MESSAGES/mcatalog.mo
+@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/rw 2> /dev/null || true
+@dirrm share/gnome/mcatalog/templates
+@dirrm share/gnome/mcatalog/pixmaps/wood
+@dirrm share/gnome/mcatalog/pixmaps/metal
+@dirrm share/gnome/mcatalog/pixmaps/leather
+@dirrm share/gnome/mcatalog/pixmaps/grass
+@dirrm share/gnome/mcatalog/pixmaps/default
+@dirrm share/gnome/mcatalog/pixmaps
+@dirrm share/gnome/mcatalog
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/mcatalog