- Fix USE_XORG [1]

- Add LICENSE [1]
- Support PORTDOCS [1]
- Remove leading article from COMMENT
- Add missing deps, sort USE_ flags

PR:		ports/170172 [1]
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

2 files changed, 65 insertions, 43 deletions

diff --git a/x11-toolkits/gtkglext/Makefile b/x11-toolkits/gtkglext/Makefile
index 5778e427897d..1311b4ea121e 100644
--- a/x11-toolkits/gtkglext/Makefile
+++ b/x11-toolkits/gtkglext/Makefile
@@ -1,33 +1,55 @@
-# New ports collection makefile for:	GtkGLExt
-# Date created:				6 November 2002
-# Whom:					Kimura Fuyuki <fuyuki@hadaly.org>
-#
+# Created by: Kimura Fuyuki <fuyuki@hadaly.org>
 # $FreeBSD$
-#
 
 PORTNAME=	gtkglext
 PORTVERSION=	1.2.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	SF
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	An OpenGL extension to GTK
+COMMENT=	OpenGL extension to GTK+
+
+LICENSE=	GPLv2
+
+LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
+		pcre:${PORTSDIR}/devel/pcre \
+		cairo:${PORTSDIR}/graphics/cairo \
+		drm:${PORTSDIR}/graphics/libdrm \
+		png15:${PORTSDIR}/graphics/png \
+		freetype:${PORTSDIR}/print/freetype2 \
+		expat:${PORTSDIR}/textproc/expat2 \
+		xcb:${PORTSDIR}/x11/libxcb \
+		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
+
+OPTIONS_DEFINE=	DOCS
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
-USE_GNOME=	gnomehack gnomeprefix gtk20
-USE_GL=		yes
-USE_XORG=	xt
+USE_ICONV=	yes
+USE_PKGCONFIG=	build
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-USE_PKGCONFIG=	build
+USE_XORG=	ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
+		xfixes xi xinerama xmu xrandr xrender xt xxf86vm
+USE_GL=		glu
+USE_GNOME=	gdkpixbuf2 gnomehack gtk20
 USE_LDCONFIG=	yes
 
+.include <bsd.port.options.mk>
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|-DGTK_DISABLE_DEPRECATED||g' \
-		-e 's|-DGDK_DISABLE_DEPRECATED||g' \
-		${WRKSRC}/examples/Makefile.in ${WRKSRC}/gtk/Makefile.in
+	@${REINPLACE_CMD} -e \
+		'/^SUBDIRS/s|docs||' ${WRKSRC}/Makefile.in
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|-DGTK_DISABLE_DEPRECATED||g ; \
+		 s|-DGDK_DISABLE_DEPRECATED||g'
+
+post-install:
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/reference/gtkglext/html/* ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtkglext/pkg-plist b/x11-toolkits/gtkglext/pkg-plist
index 2dacbc9d1973..4a974d52a4c9 100644
--- a/x11-toolkits/gtkglext/pkg-plist
+++ b/x11-toolkits/gtkglext/pkg-plist
@@ -43,35 +43,35 @@ libdata/pkgconfig/gdkglext-x11-1.0.pc
 libdata/pkgconfig/gtkglext-1.0.pc
 libdata/pkgconfig/gtkglext-x11-1.0.pc
 share/aclocal/gtkglext-1.0.m4
-%%DOCSDIR%%/GdkGLExt-API.html
-%%DOCSDIR%%/GtkGLExt-API.html
-%%DOCSDIR%%/Overview.html
-%%DOCSDIR%%/gtkglext-building.html
-%%DOCSDIR%%/gtkglext-gdkglconfig.html
-%%DOCSDIR%%/gtkglext-gdkglcontext.html
-%%DOCSDIR%%/gtkglext-gdkgldrawable.html
-%%DOCSDIR%%/gtkglext-gdkglfont.html
-%%DOCSDIR%%/gtkglext-gdkglinit.html
-%%DOCSDIR%%/gtkglext-gdkglpixmap.html
-%%DOCSDIR%%/gtkglext-gdkglquery.html
-%%DOCSDIR%%/gtkglext-gdkglshapes.html
-%%DOCSDIR%%/gtkglext-gdkgltokens.html
-%%DOCSDIR%%/gtkglext-gdkglversion.html
-%%DOCSDIR%%/gtkglext-gdkglwindow.html
-%%DOCSDIR%%/gtkglext-gdkglx.html
-%%DOCSDIR%%/gtkglext-gtkglinit.html
-%%DOCSDIR%%/gtkglext-gtkglversion.html
-%%DOCSDIR%%/gtkglext-gtkglwidget.html
-%%DOCSDIR%%/gtkglext-running.html
-%%DOCSDIR%%/gtkglext.devhelp
-%%DOCSDIR%%/home.png
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/index.sgml
-%%DOCSDIR%%/left.png
-%%DOCSDIR%%/right.png
-%%DOCSDIR%%/style.css
-%%DOCSDIR%%/up.png
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/GdkGLExt-API.html
+%%PORTDOCS%%%%DOCSDIR%%/GtkGLExt-API.html
+%%PORTDOCS%%%%DOCSDIR%%/Overview.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkglext-building.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkglext-gdkglconfig.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkglext-gdkglcontext.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkglext-gdkgldrawable.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkglext-gdkglfont.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkglext-gdkglinit.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkglext-gdkglpixmap.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkglext-gdkglquery.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkglext-gdkglshapes.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkglext-gdkgltokens.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkglext-gdkglversion.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkglext-gdkglwindow.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkglext-gdkglx.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkglext-gtkglinit.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkglext-gtkglversion.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkglext-gtkglwidget.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkglext-running.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkglext.devhelp
+%%PORTDOCS%%%%DOCSDIR%%/home.png
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/index.sgml
+%%PORTDOCS%%%%DOCSDIR%%/left.png
+%%PORTDOCS%%%%DOCSDIR%%/right.png
+%%PORTDOCS%%%%DOCSDIR%%/style.css
+%%PORTDOCS%%%%DOCSDIR%%/up.png
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/gtkglext-1.0/gtk
 @dirrm include/gtkglext-1.0/gdk/x11
 @dirrm include/gtkglext-1.0/gdk/glext