diff --git a/graphics/aalib/Makefile b/graphics/aalib/Makefile
index cc5dceadf3e3..4fe661f2ddfe 100644
--- a/graphics/aalib/Makefile
+++ b/graphics/aalib/Makefile
@@ -1,51 +1,50 @@
 PORTNAME=	aalib
 DISTVERSION=	1.4rc5
 PORTREVISION=	13
 CATEGORIES=	graphics
 MASTER_SITES=	SF/aa-project/aa-lib/1.4rc5
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	ASCII art library
 WWW=		http://aa-project.sourceforge.net/aalib/
 
 LICENSE=	LGPL20+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		libtool localbase makeinfo
-WRKSRC=		${WRKDIR}/${PORTNAME}-1.4.0
-GNU_CONFIGURE=	yes
+USES=		libtool localbase
 USE_LDCONFIG=	yes
+
+GNU_CONFIGURE=	yes
+
+WRKSRC=		${WRKDIR}/${PORTNAME}-1.4.0
+
 INFO=		aalib
 
+OPTIONS_DEFAULT=	NCURSES
 OPTIONS_MULTI=		DRIVERS
 OPTIONS_MULTI_DRIVERS=	X11 NCURSES SLANG
-OPTIONS_DEFAULT=	NCURSES
 
-DRIVERS_DESC=		Drives selection
+DRIVERS_DESC=		Drivers selection
 
-X11_USES=		xorg
-X11_USE=		XORG=x11
-X11_CONFIGURE_WITH=	x11-driver=yes
 NCURSES_USES=		ncurses
 NCURSES_CONFIGURE_WITH=	curses-driver=yes
 SLANG_LIB_DEPENDS=	libslang.so:devel/libslang2
 SLANG_CONFIGURE_WITH=	slang-driver=yes
-
-post-extract:
-	@${RM} ${WRKSRC}/doc/aalib.info*
+X11_USES=		xorg
+X11_USE=		XORG=x11
+X11_CONFIGURE_WITH=	x11-driver=yes
 
 post-patch:
 	@${RM} ${WRKSRC}/config.cache
-	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g; \
-		s|MAKEINFO=makeinfo|MAKEINFO="${MAKEINFO} --no-split"|g' \
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} \
 		-e 's|AC_DEFUN(AM_PATH_AALIB|AC_DEFUN([AM_PATH_AALIB]|g' \
 		${WRKSRC}/aalib.m4
 	@${FIND} ${WRKSRC} \( -name '*.[ch]' \! -name acconfig.h \) \
 		| ${XARGS} ${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|g'
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libaa.so
 
 .include <bsd.port.mk>
diff --git a/graphics/aalib/files/patch-doc_aalib.texinfo b/graphics/aalib/files/patch-doc_aalib.texinfo
deleted file mode 100644
index 232cdccb920b..000000000000
--- a/graphics/aalib/files/patch-doc_aalib.texinfo
+++ /dev/null
@@ -1,37 +0,0 @@
---- doc/aalib.texinfo.orig	2014-02-11 19:55:03.000000000 +0100
-+++ doc/aalib.texinfo	2014-02-11 19:56:56.000000000 +0100
-@@ -29,11 +29,11 @@
- 
- @titlepage
- 
--@title{AA-lib @value{VERSION}}
--@subtitle{An ascii-art library}
--@subtitle{API-DESCRIPTION}
-+@title AA-lib @value{VERSION}
-+@subtitle An ascii-art library 
-+@subtitle API-DESCRIPTION 
- 
--@author{Jan Hubi@v cka & Kamil Toman}
-+@author Jan Hubi@v cka & Kamil Toman 
- @tex
- Dukelsk\'ych bojovn\'\i ku 1944 
- @end tex
-@@ -61,7 +61,8 @@
- @end tex
- @vskip 0pt plus 1filll
- 
--@copyright{} 1997 @tex Jan Hubi\v cka \& Kamil Toman
-+@copyright{} 1997
-+@tex Jan Hubi\v cka \& Kamil Toman
- @end tex
- 
- Permission is granted to make and distribute verbatim
-@@ -1318,7 +1319,7 @@
- functions (like initialization, drawing to screen etc...) and register it in
- the driver registry. There is separate drivers for screen, mouse and keyboard.
- 
--@subsection Display driver
-+@section Display driver
- Display driver is the most significant driver (of course) so it is recomended
- to implement it first. Its structure is as follows:
-