6 files changed, 15 insertions, 60 deletions

diff --git a/x11-toolkits/gtk-sharp20/Makefile b/x11-toolkits/gtk-sharp20/Makefile
index 19d77b9766a1..c8e9551160f2 100644
--- a/x11-toolkits/gtk-sharp20/Makefile
+++ b/x11-toolkits/gtk-sharp20/Makefile
@@ -6,17 +6,16 @@
 #
 
 PORTNAME=	gtk-sharp
-PORTVERSION=	0.6.0.1
+PORTVERSION=	0.7
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	jmallett
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	gtk-sharp
 
 MAINTAINER=	gnome@FreeBSD.org
 
 BUILD_DEPENDS=	mono:${PORTSDIR}/lang/mono
 LIB_DEPENDS=	gnomedb-2:${PORTSDIR}/databases/libgnomedb \
-		gnomeui-2:${PORTSDIR}/x11-toolkits/libgnomeui \
-		gphoto2.2:${PORTSDIR}/graphics/gphoto2
+		gnomeui-2:${PORTSDIR}/x11-toolkits/libgnomeui
 
 # XXX Should conditionalise all the different parts of gtk# maybe.
 
diff --git a/x11-toolkits/gtk-sharp20/distinfo b/x11-toolkits/gtk-sharp20/distinfo
index ff129b60f38c..6414d19ff0f2 100644
--- a/x11-toolkits/gtk-sharp20/distinfo
+++ b/x11-toolkits/gtk-sharp20/distinfo
@@ -1 +1 @@
-MD5 (gtk-sharp-0.6.0.1.tar.gz) = e19c6f39761408b808f186941b246bf1
+MD5 (gtk-sharp-0.7.tar.gz) = 54237554ced8f772ab2b5e35c6200dde
diff --git a/x11-toolkits/gtk-sharp20/files/patch-gconf_Makefile.in b/x11-toolkits/gtk-sharp20/files/patch-gconf_Makefile.in
deleted file mode 100644
index b6e6fb490429..000000000000
--- a/x11-toolkits/gtk-sharp20/files/patch-gconf_Makefile.in
+++ /dev/null
@@ -1,21 +0,0 @@
---- gconf/Makefile.in	Wed Jan  1 17:04:56 2003
-+++ gconf/Makefile.in	Wed Jan  1 17:05:27 2003
-@@ -5,15 +5,15 @@
- 
- linux:
- 	for i in $(SUBDIRS); do \
--		make -C $$i || exit 1; \
-+		$(MAKE) -C $$i || exit 1; \
- 	done
- 
- install: all
- 	for i in $(SUBDIRS); do \
--		make -C $$i install || exit 1; \
-+		$(MAKE) -C $$i install || exit 1; \
- 	done
- 
- clean:
- 	for i in $(SUBDIRS); do \
--		make -C $$i clean || exit 1; \
-+		$(MAKE) -C $$i clean || exit 1; \
- 	done
diff --git a/x11-toolkits/gtk-sharp20/files/patch-parser_Makefile.in b/x11-toolkits/gtk-sharp20/files/patch-parser_Makefile.in
deleted file mode 100644
index 84ed9b8b86d9..000000000000
--- a/x11-toolkits/gtk-sharp20/files/patch-parser_Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- parser/Makefile.in	Tue Sep  3 23:31:19 2002
-+++ parser/Makefile.in	Wed Dec 11 15:35:33 2002
-@@ -1,4 +1,7 @@
- CC = @CC@
-+CFLAGS = @CFLAGS@
-+CPPFLAGS = @CPPFLAGS@
-+BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
- 
- SCRIPTS = \
- 	gapi.pl \
-@@ -10,7 +13,7 @@
- all: $(SCRIPTS) $(MODULES) gapi_format_xml
- 
- gapi_format_xml: formatXml.c
--	$(CC) -o gapi_format_xml formatXml.c `pkg-config --cflags --libs libxml-2.0 glib-2.0`
-+	$(CC) $(CPPFLAGS) -o gapi_format_xml formatXml.c `pkg-config --cflags --libs libxml-2.0 glib-2.0` $(CFLAGS) $(BASE_DEPENDENCIES_CFLAGS)
- 
- clean:
- 	rm -f gapi_format_xml
diff --git a/x11-toolkits/gtk-sharp20/files/patch-sample_Makefile.in b/x11-toolkits/gtk-sharp20/files/patch-sample_Makefile.in
index 2ac8663ca28f..d393c828bdfb 100644
--- a/x11-toolkits/gtk-sharp20/files/patch-sample_Makefile.in
+++ b/x11-toolkits/gtk-sharp20/files/patch-sample_Makefile.in
@@ -1,25 +1,23 @@
---- sample/Makefile.in.orig	Wed Jan  1 17:09:21 2003
-+++ sample/Makefile.in	Wed Jan  1 17:08:58 2003
-@@ -19,7 +19,7 @@
+--- sample/Makefile.in.orig	Sun Jan 26 15:46:02 2003
++++ sample/Makefile.in	Sun Jan 26 15:46:28 2003
+@@ -19,7 +19,6 @@
  	$(CSC) /unsafe /out:button.exe /r:../glib/glib-sharp.dll /r:../gtk/gtk-sharp.dll ButtonApp.cs
  
- linux: gtk-hello-world.exe button.exe menu.exe size.exe scribble.exe treeviewdemo.exe $(GNOME_TARGETS) $(GLADE_TARGETS)
--@ENABLE_GNOME_TRUE@	make -C gconf 
-+@ENABLE_GNOME_TRUE@	$(MAKE) -C gconf 
+ linux: gtk-hello-world.exe button.exe subclass.exe menu.exe size.exe scribble.exe treeviewdemo.exe $(GNOME_TARGETS) $(GLADE_TARGETS)
+-@ENABLE_GNOME_TRUE@	$(MAKE) -C gconf 
  
  gtk-hello-world.exe: HelloWorld.cs
  	$(MCS) --unsafe -o gtk-hello-world.exe $(local_paths) $(all_assemblies) HelloWorld.cs
-@@ -56,11 +56,11 @@
+@@ -59,11 +58,9 @@
  
  clean:
  	rm -f *.exe
--@ENABLE_GNOME_TRUE@	make -C gconf clean 
-+@ENABLE_GNOME_TRUE@	$(MAKE) -C gconf clean 
+-@ENABLE_GNOME_TRUE@	$(MAKE) -C gconf clean 
  
  unix:
  	@echo "'make unix' is broken for now."
  
  install: linux
--@ENABLE_GNOME_TRUE@	make -C gconf install 
-+@ENABLE_GNOME_TRUE@	$(MAKE) -C gconf install 
- 	
+-@ENABLE_GNOME_TRUE@	$(MAKE) -C gconf install 
+-	
++	@true
diff --git a/x11-toolkits/gtk-sharp20/pkg-plist b/x11-toolkits/gtk-sharp20/pkg-plist
index ff5c74980ac6..51e71524480b 100644
--- a/x11-toolkits/gtk-sharp20/pkg-plist
+++ b/x11-toolkits/gtk-sharp20/pkg-plist
@@ -16,9 +16,7 @@ lib/glib-sharp.dll
 lib/gnome-sharp.dll
 lib/gnomedb-sharp.dll
 lib/gtk-sharp.dll
-lib/libgtksharpglue.a
 lib/libgtksharpglue.so
-lib/libgtksharpglue.so.0
 lib/pango-sharp.dll
 share/gapi/art-api.xml
 share/gapi/atk-api.xml