Stageify, and misc small cleanups.

Move net/libgweather3 -> net/libgweather.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18965 df743ca5-7f9a-e211-a948-0013205c9059

7 files changed, 36 insertions, 25 deletions

diff --git a/security/gcr/Makefile b/security/gcr/Makefile
index 9f164b1ec..c2fd85ed5 100644
--- a/security/gcr/Makefile
+++ b/security/gcr/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#    $MCom: ports/trunk/security/gcr/Makefile 18610 2013-06-30 16:33:05Z marcus $
+#    $MCom$
 
 PORTNAME=	gcr
 PORTVERSION=	3.6.2
@@ -18,14 +18,17 @@ LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus \
 
 CONFLICTS=	gnome-keyring-2.[0-9]*
 
-NO_STAGE=	yes
 USE_XZ=		yes
 USE_GNOME=	gtk30 intlhack introspection:build
-USES=		gettext gmake pathfix pkgconfig shared-mime-info
+USES=		desktop-file-utils gettext gmake pathfix pkgconfig \
+		shared-mime-info
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 
 GLIB_SCHEMAS=	org.gnome.crypto.pgp.gschema.xml
 
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so*
+
 .include <bsd.port.mk>
diff --git a/security/gcr/pkg-plist b/security/gcr/pkg-plist
index 5d7d6aefa..643b9e07a 100644
--- a/security/gcr/pkg-plist
+++ b/security/gcr/pkg-plist
@@ -271,16 +271,6 @@ share/locale/xh/LC_MESSAGES/gcr.mo
 share/locale/zh_CN/LC_MESSAGES/gcr.mo
 share/locale/zh_HK/LC_MESSAGES/gcr.mo
 share/locale/zh_TW/LC_MESSAGES/gcr.mo
-share/mime/application/pkcs10+pem.xml
-share/mime/application/pkcs12+pem.xml
-share/mime/application/pkcs7-mime+pem.xml
-share/mime/application/pkcs8+pem.xml
-share/mime/application/pkix-cert+pem.xml
-share/mime/application/pkix-crl+pem.xml
-share/mime/application/x-pem-file.xml
-share/mime/application/x-pem-key.xml
-share/mime/application/x-spkac+base64.xml
-share/mime/application/x-spkac.xml
 share/mime/packages/gcr-crypto-types.xml
 @dirrm share/gtk-doc/html/gcr-3
 @dirrm share/gtk-doc/html/gck
diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index 47a5eb93b..a8fa342a1 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/trunk/security/gnome-keyring/Makefile 18610 2013-06-30 16:33:05Z marcus $
+#   $MCom$
 
 PORTNAME=	gnome-keyring
 PORTVERSION=	2.32.1
@@ -18,11 +18,11 @@ RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_ro
 
 CONFLICTS=	gnome-keyring-3.[0-9]* gcr-3.[0-9]*
 
-NO_STAGE=	yes
+NO_STAGE FUCK YEAH!
 USE_BZIP2=	yes
 USE_GNOME=	gnomeprefix gtk20 ltverhack intlhack
 USES=		gettext gmake pathfix pkgconfig
-USE_AUTOTOOLS=	libtool
+GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-pam-dir="${PREFIX}/lib" \
 		--with-root-certs="${LOCALBASE}/share/certs/ca-root-nss.crt"
diff --git a/security/libgnome-keyring/Makefile b/security/libgnome-keyring/Makefile
index c58009f7c..3102558a9 100644
--- a/security/libgnome-keyring/Makefile
+++ b/security/libgnome-keyring/Makefile
@@ -1,6 +1,6 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/trunk/security/libgnome-keyring/Makefile 18610 2013-06-30 16:33:05Z marcus $
+#   $MCom$
 
 PORTNAME=	libgnome-keyring
 PORTVERSION=	3.6.0
@@ -13,14 +13,17 @@ COMMENT=	Program that keeps passwords and other secrets
 LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus \
 		libgcrypt.so:${PORTSDIR}/security/libgcrypt
 
-NO_STAGE=	yes
 USE_XZ=		yes
 USE_GNOME=	glib20 gnomehier gnomeprefix intlhack \
 		introspection:build ltverhack
 USES=		gettext gmake pathfix pkgconfig
-USE_AUTOTOOLS=	libtool
+GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+CONFIGURE_ARGS=	--disable-vala
+
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so*
 
 .include <bsd.port.mk>
diff --git a/security/libgnome-keyring/pkg-plist b/security/libgnome-keyring/pkg-plist
index aaadd03dd..da56865c6 100644
--- a/security/libgnome-keyring/pkg-plist
+++ b/security/libgnome-keyring/pkg-plist
@@ -2,7 +2,6 @@ include/gnome-keyring-1/gnome-keyring-memory.h
 include/gnome-keyring-1/gnome-keyring-result.h
 include/gnome-keyring-1/gnome-keyring.h
 lib/girepository-1.0/GnomeKeyring-1.0.typelib
-lib/libgnome-keyring.a
 lib/libgnome-keyring.la
 lib/libgnome-keyring.so
 lib/libgnome-keyring.so.0
diff --git a/security/libpwquality/Makefile b/security/libpwquality/Makefile
index d36a82fd7..d5c5789b5 100644
--- a/security/libpwquality/Makefile
+++ b/security/libpwquality/Makefile
@@ -11,10 +11,8 @@ COMMENT=	Library for generating random passwords and quality checking
 
 LIB_DEPENDS=	libcrack.so:${PORTSDIR}/security/cracklib
 
-NO_STAGE=	yes
 USES=		gettext gmake pathfix
 USE_BZIP2=	yes
-USE_AUTOTOOLS=	libtool
 USE_GNOME=	intltool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
@@ -24,9 +22,6 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 # configure needs to be fixed
 CONFIGURE_ENV+=	LIBS="-lintl"
 
-MAN1=	pwmake.1 pwscore.1
-MAN5=	pwquality.conf.5
-
 OPTIONS_DEFINE=	PYTHON
 OPTIONS_DEFAULT=PYTHON
 
diff --git a/security/libpwquality/pkg-plist b/security/libpwquality/pkg-plist
index f73d0044e..8b9110b0b 100644
--- a/security/libpwquality/pkg-plist
+++ b/security/libpwquality/pkg-plist
@@ -8,6 +8,9 @@ lib/libpwquality.so
 lib/libpwquality.so.1
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/pwquality.so
 libdata/pkgconfig/pwquality.pc
+man/man1/pwmake.1.gz
+man/man1/pwscore.1.gz
+man/man5/pwquality.conf.5.gz
 share/locale/ar/LC_MESSAGES/libpwquality.mo
 share/locale/as/LC_MESSAGES/libpwquality.mo
 share/locale/bg/LC_MESSAGES/libpwquality.mo
@@ -54,4 +57,22 @@ share/locale/vi/LC_MESSAGES/libpwquality.mo
 share/locale/zh_CN/LC_MESSAGES/libpwquality.mo
 share/locale/zh_TW/LC_MESSAGES/libpwquality.mo
 share/locale/zu/LC_MESSAGES/libpwquality.mo
+@dirrmtry share/locale/zu/LC_MESSAGES
+@dirrmtry share/locale/zu
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/km/LC_MESSAGES
+@dirrmtry share/locale/km
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
 @dirrmtry etc/security