Index: head/graphics/gnome-color-manager/Makefile
===================================================================
--- head/graphics/gnome-color-manager/Makefile	(revision 452403)
+++ head/graphics/gnome-color-manager/Makefile	(revision 452404)
@@ -1,57 +1,51 @@
 # Created by: FreeBSD GNOME Team <gnome@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	gnome-color-manager
 PORTVERSION=	3.18.0
 PORTREVISION=	2
 CATEGORIES=	graphics gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Session framework for the GNOME desktop to manage color profiles
 
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 BUILD_DEPENDS=	docbook2man:textproc/docbook-utils \
 		itstool:textproc/itstool \
 		docbook-sgml>0:textproc/docbook-sgml
 LIB_DEPENDS=	liblcms2.so:graphics/lcms2 \
 		libcolord.so:graphics/colord \
 		libcolord-gtk.so:graphics/colord-gtk \
 		libcanberra-gtk3.so:audio/libcanberra-gtk3 \
 		libexif.so:graphics/libexif
 
 PORTSCOUT=	limitw:1,even
 
+USES=		desktop-file-utils gettext gmake localbase:ldflags gnome pathfix pkgconfig tar:xz
 USE_XORG=	xrandr
 USE_GNOME=	gnomedesktop3 gtk30 intlhack vte3
-USES=		desktop-file-utils gettext gmake gnome pathfix pkgconfig tar:xz
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-clutter=no
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	RAW
 OPTIONS_DEFAULT=RAW
+OPTIONS_SUB=	yes
 
 RAW_DESC=	Enable RAW EXIF support
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MRAW}
-LIB_DEPENDS+=	libexiv2.so:graphics/exiv2
-CONFIGURE_ARGS+=--enable-exiv=yes
-PLIST_SUB+=	RAW=""
-.else
-CONFIGURE_ARGS+=--enable-exiv=no
-PLIST_SUB+=	RAW="@comment "
-.endif
+RAW_LIB_DEPENDS=	libexiv2.so:graphics/exiv2
+RAW_CONFIGURE_ON=	--enable-exiv=yes
+RAW_CONFIGURE_OFF=	--enable-exiv=no
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-Wclobbered||g ; s|-Wempty-body||g ; \
 		s|-Wignored-qualifiers||g ; s|-Wtype-limits||g ; \
 		s|-Wmissing-parameter-type||g' \
 			${WRKSRC}/configure
 
 .include <bsd.port.mk>
Index: head/graphics/gnome-color-manager/pkg-descr
===================================================================
--- head/graphics/gnome-color-manager/pkg-descr	(revision 452403)
+++ head/graphics/gnome-color-manager/pkg-descr	(revision 452404)
@@ -1,5 +1,5 @@
 GNOME Color Manager is a session framework for the GNOME desktop environment
 that makes it easy to manage easy to manage, install and generate color
 profiles.
 
-WWW: http://projects.gnome.org/gnome-color-manager/
+WWW: https://git.gnome.org/browse/gnome-color-manager