21 files changed, 29 insertions, 31 deletions

diff --git a/x11/9menu/Makefile b/x11/9menu/Makefile
index d7acab5a9d23..b5e759fe0637 100644
--- a/x11/9menu/Makefile
+++ b/x11/9menu/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	ftp://freefriends.org/arnold/Source/ \
 EXTRACT_SUFX=	.shar.gz
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A simple menu patterned after Plan9
+COMMENT=	Simple menu patterned after Plan9
 
 EXTRACT_CMD=	${GZCAT}
 EXTRACT_BEFORE_ARGS=	# empty
diff --git a/x11/decurs/Makefile b/x11/decurs/Makefile
index 90b192d92470..04fcb5edefa5 100644
--- a/x11/decurs/Makefile
+++ b/x11/decurs/Makefile
@@ -9,9 +9,9 @@ MASTER_SITES=	http://freebsd.nsu.ru/distfiles/ \
 		#http://varg.dyndns.org/psi/files/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A program that lets you edit your X11 mouse cursors
+COMMENT=	Lets you edit your X11 mouse cursors
 
-LIB_DEPENDS=	gtkmm-2.0.6:${PORTSDIR}/x11-toolkits/gtkmm20
+LIB_DEPENDS=	libgtkmm-2.0.6.so:${PORTSDIR}/x11-toolkits/gtkmm20
 
 USE_XORG=	x11
 USE_GNOME=	gtk20
diff --git a/x11/fbdesk/Makefile b/x11/fbdesk/Makefile
index fe8351afc0f0..5096d196b582 100644
--- a/x11/fbdesk/Makefile
+++ b/x11/fbdesk/Makefile
@@ -9,11 +9,11 @@ MASTER_SITES=	http://fluxbox.sourceforge.net/download/ \
 		GENTOO/distfiles
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A Fluxbox utility to create and manage icons on the desktop
+COMMENT=	Fluxbox utility to create and manage icons on the desktop
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png
 
 OPTIONS_DEFINE=	IMLIB2 DOCS
 OPTIONS_DEFAULT=	IMLIB2
diff --git a/x11/gdkxft/Makefile b/x11/gdkxft/Makefile
index ef43b5b1f321..f4be373e41f6 100644
--- a/x11/gdkxft/Makefile
+++ b/x11/gdkxft/Makefile
@@ -8,9 +8,9 @@ CATEGORIES=	x11
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	An anti-aliased font support for gtk+
+COMMENT=	Anti-aliased font support for gtk+
 
-LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
+LIB_DEPENDS=	libXft.so:${PORTSDIR}/x11-fonts/libXft
 
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gtk12
diff --git a/x11/gtkterm2/Makefile b/x11/gtkterm2/Makefile
index 56f021b2342d..c96a9bd24f6b 100644
--- a/x11/gtkterm2/Makefile
+++ b/x11/gtkterm2/Makefile
@@ -8,11 +8,10 @@ CATEGORIES=	x11
 MASTER_SITES=	SF/gtkterm/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A simple GTK-2 terminal with tabs
+COMMENT=	Simple GTK-2 terminal with tabs
 
 USE_GNOME=	vte
-USE_GMAKE=	yes
-USES=		pkgconfig
+USES=		pkgconfig gmake
 USE_AUTOTOOLS=	libtool
 
 PORTDOCS=	README
diff --git a/x11/mrxvt/Makefile b/x11/mrxvt/Makefile
index a828be6dbf93..cdb6d1ccf24f 100644
--- a/x11/mrxvt/Makefile
+++ b/x11/mrxvt/Makefile
@@ -9,10 +9,10 @@ MASTER_SITES=	SF/materm/${PORTNAME}%20source/${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A tabbed version of rxvt
+COMMENT=	Tabbed version of rxvt
 
-LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
-		png15:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libjpeg.so.11:${PORTSDIR}/graphics/jpeg \
+		libpng15.so:${PORTSDIR}/graphics/png
 
 CONFLICTS=	mrxvt-0.5.*
 
diff --git a/x11/multi-aterm/Makefile b/x11/multi-aterm/Makefile
index 052675f5d9b0..472fdd689ed3 100644
--- a/x11/multi-aterm/Makefile
+++ b/x11/multi-aterm/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	x11
 MASTER_SITES=	http://www.nongnu.org/materm/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A multi terminal based on aterm
+COMMENT=	Multi terminal based on aterm
 
 USE_XORG=	xpm
 GNU_CONFIGURE=	yes
diff --git a/x11/rendercheck/Makefile b/x11/rendercheck/Makefile
index a58387ebe6e8..ac429fd327c4 100644
--- a/x11/rendercheck/Makefile
+++ b/x11/rendercheck/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	1.4
 CATEGORIES=	x11
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A small program for testing basic Render extension conformance
+COMMENT=	Small program for testing basic Render extension conformance
 
 XORG_CAT=	app
 USE_XORG=	xrender
diff --git a/x11/rxvt-devel/Makefile b/x11/rxvt-devel/Makefile
index 64f545e765d8..acb7f2fa36c3 100644
--- a/x11/rxvt-devel/Makefile
+++ b/x11/rxvt-devel/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-dev/${PORTVERSION}
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A low memory usage xterm replacement that supports color
+COMMENT=	Low memory usage xterm replacement that supports color
 
 USE_AUTOTOOLS=	libtool
 USES=		perl5
diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile
index 91b7dcaf59d6..c84f9b0ba311 100644
--- a/x11/rxvt/Makefile
+++ b/x11/rxvt/Makefile
@@ -8,7 +8,7 @@ CATEGORIES+=	x11
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A low memory usage xterm replacement that supports color
+COMMENT=	Low memory usage xterm replacement that supports color
 
 USE_XORG=	xpm
 GNU_CONFIGURE=	yes
diff --git a/x11/silo/Makefile b/x11/silo/Makefile
index 5853a4d7de52..189f973eb7e4 100644
--- a/x11/silo/Makefile
+++ b/x11/silo/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	x11
 MASTER_SITES=	http://doublef.nm.ru/silo/sources/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A simple X11 launcher extensible in any programming language
+COMMENT=	Simple X11 launcher extensible in any programming language
 
 DEPRECATED=	Upstream has disappeared
 EXPIRATION_DATE=	2013-10-18
diff --git a/x11/simdock/Makefile b/x11/simdock/Makefile
index 14dd59bc1184..7a3ba8d8afc3 100644
--- a/x11/simdock/Makefile
+++ b/x11/simdock/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A fast and customizable dockbar
+COMMENT=	Fast and customizable dockbar
 
 GNU_CONFIGURE=	yes
 USES=		pathfix pkgconfig
diff --git a/x11/sxpc/Makefile b/x11/sxpc/Makefile
index d0684c7ae12f..2cf0d7f022cf 100644
--- a/x11/sxpc/Makefile
+++ b/x11/sxpc/Makefile
@@ -10,7 +10,7 @@ MASTER_SITE_SUBDIR=	utilities
 EXTRACT_SUFX=	.shar.Z
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	The Simple X Protocol Compressor
+COMMENT=	Simple X Protocol Compressor
 
 USES=		imake
 NO_WRKSUBDIR=	yes
diff --git a/x11/temperature.app/Makefile b/x11/temperature.app/Makefile
index 4b8787eea47a..24773927851e 100644
--- a/x11/temperature.app/Makefile
+++ b/x11/temperature.app/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://www.fukt.bsnet.se/~per/temperature/
 DISTNAME=	Temperature.app-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A dockable WindowMaker applet which displays the local temperature
+COMMENT=	Dockable WindowMaker applet which displays the local temperature
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
diff --git a/x11/wmappl/Makefile b/x11/wmappl/Makefile
index f903012e7d78..91c7e8d9fb6f 100644
--- a/x11/wmappl/Makefile
+++ b/x11/wmappl/Makefile
@@ -17,7 +17,7 @@ USE_XORG=	xpm x11 xext sm ice
 MAKE_ENV=	DATADIR="${DATADIR}"
 
 .if defined(.PARSEDIR)
-USE_GMAKE=	yes
+USES+=		gmake
 .endif
 
 MAN1=	wmappl.1
diff --git a/x11/wmbutton/Makefile b/x11/wmbutton/Makefile
index 934184cecdbe..04bf769ee5bb 100644
--- a/x11/wmbutton/Makefile
+++ b/x11/wmbutton/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	x11 windowmaker
 MASTER_SITES=	http://greek0.net/wmbutton/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A dockapp that displays 9 buttons to run apps of your choice
+COMMENT=	Dockapp that displays 9 buttons to run apps of your choice
 
 LICENSE=	GPLv2
 
diff --git a/x11/wmdrawer/Makefile b/x11/wmdrawer/Makefile
index cc815d3de695..130eeed30427 100644
--- a/x11/wmdrawer/Makefile
+++ b/x11/wmdrawer/Makefile
@@ -12,11 +12,10 @@ DISTFILES=	${EXTRACT_ONLY}:tarball \
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A dockapp which provides a drawer to launch applications
+COMMENT=	Dockapp which provides a drawer to launch applications
 
 USE_GNOME=	gdkpixbuf
-USE_GMAKE=	yes
-USES=		pkgconfig
+USES=		pkgconfig gmake
 CONFIGURE_ENV+=	DOCSDIR=${DOCSDIR}
 MAKE_ENV+=	${CONFIGURE_ENV}
 
diff --git a/x11/xcalib/Makefile b/x11/xcalib/Makefile
index 7e5a65ad6767..f3cbea441b6a 100644
--- a/x11/xcalib/Makefile
+++ b/x11/xcalib/Makefile
@@ -8,12 +8,12 @@ MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-source-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A program for display calibration of X11-Servers with ICC profiles
+COMMENT=	Program for display calibration of X11-Servers with ICC profiles
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	README README.profilers
 USE_XORG=	x11 xext sm xxf86vm
-USE_GMAKE=	yes
+USES=		gmake
 
 DEFINES=	-DXCALIB_VERSION=\"${PORTVERSION}\" -DUNIX
 LDFLAGS+=	-L${LOCALBASE}/lib -L${LOCALBASE}/lib -lm -lX11 -lXxf86vm -lXext
diff --git a/x11/xcurs/Makefile b/x11/xcurs/Makefile
index a55ccda33fd4..64f52de56356 100644
--- a/x11/xcurs/Makefile
+++ b/x11/xcurs/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://freebsd.nsu.ru/distfiles/ \
 		#http://varg.dyndns.org/psi/files/xcurs/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	An editor for new XFree86/X.Org style full-color cursors properties
+COMMENT=	Editor for new X.Org style full-color cursors properties
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/PIL/__init__.py:${PORTSDIR}/graphics/py-imaging
 
diff --git a/x11/xmangekyou/Makefile b/x11/xmangekyou/Makefile
index 52a43cefe4b2..d3fa2ae48d1d 100644
--- a/x11/xmangekyou/Makefile
+++ b/x11/xmangekyou/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	x11
 MASTER_SITES=	http://ftp.vector.co.jp/pack/unix/art/anime/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A kaleidoscope on X
+COMMENT=	Kaleidoscope on X
 
 USE_XORG=	x11 xpm xaw
 ALL_TARGET=	xmangekyou
diff --git a/x11/xmsg/Makefile b/x11/xmsg/Makefile
index 4a909b946529..982346ce820b 100644
--- a/x11/xmsg/Makefile
+++ b/x11/xmsg/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	x11
 MASTER_SITES=	http://www.generalconcepts.com/resources/software/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	The X11R4 version of xmessage updated for X11R5 and renamed
+COMMENT=	Shows a message on the screen
 
 MAN1=		xmsg.1
 MANCOMPRESSED=	yes