Index: head/devel/guichan/Makefile
===================================================================
--- head/devel/guichan/Makefile	(revision 467601)
+++ head/devel/guichan/Makefile	(revision 467602)
@@ -1,55 +1,40 @@
 # Created by: Tobias Gion <freebsd@gionet.de>
 # $FreeBSD$
 
 PORTNAME=	guichan
 PORTVERSION=	0.8.2
 PORTREVISION=	11
 CATEGORIES=	devel games
-MASTER_SITES=	http://pkgs.fedoraproject.org/repo/pkgs/guichan/guichan-0.8.2.tar.gz/af535d7f387e774e3197cef8023ea105/
+MASTER_SITES=	http://pkgs.fedoraproject.org/repo/pkgs/guichan/${DISTFILES}/af535d7f387e774e3197cef8023ea105/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Small, efficient C++ GUI library designed for games
 
 LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/COPYING
 
+USES=		gmake pathfix libtool localbase:ldflags
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USES=		gmake pathfix libtool
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+PORTDOCS=	AUTHORS ChangeLog NEWS README TODO
 
-OPTIONS_DEFINE=		SDL ALLEGRO OPENGL
+OPTIONS_DEFINE=		SDL ALLEGRO OPENGL DOCS
 OPTIONS_DEFAULT=	SDL OPENGL
-ALLEGRO_DESC=	Allegro support
+OPTIONS_SUB=		yes
 
-.include <bsd.port.options.mk>
+SDL_USE=		SDL=sdl,image
+SDL_CONFIGURE_ENABLE=	sdl sdlimage
 
-.if ${PORT_OPTIONS:MSDL}
-USE_SDL+=	sdl image
-CONFIGURE_ARGS+=--enable-sdl --enable-sdlimage
-PLIST_SUB+=	SDL=""
-.else
-CONFIGURE_ARGS+=--disable-sdl --disable-sdlimage
-PLIST_SUB+=	SDL="@comment "
-.endif
+ALLEGRO_DESC=		Allegro support
+ALLEGRO_LIB_DEPENDS=	liballeg.so:devel/allegro
+ALLEGRO_CONFIGURE_ENABLE=allegro
 
-.if ${PORT_OPTIONS:MALLEGRO}
-LIB_DEPENDS+=	liballeg.so:devel/allegro
-CONFIGURE_ARGS+=--enable-allegro
-PLIST_SUB+=	ALLEGRO=""
-.else
-CONFIGURE_ARGS+=--disable-allegro
-PLIST_SUB+=	ALLEGRO="@comment "
-.endif
+OPENGL_USE=		GL=gl
+OPENGL_CONFIGURE_ENABLE=opengl
 
-.if ${PORT_OPTIONS:MOPENGL}
-USE_GL=		yes
-CONFIGURE_ARGS+=--enable-opengl
-PLIST_SUB+=	GL=""
-.else
-CONFIGURE_ARGS+=--disable-opengl
-PLIST_SUB+=	GL="@comment "
-.endif
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/devel/guichan/pkg-plist
===================================================================
--- head/devel/guichan/pkg-plist	(revision 467601)
+++ head/devel/guichan/pkg-plist	(revision 467602)
@@ -1,88 +1,88 @@
 include/guichan.hpp
 include/guichan/actionevent.hpp
 include/guichan/actionlistener.hpp
 include/guichan/allegro.hpp
 include/guichan/basiccontainer.hpp
 include/guichan/cliprectangle.hpp
 include/guichan/color.hpp
 include/guichan/deathlistener.hpp
 include/guichan/defaultfont.hpp
 include/guichan/event.hpp
 include/guichan/exception.hpp
 include/guichan/focushandler.hpp
 include/guichan/focuslistener.hpp
 include/guichan/font.hpp
 include/guichan/genericinput.hpp
 include/guichan/graphics.hpp
 include/guichan/gui.hpp
 include/guichan/glut.hpp
 include/guichan/image.hpp
 include/guichan/imagefont.hpp
 include/guichan/imageloader.hpp
 include/guichan/input.hpp
 include/guichan/inputevent.hpp
 include/guichan/key.hpp
 include/guichan/keyevent.hpp
 include/guichan/keyinput.hpp
 include/guichan/keylistener.hpp
 include/guichan/listmodel.hpp
 include/guichan/mouseevent.hpp
 include/guichan/mouseinput.hpp
 include/guichan/mouselistener.hpp
 include/guichan/opengl.hpp
 include/guichan/platform.hpp
 include/guichan/rectangle.hpp
 include/guichan/sdl.hpp
 include/guichan/selectionevent.hpp
 include/guichan/selectionlistener.hpp
 include/guichan/widget.hpp
 include/guichan/widgetlistener.hpp
 include/guichan/widgets/button.hpp
 include/guichan/widgets/checkbox.hpp
 include/guichan/widgets/container.hpp
 include/guichan/widgets/dropdown.hpp
 include/guichan/widgets/icon.hpp
 include/guichan/widgets/imagebutton.hpp
 include/guichan/widgets/label.hpp
 include/guichan/widgets/listbox.hpp
 include/guichan/widgets/radiobutton.hpp
 include/guichan/widgets/scrollarea.hpp
 include/guichan/widgets/slider.hpp
 include/guichan/widgets/tab.hpp
 include/guichan/widgets/tabbedarea.hpp
 include/guichan/widgets/textbox.hpp
 include/guichan/widgets/textfield.hpp
 include/guichan/widgets/window.hpp
 %%ALLEGRO%%include/guichan/allegro/allegrofont.hpp
 %%ALLEGRO%%include/guichan/allegro/allegrographics.hpp
 %%ALLEGRO%%include/guichan/allegro/allegroimage.hpp
 %%ALLEGRO%%include/guichan/allegro/allegroimageloader.hpp
 %%ALLEGRO%%include/guichan/allegro/allegroinput.hpp
-%%GL%%include/guichan/opengl/openglgraphics.hpp
-%%GL%%include/guichan/opengl/openglimage.hpp
-%%GL%%include/guichan/opengl/openglallegroimageloader.hpp
-%%GL%%include/guichan/opengl/openglsdlimageloader.hpp
+%%OPENGL%%include/guichan/opengl/openglgraphics.hpp
+%%OPENGL%%include/guichan/opengl/openglimage.hpp
+%%OPENGL%%include/guichan/opengl/openglallegroimageloader.hpp
+%%OPENGL%%include/guichan/opengl/openglsdlimageloader.hpp
 %%SDL%%include/guichan/sdl/sdlgraphics.hpp
 %%SDL%%include/guichan/sdl/sdlimage.hpp
 %%SDL%%include/guichan/sdl/sdlimageloader.hpp
 %%SDL%%include/guichan/sdl/sdlinput.hpp
 %%SDL%%include/guichan/sdl/sdlpixel.hpp
 lib/libguichan.a
 lib/libguichan.so
 lib/libguichan.so.1
 lib/libguichan.so.1.1.0
 libdata/pkgconfig/guichan-0.8.pc
 %%ALLEGRO%%lib/libguichan_allegro.a
 %%ALLEGRO%%lib/libguichan_allegro.so
 %%ALLEGRO%%lib/libguichan_allegro.so.1
 %%ALLEGRO%%lib/libguichan_allegro.so.1.1.0
-%%GL%%lib/libguichan_opengl.a
-%%GL%%lib/libguichan_opengl.so
-%%GL%%lib/libguichan_opengl.so.1
-%%GL%%lib/libguichan_opengl.so.1.1.0
-%%GL%%libdata/pkgconfig/guichan_opengl-0.8.pc
+%%OPENGL%%lib/libguichan_opengl.a
+%%OPENGL%%lib/libguichan_opengl.so
+%%OPENGL%%lib/libguichan_opengl.so.1
+%%OPENGL%%lib/libguichan_opengl.so.1.1.0
+%%OPENGL%%libdata/pkgconfig/guichan_opengl-0.8.pc
 %%SDL%%lib/libguichan_sdl.a
 %%SDL%%lib/libguichan_sdl.so
 %%SDL%%lib/libguichan_sdl.so.1
 %%SDL%%lib/libguichan_sdl.so.1.1.0
 %%SDL%%libdata/pkgconfig/guichan_sdl-0.8.pc