- Trim Makefile headers

- Drop ABI versions from LIB_DEPENDS
- OptionsNG
- Pet portlint
- Switch to dynamic plist where useful
- Canonicalize patch names
- Fix DOS line endings in patch files

26 files changed, 56 insertions, 55 deletions

diff --git a/graphics/devil/Makefile b/graphics/devil/Makefile
index bc0dc490599c..c371aab3dbe9 100644
--- a/graphics/devil/Makefile
+++ b/graphics/devil/Makefile
@@ -29,7 +29,7 @@ SIMD_DESC=	Enable SIMD autodetection (AltiVec, SSE3,...)
 WRKSRC=		${WRKDIR}/${DISTNAME:L}
 
 USE_GCC=	any
-USE_GNOME=	pkgconfig
+USES=		pkgconfig
 USE_AUTOTOOLS=	aclocal autoheader automake autoconf libtool
 ACLOCAL_ARGS=	-I m4 -I ${LOCALBASE}/share/aclocal
 AUTOMAKE_ARGS=	--add-missing --copy --force-missing
@@ -44,28 +44,28 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MJPEG}
-LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg
 CONFIGURE_ARGS+=--enable-jpeg
 .else
 CONFIGURE_ARGS+=--disable-jpeg
 .endif
 
 .if ${PORT_OPTIONS:MJASPER}
-LIB_DEPENDS+=	jasper.4:${PORTSDIR}/graphics/jasper
+LIB_DEPENDS+=	jasper:${PORTSDIR}/graphics/jasper
 CONFIGURE_ARGS+=--enable-jp2
 .else
 CONFIGURE_ARGS+=--disable-jp2
 .endif
 
 .if ${PORT_OPTIONS:MLCMS}
-LIB_DEPENDS+=	lcms.1:${PORTSDIR}/graphics/lcms
+LIB_DEPENDS+=	lcms:${PORTSDIR}/graphics/lcms
 CONFIGURE_ARGS+=--enable-lcms
 .else
 CONFIGURE_ARGS+=--disable-lcms
 .endif
 
 .if ${PORT_OPTIONS:MMNG}
-LIB_DEPENDS+=	mng.1:${PORTSDIR}/graphics/libmng
+LIB_DEPENDS+=	mng:${PORTSDIR}/graphics/libmng
 CONFIGURE_ARGS+=--enable-mng
 .else
 CONFIGURE_ARGS+=--disable-mng
@@ -79,7 +79,7 @@ CONFIGURE_ARGS+=--disable-png
 .endif
 
 .if ${PORT_OPTIONS:MTIFF}
-LIB_DEPENDS+=	tiff.4:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS+=	tiff:${PORTSDIR}/graphics/tiff
 CONFIGURE_ARGS+=--enable-tiff
 .else
 CONFIGURE_ARGS+=--disable-tiff
diff --git a/graphics/devil/files/patch-src-IL-src-il_icon.c b/graphics/devil/files/patch-src-IL-src-il__icon.c
index ee808913268e..ee808913268e 100644
--- a/graphics/devil/files/patch-src-IL-src-il_icon.c
+++ b/graphics/devil/files/patch-src-IL-src-il__icon.c
diff --git a/graphics/devil/files/patch-src-IL-src-il_nvidia.cpp b/graphics/devil/files/patch-src-IL-src-il__nvidia.cpp
index 1779d679d44b..1779d679d44b 100644
--- a/graphics/devil/files/patch-src-IL-src-il_nvidia.cpp
+++ b/graphics/devil/files/patch-src-IL-src-il__nvidia.cpp
diff --git a/graphics/devil/files/patch-src-IL-src-il_png.c b/graphics/devil/files/patch-src-IL-src-il__png.c
index a1c4e5c0e02e..a1c4e5c0e02e 100644
--- a/graphics/devil/files/patch-src-IL-src-il_png.c
+++ b/graphics/devil/files/patch-src-IL-src-il__png.c
diff --git a/graphics/devil/files/patch-src-ILUT__src__ilut_opengl.c b/graphics/devil/files/patch-src-ILUT-src-ilut__opengl.c
index 685f82ea5a2a..685f82ea5a2a 100644
--- a/graphics/devil/files/patch-src-ILUT__src__ilut_opengl.c
+++ b/graphics/devil/files/patch-src-ILUT-src-ilut__opengl.c
diff --git a/graphics/geeqie/Makefile b/graphics/geeqie/Makefile
index ef313ee08445..2f82526271bd 100644
--- a/graphics/geeqie/Makefile
+++ b/graphics/geeqie/Makefile
@@ -38,21 +38,21 @@ GPS_DESC=	GPS map support (libchamplain) EXPERIMENTAL
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MEXIV2}
-LIB_DEPENDS+=	exiv2.12:${PORTSDIR}/graphics/exiv2
+LIB_DEPENDS+=	exiv2:${PORTSDIR}/graphics/exiv2
 CONFIGURE_ARGS+=--enable-exiv2
 .else
 CONFIGURE_ARGS+=--disable-exiv2
 .endif
 
 .if ${PORT_OPTIONS:MLCMS}
-LIB_DEPENDS+=	lcms.1:${PORTSDIR}/graphics/lcms
+LIB_DEPENDS+=	lcms:${PORTSDIR}/graphics/lcms
 CONFIGURE_ARGS+=--enable-lcms
 .else
 CONFIGURE_ARGS+=--disable-lcms
 .endif
 
 .if ${PORT_OPTIONS:MLIRC}
-LIB_DEPENDS+=	lirc_client.2:${PORTSDIR}/comms/lirc
+LIB_DEPENDS+=	lirc_client:${PORTSDIR}/comms/lirc
 CONFIGURE_ARGS+=--enable-lirc
 .else
 CONFIGURE_ARGS+=--disable-lirc
@@ -60,7 +60,7 @@ CONFIGURE_ARGS+=--disable-lirc
 
 # Support for libchamplain is marked as experimental!
 .if ${PORT_OPTIONS:MGPS}
-LIB_DEPENDS+=	champlain-0.8.1:${PORTSDIR}/graphics/libchamplain
+LIB_DEPENDS+=	champlain-0.8:${PORTSDIR}/graphics/libchamplain
 CONFIGURE_ARGS+=--enable-gps
 .else
 CONFIGURE_ARGS+=--disable-gps
diff --git a/graphics/geomorph/Makefile b/graphics/geomorph/Makefile
index 19a325d05e59..0e068a40c4a3 100644
--- a/graphics/geomorph/Makefile
+++ b/graphics/geomorph/Makefile
@@ -11,7 +11,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Height field generator and editor
 
-LIB_DEPENDS=	gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext \
+LIB_DEPENDS=	gtkglext-x11-1.0:${PORTSDIR}/x11-toolkits/gtkglext \
 		png15:${PORTSDIR}/graphics/png
 
 USE_GL=		yes
diff --git a/graphics/gimp-lqr-plugin/Makefile b/graphics/gimp-lqr-plugin/Makefile
index 089cfd2216d7..34cd7fd94955 100644
--- a/graphics/gimp-lqr-plugin/Makefile
+++ b/graphics/gimp-lqr-plugin/Makefile
@@ -12,7 +12,7 @@ MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Liquid rescale GIMP plug-in
 
 LIB_DEPENDS=	gimp-2.0:${PORTSDIR}/graphics/gimp-app \
-		lqr-1.3:${PORTSDIR}/graphics/liblqr-1
+		lqr-1:${PORTSDIR}/graphics/liblqr-1
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
diff --git a/graphics/gimp-resynthesizer/pkg-descr b/graphics/gimp-resynthesizer/pkg-descr
index 35ec4ee5bdcc..f8382a4af92a 100644
--- a/graphics/gimp-resynthesizer/pkg-descr
+++ b/graphics/gimp-resynthesizer/pkg-descr
@@ -6,4 +6,4 @@ a surprising number of uses:
  * Removing objects from images
  * Creating themed images
 
-WWW:	http://www.logarithmic.net/pfh/resynthesizer
+WWW: http://www.logarithmic.net/pfh/resynthesizer
diff --git a/graphics/kudu/Makefile b/graphics/kudu/Makefile
index 95f6087e86b9..78835c4efe9e 100644
--- a/graphics/kudu/Makefile
+++ b/graphics/kudu/Makefile
@@ -12,7 +12,7 @@ COMMENT=	3D skeletal animation tool, powered by GTK+ and OpenGL
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext
+LIB_DEPENDS=	gtkglext-x11-1.0:${PORTSDIR}/x11-toolkits/gtkglext
 
 USE_GL=		gl
 USE_PYTHON=	yes
diff --git a/graphics/liblqr-1/Makefile b/graphics/liblqr-1/Makefile
index e5de5453c674..55ca726929f2 100644
--- a/graphics/liblqr-1/Makefile
+++ b/graphics/liblqr-1/Makefile
@@ -14,8 +14,8 @@ COMMENT=	An easy to use C/C++ seam carving library
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	_glib20 pkgconfig
-USES=		gettext
+USE_GNOME=	_glib20
+USES=		gettext pkgconfig
 MAKE_JOBS_SAFE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/graphics/lprof-devel/Makefile b/graphics/lprof-devel/Makefile
index 5f50f43f05d0..c425d3802729 100644
--- a/graphics/lprof-devel/Makefile
+++ b/graphics/lprof-devel/Makefile
@@ -6,20 +6,21 @@ PORTVERSION=	20080514
 PORTREVISION=	10
 CATEGORIES=	graphics
 MASTER_SITES=	http://mirror.amdmi3.ru/distfiles/ \
-		${MASTER_SITE_LOCAL:S|%SUBDIR%|amdmi3|}
+		LOCAL/amdmi3
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Open source color profiler
 
-LIB_DEPENDS=	lcms.1:${PORTSDIR}/graphics/lcms \
-		jpeg.11:${PORTSDIR}/graphics/jpeg \
-		tiff.4:${PORTSDIR}/graphics/tiff \
-		vigraimpex.4:${PORTSDIR}/graphics/vigra
+LIB_DEPENDS=	lcms:${PORTSDIR}/graphics/lcms \
+		jpeg:${PORTSDIR}/graphics/jpeg \
+		tiff:${PORTSDIR}/graphics/tiff \
+		vigraimpex:${PORTSDIR}/graphics/vigra
 
 USE_BZIP2=	yes
 USE_XORG=	x11 xext sm ice xxf86vm
-USE_QT4=	corelib gui qt3support assistantclient linguist_build qmake_build moc_build uic_build rcc_build
+USE_QT4=	corelib gui qt3support assistantclient \
+		linguist_build qmake_build moc_build uic_build rcc_build
 USES=		cmake
 MAKE_JOBS_SAFE=	yes
 
diff --git a/graphics/lprof-devel/files/patch-src_argyll_spectro_usbio.c b/graphics/lprof-devel/files/patch-src-argyll-spectro-usbio.c
index 9ee392c2e375..9ee392c2e375 100644
--- a/graphics/lprof-devel/files/patch-src_argyll_spectro_usbio.c
+++ b/graphics/lprof-devel/files/patch-src-argyll-spectro-usbio.c
diff --git a/graphics/mhgui/Makefile b/graphics/mhgui/Makefile
index 6254c54abe53..ded631d2abeb 100644
--- a/graphics/mhgui/Makefile
+++ b/graphics/mhgui/Makefile
@@ -12,7 +12,7 @@ COMMENT=	GUI widget library for MakeHuman
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	animorph.0:${PORTSDIR}/graphics/animorph \
+LIB_DEPENDS=	animorph:${PORTSDIR}/graphics/animorph \
 		png15:${PORTSDIR}/graphics/png
 
 GNU_CONFIGURE=	yes
diff --git a/graphics/nvidia-texture-tools/Makefile b/graphics/nvidia-texture-tools/Makefile
index 656cf7a36159..18a5b0a6149a 100644
--- a/graphics/nvidia-texture-tools/Makefile
+++ b/graphics/nvidia-texture-tools/Makefile
@@ -12,8 +12,8 @@ MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Texture Tools with support for DirectX 10 texture formats
 
 LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
-		jpeg.11:${PORTSDIR}/graphics/jpeg \
-		tiff.4:${PORTSDIR}/graphics/tiff \
+		jpeg:${PORTSDIR}/graphics/jpeg \
+		tiff:${PORTSDIR}/graphics/tiff \
 		IlmImf:${PORTSDIR}/graphics/OpenEXR
 
 USES=		cmake
diff --git a/graphics/osg-devel/Makefile b/graphics/osg-devel/Makefile
index e3442d0f6c24..d5754d2abe09 100644
--- a/graphics/osg-devel/Makefile
+++ b/graphics/osg-devel/Makefile
@@ -13,9 +13,9 @@ DISTNAME=	OpenSceneGraph-${PORTVERSION}
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	C++ OpenGL scene graph library for real-time rendering
 
-LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
+LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
 		png15:${PORTSDIR}/graphics/png \
-		tiff.4:${PORTSDIR}/graphics/tiff
+		tiff:${PORTSDIR}/graphics/tiff
 
 CONFLICTS=	osg-[0-9]*
 
@@ -65,7 +65,7 @@ PLIST_SUB+=	CURL="@comment "
 
 .if ${PORT_OPTIONS:MFREETYPE}
 FORCE_REQUIRE+=	FreeType
-LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
+LIB_DEPENDS+=	freetype:${PORTSDIR}/print/freetype2
 PLIST_SUB+=	FREETYPE=""
 .else
 FORCE_IGNORE+=	FreeType
@@ -74,7 +74,7 @@ PLIST_SUB+=	FREETYPE="@comment "
 
 .if ${PORT_OPTIONS:MGDAL}
 FORCE_REQUIRE+=	GDAL
-LIB_DEPENDS+=	gdal.17:${PORTSDIR}/graphics/gdal
+LIB_DEPENDS+=	gdal:${PORTSDIR}/graphics/gdal
 PLIST_SUB+=	GDAL=""
 .else
 FORCE_IGNORE+=	GDAL
@@ -83,7 +83,7 @@ PLIST_SUB+=	GDAL="@comment "
 
 .if ${PORT_OPTIONS:MGIF}
 FORCE_REQUIRE+=	GIFLIB
-LIB_DEPENDS+=	gif.5:${PORTSDIR}/graphics/giflib
+LIB_DEPENDS+=	gif:${PORTSDIR}/graphics/giflib
 PLIST_SUB+=	GIF=""
 .else
 FORCE_IGNORE+=	GIFLIB
@@ -102,7 +102,7 @@ PLIST_SUB+=	INVENTOR="@comment "
 
 .if ${PORT_OPTIONS:MJASPER}
 FORCE_REQUIRE+=	Jasper
-LIB_DEPENDS+=	jasper.4:${PORTSDIR}/graphics/jasper
+LIB_DEPENDS+=	jasper:${PORTSDIR}/graphics/jasper
 PLIST_SUB+=	JASPER=""
 .else
 FORCE_IGNORE+=	Jasper
@@ -111,7 +111,7 @@ PLIST_SUB+=	JASPER="@comment "
 
 #.if ${PORT_OPTIONS:MOPENVRML}
 #FORCE_REQUIRE+=	OpenVRML
-#LIB_DEPENDS+=	openvrml.8:${PORTSDIR}/www/openvrml
+#LIB_DEPENDS+=	openvrml:${PORTSDIR}/www/openvrml
 #PLIST_SUB+=	OPENVRML=""
 #.else
 FORCE_IGNORE+=	OpenVRML
@@ -120,7 +120,7 @@ PLIST_SUB+=	OPENVRML="@comment "
 
 .if ${PORT_OPTIONS:MXINE}
 FORCE_REQUIRE+=	Xine
-LIB_DEPENDS+=	xine.2:${PORTSDIR}/multimedia/libxine
+LIB_DEPENDS+=	xine:${PORTSDIR}/multimedia/libxine
 PLIST_SUB+=	XINE=""
 .else
 FORCE_IGNORE+=	Xine
@@ -140,7 +140,7 @@ PLIST_SUB+=	ITK="@comment "
 
 .if ${PORT_OPTIONS:MVNC}
 FORCE_REQUIRE+=	LibVNCServer
-LIB_DEPENDS+=	vncserver.0:${PORTSDIR}/net/libvncserver
+LIB_DEPENDS+=	vncserver:${PORTSDIR}/net/libvncserver
 PLIST_SUB+=	VNC=""
 .else
 FORCE_IGNORE+=	LibVNCServer
@@ -149,7 +149,7 @@ PLIST_SUB+=	VNC="@comment "
 
 .if ${PORT_OPTIONS:MOPENEXR}
 FORCE_REQUIRE+=	OpenEXR
-LIB_DEPENDS+=	IlmImf.6:${PORTSDIR}/graphics/OpenEXR
+LIB_DEPENDS+=	IlmImf:${PORTSDIR}/graphics/OpenEXR
 PLIST_SUB+=	OPENEXR=""
 .else
 FORCE_IGNORE+=	OpenEXR
@@ -158,7 +158,7 @@ PLIST_SUB+=	OPENEXR="@comment "
 
 .if ${PORT_OPTIONS:MFFMPEG}
 FORCE_REQUIRE+=	FFmpeg
-LIB_DEPENDS+=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg
+LIB_DEPENDS+=	avcodec:${PORTSDIR}/multimedia/ffmpeg
 PLIST_SUB+=	FFMPEG=""
 .else
 FORCE_IGNORE+=	FFmpeg
@@ -184,7 +184,7 @@ PLIST_SUB+=	SVG="@comment "
 
 .if ${PORT_OPTIONS:MPDF}
 FORCE_REQUIRE+=	Poppler-glib
-LIB_DEPENDS+=	poppler-glib.8:${PORTSDIR}/graphics/poppler-glib
+LIB_DEPENDS+=	poppler-glib:${PORTSDIR}/graphics/poppler-glib
 PLIST_SUB+=	PDF=""
 .else
 FORCE_IGNORE+=	Poppler-glib
@@ -192,7 +192,7 @@ PLIST_SUB+=	PDF="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSVG} || ${PORT_OPTIONS:MPDF}
-LIB_DEPENDS+=	cairo.2:${PORTSDIR}/graphics/cairo
+LIB_DEPENDS+=	cairo:${PORTSDIR}/graphics/cairo
 .endif
 
 # other options
diff --git a/graphics/osg-devel/files/patch-src-osgPlugins-xine-video_out_rgb.c b/graphics/osg-devel/files/patch-src-osgPlugins-xine-video__out__rgb.c
index 40ef08509ccc..40ef08509ccc 100644
--- a/graphics/osg-devel/files/patch-src-osgPlugins-xine-video_out_rgb.c
+++ b/graphics/osg-devel/files/patch-src-osgPlugins-xine-video__out__rgb.c
diff --git a/graphics/osg/Makefile b/graphics/osg/Makefile
index c386639c10c9..39d83ed0dcc7 100644
--- a/graphics/osg/Makefile
+++ b/graphics/osg/Makefile
@@ -12,9 +12,9 @@ DISTNAME=	OpenSceneGraph-${PORTVERSION}
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	C++ OpenGL scene graph library for real-time rendering
 
-LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
+LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
 		png15:${PORTSDIR}/graphics/png \
-		tiff.4:${PORTSDIR}/graphics/tiff
+		tiff:${PORTSDIR}/graphics/tiff
 
 CONFLICTS=	osg-devel-[0-9]*
 
@@ -66,7 +66,7 @@ PLIST_SUB+=	CURL="@comment "
 
 .if ${PORT_OPTIONS:MFREETYPE}
 FORCE_REQUIRE+=	FreeType
-LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
+LIB_DEPENDS+=	freetype:${PORTSDIR}/print/freetype2
 PLIST_SUB+=	FREETYPE=""
 .else
 FORCE_IGNORE+=	FreeType
@@ -75,7 +75,7 @@ PLIST_SUB+=	FREETYPE="@comment "
 
 .if ${PORT_OPTIONS:MGDAL}
 FORCE_REQUIRE+=	GDAL
-LIB_DEPENDS+=	gdal.17:${PORTSDIR}/graphics/gdal
+LIB_DEPENDS+=	gdal:${PORTSDIR}/graphics/gdal
 PLIST_SUB+=	GDAL=""
 .else
 FORCE_IGNORE+=	GDAL
@@ -84,7 +84,7 @@ PLIST_SUB+=	GDAL="@comment "
 
 .if ${PORT_OPTIONS:MGIF}
 FORCE_REQUIRE+=	GIFLIB
-LIB_DEPENDS+=	gif.5:${PORTSDIR}/graphics/giflib
+LIB_DEPENDS+=	gif:${PORTSDIR}/graphics/giflib
 PLIST_SUB+=	GIF=""
 .else
 FORCE_IGNORE+=	GIFLIB
@@ -103,7 +103,7 @@ PLIST_SUB+=	INVENTOR="@comment "
 
 .if ${PORT_OPTIONS:MJASPER}
 FORCE_REQUIRE+=	Jasper
-LIB_DEPENDS+=	jasper.4:${PORTSDIR}/graphics/jasper
+LIB_DEPENDS+=	jasper:${PORTSDIR}/graphics/jasper
 PLIST_SUB+=	JASPER=""
 .else
 FORCE_IGNORE+=	Jasper
@@ -112,7 +112,7 @@ PLIST_SUB+=	JASPER="@comment "
 
 #.if ${PORT_OPTIONS:MOPENVRML}
 #FORCE_REQUIRE+=	OpenVRML
-#LIB_DEPENDS+=	openvrml.8:${PORTSDIR}/www/openvrml
+#LIB_DEPENDS+=	openvrml:${PORTSDIR}/www/openvrml
 #PLIST_SUB+=	OPENVRML=""
 #.else
 FORCE_IGNORE+=	OpenVRML
@@ -121,7 +121,7 @@ PLIST_SUB+=	OPENVRML="@comment "
 
 .if ${PORT_OPTIONS:MXINE}
 FORCE_REQUIRE+=	Xine
-LIB_DEPENDS+=	xine.2:${PORTSDIR}/multimedia/libxine
+LIB_DEPENDS+=	xine:${PORTSDIR}/multimedia/libxine
 PLIST_SUB+=	XINE=""
 .else
 FORCE_IGNORE+=	Xine
@@ -141,7 +141,7 @@ PLIST_SUB+=	ITK="@comment "
 
 .if ${PORT_OPTIONS:MVNC}
 FORCE_REQUIRE+=	LibVNCServer
-LIB_DEPENDS+=	vncserver.0:${PORTSDIR}/net/libvncserver
+LIB_DEPENDS+=	vncserver:${PORTSDIR}/net/libvncserver
 PLIST_SUB+=	VNC=""
 .else
 FORCE_IGNORE+=	LibVNCServer
@@ -150,7 +150,7 @@ PLIST_SUB+=	VNC="@comment "
 
 .if ${PORT_OPTIONS:MOPENEXR}
 FORCE_REQUIRE+=	OpenEXR
-LIB_DEPENDS+=	IlmImf.6:${PORTSDIR}/graphics/OpenEXR
+LIB_DEPENDS+=	IlmImf:${PORTSDIR}/graphics/OpenEXR
 PLIST_SUB+=	OPENEXR=""
 .else
 FORCE_IGNORE+=	OpenEXR
@@ -159,7 +159,7 @@ PLIST_SUB+=	OPENEXR="@comment "
 
 .if ${PORT_OPTIONS:MFFMPEG}
 FORCE_REQUIRE+=	FFmpeg
-LIB_DEPENDS+=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg
+LIB_DEPENDS+=	avcodec:${PORTSDIR}/multimedia/ffmpeg
 PLIST_SUB+=	FFMPEG=""
 .else
 FORCE_IGNORE+=	FFmpeg
@@ -185,7 +185,7 @@ PLIST_SUB+=	SVG="@comment "
 
 .if ${PORT_OPTIONS:MPDF}
 FORCE_REQUIRE+=	Poppler-glib
-LIB_DEPENDS+=	poppler-glib.8:${PORTSDIR}/graphics/poppler-glib
+LIB_DEPENDS+=	poppler-glib:${PORTSDIR}/graphics/poppler-glib
 PLIST_SUB+=	PDF=""
 .else
 FORCE_IGNORE+=	Poppler-glib
@@ -193,7 +193,7 @@ PLIST_SUB+=	PDF="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSVG} || ${PORT_OPTIONS:MPDF}
-LIB_DEPENDS+=	cairo.2:${PORTSDIR}/graphics/cairo
+LIB_DEPENDS+=	cairo:${PORTSDIR}/graphics/cairo
 .endif
 
 # other options
diff --git a/graphics/osg/files/patch-src-osgPlugins-xine-video_out_rgb.c b/graphics/osg/files/patch-src-osgPlugins-xine-video__out__rgb.c
index 41f1c6bf8dc2..41f1c6bf8dc2 100644
--- a/graphics/osg/files/patch-src-osgPlugins-xine-video_out_rgb.c
+++ b/graphics/osg/files/patch-src-osgPlugins-xine-video__out__rgb.c
diff --git a/graphics/scrot/Makefile b/graphics/scrot/Makefile
index 7f01d3e3f7d9..9e6ea60b1d0d 100644
--- a/graphics/scrot/Makefile
+++ b/graphics/scrot/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://linuxbrit.co.uk/downloads/ \
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	A screen capture utility that utilizes Imlib2
 
-LIB_DEPENDS=	giblib.1:${PORTSDIR}/graphics/giblib
+LIB_DEPENDS=	giblib:${PORTSDIR}/graphics/giblib
 
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/graphics/sharpconstruct/Makefile b/graphics/sharpconstruct/Makefile
index 4f73120e78c1..15b025e331b8 100644
--- a/graphics/sharpconstruct/Makefile
+++ b/graphics/sharpconstruct/Makefile
@@ -14,8 +14,8 @@ MASTER_SITES=	SF/sharp3d/SharpConstruct/${PORTVERSION}
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	3D modeller for organic shapes
 
-LIB_DEPENDS=	gtkglextmm-x11-1.2.0:${PORTSDIR}/x11-toolkits/gtkglextmm \
-		glademm-2.4.1:${PORTSDIR}/devel/libglademm24
+LIB_DEPENDS=	gtkglextmm-x11-1.2:${PORTSDIR}/x11-toolkits/gtkglextmm \
+		glademm-2.4:${PORTSDIR}/devel/libglademm24
 
 USE_BZIP2=	yes
 USE_GL=		yes
diff --git a/graphics/tiled/pkg-descr b/graphics/tiled/pkg-descr
index 299121e4a16e..904200bd3cdf 100644
--- a/graphics/tiled/pkg-descr
+++ b/graphics/tiled/pkg-descr
@@ -15,4 +15,4 @@ framework. The main features in a nutshell:
     * Supports input/output plugins to open and save files in custom
       formats
 
-WWW:	http://www.mapeditor.org/
+WWW: http://www.mapeditor.org/
diff --git a/graphics/wings-devel/files/patch-plugins__src_accel_perlin__noise__drv.c b/graphics/wings-devel/files/patch-plugins__src-accel-perlin__noise__drv.c
index 46e5922224b7..46e5922224b7 100644
--- a/graphics/wings-devel/files/patch-plugins__src_accel_perlin__noise__drv.c
+++ b/graphics/wings-devel/files/patch-plugins__src-accel-perlin__noise__drv.c
diff --git a/graphics/wings-devel/files/patch-plugins__src_accel_wings__pick__drv.c b/graphics/wings-devel/files/patch-plugins__src-accel-wings__pick__drv.c
index 853f7e98bcb7..853f7e98bcb7 100644
--- a/graphics/wings-devel/files/patch-plugins__src_accel_wings__pick__drv.c
+++ b/graphics/wings-devel/files/patch-plugins__src-accel-wings__pick__drv.c
diff --git a/graphics/wings/files/patch-plugins__src_accel_perlin__noise__drv.c b/graphics/wings/files/patch-plugins__src-accel-perlin__noise__drv.c
index 46e5922224b7..46e5922224b7 100644
--- a/graphics/wings/files/patch-plugins__src_accel_perlin__noise__drv.c
+++ b/graphics/wings/files/patch-plugins__src-accel-perlin__noise__drv.c
diff --git a/graphics/wings/files/patch-plugins__src_accel_wings__pick__drv.c b/graphics/wings/files/patch-plugins__src-accel-wings__pick__drv.c
index 853f7e98bcb7..853f7e98bcb7 100644
--- a/graphics/wings/files/patch-plugins__src_accel_wings__pick__drv.c
+++ b/graphics/wings/files/patch-plugins__src-accel-wings__pick__drv.c