5 files changed, 37 insertions, 3 deletions

diff --git a/security/gnome-keyring-sharp/Makefile b/security/gnome-keyring-sharp/Makefile
index db988bf68d37..7e9cc691addb 100644
--- a/security/gnome-keyring-sharp/Makefile
+++ b/security/gnome-keyring-sharp/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gnome-keyring-sharp
 PORTVERSION=	1.0.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	security
 MASTER_SITES=	http://www.go-mono.com/archive/${PORTNAME}/
 
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-1.0.pc:devel/ndesk-dbus
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 GNU_CONFIGURE=	yes
-USES=		gmake libtool mono pathfix pkgconfig
+USES=		autoreconf gmake libtool mono pathfix pkgconfig
 USE_GNOME=	gtksharp20
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
diff --git a/security/gnome-keyring-sharp/files/patch-configure.ac b/security/gnome-keyring-sharp/files/patch-configure.ac
new file mode 100644
index 000000000000..851900d6279f
--- /dev/null
+++ b/security/gnome-keyring-sharp/files/patch-configure.ac
@@ -0,0 +1,16 @@
+--- configure.ac.orig	2018-01-20 15:44:37 UTC
++++ configure.ac
+@@ -20,8 +20,13 @@ AC_PATH_PROG(CSC, csc, no)
+ AC_PATH_PROG(GMCS, gmcs, no)
+ AC_PATH_PROG(MCS, mcs, no)
+ AC_PATH_PROG(RUNTIME, mono, no)
++AC_PATH_PROG(SN, sn, no)
+ CS="C#"
+ 
++if test "x$SN" = "xno" ; then
++	AC_MSG_ERROR([No key signing tool found])
++fi
++
+ if test "x$CSC" = "xno" ; then
+ 	if test "x$GMCS" = "xno" ; then
+ 		if test "x$MCS" = "xno" ; then
diff --git a/security/gnome-keyring-sharp/files/patch-src_Gnome.Keyring_AssemblyInfo.cs.in b/security/gnome-keyring-sharp/files/patch-src_Gnome.Keyring_AssemblyInfo.cs.in
new file mode 100644
index 000000000000..7875569f5c00
--- /dev/null
+++ b/security/gnome-keyring-sharp/files/patch-src_Gnome.Keyring_AssemblyInfo.cs.in
@@ -0,0 +1,8 @@
+--- src/Gnome.Keyring/AssemblyInfo.cs.in.orig	2010-06-30 23:06:58 UTC
++++ src/Gnome.Keyring/AssemblyInfo.cs.in
+@@ -35,5 +35,6 @@ using System.Runtime.CompilerServices;
+ [assembly: AssemblyDescription ("Client library to access the GNOME Keyring daemon")]
+ [assembly: AssemblyCopyright ("(c) 2006 Novell, Inc.")]
+ [assembly: AssemblyCompany ("Novell, Inc.")]
+ [assembly: AssemblyKeyFile ("Gnome.Keyring.snk")]
++[assembly: AssemblyDelaySignAttribute (true)]
diff --git a/security/gnome-keyring-sharp/files/patch-src_Makefile.am b/security/gnome-keyring-sharp/files/patch-src_Makefile.am
new file mode 100644
index 000000000000..34e49119f436
--- /dev/null
+++ b/security/gnome-keyring-sharp/files/patch-src_Makefile.am
@@ -0,0 +1,10 @@
+--- src/Makefile.am.orig	2018-01-20 15:47:50 UTC
++++ src/Makefile.am
+@@ -33,6 +33,7 @@ all: $(ASSEMBLY)
+ 
+ $(ASSEMBLY): $(gnomekeyring_build_sources) $(SNK)
+ 	$(CSC) $(CSFLAGS) $(gnomekeyring_references) -target:library -out:$@ $(gnomekeyring_build_sources)
++	$(SN) -R $@ $(SNK)
+ 
+ $(SNK): $(top_srcdir)/$(SNK)
+ 	cp $(top_srcdir)/$(SNK) .
diff --git a/security/gnome-keyring-sharp/pkg-plist b/security/gnome-keyring-sharp/pkg-plist
index 6ea3281bd49a..c17716ddca1a 100644
--- a/security/gnome-keyring-sharp/pkg-plist
+++ b/security/gnome-keyring-sharp/pkg-plist
@@ -2,7 +2,7 @@ lib/libgnome-keyring-sharp-glue.a
 lib/libgnome-keyring-sharp-glue.so
 lib/mono/gac/Gnome.Keyring/1.0.0.0__1a73e1bde00c9b66/Gnome.Keyring.dll
 lib/mono/gac/Gnome.Keyring/1.0.0.0__1a73e1bde00c9b66/Gnome.Keyring.dll.config
-lib/mono/gac/Gnome.Keyring/1.0.0.0__1a73e1bde00c9b66/Gnome.Keyring.dll.mdb
+lib/mono/gac/Gnome.Keyring/1.0.0.0__1a73e1bde00c9b66/Gnome.Keyring.pdb
 lib/mono/gnome-keyring-sharp-1.0/Gnome.Keyring.dll
 lib/monodoc/sources/Gnome.Keyring.source
 lib/monodoc/sources/Gnome.Keyring.tree