Add USES=pkgconfig where needed, update to new port rules, incl stage support.

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

18 files changed, 37 insertions, 49 deletions

diff --git a/math/gcalctool3/Makefile b/math/gcalctool3/Makefile
index 2da04eda4..44258ee0c 100644
--- a/math/gcalctool3/Makefile
+++ b/math/gcalctool3/Makefile
@@ -6,6 +6,7 @@ PORTNAME=	gcalctool
 PORTVERSION=	6.4.2.1
 CATEGORIES=	math gnome
 MASTER_SITES=	GNOME
+PKGNAMESUFFIX=	3
 DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -16,16 +17,13 @@ CONFLICTS=	gcalctool-5.[0-9]*
 BUILD_DEPENDS=	yelp-build:${PORTSDIR}/textproc/yelp-tools \
 		itstool:${PORTSDIR}/textproc/itstool
 
-NO_STAGE=	yes
-LATEST_LINK=	gcalctool3
 USE_XZ=	yes
-USES=		bison gettext gmake pathfix
+USES=		bison gettext gmake pathfix pkgconfig
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomeprefix intlhack gconf2 gtk30 libxml2
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-MAN1=		gcalccmd.1 gcalctool.1
 GLIB_SCHEMAS=	org.gnome.gcalctool.gschema.xml
 
 .include <bsd.port.mk>
diff --git a/math/gcalctool3/pkg-plist b/math/gcalctool3/pkg-plist
index 4b1a40765..5806721cd 100644
--- a/math/gcalctool3/pkg-plist
+++ b/math/gcalctool3/pkg-plist
@@ -1,6 +1,8 @@
 bin/gcalccmd
 bin/gcalctool
 bin/gnome-calculator
+man/man1/gcalccmd.1.gz
+man/man1/gcalctool.1.gz
 share/applications/gcalctool.desktop
 %%DATADIR%%/buttons-advanced.ui
 %%DATADIR%%/buttons-basic.ui
@@ -801,6 +803,8 @@ share/locale/zh_TW/LC_MESSAGES/gcalctool.mo
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
 @dirrmtry share/locale/sr@latin/LC_MESSAGES
diff --git a/misc/gnome-icon-theme-extras/Makefile b/misc/gnome-icon-theme-extras/Makefile
index d65543ee3..d05cec736 100644
--- a/misc/gnome-icon-theme-extras/Makefile
+++ b/misc/gnome-icon-theme-extras/Makefile
@@ -9,16 +9,15 @@ MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	An additional collection of icons for the GNOME desktop
+COMMENT=	Additional collection of icons for the GNOME desktop
 
 BUILD_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
 		icon-naming-utils>=0.8.7:${PORTSDIR}/x11-themes/icon-naming-utils
 RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
 
-NO_STAGE=	yes
 USE_XZ=		yes
 GNU_CONFIGURE=	yes
-USES=		gmake pathfix
+USES=		gmake pathfix pkgconfig
 USE_GNOME=	intlhack gtk-update-icon-cache
 INSTALLS_ICONS=	yes
 CONFIGURE_ARGS=	--enable-icon-mapping
diff --git a/misc/gnome-icon-theme/Makefile b/misc/gnome-icon-theme/Makefile
index 0f6becb1e..7ddebdfda 100644
--- a/misc/gnome-icon-theme/Makefile
+++ b/misc/gnome-icon-theme/Makefile
@@ -9,16 +9,15 @@ MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	A collection of icons for the GNOME desktop
+COMMENT=	Collection of icons for the GNOME desktop
 
 BUILD_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
 		icon-naming-utils>=0.8.7:${PORTSDIR}/x11-themes/icon-naming-utils
 RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
 
-NO_STAGE=	yes
 USE_XZ=		yes
 GNU_CONFIGURE=	yes
-USES=		gmake pathfix
+USES=		gmake pathfix pkgconfig
 USE_GNOME=	intlhack
 INSTALLS_ICONS=	yes
 CONFIGURE_ARGS=	--enable-icon-mapping
diff --git a/multimedia/clutter-gst/Makefile b/multimedia/clutter-gst/Makefile
index 895e93d9c..26a1b69f1 100644
--- a/multimedia/clutter-gst/Makefile
+++ b/multimedia/clutter-gst/Makefile
@@ -12,11 +12,10 @@ COMMENT=	Clutter GStreamer integration
 
 LIB_DEPENDS=	libclutter-1.0.so:${PORTSDIR}/graphics/clutter
 
-NO_STAGE=	yes
 USE_XZ=		yes
 USE_AUTOTOOLS=	libtool
 USE_GL=		gl
-USES=		gmake pathfix
+USES=		gmake pathfix pkgconfig
 USE_GNOME=	ltverhack gnomeprefix gnomehier introspection:build
 USE_GSTREAMER1=	yes
 USE_XORG=	xp x11
diff --git a/net/gtk-vnc3/Makefile b/net/gtk-vnc3/Makefile
index 8b639eaa2..32324a1dd 100644
--- a/net/gtk-vnc3/Makefile
+++ b/net/gtk-vnc3/Makefile
@@ -6,6 +6,7 @@ PORTVERSION=	0.4.4
 PORTREVISION=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	GNOME
+PKGNAMESUFFIX=	3
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	VNC viewer widget for GTK+
@@ -19,17 +20,14 @@ LICENSE_FILE=	${WRKSRC}/COPYING.LIB
 
 CONFLICTS=	gtk-vnc-0.3.[0-9]*
 
-NO_STAGE=	yes
-LATEST_LINK=	gtk-vnc3
 USE_XZ=		yes
 USE_GNOME=	gtk30
-USES=		gettext gmake pathfix
+USES=		gettext gmake pathfix pkgconfig
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-gtk=3.0 --disable-introspection \
 		--disable-plugin --without-python
-MAN1=		gvnccapture.1
 
 .include <bsd.port.mk>
diff --git a/net/gtk-vnc3/pkg-plist b/net/gtk-vnc3/pkg-plist
index a174ebb16..5345278dd 100644
--- a/net/gtk-vnc3/pkg-plist
+++ b/net/gtk-vnc3/pkg-plist
@@ -21,6 +21,7 @@ lib/libgvnc-1.0.so
 lib/libgvnc-1.0.so.0
 libdata/pkgconfig/gtk-vnc-2.0.pc
 libdata/pkgconfig/gvnc-1.0.pc
+man/man1/gvnccapture.1.gz
 share/locale/ca/LC_MESSAGES/gtk-vnc.mo
 share/locale/ca@valencia/LC_MESSAGES/gtk-vnc.mo
 share/locale/cs/LC_MESSAGES/gtk-vnc.mo
diff --git a/security/gnome-keyring3/Makefile b/security/gnome-keyring3/Makefile
index 22a16f383..5f065bd61 100644
--- a/security/gnome-keyring3/Makefile
+++ b/security/gnome-keyring3/Makefile
@@ -6,6 +6,7 @@ PORTNAME=	gnome-keyring
 PORTVERSION=	3.6.2
 CATEGORIES=	security gnome
 MASTER_SITES=	GNOME
+PKGNAMESUFFIX=	3
 DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -15,7 +16,7 @@ BUILD_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_
 		gcr>=3.5.3:${PORTSDIR}/security/gcr
 LIB_DEPENDS=	libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring \
 		libdbus-1.so:${PORTSDIR}/devel/dbus \
-		libgcr.so:${PORTSDIR}/security/gcr \
+		libgcr-3.so:${PORTSDIR}/security/gcr \
 		libtasn1.so:${PORTSDIR}/security/libtasn1 \
 		libp11-kit.so:${PORTSDIR}/security/p11-kit \
 		libgcrypt.so:${PORTSDIR}/security/libgcrypt
@@ -23,8 +24,6 @@ RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_ro
 
 CONFLICTS=	gnome-keyring-2.[0-9]*
 
-NO_STAGE=	yes
-LATEST_LINK=	gnome-keyring3
 USE_XZ=		yes
 USE_GNOME=	gnomeprefix gtk30 ltverhack intlhack
 USES=		gettext gmake pathfix pkgconfig
diff --git a/security/libcryptui/Makefile b/security/libcryptui/Makefile
index e45bb2b85..e96db8042 100644
--- a/security/libcryptui/Makefile
+++ b/security/libcryptui/Makefile
@@ -19,7 +19,6 @@ RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
 
 CONFLICTS=	seahorse-2.[0-9]* seahorse-3.0.[0-9]*
 
-NO_STAGE=	yes
 USE_LDCONFIG=	yes
 USE_XZ=		yes
 USES=		gettext gmake pathfix pkgconfig
@@ -30,7 +29,6 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--enable-introspection=no
 
 GLIB_SCHEMAS=	org.gnome.seahorse.recipients.gschema.xml
-MAN1=		seahorse-daemon.1
 
 OPTIONS_DEFINE=	NOTIFY
 
diff --git a/security/libcryptui/pkg-plist b/security/libcryptui/pkg-plist
index 01f2caa4f..1f9c30bfe 100644
--- a/security/libcryptui/pkg-plist
+++ b/security/libcryptui/pkg-plist
@@ -10,6 +10,7 @@ lib/libcryptui.la
 lib/libcryptui.so
 lib/libcryptui.so.0
 libdata/pkgconfig/cryptui-0.0.pc
+man/man1/seahorse-daemon.1.gz
 share/GConf/gsettings/org.gnome.seahorse.recipients.convert
 share/cryptui/ui/seahorse-notify.xml
 share/cryptui/ui/seahorse-pgp-generate.xml
diff --git a/sysutils/polkit-gnome/Makefile b/sysutils/polkit-gnome/Makefile
index 4dd4c75c1..ad92abc86 100644
--- a/sysutils/polkit-gnome/Makefile
+++ b/sysutils/polkit-gnome/Makefile
@@ -12,9 +12,8 @@ COMMENT=	GNOME frontend to the PolicyKit framework
 
 LIB_DEPENDS=	libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit
 
-NO_STAGE=	yes
 USE_XZ=		yes
-USES=		gettext gmake pathfix
+USES=		gettext gmake pathfix pkgconfig
 USE_GNOME=	gnomeprefix gtk20 intlhack introspection:build
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/sysutils/polkit-gnome/pkg-plist b/sysutils/polkit-gnome/pkg-plist
index 8a83b404a..4d1e45269 100644
--- a/sysutils/polkit-gnome/pkg-plist
+++ b/sysutils/polkit-gnome/pkg-plist
@@ -65,6 +65,8 @@ share/locale/zh_TW/LC_MESSAGES/polkit-gnome-1.mo
 @dirrmtry share/locale/te
 @dirrmtry share/locale/sr@latin/LC_MESSAGES
 @dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
 @dirrmtry share/locale/ca@valencia/LC_MESSAGES
 @dirrmtry share/locale/ca@valencia
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
diff --git a/textproc/ibus/Makefile b/textproc/ibus/Makefile
index 1b3669923..da16da835 100644
--- a/textproc/ibus/Makefile
+++ b/textproc/ibus/Makefile
@@ -15,17 +15,16 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83.0:${PORTSDIR}/devel/py-dbus \
 		vapigen:${PORTSDIR}/lang/vala-vapigen \
 		librsvg2>=2.0:${PORTSDIR}/graphics/librsvg2
+LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83.0:${PORTSDIR}/devel/py-dbus \
 		${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/__init__.py:${PORTSDIR}/devel/py-notify \
 		${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg \
 		librsvg2>=2.0:${PORTSDIR}/graphics/librsvg2
-LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib
 
 USE_PYTHON=	yes
 
-NO_STAGE=	yes
 USE_LDCONFIG=	yes
-USES=		gmake
+USES=		gmake pkgconfig
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 GLIB_SCHEMAS=	org.freedesktop.ibus.gschema.xml
@@ -72,7 +71,7 @@ PLIST_SUB+=	VALA="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MGINTRO}
-USE_GNOME+=		introspection
+USE_GNOME+=		introspection:build
 CONFIGURE_ARGS+=	--enable-introspection=yes
 PLIST_SUB+=		GINTRO=""
 .else
@@ -93,13 +92,8 @@ post-patch:
 		${WRKSRC}/ui/gtk3/Makefile.in
 
 post-install:
-	@${MKDIR} ${PREFIX}/etc/xdg/autostart
-	@${INSTALL_DATA} ${WRKSRC}/bus/ibus.desktop ${PREFIX}/etc/xdg/autostart
-.	if ${PORT_OPTIONS:MGTK3}
-		@${LOCALBASE}/bin/gtk-query-immodules-3.0 > ${LOCALBASE}/lib/gtk-3.0/${GTK3_VERSION}/immodules.cache
-.	endif
-	@${LOCALBASE}/bin/gtk-query-immodules-2.0 > ${LOCALBASE}/etc/gtk-2.0/gtk.immodules
-	@${CAT} ${PKGMESSAGE}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/xdg/autostart
+	@${INSTALL_DATA} ${WRKSRC}/bus/ibus.desktop ${STAGEDIR}${PREFIX}/etc/xdg/autostart
 	@${ECHO} To display this message again, type ${PKG_INFO} -D ${PKGNAME}
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtksourceview3/Makefile b/x11-toolkits/gtksourceview3/Makefile
index 3bad74d1f..3c83010d3 100644
--- a/x11-toolkits/gtksourceview3/Makefile
+++ b/x11-toolkits/gtksourceview3/Makefile
@@ -11,16 +11,15 @@ PKGNAMESUFFIX=	3
 DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	A text widget that adds syntax highlighting to the GtkTextView widget
+COMMENT=	Text widget that adds syntax highlighting to the GtkTextView widget
 
 USE_XZ=		yes
-NO_STAGE=	yes
 
 .if !defined(REFERENCE_PORT)
 
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
-USES=		gettext gmake pathfix
+USES=		gettext gmake pathfix pkgconfig
 USE_GNOME=	gnomeprefix gtk30 intlhack libxml2 ltverhack referencehack
 CONFIGURE_ARGS=	--enable-compile-warnings=no --enable-glade-catalog=no \
 		--enable-introspection
diff --git a/x11-toolkits/libwnck3/Makefile b/x11-toolkits/libwnck3/Makefile
index 73199dd6f..fdf4c6832 100644
--- a/x11-toolkits/libwnck3/Makefile
+++ b/x11-toolkits/libwnck3/Makefile
@@ -7,22 +7,21 @@ PORTVERSION=	3.4.5
 PORTREVISION?=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	GNOME
+PKGNAMESUFFIX=	3
 DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Library used for writing pagers and taskslists
 
 USE_XZ=		yes
-NO_STAGE=	yes
 
 .if !defined(REFERENCE_PORT)
 
 LIB_DEPENDS=	startup-notification-1:${PORTSDIR}/x11/startup-notification
 
-LATEST_LINK=	libwnck3
 USE_XORG=	xres x11
-USE_GNOME=	gtk30 intlhack introspection ltverhack referencehack
-USES=		bison gettext gmake pathfix
+USE_GNOME=	gtk30 intlhack introspection:build ltverhack referencehack
+USES=		bison gettext gmake pathfix pkgconfig
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--disable-tools
diff --git a/x11/gnome-desktop3/Makefile b/x11/gnome-desktop3/Makefile
index efabfedc3..7b89daf75 100644
--- a/x11/gnome-desktop3/Makefile
+++ b/x11/gnome-desktop3/Makefile
@@ -7,6 +7,7 @@ PORTVERSION=	3.6.2
 PORTREVISION?=	0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
+PKGNAMESUFFIX=	3
 DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -25,10 +26,8 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTS
 		${LOCALBASE}/libdata/pkgconfig/xkeyboard-config.pc:${PORTSDIR}/x11/xkeyboard-config \
 		${LOCALBASE}/libdata/pkgconfig/xkbfile.pc:${PORTSDIR}/x11/libxkbfile
 
-NO_STAGE=	yes
-LATEST_LINK=	gnome-desktop3
 USE_XORG=	x11 xrandr xext
-USES=		bison gettext gmake pathfix
+USES=		bison gettext gmake pathfix pkgconfig
 USE_GNOME=	gnomeprefix intlhack gtk30 ltverhack referencehack \
 		introspection:build
 USE_PYTHON=	yes
diff --git a/x11/gnome-desktop3/pkg-plist b/x11/gnome-desktop3/pkg-plist
index ab41c0028..047ac3771 100644
--- a/x11/gnome-desktop3/pkg-plist
+++ b/x11/gnome-desktop3/pkg-plist
@@ -257,6 +257,8 @@ share/locale/zu/LC_MESSAGES/gnome-desktop-3.0.mo
 @dirrmtry share/locale/ky
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+@dirrmtry share/locale/km/LC_MESSAGES
+@dirrmtry share/locale/km
 @dirrmtry share/locale/kk/LC_MESSAGES
 @dirrmtry share/locale/kk
 @dirrmtry share/locale/kg/LC_MESSAGES
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index 4be6bee9a..be305e757 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -9,22 +9,20 @@ CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	An utility library to make XKB stuff easier
+COMMENT=	Utility library to make XKB stuff easier
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
 RUN_DEPENDS=	xkbcomp:${PORTSDIR}/x11/xkbcomp \
     		${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
 
-NO_STAGE=	yes
 USE_XORG=	x11 xkbfile
 USE_XZ=		yes
-USES=		gmake pathfix
+USES=		gmake pathfix pkgconfig
 USE_GNOME=	libxml2 glib20 ltverhack:12 introspection:build
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ARGS=	--disable-doxygen \
-		--with-xkb-base=${LOCALBASE}/share/X11/xkb \
+CONFIGURE_ARGS=	--with-xkb-base=${LOCALBASE}/share/X11/xkb \
 		--with-xkb-bin-base=${LOCALBASE}/bin \
 		--with-xmodmap-base=${LOCALBASE}/share/xmodmap \
 		--disable-gtk-doc \