Make portlint happy. I am using cports.sh in MC portstools.

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

15 files changed, 48 insertions, 49 deletions

diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile
index daf089a6c..5e3a64fa0 100644
--- a/accessibility/at-spi/Makefile
+++ b/accessibility/at-spi/Makefile
@@ -3,7 +3,7 @@
 # Whom:				Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/accessibility/at-spi/Makefile,v 1.106 2011/04/11 02:42:14 mezz Exp $
+#   $MCom: ports/accessibility/at-spi/Makefile,v 1.107 2011/04/30 20:43:11 mezz Exp $
 #
 
 PORTNAME=	at-spi
@@ -30,8 +30,8 @@ USE_PYTHON=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-static
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS=	-I${LOCALBASE}/include
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 
 GCONF_SCHEMAS=	at-spi.schemas
 
diff --git a/accessibility/at-spi2-atk/Makefile b/accessibility/at-spi2-atk/Makefile
index 5bae20ccd..03461ac54 100644
--- a/accessibility/at-spi2-atk/Makefile
+++ b/accessibility/at-spi2-atk/Makefile
@@ -3,7 +3,7 @@
 # Whom:				Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/accessibility/at-spi2-atk/Makefile,v 1.28 2011/04/27 16:26:13 kwm Exp $
+#   $MCom: ports/accessibility/at-spi2-atk/Makefile,v 1.29 2011/05/28 10:58:10 kwm Exp $
 #
 
 PORTNAME=	at-spi2-atk
@@ -30,8 +30,8 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomehier intlhack gconf2 libxml2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-static
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS=	-I${LOCALBASE}/include
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 GLIB_SCHEMAS=	org.a11y.atspi.gschema.xml
 
 .include <bsd.port.mk>
diff --git a/accessibility/at-spi2-core/Makefile b/accessibility/at-spi2-core/Makefile
index 8693e8894..99f4e273d 100644
--- a/accessibility/at-spi2-core/Makefile
+++ b/accessibility/at-spi2-core/Makefile
@@ -3,7 +3,7 @@
 # Whom:				Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/accessibility/at-spi2-core/Makefile,v 1.30 2011/04/27 16:26:13 kwm Exp $
+#   $MCom: ports/accessibility/at-spi2-core/Makefile,v 1.31 2011/05/28 10:58:11 kwm Exp $
 #
 
 PORTNAME=	at-spi2-core
@@ -25,10 +25,11 @@ USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomehier glib20 intlhack
 USE_XORG=	x11 xi xtst xext
+USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-static \
 		--disable-xevie
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS=	-I${LOCALBASE}/include
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile
index 8c748c615..a20f81caf 100644
--- a/accessibility/atk/Makefile
+++ b/accessibility/atk/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/accessibility/atk/Makefile,v 1.111 2011/03/23 17:06:15 kwm Exp $
+#   $MCom: ports/accessibility/atk/Makefile,v 1.112 2011/04/06 05:47:57 kwm Exp $
 #
 
 PORTNAME=	atk
@@ -30,8 +30,8 @@ USE_GNOME=	gnomehack glib20 ltverhack referencehack
 CONFIGURE_ARGS=	--enable-static \
 		--disable-gtk-doc \
 		--with-html-dir=${PREFIX}/share/doc
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
+CPPFLAGS=	-I${LOCALBASE}/include
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
 		AUTOCONF=${TRUE} AUTOMAKE=${TRUE}
 
 post-patch:
diff --git a/accessibility/atkmm/Makefile b/accessibility/atkmm/Makefile
index 92194c954..039b01775 100644
--- a/accessibility/atkmm/Makefile
+++ b/accessibility/atkmm/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/accessibility/atkmm/Makefile,v 1.8 2011/03/25 15:13:36 kwm Exp $
+#   $MCom: ports/accessibility/atkmm/Makefile,v 1.9 2011/03/30 22:07:49 kwm Exp $
 #
 
 PORTNAME=	atkmm
@@ -22,8 +22,8 @@ USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 USE_GNOME=	gnomehack atk
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include " \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS=	-I${LOCALBASE}/include
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--disable-documentation
 
 .include <bsd.port.mk>
diff --git a/accessibility/caribou/Makefile b/accessibility/caribou/Makefile
index adcce5782..74ffb08ef 100644
--- a/accessibility/caribou/Makefile
+++ b/accessibility/caribou/Makefile
@@ -3,7 +3,7 @@
 # Whom:				Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/accessibility/caribou/Makefile,v 1.5 2011/03/23 12:05:45 kwm Exp $
+#    $MCom: ports/accessibility/caribou/Makefile,v 1.6 2011/04/06 05:49:22 kwm Exp $
 #
 
 PORTNAME=	caribou
@@ -24,10 +24,9 @@ USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_PYTHON=	yes
 USE_GNOME=	gnomehack intltool pygobject gtk30 intlhack gnomedocutils
-#USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-#CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-#		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS=	-I${LOCALBASE}/include
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 GLIB_SCHEMAS=	org.gnome.caribou.gschema.xml
 
 .include <bsd.port.mk>
diff --git a/accessibility/caribou/pkg-descr b/accessibility/caribou/pkg-descr
index 9031a4a83..9176f7498 100644
--- a/accessibility/caribou/pkg-descr
+++ b/accessibility/caribou/pkg-descr
@@ -4,5 +4,4 @@ pointer users.
 Features:
 A configurable on screen keyboard with scanning mode.
 
-WWW:	http://live.gnome.org/Caribou
-
+WWW: http://live.gnome.org/Caribou
diff --git a/accessibility/mousetweaks/Makefile b/accessibility/mousetweaks/Makefile
index 214ed5f7a..50bb3de1f 100644
--- a/accessibility/mousetweaks/Makefile
+++ b/accessibility/mousetweaks/Makefile
@@ -3,7 +3,7 @@
 # Whom:				Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/accessibility/mousetweaks/Makefile,v 1.55 2011/04/17 19:05:40 mezz Exp $
+#   $MCom: ports/accessibility/mousetweaks/Makefile,v 1.56 2011/04/30 20:43:12 mezz Exp $
 #
 
 PORTNAME=	mousetweaks
@@ -24,8 +24,8 @@ USE_GMAKE=	yes
 USE_GETTEXT=	yes
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS=	-I${LOCALBASE}/include
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 
 GCONF_SCHEMAS=	mousetweaks.schemas pointer-capture-applet.schemas
 MAN1=		dwell-click-applet.1 mousetweaks.1 pointer-capture-applet.1
diff --git a/accessibility/mousetweaks3/Makefile b/accessibility/mousetweaks3/Makefile
index 734f98007..2dce6427e 100644
--- a/accessibility/mousetweaks3/Makefile
+++ b/accessibility/mousetweaks3/Makefile
@@ -3,7 +3,7 @@
 # Whom:				Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/accessibility/mousetweaks3/Makefile,v 1.10 2011/05/25 15:44:59 kwm Exp $
+#   $MCom: ports/accessibility/mousetweaks3/Makefile,v 1.11 2011/06/10 22:59:01 mezz Exp $
 #
 
 PORTNAME=	mousetweaks
@@ -28,8 +28,8 @@ USE_GMAKE=	yes
 USE_GETTEXT=	yes
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS=	-I${LOCALBASE}/include
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 
 GLIB_SCHEMAS=	org.gnome.mousetweaks.enums.xml \
 		org.gnome.mousetweaks.gschema.xml
diff --git a/accessibility/orca/Makefile b/accessibility/orca/Makefile
index 748201999..63f70a01f 100644
--- a/accessibility/orca/Makefile
+++ b/accessibility/orca/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/accessibility/orca/Makefile,v 1.92 2011/04/26 02:37:59 mezz Exp $
+#   $MCom: ports/accessibility/orca/Makefile,v 1.93 2011/04/30 20:43:12 mezz Exp $
 #
 
 PORTNAME=	orca
@@ -36,8 +36,8 @@ USE_GNOME=	gnomeprefix gnomehack libgnomeui gnomespeech pygnome2 \
 		pygnomedesktop
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS=	-I${LOCALBASE}/include
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=		orca.1
 
diff --git a/accessibility/py-atspi/Makefile b/accessibility/py-atspi/Makefile
index dad9340c9..40c9f5d4f 100644
--- a/accessibility/py-atspi/Makefile
+++ b/accessibility/py-atspi/Makefile
@@ -3,7 +3,7 @@
 # Whom:				Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/accessibility/py-atspi/Makefile,v 1.22 2011/04/27 16:26:13 kwm Exp $
+#   $MCom: ports/accessibility/py-atspi/Makefile,v 1.23 2011/05/28 10:58:11 kwm Exp $
 #
 
 PORTNAME=	atspi
@@ -29,7 +29,7 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomehier intlhack gtk20 libxml2 pygobject
 GNU_CONFIGURE=	yes
 USE_PYTHON=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS=	-I${LOCALBASE}/include
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 4c35aca00..86c327389 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Anders Nordby <anders@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/archivers/file-roller/Makefile,v 1.186 2011/04/11 10:18:16 kwm Exp $
+#   $MCom: ports/archivers/file-roller/Makefile,v 1.187 2011/06/03 21:27:49 mezz Exp $
 #
 
 PORTNAME=	file-roller
@@ -16,8 +16,6 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An archive manager for zip files, tar, etc
 
-OPTIONS=	NAUTILUS	"Enable Nautilus extension"	on
-
 RUN_DEPENDS=	${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar \
     		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip
 
@@ -33,13 +31,15 @@ USE_GNOME=	gnomeprefix intlhack gnomehack desktopfileutils gnomedocutils \
 		gtk20 gconf2
 USE_XORG=	sm
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS=	-I${LOCALBASE}/include
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--disable-packagekit
 
 PORTDOCS=	AUTHORS NEWS README TODO ChangeLog
 GCONF_SCHEMAS=	file-roller.schemas
 
+OPTIONS=	NAUTILUS	"Enable Nautilus extension"	on
+
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_NAUTILUS)
diff --git a/archivers/file-roller3/Makefile b/archivers/file-roller3/Makefile
index fa3277ef6..33d56695c 100644
--- a/archivers/file-roller3/Makefile
+++ b/archivers/file-roller3/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Anders Nordby <anders@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/archivers/file-roller3/Makefile,v 1.12 2011/05/28 10:43:17 kwm Exp $
+#   $MCom: ports/archivers/file-roller3/Makefile,v 1.13 2011/06/10 22:59:02 mezz Exp $
 #
 
 PORTNAME=	file-roller
@@ -15,8 +15,6 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An archive manager for zip files, tar, etc
 
-OPTIONS=	NAUTILUS	"Enable Nautilus extension"	on
-
 RUN_DEPENDS=	${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar \
     		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip
 
@@ -33,13 +31,15 @@ USE_GNOME=	gnomeprefix intlhack gnomehack desktopfileutils gnomedocutils \
 		gtk30 gconf2
 USE_XORG=	sm
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS=	-I${LOCALBASE}/include
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--disable-packagekit
 
 PORTDOCS=	AUTHORS NEWS README TODO ChangeLog
 GLIB_SCHEMAS=	org.gnome.FileRoller.gschema.xml
 
+OPTIONS=	NAUTILUS	"Enable Nautilus extension"	on
+
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_NAUTILUS)
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index f9741ad19..1dc29057e 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/gnome-media/Makefile,v 1.159 2011/04/30 20:43:12 mezz Exp $
+#   $MCom: ports/audio/gnome-media/Makefile,v 1.160 2011/06/03 21:27:49 mezz Exp $
 #
 
 PORTNAME=	gnome-media
@@ -32,8 +32,8 @@ USE_LDCONFIG=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gtk20 libxml2 gconf2
 USE_GSTREAMER=	gconf good
 CONFIGURE_ARGS=	--disable-gstmix
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS=	-I${LOCALBASE}/include
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 
 GCONF_SCHEMAS=	gnome-audio-profiles.schemas \
 		gnome-sound-recorder.schemas
diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile
index 9f17a8673..bb5a4ee32 100644
--- a/audio/libcanberra/Makefile
+++ b/audio/libcanberra/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/libcanberra/Makefile,v 1.26 2011/03/16 10:23:09 kwm Exp $
+#   $MCom: ports/audio/libcanberra/Makefile,v 1.27 2011/04/30 20:43:13 mezz Exp $
 
 PORTNAME=	libcanberra
 PORTVERSION=	0.28
@@ -23,8 +23,8 @@ USE_GNOME=	gnomeprefix gnomehack gtk20 ltverhack gconf2
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool libltdl
 CONFIGURE_ARGS=	--disable-lynx --disable-tdb --disable-alsa
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS=	-I${LOCALBASE}/include
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 
 .if !defined(SLAVEPORT)
 GCONF_SCHEMAS=	libcanberra.schemas