4 files changed, 126 insertions, 2 deletions

diff --git a/devel/dbus-sharp/Makefile b/devel/dbus-sharp/Makefile
index 18f226870a04..56d3d1e01b3f 100644
--- a/devel/dbus-sharp/Makefile
+++ b/devel/dbus-sharp/Makefile
@@ -6,20 +6,23 @@
 #   $Id: Makefile,v 1.18 2006/01/02 20:54:03 tmclau02 Exp $
 #
 
-PORTREVISION=	13
+PORTVERSION=	0.62
+PORTREVISION=	16
 CATEGORIES=	devel gnome
 PKGNAMESUFFIX=	-sharp
 
 MAINTAINER=	bsd-sharp-list@forge.novell.com
 COMMENT=	Mono interface to the D-BUS messaging system
 
-LIB_DEPENDS=	dbus-1.2:${PORTSDIR}/devel/dbus
+LIB_DEPENDS=	dbus-1.3:${PORTSDIR}/devel/dbus
 BUILD_DEPENDS=	monodoc:${PORTSDIR}/devel/mono-tools
 RUN_DEPENDS=	monodoc:${PORTSDIR}/devel/mono-tools
 
 MASTERDIR=	${.CURDIR}/../dbus
 BUILD_WRKSRC=	${WRKSRC}/mono
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
+PATCHDIR=	${.CURDIR}/files
+MD5_FILE=	${.CURDIR}/distinfo
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
 
@@ -31,6 +34,7 @@ CONFIGURE_ARGS=	--enable-mono \
 		--disable-gcj \
 		--disable-gtk \
 		--disable-qt \
+		--with-test-socket-dir=${WRKDIR} \
 		--with-system-pid-file=/var/run/dbus.pid \
 		--with-system-socket=/var/run/dbus \
 		--with-session-socket-dir=/var/tmp \
diff --git a/devel/dbus-sharp/distinfo b/devel/dbus-sharp/distinfo
new file mode 100644
index 000000000000..363c5a579806
--- /dev/null
+++ b/devel/dbus-sharp/distinfo
@@ -0,0 +1,3 @@
+MD5 (dbus-0.62.tar.gz) = ba7692f63d0e9f1ef06703dff56cb650
+SHA256 (dbus-0.62.tar.gz) = 884cc2083add655df57acc7bb144c61e9beeabf08ef76fa86929a58d7bc96707
+SIZE (dbus-0.62.tar.gz) = 1737361
diff --git a/devel/dbus-sharp/files/patch-mono_Makefile.in b/devel/dbus-sharp/files/patch-mono_Makefile.in
new file mode 100644
index 000000000000..7f1d7026cf22
--- /dev/null
+++ b/devel/dbus-sharp/files/patch-mono_Makefile.in
@@ -0,0 +1,108 @@
+--- mono/Makefile.in.orig	Thu Jun 30 23:27:19 2005
++++ mono/Makefile.in	Thu Jun 30 23:27:43 2005
+@@ -299,7 +299,7 @@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-SUBDIRS = . doc example
++SUBDIRS = . example
+ TARGET = $(ASSEMBLY)
+ NOINST_EXES = test-dbus-sharp.exe
+ ASSEMBLY_NAME = dbus-sharp
+@@ -345,6 +345,10 @@
+ 	$(ASSEMBLY).config.in   \
+ 	dbus-sharp.snk
+ 
++pkgconfigdir = $(prefix)/libdata/pkgconfig
++pkgconfigDATA_INSTALL = $(INSTALL_DATA)
++pkgconfig_DATA = ../dbus-sharp.pc
++
+ all: all-recursive
+ 
+ .SUFFIXES:
+@@ -391,6 +395,23 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
++install-pkgconfigDATA: $(pkgconfig_DATA)
++	@$(NORMAL_INSTALL)
++	test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
++	@list='$(pkgconfig_DATA)'; for p in $$list; do \
++	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++	  f="`echo $$p | sed -e 's|^.*/||'`"; \
++	  echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
++	 $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \
++	done
++
++uninstall-pkgconfigDATA:
++	@$(NORMAL_UNINSTALL)
++	@list='$(pkgconfig_DATA)'; for p in $$list; do \
++	  f="`echo $$p | sed -e 's|^.*/||'`"; \
++	  echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
++	done
+ 
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+@@ -569,7 +590,7 @@
+ 	done
+ check-am: all-am
+ check: check-recursive
+-all-am: Makefile
++all-am: Makefile $(pkgconfig_DATA)
+ installdirs: installdirs-recursive
+ installdirs-am:
+ install: install-recursive
+@@ -614,7 +635,7 @@
+ 
+ info-am:
+ 
+-install-data-am: install-data-local
++install-data-am: install-data-local install-pkgconfigDATA
+ 
+ install-exec-am:
+ 
+@@ -640,7 +661,7 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-local
++uninstall-am: uninstall-info-am uninstall-local uninstall-pkgconfigDATA
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+@@ -651,12 +672,13 @@
+ 	html-am info info-am install install-am install-data \
+ 	install-data-am install-data-local install-exec \
+ 	install-exec-am install-info install-info-am install-man \
+-	install-strip installcheck installcheck-am installdirs \
++	install-pkgconfigDATA install-strip installcheck \
++	installcheck-am installdirs \
+ 	installdirs-am maintainer-clean maintainer-clean-generic \
+ 	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+ 	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+ 	tags tags-recursive uninstall uninstall-am uninstall-info-am \
+-	uninstall-local
++	uninstall-pkgconfigDATA uninstall-local
+ 
+ 
+ all-am: $(TARGET)
+@@ -672,14 +694,14 @@
+ 
+ install-data-local:
+ 	@if test -n '$(TARGET)'; then                       \
+-	  echo "$(GACUTIL) /i $(ASSEMBLY) /f /package dbus-sharp /gacdir $(DESTDIR)$(libdir)";    \
+-	  $(GACUTIL) /i $(ASSEMBLY) /f /package dbus-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir) || exit 1; \
++	  echo "$(GACUTIL) /i $(ASSEMBLY) /f /package dbus-sharp /gacdir $(DESTDIR)$(libdir) /root $(DESTDIR)$(libdir)";    \
++	  $(GACUTIL) /i $(ASSEMBLY) /f /package dbus-sharp /gacdir $(DESTDIR)$(libdir) /root $(DESTDIR)$(libdir) || exit 1; \
+ 	fi
+ 
+ uninstall-local:
+ 	@if test -n '$(TARGET)'; then                       \
+-	  echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package dbus-sharp /gacdir $(DESTDIR)$(libdir)";  \
+-	  $(GACUTIL) /u $(ASSEMBLY_NAME) /package dbus-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir) || exit 1;   \
++	  echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package dbus-sharp /gacdir $(DESTDIR)$(libdir) /root $(DESTDIR)$(libdir)";  \
++	  $(GACUTIL) /u $(ASSEMBLY_NAME) /package dbus-sharp /gacdir $(DESTDIR)$(libdir) /root $(DESTDIR)$(libdir)|| exit 1;   \
+ 	fi
+ # 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.
diff --git a/devel/dbus-sharp/files/patch-mono_dbus-sharp.dll.config.in b/devel/dbus-sharp/files/patch-mono_dbus-sharp.dll.config.in
new file mode 100644
index 000000000000..b7c0032aad1f
--- /dev/null
+++ b/devel/dbus-sharp/files/patch-mono_dbus-sharp.dll.config.in
@@ -0,0 +1,9 @@
+--- mono/dbus-sharp.dll.config.in.orig	Sat Mar 12 20:56:29 2005
++++ mono/dbus-sharp.dll.config.in	Wed Apr 13 21:19:06 2005
+@@ -1,4 +1,4 @@
+ <configuration>
+-  <dllmap dll="dbus-1" target="libdbus-1@LIB_PREFIX@.@LT_CURRENT@@LIB_SUFFIX@"/>
+-  <dllmap dll="dbus-glib-1" target="libdbus-glib-1@LIB_PREFIX@.@LT_CURRENT@@LIB_SUFFIX@"/>
++  <dllmap dll="dbus-1" target="libdbus-1@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="dbus-glib-1" target="libdbus-glib-1@LIB_PREFIX@@LIB_SUFFIX@"/>
+ </configuration>