Index: head/graphics/jasper/Makefile
===================================================================
--- head/graphics/jasper/Makefile	(revision 431513)
+++ head/graphics/jasper/Makefile	(revision 431514)
@@ -1,47 +1,34 @@
 # Created by: Maxim Sobolev <sobomax@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	jasper
 PORTVERSION=	1.900.1
 PORTREVISION=	16
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.ece.uvic.ca/~mdadams/jasper/software/ \
 		ftp://ftp.imagemagick.org/pub/ImageMagick/delegates/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Implementation of the codec specified in the JPEG-2000 standard
 
 LICENSE=	MIT
 
-USES=		zip libtool:keepla jpeg
-GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ARGS=	--enable-shared --enable-static
-USE_LDCONFIG=	yes
-
 OPTIONS_DEFINE=	OPENGL UUID DOCS
 OPTIONS_DEFAULT=UUID
+OPTIONS_SUB=	yes
 UUID_DESC=	UUID support (required by GDAL)
 
-.include <bsd.port.options.mk>
+CONFIGURE_ARGS=	--enable-shared --enable-static
+GNU_CONFIGURE=	yes
+USE_LDCONFIG=	yes
+USES=		jpeg libtool:keepla localbase zip
 
-.if ${PORT_OPTIONS:MOPENGL}
-USE_XORG=	x11 xmu xi xext
-USE_GL=		glut
-CONFIGURE_ARGS+=--enable-opengl
-PLIST_SUB+=	OPENGL=""
-.else
-CONFIGURE_ARGS+=--disable-opengl
-PLIST_SUB+=	OPENGL="@comment "
-.endif
+OPENGL_CONFIGURE_ENABLE=opengl
+OPENGL_USE=		GL=glut XORG=x11,xext,xi,xmu
+UUID_EXTRA_PATCHES=	${PATCHDIR}/uuid.patch
 
-.if ${PORT_OPTIONS:MUUID}
-EXTRA_PATCHES+=	${FILESDIR}/uuid.patch
-.endif
-
 post-install-DOCS-on:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
Index: head/graphics/jasper/pkg-descr
===================================================================
--- head/graphics/jasper/pkg-descr	(revision 431513)
+++ head/graphics/jasper/pkg-descr	(revision 431514)
@@ -1,7 +1,6 @@
 JasPer is a software-based implementation of the codec specified in the
 emerging JPEG-2000 Part-1 standard (i.e., ISO/IEC 15444-1). The JasPer software
 is written in the C programming language.
 
-LICENSE: MIT
-
-WWW: http://www.ece.uvic.ca/~mdadams/jasper/
+WWW: http://www.ece.uvic.ca/~frodo/jasper/
+WWW: https://github.com/mdadams/jasper