aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@FreeBSD.org>2010-05-14 12:36:48 +0800
committermarcus <marcus@FreeBSD.org>2010-05-14 12:36:48 +0800
commit8f72e2216f4d0b2f9ec9d00d6c056d58f1f221e9 (patch)
treedd4c71dfd2e2f94c24f34cfd4eb5a383821d7834
parent03608d166e85dfe645cf787dd888a755453847e4 (diff)
downloadfreebsd-ports-gnome-8f72e2216f4d0b2f9ec9d00d6c056d58f1f221e9.tar.gz
freebsd-ports-gnome-8f72e2216f4d0b2f9ec9d00d6c056d58f1f221e9.tar.zst
freebsd-ports-gnome-8f72e2216f4d0b2f9ec9d00d6c056d58f1f221e9.zip
Properly install the missing org.freedesktop.secrets.service file.
Reported by: Jonathan Chen <jonc@chen.org.nz> Obtained from: https://bugzilla.gnome.org/show_bug.cgi?id=611002
-rw-r--r--security/gnome-keyring/Makefile7
-rw-r--r--security/gnome-keyring/files/org.freedesktop.secrets.service.in3
-rw-r--r--security/gnome-keyring/files/patch-daemon_Makefile.in11
-rw-r--r--security/gnome-keyring/pkg-plist1
4 files changed, 22 insertions, 0 deletions
diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index 12995c21b88e..61d1a420c75d 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gnome-keyring
PORTVERSION= 2.30.1
+PORTREVISION= 1
CATEGORIES= security gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -28,4 +29,10 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
GCONF_SCHEMAS= gnome-keyring.schemas
+SUB_FILES= org.freedesktop.secrets.service
+
+post-install:
+ ${INSTALL_DATA} ${WRKDIR}/org.freedesktop.secrets.service \
+ ${PREFIX}/share/dbus-1/services
+
.include <bsd.port.mk>
diff --git a/security/gnome-keyring/files/org.freedesktop.secrets.service.in b/security/gnome-keyring/files/org.freedesktop.secrets.service.in
new file mode 100644
index 000000000000..6f3f308b8c6e
--- /dev/null
+++ b/security/gnome-keyring/files/org.freedesktop.secrets.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.freedesktop.secrets
+Exec=%%PREFIX%%/bin/gnome-keyring-daemon --start --foreground --components=secrets
diff --git a/security/gnome-keyring/files/patch-daemon_Makefile.in b/security/gnome-keyring/files/patch-daemon_Makefile.in
new file mode 100644
index 000000000000..9ac991927239
--- /dev/null
+++ b/security/gnome-keyring/files/patch-daemon_Makefile.in
@@ -0,0 +1,11 @@
+--- daemon/Makefile.in.orig 2010-05-14 00:25:44.000000000 -0400
++++ daemon/Makefile.in 2010-05-14 00:25:29.000000000 -0400
+@@ -906,7 +906,7 @@ uninstall-am: uninstall-binPROGRAMS unin
+
+
+ # Rule to make the service file with bindir expanded
+-$(service_DATA): $(service_in_files) Makefile
++%.service: %.service.in Makefile
+ @sed -e "s|\@PATH\@|$(service_PATH)|" $< > $@
+
+ @INTLTOOL_DESKTOP_RULE@
diff --git a/security/gnome-keyring/pkg-plist b/security/gnome-keyring/pkg-plist
index ab1d77448aec..8094cfb282a5 100644
--- a/security/gnome-keyring/pkg-plist
+++ b/security/gnome-keyring/pkg-plist
@@ -44,6 +44,7 @@ lib/pam_gnome_keyring.so
libdata/pkgconfig/gcr-0.pc
libdata/pkgconfig/gp11-0.pc
libexec/gnome-keyring-prompt
+share/dbus-1/services/org.freedesktop.secrets.service
share/dbus-1/services/org.gnome.keyring.service
share/doc/gcr/ch01.html
share/doc/gcr/gcr-GcrCertificate.html