Sync with freebsd ports. portrevision bumping, getting CPPFLAGS/LDFLAGS from

CONFIGURE_ENV, s/CPPFLAGS=/CPPFLAGS+=/ etc
Sprinkle USE_PKGCONFIG in some ports.

Some small nits here and there.


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

9 files changed, 27 insertions, 28 deletions

diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index cd60c1ae8..1f5221a69 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/devhelp/Makefile,v 1.42 2011/04/30 20:43:15 mezz Exp $
+#   $MCom: ports/devel/devhelp/Makefile,v 1.43 2011/06/11 19:51:13 mezz Exp $
 
 PORTNAME=	devhelp
 PORTVERSION=	2.32.0
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
@@ -31,8 +31,8 @@ GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 GCONF_SCHEMAS=	devhelp.schemas
-CPPFLAGS=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib"
+CPPFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
+LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
 
 OPTIONS=	GEDIT "Enable GEdit plug-in support" off
 
diff --git a/devel/gsettings-desktop-schemas/Makefile b/devel/gsettings-desktop-schemas/Makefile
index ac81d41b3..59db7c916 100644
--- a/devel/gsettings-desktop-schemas/Makefile
+++ b/devel/gsettings-desktop-schemas/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gsettings-desktop-schemas/Makefile,v 1.18 2012/05/16 15:28:36 kwm Exp $
+#   $MCom: ports/devel/gsettings-desktop-schemas/Makefile,v 1.19 2012/08/04 16:55:24 kwm Exp $
 #
 
 PORTNAME=	gsettings-desktop-schemas
@@ -24,7 +24,7 @@ RUN_DEPENDS=	${LOCALBASE}/etc/fonts/conf.avail/31-cantarell.conf:${PORTSDIR}/x11
 USE_XZ=		yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_PERL_BUILD=	yes
+USE_PERL5_BUILD=	yes
 USE_GNOME=	gnomehack intltool glib20
 USE_PKGCONFIG=	build
 GNU_CONFIGURE=	yes
diff --git a/devel/json-glib/Makefile b/devel/json-glib/Makefile
index 827cb591c..7722fc78f 100644
--- a/devel/json-glib/Makefile
+++ b/devel/json-glib/Makefile
@@ -3,7 +3,7 @@
 # Whom:                 		Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/json-glib/Makefile,v 1.19 2011/09/19 18:50:13 kwm Exp $
+#   $MCom: ports/devel/json-glib/Makefile,v 1.20 2011/10/26 13:14:50 kwm Exp $
 #
 
 PORTNAME=	json-glib
@@ -20,6 +20,7 @@ RUN_DEPENDS=	${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-i
 USE_GMAKE=	yes
 USE_XZ=		yes
 USE_GNOME=	glib20 gnomehack gnomeprefix ltverhack
+USE_PKGCONFIG=	build
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 CPPFLAGS=	-I${LOCALBASE}/include
diff --git a/devel/libgdata/Makefile b/devel/libgdata/Makefile
index d9a9e6479..32bad900c 100644
--- a/devel/libgdata/Makefile
+++ b/devel/libgdata/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/libgdata/Makefile,v 1.23 2012/05/02 07:13:11 kwm Exp $
+#   $MCom: ports/devel/libgdata/Makefile,v 1.24 2012/05/27 14:03:58 kwm Exp $
 #
 
 PORTNAME=	libgdata
@@ -17,7 +17,7 @@ COMMENT=	GLib based implimentation of the GData protocol
 BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \
 		ca_root_nss>=0:${PORTSDIR}/security/ca_root_nss
 LIB_DEPENDS=	soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup-gnome \
-		oauth.8:${PORTSDIR}/net/liboauth
+		oauth:${PORTSDIR}/net/liboauth
 RUN_DEPENDS=	ca_root_nss>=0:${PORTSDIR}/security/ca_root_nss
 
 CONFLICTS=	libgdata-0.6.*
@@ -28,10 +28,10 @@ USE_GETTEXT=	yes
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 USE_AUTOTOOLS=	libtool
-USE_GNOME=	gnomehack intltool ltverhack glib20
+USE_GNOME=	gnomeprefix gnomehack intltool ltverhack glib20
+USE_PKGCONFIG=	build
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ARGS+=--with-html-dir="${PREFIX}/share/doc" \
-		--with-ca-certs=${LOCALBASE}/share/certs/ca-root-nss.crt
+CONFIGURE_ARGS+=--with-ca-certs=${LOCALBASE}/share/certs/ca-root-nss.crt
 
 .include <bsd.port.mk>
diff --git a/devel/libgee/Makefile b/devel/libgee/Makefile
index 1ce67bc18..41ceaf424 100644
--- a/devel/libgee/Makefile
+++ b/devel/libgee/Makefile
@@ -19,7 +19,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-introspection=yes
 USE_GMAKE=	yes
 USE_XZ=		yes
-USE_GNOME=	glib20 gnomehier gnomehack gnomehier
+USE_GNOME=	glib20 gnomehier gnomehack
+USE_PKGCONFIG=	build
 USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index beb7faf2b..3f5f0bb08 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -3,7 +3,7 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/libgtop/Makefile,v 1.56 2010/05/02 00:04:47 marcus Exp $
+#   $MCom: ports/devel/libgtop/Makefile,v 1.58 2011/08/30 20:55:55 kwm Exp $
 #
 
 PORTNAME=	libgtop
@@ -22,13 +22,11 @@ USE_PERL5_BUILD=yes
 USE_XORG=	xau
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack glib20 ltverhack intlhack
+USE_GNOME=	gnomeprefix gnomehack glib20 ltverhack intlhack
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ARGS=	--disable-gtk-doc \
-		--with-html-dir=${PREFIX}/share/doc
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -DHAVE_NET_IF_VAR_H" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include -DHAVE_NET_IF_VAR_H
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 INFO=		libgtop2
 
diff --git a/devel/liboobs/Makefile b/devel/liboobs/Makefile
index fc285387a..ab6888da0 100644
--- a/devel/liboobs/Makefile
+++ b/devel/liboobs/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/liboobs/Makefile,v 1.52 2011/04/04 09:31:41 kwm Exp $
+#   $MCom: ports/devel/liboobs/Makefile,v 1.53 2011/06/11 19:51:15 mezz Exp $
 #
 
 PORTNAME=	liboobs
@@ -23,10 +23,10 @@ RUN_DEPENDS=	${LOCALBASE}/etc/dbus-1/system.d/org.freedesktop.SystemToolsBackend
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	gnomehack glib20
+USE_GNOME=	gnomeprefix gnomehack glib20
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc --with-hal
-CPPFLAGS=	-I${LOCALBASE}/include
+CONFIGURE_ARGS=	--with-hal
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 .include <bsd.port.pre.mk>
 
diff --git a/devel/py-gobject/Makefile b/devel/py-gobject/Makefile
index cfeec1497..11a2e7abf 100644
--- a/devel/py-gobject/Makefile
+++ b/devel/py-gobject/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/py-gobject/Makefile,v 1.55 2011/10/07 10:06:54 kwm Exp $
+#   $MCom: ports/devel/py-gobject/Makefile,v 1.56 2011/10/07 13:30:13 kwm Exp $
 #
 
 PORTNAME=	gobject
@@ -20,7 +20,6 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Python bindings for GObject
 
 LICENSE=	LGPL21
-LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \
 		${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo
diff --git a/devel/seed/Makefile b/devel/seed/Makefile
index 8893f5c5f..2e38f4240 100644
--- a/devel/seed/Makefile
+++ b/devel/seed/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Alexander Logvinov <avl@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/seed/Makefile,v 1.32 2012/02/07 15:36:54 kwm Exp $
+#   $MCom: ports/devel/seed/Makefile,v 1.33 2012/08/08 16:56:39 kwm Exp $
 #
 # NOTE: It may be necessary to update ${FILESDIR}/Seed.js on each release.
 # To do that, just replace imports.searchPaths with "." and ".." elements.
@@ -36,8 +36,8 @@ USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 USE_SQLITE=	yes
 USE_GMAKE=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=--enable-gtk-doc=no --with-webkit=1.0
 
 MAN1=		seed.1