4 files changed, 14 insertions, 29 deletions

diff --git a/security/libmatekeyring/Makefile b/security/libmatekeyring/Makefile
index 342241e78586..e806deb26377 100644
--- a/security/libmatekeyring/Makefile
+++ b/security/libmatekeyring/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libmatekeyring
 PORTVERSION=	1.6.0
+PORTREVISION=	1
 CATEGORIES=	security mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
@@ -16,17 +17,17 @@ LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt \
 
 PORTSCOUT=	limitw:1,even
 
-USES=		gettext gmake pathfix pkgconfig
-USE_XZ=		yes
-USE_MATE=	autogen common:build intlhack ltverhack
+USES=		gettext gmake libtool pathfix pkgconfig tar:xz
+USE_MATE=	autogen common:build intlhack
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	aclocal:env autoconf:env automake:env libtool libtoolize:env
+USE_AUTOTOOLS=	aclocal:env autoconf:env automake:env libtoolize:env
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-gtk-doc \
 		--with-html-dir=${PREFIX}/share/doc
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 PATHFIX_MAKEFILEIN=	Makefile.*
+INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>
diff --git a/security/libmatekeyring/pkg-plist b/security/libmatekeyring/pkg-plist
index 1bc86246633a..c87ee1f1f3af 100644
--- a/security/libmatekeyring/pkg-plist
+++ b/security/libmatekeyring/pkg-plist
@@ -1,10 +1,9 @@
 include/mate-keyring-1/mate-keyring-memory.h
 include/mate-keyring-1/mate-keyring-result.h
 include/mate-keyring-1/mate-keyring.h
-lib/libmate-keyring.a
-lib/libmate-keyring.la
 lib/libmate-keyring.so
 lib/libmate-keyring.so.1
+lib/libmate-keyring.so.1.0.2
 libdata/pkgconfig/mate-keyring-1.pc
 share/doc/mate-keyring/ch01.html
 share/doc/mate-keyring/home.png
diff --git a/security/mate-keyring/Makefile b/security/mate-keyring/Makefile
index 5cb03c7ed988..eff04ae26caa 100644
--- a/security/mate-keyring/Makefile
+++ b/security/mate-keyring/Makefile
@@ -3,12 +3,13 @@
 
 PORTNAME=	mate-keyring
 PORTVERSION=	1.6.0
+PORTREVISION=	1
 CATEGORIES=	security mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	A program that keeps passwords and other secrets
+COMMENT=	Program that keeps passwords and other secrets
 
 BUILD_DEPENDS=	gtkdoc-check:${PORTSDIR}/textproc/gtk-doc \
 		${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
@@ -19,12 +20,11 @@ RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_ro
 
 PORTSCOUT=	limitw:1,even
 
-USES=		gettext gmake pathfix pkgconfig
-USE_XZ=		yes
-USE_MATE=	autogen common:build intlhack libmatekeyring ltverhack
+USES=		gettext gmake libtool pathfix pkgconfig tar:xz
+USE_MATE=	autogen common:build intlhack libmatekeyring
 USE_GNOME=	gnomehier glib20 gtk20
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	aclocal:env autoconf:env automake:env libtool libtoolize:env
+USE_AUTOTOOLS=	aclocal:env autoconf:env automake:env libtoolize:env
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-pam-dir="${PREFIX}/lib" \
 		--with-root-certs="${LOCALBASE}/share/certs" \
@@ -34,6 +34,7 @@ CONFIGURE_ARGS=	--with-pam-dir="${PREFIX}/lib" \
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 PATHFIX_MAKEFILEIN=	Makefile.*
+INSTALL_TARGET=	install-strip
 
 GLIB_SCHEMAS=	org.mate.crypto.cache.gschema.xml \
 		org.mate.crypto.pgp.gschema.xml
diff --git a/security/mate-keyring/pkg-plist b/security/mate-keyring/pkg-plist
index bd6defa4dfef..c33ab2793130 100644
--- a/security/mate-keyring/pkg-plist
+++ b/security/mate-keyring/pkg-plist
@@ -28,34 +28,18 @@ include/mategcr/gcr/gcr-unlock-options-widget.h
 include/mategcr/gcr/gcr-unlock-options.h
 include/mategcr/gcr/gcr-viewer.h
 include/mategcr/gcr/gcr.h
-lib/libmategck.a
-lib/libmategck.la
 lib/libmategck.so
 lib/libmategck.so.0
-lib/libmategcr.a
-lib/libmategcr.la
+lib/libmategck.so.0.0.0
 lib/libmategcr.so
 lib/libmategcr.so.0
-lib/mate-keyring/devel/gkm-mate2-store-standalone.a
-lib/mate-keyring/devel/gkm-mate2-store-standalone.la
+lib/libmategcr.so.0.0.0
 lib/mate-keyring/devel/gkm-mate2-store-standalone.so
-lib/mate-keyring/devel/gkm-roots-store-standalone.a
-lib/mate-keyring/devel/gkm-roots-store-standalone.la
 lib/mate-keyring/devel/gkm-roots-store-standalone.so
-lib/mate-keyring/devel/gkm-ssh-store-standalone.a
-lib/mate-keyring/devel/gkm-ssh-store-standalone.la
 lib/mate-keyring/devel/gkm-ssh-store-standalone.so
-lib/mate-keyring/devel/gkm-xdg-store-standalone.a
-lib/mate-keyring/devel/gkm-xdg-store-standalone.la
 lib/mate-keyring/devel/gkm-xdg-store-standalone.so
-lib/mate-keyring/standalone/gkm-secret-store-standalone.a
-lib/mate-keyring/standalone/gkm-secret-store-standalone.la
 lib/mate-keyring/standalone/gkm-secret-store-standalone.so
-lib/pam_mate_keyring.a
-lib/pam_mate_keyring.la
 lib/pam_mate_keyring.so
-lib/pkcs11/mate-keyring-pkcs11.a
-lib/pkcs11/mate-keyring-pkcs11.la
 lib/pkcs11/mate-keyring-pkcs11.so
 libdata/pkgconfig/mate-gck-0.pc
 libdata/pkgconfig/mate-gcr-0.pc