- Update to 4.2.0

- Use OPTIONS
- Take maintainership

PR:		ports/88907
Submitted by:	Alejandro Pulver <alejandro@varnet.biz>

14 files changed, 878 insertions, 1818 deletions

diff --git a/devel/allegro-devel/Makefile b/devel/allegro-devel/Makefile
index 3459828d3f22..a79a9cc48081 100644
--- a/devel/allegro-devel/Makefile
+++ b/devel/allegro-devel/Makefile
@@ -6,90 +6,134 @@
 #
 
 PORTNAME=	allegro
-PORTVERSION=	4.1.12
-PORTREVISION=	1
+DISTVERSION=	4.2.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	alleg
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	alejandro@varnet.biz
 COMMENT=	A cross-platform library for games and multimedia programming
 
+USE_GMAKE=	yes
+USE_REINPLACE=	yes
 USE_XLIB=	yes
 WANT_GNOME=	yes
-USE_REINPLACE=	yes
-USE_GMAKE=	yes
-USE_AUTOCONF_VER=	253
 
-.if !defined(WITHOUT_THREADS)
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -DHAVE_LIBPTHREAD" \
-		LDFLAGS="${PTHREAD_LIBS}"
-CONFIGURE_ARGS=	--enable-vga=no
-.else
-CONFIGURE_ARGS= --enable-vga=no --enable-pthreads=no
-.endif
+USE_AUTOCONF_VER=	259
+
+.include "Makefile.man"
+
+INFO=		allegro
+
+OPTIONS=	ARTS "Enable Arts support" off \
+		DEBUG_LIB "Build debugging library" off \
+		DEV_UTILS "Build development utilities" on \
+		ESOUND "Enable Esound support" off \
+		OPTIMIZED_CFLAGS "Enable compilation optimizations" on \
+		PROFILE_LIB "Build profiling library" off \
+		THREADS "Enable threads" on
 
 MAKEFILE=	makefile
 ALL_TARGET=	full-build
-INSTALLS_SHLIB=	yes
 
-SHLIB_VER=	41
+INSTALLS_SHLIB=	yes
+SHLIB_VER=	42
 PLIST_SUB=	SHLIB_VER="${SHLIB_VER}"
 DEMO=		demo.c demo.dat demo.h music.txt ../readme.txt
 
-INFO=		allegro
-
 .include <bsd.port.pre.mk>
 
-.if ${HAVE_GNOME:Mesound}!=""
-USE_GNOME+=	esound
-PKGNAMESUFFIX=	-esound
-PLIST_SUB+=	ESOUND=""
-.else
-CONFIGURE_ARGS+=	--enable-esddigi=no
-PLIST_SUB+=	ESOUND="@comment "
+.if ${ARCH} == "alpha" && ${OSVERSION} < 500000
+EXTRA_PATCHES=	${FILESDIR}/extra-patch-include-allegro-inline-fmaths.in
 .endif
 
-.if exists(${LOCALBASE}/lib/libartsc.so.0)
-WITH_ARTS=	yes
-.endif
-.if defined(WITH_ARTS)
+.if defined(WITH_ARTS) || exists(${LOCALBASE}/lib/libartsc.so.0)
 LIB_DEPENDS+=	artsc.0:${PORTSDIR}/audio/arts
+CONFIGURE_ARGS+=	--enable-artsdigi
 PLIST_SUB+=	ARTS=""
 .else
 CONFIGURE_ARGS+=	--disable-artsdigi
 PLIST_SUB+=	ARTS="@comment "
 .endif
 
-.if defined(WITHOUT_DEVEL)
-INSTALL_TARGET=	mini-install install-man install-info
-PLIST_SUB+=	FULL="@comment "
+.if defined(WITH_DEBUG_LIB)
+CONFIGURE_ARGS+=	--enable-dbglib
+PLIST_SUB+=	DEBUG_LIB=""
 .else
+CONFIGURE_ARGS+=	--disable-dbglib
+PLIST_SUB+=	DEBUG_LIB="@comment "
+.endif
+
+.if !defined(WITHOUT_DEV_UTILS)
 INSTALL_TARGET=	full-install install-man install-info
-PLIST_SUB+=	FULL=""
+PLIST_SUB+=	DEV_UTILS=""
+.else
+INSTALL_TARGET=	mini-install install-man install-info
+PLIST_SUB+=	DEV_UTILS="@comment "
 .endif
 
-.if !defined(NOPORTDOCS)
-PLIST_SUB+=	EXAMPLESDIR="share/examples/${PORTNAME}"
+.if defined(WITH_ESOUND) || ${HAVE_GNOME:Mesound}!=""
+USE_GNOME+=	esound
+CONFIGURE_ARGS+=	--enable-esddigi
+PLIST_SUB+=	ESOUND=""
+.else
+CONFIGURE_ARGS+=	--disable-esddigi
+PLIST_SUB+=	ESOUND="@comment "
+.endif
+
+.if defined(WITH_PROFILE_LIB)
+CONFIGURE_ARGS+=	--enable-proflib
+PLIST_SUB+=	PROFILE_LIB=""
+.else
+CONFIGURE_ARGS+=	--disable-proflib
+PLIST_SUB+=	PROFILE_LIB="@comment "
+.endif
+
+.if !defined(WITHOUT_THREADS)
+CONFIGURE_ARGS+=	--enable-pthreads
+CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -DHAVE_LIBPTHREAD" \
+		LDFLAGS="${PTHREAD_LIBS}"
+.else
+CONFIGURE_ARGS+=	--disable-pthreads
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e \
-		's|${PORTVERSION}|${SHLIB_VER}|g' ${WRKSRC}/makefile.ver
-	@${REINPLACE_CMD} -e 's|-l[$$]{lib_type}-[$$]{version}|-l\$${lib_type}|' \
-		${WRKSRC}/misc/allegro-config.in
+# Change "x.y.z" into "xy" in the shared library version.
+	@${REINPLACE_CMD} -e 's|${PORTVERSION}|${SHLIB_VER}|g' \
+		${WRKSRC}/makefile.ver
+
+# Remove architecture specific optimizations.
+	@${REINPLACE_CMD} -e 's|$$TARGET_ARCH||g' \
+		${CONFIGURE_WRKSRC}/configure.in
+
+# Remove "-ffast-math" flag on alpha, because it breaks.
+.if ${ARCH} == "alpha"
+	@${REINPLACE_CMD} -e 's|-ffast-math||g' \
+		${CONFIGURE_WRKSRC}/configure.in
+.endif
+
+# Enable/disable compilation optimizations.
+.if defined(WITHOUT_OPTIMIZED_CFLAGS)
+	@${REINPLACE_CMD} -e 's|-O2||g ; \
+		s|-ffast-math||g ; \
+		s|-fomit-frame-pointer||g ; \
+		s|-funroll-loops||g' \
+			${CONFIGURE_WRKSRC}/configure.in
+.endif
 
 post-install:
+# Documentation.
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/docs/html/*.html ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/html/*.html ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/html/*.css  ${DOCSDIR}
+
+# Examples.
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/demo/demo ${EXAMPLESDIR}
-.for FILE in ${DEMO}
-	${INSTALL_DATA} ${WRKSRC}/demo/${FILE} ${EXAMPLESDIR}
-.endfor
+.   for f in ${DEMO}
+	${INSTALL_DATA} ${WRKSRC}/demo/${f} ${EXAMPLESDIR}
+.   endfor
 .endif
 
-.include "Makefile.man"
 .include <bsd.port.post.mk>
diff --git a/devel/allegro-devel/Makefile.man b/devel/allegro-devel/Makefile.man
index ae663ffea8fb..e1a73fd4a152 100644
--- a/devel/allegro-devel/Makefile.man
+++ b/devel/allegro-devel/Makefile.man
@@ -1,790 +1,250 @@
-MAN3=	\
-	ASSERT.3 \
-	AUDIOSTREAM.3 \
-	BITMAP.3 \
-	COLOR_MAP.3 \
-	COMPILED_SPRITE.3 \
-	DATAFILE.3 \
-	DIALOG.3 \
-	DIALOG_PLAYER.3 \
-	END_OF_MAIN.3 \
-	FONT.3 \
-	GFX_MODE.3 \
-	GFX_MODE_LIST.3 \
-	JOYSTICK_BUTTON_INFO.3 \
-	JOYSTICK_INFO.3 \
-	JOYSTICK_STICK_INFO.3 \
-	JOYSTIC_AXIS_INFO.3 \
-	MASK_COLOR_15.3 \
-	MASK_COLOR_16.3 \
-	MASK_COLOR_24.3 \
-	MASK_COLOR_32.3 \
-	MASK_COLOR_8.3 \
-	MATRIX.3 \
-	MATRIX_f.3 \
-	MENU.3 \
-	MENU_PLAYER.3 \
-	MIDI.3 \
-	PACKFILE.3 \
-	PALETTE.3 \
-	QUAT.3 \
-	RGB.3 \
-	RGB_MAP.3 \
-	RLE_SPRITE.3 \
-	SAMPLE.3 \
-	TRACE.3 \
-	V3D.3 \
-	V3D_f.3 \
-	ZBUFFER.3 \
-	_getpixel.3 \
-	_getpixel15.3 \
-	_getpixel16.3 \
-	_getpixel24.3 \
-	_getpixel32.3 \
-	_putpixel.3 \
-	_putpixel15.3 \
-	_putpixel16.3 \
-	_putpixel24.3 \
-	_putpixel32.3 \
-	_set_color.3 \
-	_ustrdup.3 \
-	acquire_bitmap.3 \
-	acquire_screen.3 \
-	active_dialog.3 \
-	active_menu.3 \
-	adjust_sample.3 \
-	al_assert.3 \
-	al_ffblk.3 \
-	al_findclose.3 \
-	al_findfirst.3 \
-	al_findnext.3 \
-	al_trace.3 \
-	alert.3 \
-	alert3.3 \
-	allegro_404_char.3 \
-	allegro_error.3 \
-	allegro_exit.3 \
-	allegro_id.3 \
-	allegro_init.3 \
-	allegro_message.3 \
-	allocate_voice.3 \
-	append_filename.3 \
-	apply_matrix.3 \
-	apply_matrix_f.3 \
-	apply_quat.3 \
-	arc.3 \
-	bestfit_color.3 \
-	bitmap_color_depth.3 \
-	bitmap_mask_color.3 \
-	black_palette.3 \
-	blit.3 \
-	broadcast_dialog_message.3 \
-	calc_spline.3 \
-	calibrate_joystick.3 \
-	calibrate_joystick_name.3 \
-	canonicalize_filename.3 \
-	centre_dialog.3 \
-	check_cpu.3 \
-	circle.3 \
-	circlefill.3 \
-	clear_bitmap.3 \
-	clear_keybuf.3 \
-	clear_scene.3 \
-	clear_to_color.3 \
-	clear_zbuffer.3 \
-	clip3d.3 \
-	clip3d_f.3 \
-	close_fli.3 \
-	color_map.3 \
-	config_is_hooked.3 \
-	cpu_capabilities.3 \
-	cpu_family.3 \
-	cpu_model.3 \
-	cpu_vendor.3 \
-	create_bitmap.3 \
-	create_bitmap_ex.3 \
-	create_blender_table.3 \
-	create_color_table.3 \
-	create_light_table.3 \
-	create_rgb_table.3 \
-	create_sample.3 \
-	create_scene.3 \
-	create_sub_bitmap.3 \
-	create_sub_zbuffer.3 \
-	create_system_bitmap.3 \
-	create_trans_table.3 \
-	create_video_bitmap.3 \
-	create_zbuffer.3 \
-	cross_product.3 \
-	cross_product_f.3 \
-	d_bitmap_proc.3 \
-	d_box_proc.3 \
-	d_button_proc.3 \
-	d_check_proc.3 \
-	d_clear_proc.3 \
-	d_ctext_proc.3 \
-	d_edit_proc.3 \
-	d_icon_proc.3 \
-	d_keyboard_proc.3 \
-	d_list_proc.3 \
-	d_menu_proc.3 \
-	d_radio_proc.3 \
-	d_rtext_proc.3 \
-	d_shadow_box_proc.3 \
-	d_slider_proc.3 \
-	d_text_list_proc.3 \
-	d_text_proc.3 \
-	d_textbox_proc.3 \
-	d_yield_proc.3 \
-	deallocate_voice.3 \
-	default_palette.3 \
-	delete_file.3 \
-	desktop_color_depth.3 \
-	desktop_palette.3 \
-	destroy_bitmap.3 \
-	destroy_compiled_sprite.3 \
-	destroy_font.3 \
-	destroy_gfx_mode_list.3 \
-	destroy_midi.3 \
-	destroy_rle_sprite.3 \
-	destroy_sample.3 \
-	destroy_scene.3 \
-	destroy_zbuffer.3 \
-	detect_digi_driver.3 \
-	detect_midi_driver.3 \
-	dialog_message.3 \
-	digi_recorder.3 \
-	do_arc.3 \
-	do_circle.3 \
-	do_dialog.3 \
-	do_ellipse.3 \
-	do_line.3 \
-	do_menu.3 \
-	do_uconvert.3 \
-	dot_product.3 \
-	dot_product_f.3 \
-	draw_character_ex.3 \
-	draw_compiled_sprite.3 \
-	draw_gouraud_sprite.3 \
-	draw_lit_rle_sprite.3 \
-	draw_lit_sprite.3 \
-	draw_rle_sprite.3 \
-	draw_sprite.3 \
-	draw_sprite_h_flip.3 \
-	draw_sprite_v_flip.3 \
-	draw_sprite_vh_flip.3 \
-	draw_trans_rle_sprite.3 \
-	draw_trans_sprite.3 \
-	drawing_mode.3 \
-	ellipse.3 \
-	ellipsefill.3 \
-	empty_string.3 \
-	enable_triple_buffer.3 \
-	ex12bit.3 \
-	ex3buf.3 \
-	ex3d.3 \
-	exaccel.3 \
-	exalpha.3 \
-	exbitmap.3 \
-	exblend.3 \
-	excamera.3 \
-	excolmap.3 \
-	exconfig.3 \
-	excustom.3 \
-	exdata.3 \
-	exdbuf.3 \
-	exdodgy.3 \
-	exexedat.3 \
-	exfixed.3 \
-	exflame.3 \
-	exflip.3 \
-	exgui.3 \
-	exhello.3 \
-	exists.3 \
-	exjoy.3 \
-	exkeys.3 \
-	exlights.3 \
-	exmem.3 \
-	exmidi.3 \
-	exmouse.3 \
-	expal.3 \
-	expat.3 \
-	exquat.3 \
-	exrgbhsv.3 \
-	exsample.3 \
-	exscale.3 \
-	exscn3d.3 \
-	exscroll.3 \
-	exshade.3 \
-	exspline.3 \
-	exsprite.3 \
-	exstars.3 \
-	exstream.3 \
-	exswitch.3 \
-	extimer.3 \
-	extrans.3 \
-	extruec.3 \
-	exunicod.3 \
-	exupdate.3 \
-	exxfade.3 \
-	exzbuf.3 \
-	fade_from.3 \
-	fade_from_range.3 \
-	fade_in.3 \
-	fade_in_range.3 \
-	fade_interpolate.3 \
-	fade_out.3 \
-	fade_out_range.3 \
-	file_exists.3 \
-	file_select_ex.3 \
-	file_size.3 \
-	file_time.3 \
-	find_allegro_resource.3 \
-	find_datafile_object.3 \
-	find_dialog_focus.3 \
-	fix_filename_case.3 \
-	fix_filename_slashes.3 \
-	fixacos.3 \
-	fixadd.3 \
-	fixasin.3 \
-	fixatan.3 \
-	fixatan2.3 \
-	fixceil.3 \
-	fixcos.3 \
-	fixdiv.3 \
-	fixed.3 \
-	fixfloor.3 \
-	fixhypot.3 \
-	fixmul.3 \
-	fixsin.3 \
-	fixsqrt.3 \
-	fixsub.3 \
-	fixtan.3 \
-	fixtof.3 \
-	fixtoi.3 \
-	fixtorad_r.3 \
-	fixup_datafile.3 \
-	fli_bitmap.3 \
-	fli_bmp_dirty_from.3 \
-	fli_bmp_dirty_to.3 \
-	fli_frame.3 \
-	fli_pal_dirty_from.3 \
-	fli_pal_dirty_to.3 \
-	fli_palette.3 \
-	fli_timer.3 \
-	floodfill.3 \
-	flush_config_file.3 \
-	font.3 \
-	for_each_file_ex.3 \
-	free_audio_stream_buffer.3 \
-	freeze_mouse_flag.3 \
-	ftofix.3 \
-	generate_332_palette.3 \
-	generate_optimized_palette.3 \
-	get_align_matrix.3 \
-	get_align_matrix_f.3 \
-	get_audio_stream_buffer.3 \
-	get_camera_matrix.3 \
-	get_camera_matrix_f.3 \
-	get_color.3 \
-	get_color_conversion.3 \
-	get_color_depth.3 \
-	get_compiled_sprite.3 \
-	get_config_argv.3 \
-	get_config_float.3 \
-	get_config_hex.3 \
-	get_config_id.3 \
-	get_config_int.3 \
-	get_config_string.3 \
-	get_config_text.3 \
-	get_datafile_property.3 \
-	get_desktop_resolution.3 \
-	get_display_switch_mode.3 \
-	get_executable_name.3 \
-	get_extension.3 \
-	get_filename.3 \
-	get_gfx_mode_list.3 \
-	get_mouse_mickeys.3 \
-	get_palette.3 \
-	get_palette_range.3 \
-	get_refresh_rate.3 \
-	get_rle_sprite.3 \
-	get_rotation_matrix.3 \
-	get_rotation_matrix_f.3 \
-	get_rotation_quat.3 \
-	get_scaling_matrix.3 \
-	get_scaling_matrix_f.3 \
-	get_sound_input_cap_bits.3 \
-	get_sound_input_cap_parm.3 \
-	get_sound_input_cap_rate.3 \
-	get_sound_input_cap_stereo.3 \
-	get_transformation_matrix.3 \
-	get_transformation_matrix_f.3 \
-	get_translation_matrix.3 \
-	get_translation_matrix_f.3 \
-	get_uformat.3 \
-	get_vector_rotation_matrix.3 \
-	get_vector_rotation_matrix_f.3 \
-	get_vector_rotation_quat.3 \
-	get_x_rotate_matrix.3 \
-	get_x_rotate_matrix_f.3 \
-	get_x_rotate_quat.3 \
-	get_y_rotate_matrix.3 \
-	get_y_rotate_matrix_f.3 \
-	get_y_rotate_quat.3 \
-	get_z_rotate_matrix.3 \
-	get_z_rotate_matrix_f.3 \
-	get_z_rotate_quat.3 \
-	geta.3 \
-	geta32.3 \
-	geta_depth.3 \
-	getb.3 \
-	getb15.3 \
-	getb16.3 \
-	getb24.3 \
-	getb32.3 \
-	getb8.3 \
-	getb_depth.3 \
-	getg.3 \
-	getg15.3 \
-	getg16.3 \
-	getg24.3 \
-	getg32.3 \
-	getg8.3 \
-	getg_depth.3 \
-	getpixel.3 \
-	getr.3 \
-	getr15.3 \
-	getr16.3 \
-	getr24.3 \
-	getr32.3 \
-	getr8.3 \
-	getr_depth.3 \
-	gfx_capabilities.3 \
-	gfx_mode_select.3 \
-	gfx_mode_select_ex.3 \
-	gfx_mode_select_filter.3 \
-	gui_bg_color.3 \
-	gui_button_proc.3 \
-	gui_ctext_proc.3 \
-	gui_edit_proc.3 \
-	gui_fg_color.3 \
-	gui_font_baseline.3 \
-	gui_list_proc.3 \
-	gui_menu_draw_menu.3 \
-	gui_menu_draw_menu_item.3 \
-	gui_mg_color.3 \
-	gui_mouse_b.3 \
-	gui_mouse_focus.3 \
-	gui_mouse_x.3 \
-	gui_mouse_y.3 \
-	gui_mouse_z.3 \
-	gui_shadow_box_proc.3 \
-	gui_strlen.3 \
-	gui_text_list_proc.3 \
-	gui_textout_ex.3 \
-	hline.3 \
-	hook_config_section.3 \
-	hsv_to_rgb.3 \
-	identity_matrix.3 \
-	identity_matrix_f.3 \
-	identity_quat.3 \
-	init_dialog.3 \
-	init_menu.3 \
-	initialise_joystick.3 \
-	install_allegro.3 \
-	install_int.3 \
-	install_int_ex.3 \
-	install_joystick.3 \
-	install_keyboard.3 \
-	install_keyboard_hooks.3 \
-	install_mouse.3 \
-	install_param_int.3 \
-	install_param_int_ex.3 \
-	install_sound.3 \
-	install_sound_input.3 \
-	install_timer.3 \
-	is_linear_bitmap.3 \
-	is_memory_bitmap.3 \
-	is_planar_bitmap.3 \
-	is_relative_filename.3 \
-	is_same_bitmap.3 \
-	is_screen_bitmap.3 \
-	is_sub_bitmap.3 \
-	is_system_bitmap.3 \
-	is_video_bitmap.3 \
-	itofix.3 \
-	joy.3 \
-	key.3 \
-	key_led_flag.3 \
-	key_shifts.3 \
-	keyboard_callback.3 \
-	keyboard_lowlevel_callback.3 \
-	keyboard_needs_poll.3 \
-	keyboard_ucallback.3 \
-	keypressed.3 \
-	line.3 \
-	load_bitmap.3 \
-	load_bmp.3 \
-	load_datafile.3 \
-	load_datafile_callback.3 \
-	load_datafile_object.3 \
-	load_ibk.3 \
-	load_joystick_data.3 \
-	load_lbm.3 \
-	load_midi.3 \
-	load_midi_patches.3 \
-	load_pcx.3 \
-	load_sample.3 \
-	load_tga.3 \
-	load_voc.3 \
-	load_wav.3 \
-	lock_bitmap.3 \
-	lock_midi.3 \
-	lock_sample.3 \
-	make_absolute_filename.3 \
-	make_relative_filename.3 \
-	makeacol.3 \
-	makeacol32.3 \
-	makeacol_depth.3 \
-	makecol.3 \
-	makecol15.3 \
-	makecol15_dither.3 \
-	makecol16.3 \
-	makecol16_dither.3 \
-	makecol24.3 \
-	makecol32.3 \
-	makecol8.3 \
-	makecol_depth.3 \
-	masked_blit.3 \
-	masked_stretch_blit.3 \
-	matrix_mul.3 \
-	matrix_mul_f.3 \
-	matrix_to_quat.3 \
-	midi_loop_end.3 \
-	midi_loop_start.3 \
-	midi_meta_callback.3 \
-	midi_msg_callback.3 \
-	midi_out.3 \
-	midi_pause.3 \
-	midi_pos.3 \
-	midi_recorder.3 \
-	midi_resume.3 \
-	midi_seek.3 \
-	midi_sysex_callback.3 \
-	mouse_b.3 \
-	mouse_callback.3 \
-	mouse_needs_poll.3 \
-	mouse_pos.3 \
-	mouse_sprite.3 \
-	mouse_x.3 \
-	mouse_x_focus.3 \
-	mouse_y.3 \
-	mouse_y_focus.3 \
-	mouse_z.3 \
-	need_uconvert.3 \
-	next_fli_frame.3 \
-	normalize_vector.3 \
-	normalize_vector_f.3 \
-	num_joysticks.3 \
-	object_message.3 \
-	offer_focus.3 \
-	open_fli.3 \
-	open_memory_fli.3 \
-	os_multitasking.3 \
-	os_revision.3 \
-	os_type.3 \
-	os_version.3 \
-	override_config_data.3 \
-	override_config_file.3 \
-	pack_fclose.3 \
-	pack_fclose_chunk.3 \
-	pack_feof.3 \
-	pack_ferror.3 \
-	pack_fgets.3 \
-	pack_fopen.3 \
-	pack_fopen_chunk.3 \
-	pack_fputs.3 \
-	pack_fread.3 \
-	pack_fseek.3 \
-	pack_fwrite.3 \
-	pack_getc.3 \
-	pack_igetl.3 \
-	pack_igetw.3 \
-	pack_iputl.3 \
-	pack_iputw.3 \
-	pack_mgetl.3 \
-	pack_mgetw.3 \
-	pack_mputl.3 \
-	pack_mputw.3 \
-	pack_putc.3 \
-	packfile_password.3 \
-	palette_color.3 \
-	persp_project.3 \
-	persp_project_f.3 \
-	pivot_scaled_sprite.3 \
-	pivot_scaled_sprite_v_flip.3 \
-	pivot_sprite.3 \
-	pivot_sprite_v_flip.3 \
-	play_audio_stream.3 \
-	play_fli.3 \
-	play_looped_midi.3 \
-	play_memory_fli.3 \
-	play_midi.3 \
-	play_sample.3 \
-	poll_joystick.3 \
-	poll_keyboard.3 \
-	poll_mouse.3 \
-	poll_scroll.3 \
-	polygon.3 \
-	polygon3d.3 \
-	polygon3d_f.3 \
-	polygon_z_normal.3 \
-	polygon_z_normal_f.3 \
-	pop_config_state.3 \
-	popup_dialog.3 \
-	position_dialog.3 \
-	position_mouse.3 \
-	position_mouse_z.3 \
-	push_config_state.3 \
-	put_backslash.3 \
-	putpixel.3 \
-	qnx_get_window.3 \
-	qscale_matrix.3 \
-	qscale_matrix_f.3 \
-	qtranslate_matrix.3 \
-	qtranslate_matrix_f.3 \
-	quad3d.3 \
-	quad3d_f.3 \
-	quat_interpolate.3 \
-	quat_mul.3 \
-	quat_slerp.3 \
-	quat_to_matrix.3 \
-	radtofix_r.3 \
-	read_sound_input.3 \
-	readkey.3 \
-	reallocate_voice.3 \
-	rect.3 \
-	rectfill.3 \
-	register_assert_handler.3 \
-	register_bitmap_file_type.3 \
-	register_datafile_object.3 \
-	register_sample_file_type.3 \
-	register_trace_handler.3 \
-	register_uformat.3 \
-	release_bitmap.3 \
-	release_screen.3 \
-	release_voice.3 \
-	reload_config_texts.3 \
-	remove_display_switch_callback.3 \
-	remove_int.3 \
-	remove_joystick.3 \
-	remove_keyboard.3 \
-	remove_mouse.3 \
-	remove_param_int.3 \
-	remove_sound.3 \
-	remove_sound_input.3 \
-	remove_timer.3 \
-	render_scene.3 \
-	replace_extension.3 \
-	replace_filename.3 \
-	request_refresh_rate.3 \
-	request_scroll.3 \
-	request_video_bitmap.3 \
-	reserve_voices.3 \
-	reset_fli_variables.3 \
-	rest.3 \
-	rest_callback.3 \
-	retrace_count.3 \
-	retrace_proc.3 \
-	rgb_map.3 \
-	rgb_to_hsv.3 \
-	rotate_scaled_sprite.3 \
-	rotate_scaled_sprite_v_flip.3 \
-	rotate_sprite.3 \
-	rotate_sprite_v_flip.3 \
-	save_bitmap.3 \
-	save_bmp.3 \
-	save_joystick_data.3 \
-	save_pcx.3 \
-	save_sample.3 \
-	save_tga.3 \
-	scancode_to_ascii.3 \
-	scare_mouse.3 \
-	scare_mouse_area.3 \
-	scene_gap.3 \
-	scene_polygon3d.3 \
-	scene_polygon3d_f.3 \
-	screen.3 \
-	scroll_screen.3 \
-	select_palette.3 \
-	set_add_blender.3 \
-	set_alpha_blender.3 \
-	set_blender_mode.3 \
-	set_blender_mode_ex.3 \
-	set_burn_blender.3 \
-	set_clip.3 \
-	set_close_button_callback.3 \
-	set_color.3 \
-	set_color_blender.3 \
-	set_color_conversion.3 \
-	set_color_depth.3 \
-	set_config_data.3 \
-	set_config_file.3 \
-	set_config_float.3 \
-	set_config_hex.3 \
-	set_config_id.3 \
-	set_config_int.3 \
-	set_config_string.3 \
-	set_dialog_color.3 \
-	set_difference_blender.3 \
-	set_display_switch_callback.3 \
-	set_display_switch_mode.3 \
-	set_dissolve_blender.3 \
-	set_dodge_blender.3 \
-	set_gfx_mode.3 \
-	set_hue_blender.3 \
-	set_invert_blender.3 \
-	set_keyboard_rate.3 \
-	set_leds.3 \
-	set_luminance_blender.3 \
-	set_mouse_range.3 \
-	set_mouse_speed.3 \
-	set_mouse_sprite.3 \
-	set_mouse_sprite_focus.3 \
-	set_multiply_blender.3 \
-	set_palette.3 \
-	set_palette_range.3 \
-	set_projection_viewport.3 \
-	set_saturation_blender.3 \
-	set_screen_blender.3 \
-	set_sound_input_source.3 \
-	set_trans_blender.3 \
-	set_ucodepage.3 \
-	set_uformat.3 \
-	set_volume.3 \
-	set_volume_per_voice.3 \
-	set_window_title.3 \
-	set_write_alpha_blender.3 \
-	set_zbuffer.3 \
-	show_mouse.3 \
-	show_video_bitmap.3 \
-	shutdown_dialog.3 \
-	shutdown_menu.3 \
-	simulate_keypress.3 \
-	simulate_ukeypress.3 \
-	solid_mode.3 \
-	spline.3 \
-	start_sound_input.3 \
-	stop_audio_stream.3 \
-	stop_midi.3 \
-	stop_sample.3 \
-	stop_sound_input.3 \
-	stretch_blit.3 \
-	stretch_sprite.3 \
-	text_height.3 \
-	text_length.3 \
-	textout_centre_ex.3 \
-	textout_ex.3 \
-	textout_justify_ex.3 \
-	textout_right_ex.3 \
-	textprintf_centre_ex.3 \
-	textprintf_ex.3 \
-	textprintf_justify_ex.3 \
-	textprintf_right_ex.3 \
-	three_finger_flag.3 \
-	timer_can_simulate_retrace.3 \
-	timer_is_using_retrace.3 \
-	timer_simulate_retrace.3 \
-	triangle.3 \
-	triangle3d.3 \
-	triangle3d_f.3 \
-	uatof.3 \
-	uconvert.3 \
-	uconvert_ascii.3 \
-	uconvert_size.3 \
-	uconvert_toascii.3 \
-	ucwidth.3 \
-	ugetat.3 \
-	ugetc.3 \
-	ugetx.3 \
-	ugetxc.3 \
-	uinsert.3 \
-	uisdigit.3 \
-	uisok.3 \
-	uisspace.3 \
-	unload_datafile.3 \
-	unload_datafile_object.3 \
-	unscare_mouse.3 \
-	unselect_palette.3 \
-	uoffset.3 \
-	update_dialog.3 \
-	update_menu.3 \
-	ureadkey.3 \
-	uremove.3 \
-	usetat.3 \
-	usetc.3 \
-	usprintf.3 \
-	ustrcat.3 \
-	ustrchr.3 \
-	ustrcmp.3 \
-	ustrcpy.3 \
-	ustrdup.3 \
-	ustrerror.3 \
-	ustricmp.3 \
-	ustrlen.3 \
-	ustrlwr.3 \
-	ustrncat.3 \
-	ustrncmp.3 \
-	ustrncpy.3 \
-	ustrnicmp.3 \
-	ustrpbrk.3 \
-	ustrrchr.3 \
-	ustrsize.3 \
-	ustrsizez.3 \
-	ustrstr.3 \
-	ustrtod.3 \
-	ustrtok.3 \
-	ustrtok_r.3 \
-	ustrtol.3 \
-	ustrupr.3 \
-	ustrzcat.3 \
-	ustrzcpy.3 \
-	ustrzncat.3 \
-	ustrzncpy.3 \
-	uszprintf.3 \
-	utolower.3 \
-	utoupper.3 \
-	uvsprintf.3 \
-	uvszprintf.3 \
-	uwidth.3 \
-	uwidth_max.3 \
-	vector_length.3 \
-	vector_length_f.3 \
-	vline.3 \
-	voice_check.3 \
-	voice_get_frequency.3 \
-	voice_get_pan.3 \
-	voice_get_position.3 \
-	voice_get_volume.3 \
-	voice_ramp_volume.3 \
-	voice_set_echo.3 \
-	voice_set_frequency.3 \
-	voice_set_pan.3 \
-	voice_set_playmode.3 \
-	voice_set_position.3 \
-	voice_set_priority.3 \
-	voice_set_tremolo.3 \
-	voice_set_vibrato.3 \
-	voice_set_volume.3 \
-	voice_start.3 \
-	voice_stop.3 \
-	voice_stop_frequency_sweep.3 \
-	voice_stop_pan_sweep.3 \
-	voice_stop_volumeramp.3 \
-	voice_sweep_frequency.3 \
-	voice_sweep_pan.3 \
-	vsync.3 \
-	xor_mode.3 \
-	xwin_set_window_name.3 \
-	yield_timeslice.3
+MAN3=	ALLEGRO_DATE.3 ALLEGRO_DATE_STR.3 ALLEGRO_SUB_VERSION.3 \
+	ALLEGRO_VERSION.3 ALLEGRO_VERSION_STR.3 ALLEGRO_WIP_VERSION.3 \
+	AL_ID.3 ASSERT.3 AUDIOSTREAM.3 BITMAP.3 COLOR_MAP.3 \
+	COMPILED_SPRITE.3 DATAFILE.3 DAT_ID.3 DIALOG.3 DIALOG_PLAYER.3 \
+	END_OF_FUNCTION.3 END_OF_MAIN.3 FONT.3 GFX_MODE.3 \
+	GFX_MODE_LIST.3 JOYSTICK_AXIS_INFO.3 JOYSTICK_BUTTON_INFO.3 \
+	JOYSTICK_INFO.3 JOYSTICK_STICK_INFO.3 LOCK_FUNCTION.3 \
+	LOCK_VARIABLE.3 LZSS_PACK_DATA.3 LZSS_UNPACK_DATA.3 \
+	MAKE_VERSION.3 MASK_COLOR_15.3 MASK_COLOR_16.3 MASK_COLOR_24.3 \
+	MASK_COLOR_32.3 MASK_COLOR_8.3 MATRIX.3 MATRIX_f.3 MENU.3 \
+	MENU_PLAYER.3 MIDI.3 PACKFILE.3 PACKFILE_VTABLE.3 PALETTE.3 \
+	PAL_SIZE.3 POLYTYPE_ATEX.3 POLYTYPE_ATEX_LIT.3 \
+	POLYTYPE_ATEX_MASK.3 POLYTYPE_ATEX_MASK_LIT.3 \
+	POLYTYPE_ATEX_MASK_TRANS.3 POLYTYPE_ATEX_TRANS.3 POLYTYPE_FLAT.3 \
+	POLYTYPE_GCOL.3 POLYTYPE_GRGB.3 POLYTYPE_PTEX.3 \
+	POLYTYPE_PTEX_LIT.3 POLYTYPE_PTEX_MASK.3 \
+	POLYTYPE_PTEX_MASK_LIT.3 POLYTYPE_PTEX_MASK_TRANS.3 \
+	POLYTYPE_PTEX_TRANS.3 QUAT.3 RGB.3 RGB_MAP.3 RLE_SPRITE.3 \
+	SAMPLE.3 SCREEN_H.3 SCREEN_W.3 TRACE.3 V3D.3 V3D_f.3 VIRTUAL_H.3 \
+	VIRTUAL_W.3 ZBUFFER.3 _getpixel.3 _getpixel15.3 _getpixel16.3 \
+	_getpixel24.3 _getpixel32.3 _putpixel.3 _putpixel15.3 \
+	_putpixel16.3 _putpixel24.3 _putpixel32.3 _set_color.3 \
+	_ustrdup.3 acquire_bitmap.3 acquire_screen.3 active_dialog.3 \
+	active_menu.3 add_clip_rect.3 adjust_sample.3 al_assert.3 \
+	al_ffblk.3 al_findclose.3 al_findfirst.3 al_findnext.3 \
+	al_trace.3 alert.3 alert3.3 allegro_404_char.3 allegro_error.3 \
+	allegro_exit.3 allegro_icon.3 allegro_id.3 allegro_init.3 \
+	allegro_message.3 allocate_voice.3 append_filename.3 \
+	apply_matrix.3 apply_matrix_f.3 apply_quat.3 arc.3 \
+	bestfit_color.3 bitmap_color_depth.3 bitmap_mask_color.3 \
+	black_palette.3 blit.3 bmp_read_line.3 bmp_unwrite_line.3 \
+	bmp_write_line.3 broadcast_dialog_message.3 calc_spline.3 \
+	calibrate_joystick.3 calibrate_joystick_name.3 \
+	canonicalize_filename.3 centre_dialog.3 check_cpu.3 circle.3 \
+	circlefill.3 clear_bitmap.3 clear_keybuf.3 clear_scene.3 \
+	clear_to_color.3 clear_zbuffer.3 clip3d.3 clip3d_f.3 close_fli.3 \
+	color_map.3 config_is_hooked.3 cpu_capabilities.3 cpu_family.3 \
+	cpu_model.3 cpu_vendor.3 create_bitmap.3 create_bitmap_ex.3 \
+	create_blender_table.3 create_color_table.3 create_light_table.3 \
+	create_lzss_pack_data.3 create_lzss_unpack_data.3 \
+	create_rgb_table.3 create_sample.3 create_scene.3 \
+	create_sub_bitmap.3 create_sub_zbuffer.3 create_system_bitmap.3 \
+	create_trans_table.3 create_video_bitmap.3 create_zbuffer.3 \
+	cross_product.3 cross_product_f.3 d_bitmap_proc.3 d_box_proc.3 \
+	d_button_proc.3 d_check_proc.3 d_clear_proc.3 d_ctext_proc.3 \
+	d_edit_proc.3 d_icon_proc.3 d_keyboard_proc.3 d_list_proc.3 \
+	d_menu_proc.3 d_radio_proc.3 d_rtext_proc.3 d_shadow_box_proc.3 \
+	d_slider_proc.3 d_text_list_proc.3 d_text_proc.3 \
+	d_textbox_proc.3 d_yield_proc.3 deallocate_voice.3 \
+	default_palette.3 delete_file.3 desktop_color_depth.3 \
+	desktop_palette.3 destroy_bitmap.3 destroy_compiled_sprite.3 \
+	destroy_font.3 destroy_gfx_mode_list.3 destroy_midi.3 \
+	destroy_rle_sprite.3 destroy_sample.3 destroy_scene.3 \
+	destroy_zbuffer.3 detect_digi_driver.3 detect_midi_driver.3 \
+	dialog_message.3 digi_recorder.3 disable_hardware_cursor.3 \
+	do_arc.3 do_circle.3 do_dialog.3 do_ellipse.3 do_line.3 \
+	do_menu.3 do_uconvert.3 dot_product.3 dot_product_f.3 \
+	draw_character_ex.3 draw_compiled_sprite.3 draw_gouraud_sprite.3 \
+	draw_lit_rle_sprite.3 draw_lit_sprite.3 draw_rle_sprite.3 \
+	draw_sprite.3 draw_sprite_h_flip.3 draw_sprite_v_flip.3 \
+	draw_sprite_vh_flip.3 draw_trans_rle_sprite.3 \
+	draw_trans_sprite.3 drawing_mode.3 ellipse.3 ellipsefill.3 \
+	empty_string.3 enable_hardware_cursor.3 enable_triple_buffer.3 \
+	ex12bit.3 ex3buf.3 ex3d.3 exaccel.3 exalpha.3 exbitmap.3 \
+	exblend.3 excamera.3 excolmap.3 exconfig.3 excustom.3 exdata.3 \
+	exdbuf.3 exexedat.3 exfixed.3 exflame.3 exflip.3 exfont.3 \
+	exgui.3 exhello.3 exists.3 exjoy.3 exkeys.3 exlights.3 exmem.3 \
+	exmidi.3 exmouse.3 expackf.3 expal.3 expat.3 exquat.3 exrgbhsv.3 \
+	exsample.3 exscale.3 exscn3d.3 exscroll.3 exshade.3 exspline.3 \
+	exsprite.3 exstars.3 exstream.3 exswitch.3 exsyscur.3 extimer.3 \
+	extract_font_range.3 extrans.3 extruec.3 exunicod.3 exupdate.3 \
+	exxfade.3 exzbuf.3 fade_from.3 fade_from_range.3 fade_in.3 \
+	fade_in_range.3 fade_interpolate.3 fade_out.3 fade_out_range.3 \
+	fastline.3 file_exists.3 file_select_ex.3 file_size.3 \
+	file_time.3 find_allegro_resource.3 find_datafile_object.3 \
+	find_dialog_focus.3 fix_filename_case.3 fix_filename_slashes.3 \
+	fixacos.3 fixadd.3 fixasin.3 fixatan.3 fixatan2.3 fixceil.3 \
+	fixcos.3 fixdiv.3 fixed.3 fixfloor.3 fixhypot.3 fixmul.3 \
+	fixsin.3 fixsqrt.3 fixsub.3 fixtan.3 fixtof.3 fixtoi.3 \
+	fixtorad_r.3 fixup_datafile.3 fli_bitmap.3 fli_bmp_dirty_from.3 \
+	fli_bmp_dirty_to.3 fli_frame.3 fli_pal_dirty_from.3 \
+	fli_pal_dirty_to.3 fli_palette.3 fli_timer.3 floodfill.3 \
+	flush_config_file.3 font.3 for_each_file_ex.3 \
+	free_audio_stream_buffer.3 free_lzss_pack_data.3 \
+	free_lzss_unpack_data.3 freeze_mouse_flag.3 ftofix.3 \
+	generate_332_palette.3 generate_optimized_palette.3 \
+	get_align_matrix.3 get_align_matrix_f.3 \
+	get_audio_stream_buffer.3 get_camera_matrix.3 \
+	get_camera_matrix_f.3 get_clip_rect.3 get_clip_state.3 \
+	get_color.3 get_color_conversion.3 get_color_depth.3 \
+	get_compiled_sprite.3 get_config_argv.3 get_config_float.3 \
+	get_config_hex.3 get_config_id.3 get_config_int.3 \
+	get_config_string.3 get_config_text.3 get_datafile_property.3 \
+	get_desktop_resolution.3 get_display_switch_mode.3 \
+	get_executable_name.3 get_extension.3 get_filename.3 \
+	get_font_range_begin.3 get_font_range_end.3 get_font_ranges.3 \
+	get_gfx_mode_list.3 get_midi_length.3 get_mixer_bits.3 \
+	get_mixer_buffer_length.3 get_mixer_channels.3 \
+	get_mixer_frequency.3 get_mixer_quality.3 get_mixer_voices.3 \
+	get_mouse_mickeys.3 get_palette.3 get_palette_range.3 \
+	get_refresh_rate.3 get_rle_sprite.3 get_rotation_matrix.3 \
+	get_rotation_matrix_f.3 get_rotation_quat.3 get_scaling_matrix.3 \
+	get_scaling_matrix_f.3 get_sound_input_cap_bits.3 \
+	get_sound_input_cap_parm.3 get_sound_input_cap_rate.3 \
+	get_sound_input_cap_stereo.3 get_transformation_matrix.3 \
+	get_transformation_matrix_f.3 get_translation_matrix.3 \
+	get_translation_matrix_f.3 get_uformat.3 \
+	get_vector_rotation_matrix.3 get_vector_rotation_matrix_f.3 \
+	get_vector_rotation_quat.3 get_x_rotate_matrix.3 \
+	get_x_rotate_matrix_f.3 get_x_rotate_quat.3 \
+	get_y_rotate_matrix.3 get_y_rotate_matrix_f.3 \
+	get_y_rotate_quat.3 get_z_rotate_matrix.3 \
+	get_z_rotate_matrix_f.3 get_z_rotate_quat.3 geta.3 geta32.3 \
+	geta_depth.3 getb.3 getb15.3 getb16.3 getb24.3 getb32.3 getb8.3 \
+	getb_depth.3 getg.3 getg15.3 getg16.3 getg24.3 getg32.3 getg8.3 \
+	getg_depth.3 getpixel.3 getr.3 getr15.3 getr16.3 getr24.3 \
+	getr32.3 getr8.3 getr_depth.3 gfx_capabilities.3 \
+	gfx_mode_select.3 gfx_mode_select_ex.3 gfx_mode_select_filter.3 \
+	grab_font_from_bitmap.3 gui_bg_color.3 gui_button_proc.3 \
+	gui_ctext_proc.3 gui_edit_proc.3 gui_fg_color.3 \
+	gui_font_baseline.3 gui_get_screen.3 gui_list_proc.3 \
+	gui_menu_draw_menu.3 gui_menu_draw_menu_item.3 gui_mg_color.3 \
+	gui_mouse_b.3 gui_mouse_focus.3 gui_mouse_x.3 gui_mouse_y.3 \
+	gui_mouse_z.3 gui_set_screen.3 gui_shadow_box_proc.3 \
+	gui_strlen.3 gui_text_list_proc.3 gui_textout_ex.3 hline.3 \
+	hook_config_section.3 hsv_to_rgb.3 identity_matrix.3 \
+	identity_matrix_f.3 identity_quat.3 init_dialog.3 init_menu.3 \
+	initialise_joystick.3 install_allegro.3 install_int.3 \
+	install_int_ex.3 install_joystick.3 install_keyboard.3 \
+	install_keyboard_hooks.3 install_mouse.3 install_param_int.3 \
+	install_param_int_ex.3 install_sound.3 install_sound_input.3 \
+	install_timer.3 is_color_font.3 is_compatible_font.3 \
+	is_inside_bitmap.3 is_linear_bitmap.3 is_memory_bitmap.3 \
+	is_mono_font.3 is_planar_bitmap.3 is_relative_filename.3 \
+	is_same_bitmap.3 is_screen_bitmap.3 is_sub_bitmap.3 \
+	is_system_bitmap.3 is_video_bitmap.3 is_windowed_mode.3 itofix.3 \
+	joy.3 key.3 key_led_flag.3 key_shifts.3 keyboard_callback.3 \
+	keyboard_lowlevel_callback.3 keyboard_needs_poll.3 \
+	keyboard_ucallback.3 keypressed.3 line.3 load_bios_font.3 \
+	load_bitmap.3 load_bitmap_font.3 load_bmp.3 load_bmp_pf.3 \
+	load_dat_font.3 load_datafile.3 load_datafile_callback.3 \
+	load_datafile_object.3 load_font.3 load_grx_font.3 \
+	load_grx_or_bios_font.3 load_ibk.3 load_joystick_data.3 \
+	load_lbm.3 load_midi.3 load_midi_patches.3 load_pcx.3 \
+	load_pcx_pf.3 load_sample.3 load_tga.3 load_tga_pf.3 \
+	load_txt_font.3 load_voc.3 load_voc_pf.3 load_wav.3 \
+	load_wav_pf.3 lock_bitmap.3 lock_midi.3 lock_sample.3 \
+	lzss_read.3 lzss_write.3 make_absolute_filename.3 \
+	make_relative_filename.3 makeacol.3 makeacol32.3 \
+	makeacol_depth.3 makecol.3 makecol15.3 makecol15_dither.3 \
+	makecol16.3 makecol16_dither.3 makecol24.3 makecol32.3 \
+	makecol8.3 makecol_depth.3 masked_blit.3 masked_stretch_blit.3 \
+	matrix_mul.3 matrix_mul_f.3 matrix_to_quat.3 merge_fonts.3 \
+	midi_loop_end.3 midi_loop_start.3 midi_meta_callback.3 \
+	midi_msg_callback.3 midi_out.3 midi_pause.3 midi_pos.3 \
+	midi_recorder.3 midi_resume.3 midi_seek.3 midi_sysex_callback.3 \
+	midi_time.3 mouse_b.3 mouse_callback.3 mouse_needs_poll.3 \
+	mouse_pos.3 mouse_sprite.3 mouse_x.3 mouse_x_focus.3 mouse_y.3 \
+	mouse_y_focus.3 mouse_z.3 need_uconvert.3 next_fli_frame.3 \
+	normalize_vector.3 normalize_vector_f.3 num_joysticks.3 \
+	object_message.3 offer_focus.3 open_fli.3 open_memory_fli.3 \
+	os_multitasking.3 os_revision.3 os_type.3 os_version.3 \
+	override_config_data.3 override_config_file.3 pack_fclose.3 \
+	pack_fclose_chunk.3 pack_feof.3 pack_ferror.3 pack_fgets.3 \
+	pack_fopen.3 pack_fopen_chunk.3 pack_fopen_vtable.3 pack_fputs.3 \
+	pack_fread.3 pack_fseek.3 pack_fwrite.3 pack_getc.3 pack_igetl.3 \
+	pack_igetw.3 pack_iputl.3 pack_iputw.3 pack_mgetl.3 pack_mgetw.3 \
+	pack_mputl.3 pack_mputw.3 pack_putc.3 packfile_password.3 \
+	palette_color.3 persp_project.3 persp_project_f.3 \
+	pivot_scaled_sprite.3 pivot_scaled_sprite_v_flip.3 \
+	pivot_sprite.3 pivot_sprite_v_flip.3 play_audio_stream.3 \
+	play_fli.3 play_looped_midi.3 play_memory_fli.3 play_midi.3 \
+	play_sample.3 poll_joystick.3 poll_keyboard.3 poll_mouse.3 \
+	poll_scroll.3 polygon.3 polygon3d.3 polygon3d_f.3 \
+	polygon_z_normal.3 polygon_z_normal_f.3 pop_config_state.3 \
+	popup_dialog.3 position_dialog.3 position_mouse.3 \
+	position_mouse_z.3 push_config_state.3 put_backslash.3 \
+	putpixel.3 qnx_get_window.3 qscale_matrix.3 qscale_matrix_f.3 \
+	qtranslate_matrix.3 qtranslate_matrix_f.3 quad3d.3 quad3d_f.3 \
+	quat_interpolate.3 quat_mul.3 quat_slerp.3 quat_to_matrix.3 \
+	radtofix_r.3 read_sound_input.3 readkey.3 reallocate_voice.3 \
+	rect.3 rectfill.3 register_assert_handler.3 \
+	register_bitmap_file_type.3 register_datafile_object.3 \
+	register_font_file_type.3 register_sample_file_type.3 \
+	register_trace_handler.3 register_uformat.3 release_bitmap.3 \
+	release_screen.3 release_voice.3 reload_config_texts.3 \
+	remove_display_switch_callback.3 remove_int.3 remove_joystick.3 \
+	remove_keyboard.3 remove_mouse.3 remove_param_int.3 \
+	remove_sound.3 remove_sound_input.3 remove_timer.3 \
+	render_scene.3 replace_extension.3 replace_filename.3 \
+	request_refresh_rate.3 request_scroll.3 request_video_bitmap.3 \
+	reserve_voices.3 reset_fli_variables.3 rest.3 rest_callback.3 \
+	retrace_count.3 rgb_map.3 rgb_to_hsv.3 rotate_scaled_sprite.3 \
+	rotate_scaled_sprite_v_flip.3 rotate_sprite.3 \
+	rotate_sprite_v_flip.3 save_bitmap.3 save_bmp.3 save_bmp_pf.3 \
+	save_joystick_data.3 save_pcx.3 save_pcx_pf.3 save_sample.3 \
+	save_tga.3 save_tga_pf.3 scancode_to_ascii.3 scancode_to_name.3 \
+	scare_mouse.3 scare_mouse_area.3 scene_gap.3 scene_polygon3d.3 \
+	scene_polygon3d_f.3 screen.3 scroll_screen.3 \
+	select_mouse_cursor.3 select_palette.3 set_add_blender.3 \
+	set_allegro_resource_path.3 set_alpha_blender.3 \
+	set_blender_mode.3 set_blender_mode_ex.3 set_burn_blender.3 \
+	set_clip_rect.3 set_clip_state.3 set_close_button_callback.3 \
+	set_color.3 set_color_blender.3 set_color_conversion.3 \
+	set_color_depth.3 set_config_data.3 set_config_file.3 \
+	set_config_float.3 set_config_hex.3 set_config_id.3 \
+	set_config_int.3 set_config_string.3 set_dialog_color.3 \
+	set_difference_blender.3 set_display_switch_callback.3 \
+	set_display_switch_mode.3 set_dissolve_blender.3 \
+	set_dodge_blender.3 set_gfx_mode.3 set_hardware_volume.3 \
+	set_hue_blender.3 set_invert_blender.3 set_keyboard_rate.3 \
+	set_leds.3 set_luminance_blender.3 set_mixer_quality.3 \
+	set_mouse_cursor_bitmap.3 set_mouse_range.3 set_mouse_speed.3 \
+	set_mouse_sprite.3 set_mouse_sprite_focus.3 \
+	set_multiply_blender.3 set_palette.3 set_palette_range.3 \
+	set_projection_viewport.3 set_saturation_blender.3 \
+	set_screen_blender.3 set_sound_input_source.3 \
+	set_trans_blender.3 set_ucodepage.3 set_uformat.3 set_volume.3 \
+	set_volume_per_voice.3 set_window_title.3 \
+	set_write_alpha_blender.3 set_zbuffer.3 show_mouse.3 \
+	show_os_cursor.3 show_video_bitmap.3 shutdown_dialog.3 \
+	shutdown_menu.3 simulate_keypress.3 simulate_ukeypress.3 \
+	solid_mode.3 spline.3 start_sound_input.3 stop_audio_stream.3 \
+	stop_midi.3 stop_sample.3 stop_sound_input.3 stretch_blit.3 \
+	stretch_sprite.3 text_height.3 text_length.3 textout_centre_ex.3 \
+	textout_ex.3 textout_justify_ex.3 textout_right_ex.3 \
+	textprintf_centre_ex.3 textprintf_ex.3 textprintf_justify_ex.3 \
+	textprintf_right_ex.3 three_finger_flag.3 transpose_font.3 \
+	triangle.3 triangle3d.3 triangle3d_f.3 uatof.3 uconvert.3 \
+	uconvert_ascii.3 uconvert_size.3 uconvert_toascii.3 ucwidth.3 \
+	ugetat.3 ugetc.3 ugetx.3 ugetxc.3 uinsert.3 uisdigit.3 uisok.3 \
+	uisspace.3 unload_datafile.3 unload_datafile_object.3 \
+	unscare_mouse.3 unselect_palette.3 uoffset.3 update_dialog.3 \
+	update_menu.3 ureadkey.3 uremove.3 usetat.3 usetc.3 usprintf.3 \
+	ustrcat.3 ustrchr.3 ustrcmp.3 ustrcpy.3 ustrdup.3 ustrerror.3 \
+	ustricmp.3 ustrlen.3 ustrlwr.3 ustrncat.3 ustrncmp.3 ustrncpy.3 \
+	ustrnicmp.3 ustrpbrk.3 ustrrchr.3 ustrsize.3 ustrsizez.3 \
+	ustrstr.3 ustrtod.3 ustrtok.3 ustrtok_r.3 ustrtol.3 ustrupr.3 \
+	ustrzcat.3 ustrzcpy.3 ustrzncat.3 ustrzncpy.3 uszprintf.3 \
+	utolower.3 utoupper.3 uvsprintf.3 uvszprintf.3 uwidth.3 \
+	uwidth_max.3 vector_length.3 vector_length_f.3 vline.3 \
+	voice_check.3 voice_get_frequency.3 voice_get_pan.3 \
+	voice_get_position.3 voice_get_volume.3 voice_ramp_volume.3 \
+	voice_set_echo.3 voice_set_frequency.3 voice_set_pan.3 \
+	voice_set_playmode.3 voice_set_position.3 voice_set_priority.3 \
+	voice_set_tremolo.3 voice_set_vibrato.3 voice_set_volume.3 \
+	voice_start.3 voice_stop.3 voice_stop_frequency_sweep.3 \
+	voice_stop_pan_sweep.3 voice_stop_volumeramp.3 \
+	voice_sweep_frequency.3 voice_sweep_pan.3 vsync.3 xor_mode.3 \
+	xwin_set_window_name.3
diff --git a/devel/allegro-devel/distinfo b/devel/allegro-devel/distinfo
index 0c223ec6c9c6..f36cc80b83be 100644
--- a/devel/allegro-devel/distinfo
+++ b/devel/allegro-devel/distinfo
@@ -1,2 +1,3 @@
-MD5 (allegro-4.1.12.tar.gz) = 93c215aab32b086dcfd8a74c1d383abc
-SIZE (allegro-4.1.12.tar.gz) = 2760323
+MD5 (allegro-4.2.0.tar.gz) = a8b2c85c58b16345fe735f72763f3a6e
+SHA256 (allegro-4.2.0.tar.gz) = d8df27558bc083298d6933c843d4fdaf9afc0aa1607276acc96ed8fa9a39060c
+SIZE (allegro-4.2.0.tar.gz) = 3056173
diff --git a/devel/allegro-devel/files/extra-patch-include-allegro-inline-fmaths.in b/devel/allegro-devel/files/extra-patch-include-allegro-inline-fmaths.in
new file mode 100644
index 000000000000..657cff75a39f
--- /dev/null
+++ b/devel/allegro-devel/files/extra-patch-include-allegro-inline-fmaths.in
@@ -0,0 +1,43 @@
+--- include/allegro/inline/fmaths.inl.orig	Sun Jun  5 18:23:46 2005
++++ include/allegro/inline/fmaths.inl	Thu Aug 11 18:53:53 2005
+@@ -103,40 +103,11 @@
+ 
+ AL_INLINE(fixed, fixmul, (fixed x, fixed y),
+ {
+-   /* In benchmarks conducted circa May 2005 we found that, in the main:
+-    * - IA32 machines performed faster with one implementation;
+-    * - AMD64 and G4 machines performed faster with another implementation.
+-    *
+-    * Benchmarks were mainly done with differing versions of gcc.
+-    * Results varied with other compilers, optimisation levels, etc.
+-    * so this is not optimal, though a tenable compromise.
+-    */
+-   #if (defined ALLEGRO_I386) || (!defined LONG_LONG)
+-
+-      fixed sign = (x^y) & 0x80000000;
+-      int mask_x = x >> 31;
+-      int mask_y = y >> 31;
+-      int mask_result = sign >> 31;
+-      fixed result;
+-
+-      x = (x^mask_x) - mask_x;
+-      y = (y^mask_y) - mask_y;
+-
+-      result = ((y >> 8)*(x >> 8) +
+-		(((y >> 8)*(x&0xff)) >> 8) +
+-		(((x >> 8)*(y&0xff)) >> 8));
+-
+-      return (result^mask_result) - mask_result;
+-
+-   #else
+-
+       LONG_LONG lx = x;
+       LONG_LONG ly = y;
+       LONG_LONG lres = (lx*ly)>>16;
+       int res = lres;
+       return res;
+-
+-   #endif
+ })
+ 
+ 
diff --git a/devel/allegro-devel/files/patch-configure.in b/devel/allegro-devel/files/patch-configure.in
index 2d5542e78287..a3f5c3c6a025 100644
--- a/devel/allegro-devel/files/patch-configure.in
+++ b/devel/allegro-devel/files/patch-configure.in
@@ -1,8 +1,8 @@
---- configure.in.orig	Sun Nov  9 19:43:06 2003
-+++ configure.in	Thu Dec 11 22:22:35 2003
-@@ -256,8 +256,8 @@
-   LINK_WITH_STATIC_LIBS=yes
+--- configure.in.orig	Sun Jun 12 04:53:19 2005
++++ configure.in	Fri Aug  5 15:09:10 2005
+@@ -297,8 +297,8 @@
    allegro_static_libraries=yes
+   _programs="statically linked $_programs"
  else
 -  LIBALLEG="lib/unix/lib${LIB_TO_LINK}-\$(shared_version).so lib/unix/lib${LIB_TO_LINK}_unsharable.a"
 -  LINK_LIBALLEG="-Llib/unix -l${LIB_TO_LINK}-\$(shared_version) -l${LIB_TO_LINK}_unsharable -lm"
@@ -10,45 +10,23 @@
 +  LINK_LIBALLEG="-Llib/unix -l${LIB_TO_LINK} -l${LIB_TO_LINK}_unsharable -lm"
    LINK_WITH_STATIC_LIBS=no
    allegro_shared_libraries=yes
- fi
-@@ -286,13 +286,13 @@
- fi
- if test "X$allegro_shared_libraries" = "Xyes"; then
+   _programs="dynamically linked $_programs"
+@@ -337,15 +337,15 @@
+ 
+   _libraries="$_libraries shared"
    if test "X$allegro_build_normal_library" = "Xyes"; then
 -    ALLEGRO_LIB_TARGETS="$ALLEGRO_LIB_TARGETS lib/unix/liballeg-\$(shared_version).so lib/unix/liballeg_unsharable.a"
 +    ALLEGRO_LIB_TARGETS="$ALLEGRO_LIB_TARGETS lib/unix/liballeg.so.\$(shared_version) lib/unix/liballeg_unsharable.a"
+     _libraries="$_libraries release"
    fi
    if test "X$allegro_build_debugging_library" = "Xyes"; then
 -    ALLEGRO_LIB_TARGETS="$ALLEGRO_LIB_TARGETS lib/unix/liballd-\$(shared_version).so lib/unix/liballd_unsharable.a"
 +    ALLEGRO_LIB_TARGETS="$ALLEGRO_LIB_TARGETS lib/unix/liballd.so.\$(shared_version) lib/unix/liballd_unsharable.a"
+     _libraries="$_libraries debug"
    fi
    if test "X$allegro_build_profiling_library" = "Xyes"; then
 -    ALLEGRO_LIB_TARGETS="$ALLEGRO_LIB_TARGETS lib/unix/liballp-\$(shared_version).so lib/unix/liballp_unsharable.a"
 +    ALLEGRO_LIB_TARGETS="$ALLEGRO_LIB_TARGETS lib/unix/liballp.so.\$(shared_version) lib/unix/liballp_unsharable.a"
+     _libraries="$_libraries profile"
    fi
  fi
- AC_SUBST(ALLEGRO_LIB_TARGETS)
-@@ -647,11 +647,11 @@
-   if test "X$allegro_debug_with_fortify" = "Xyes"; then
-      ALLEGRO_DEBUG_CFLAGS="$ALLEGRO_DEBUG_CFLAGS -DFORTIFY"
-   fi
--  ALLEGRO_PROFILE_CFLAGS="$CFLAGS -pg $TARGET_ARCH -O2 -funroll-loops -ffast-math $WFLAGS"
-+  ALLEGRO_PROFILE_CFLAGS="$CFLAGS -pg $TARGET_ARCH -funroll-loops -ffast-math $WFLAGS"
-   if test "X$allegro_cv_support_fomit_frame_pointer" = "Xyes"; then
--    CFLAGS="$CFLAGS $TARGET_ARCH -O2 -funroll-loops -ffast-math -fomit-frame-pointer $WFLAGS"
-+    CFLAGS="$CFLAGS $TARGET_ARCH $CFLAGS -funroll-loops -ffast-math -fomit-frame-pointer $WFLAGS"
-   else
--    CFLAGS="$CFLAGS $TARGET_ARCH -O2 -funroll-loops -ffast-math $WFLAGS"
-+    CFLAGS="$CFLAGS $TARGET_ARCH $CFLAGS -funroll-loops -ffast-math $WFLAGS"
-   fi
-   ALLEGRO_SFLAGS="-x assembler-with-cpp"
-   ALLEGRO_SHAREDLIB_CFLAGS="-fPIC -DALLEGRO_SHARED"
-@@ -740,7 +740,7 @@
-     ${MAKE-make} depend
-   else
-     AC_MSG_WARN([Non-GNU make detected, trying gmake to build dependencies.])
--    gmake depend
-+    ${MAKE-make} depend
-   fi
- fi
- 
diff --git a/devel/allegro-devel/files/patch-makefile.in b/devel/allegro-devel/files/patch-makefile.in
index ffd14b923f9f..21091761d476 100644
--- a/devel/allegro-devel/files/patch-makefile.in
+++ b/devel/allegro-devel/files/patch-makefile.in
@@ -1,5 +1,5 @@
---- makefile.in.orig	Sun Nov  9 19:43:06 2003
-+++ makefile.in	Thu Dec 11 22:25:58 2003
+--- makefile.in.orig	Sat Sep 10 17:17:51 2005
++++ makefile.in	Sat Nov 12 19:41:57 2005
 @@ -20,7 +20,7 @@
  mandir = @mandir@
  libdir = @libdir@
@@ -26,8 +26,8 @@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_INFO = @INSTALL_INFO@
  
-@@ -325,6 +326,11 @@
- full-build: lib modules programs docs
+@@ -354,6 +355,11 @@
+ endif
  
  lib: $(ALLEGRO_LIB_TARGETS)
 +	@for l in alleg alld allp; do \
@@ -38,29 +38,20 @@
  
  modules: $(ALLEGRO_MODULE_TARGETS)
  
-@@ -436,35 +442,37 @@
+@@ -465,9 +471,9 @@
  	  fi; \
  	done
  	@for l in alleg alld allp; do \
 -	  if test -f $(LIBDIR)/lib$${l}-$(shared_version).so; then \
 -	    echo Installing $(LIBDIR)/lib$${l}-$(shared_version).so to $(DESTDIR)$(libdir); \
--	    $(INSTALL_DATA) $(LIBDIR)/lib$${l}-$(shared_version).so $(DESTDIR)$(libdir)/; \
+-	    $(INSTALL_PROGRAM) $(LIBDIR)/lib$${l}-$(shared_version).so $(DESTDIR)$(libdir)/; \
 +	  if test -f $(LIBDIR)/lib$${l}.so.$(shared_version); then \
 +	    echo Installing $(LIBDIR)/lib$${l}.so.$(shared_version) to $(libdir); \
 +	    $(INSTALL_PROGRAM) $(LIBDIR)/lib$${l}.so.$(shared_version) $(libdir)/; \
  	    $(INSTALL_DATA) $(LIBDIR)/lib$${l}_unsharable.a $(DESTDIR)$(libdir)/; \
  	  fi; \
  	done
- 	@if test -n "$(ALLEGRO_MODULE_TARGETS)"; then \
- 	  $(mkinstalldirs) $(DESTDIR)$(moduledir); \
--	  for m in $(ALLEGRO_MODULE_TARGETS) modules.lst; do \
-+	  for m in $(ALLEGRO_MODULE_TARGETS); do \
- 	   echo Installing $$m to $(DESTDIR)$(moduledir); \
--	   $(INSTALL_DATA) $$m $(DESTDIR)$(moduledir)/; \
-+	   $(INSTALL_PROGRAM) $$m $(DESTDIR)$(moduledir)/; \
- 	  done; \
-+	  echo Installing modules.lst to $(DESTDIR)$(moduledir); \
-+	  $(INSTALL_DATA) modules.lst $(DESTDIR)$(moduledir)/; \
+@@ -481,20 +487,10 @@
  	fi
  	$(mkinstalldirs) $(DESTDIR)$(bindir)
  	@echo Installing allegro-config to $(DESTDIR)$(bindir)
@@ -76,21 +67,11 @@
 -		) ; \
 -	fi
 +	@$(INSTALL_SCRIPT) allegro-config $(DESTDIR)$(bindir)
-+#	@if test -n "$(LIBDIR)/liball*-$(shared_version).so"; then \
-+#		(cat /etc/ld.so.conf | grep $(libdir) >/dev/null || \
-+#		 test $(libdir) = /lib || test $(libdir) = /usr/lib) \
-+#		&& ($(LDCONFIG) $(libdir) || true) || (\
-+#			echo "" ; \
-+#			echo "Warning: shared library destination $(libdir) is not in ldd search path." ; \
-+#			echo "Unless you add it to /etc/ld.so.conf, you must set LD_LIBRARY_PATH to include"; \
-+#			echo "$(libdir) each time you want to run an Allegro program." ; \
-+#		) ; \
-+#	fi
  	@for l in alleg alld allp; do \
 -	  if test -f $(DESTDIR)$(libdir)/lib$${l}-$(shared_version).so -a \! -h $(DESTDIR)$(libdir)/lib$${l}.so.${shared_major_minor}; then \
 -	    (cd $(DESTDIR)$(libdir); ln -s lib$${l}-$(shared_version).so lib$${l}.so.${shared_major_minor}); \
-+	  if test -f $(libdir)/lib$${l}.so.$(shared_version) -a \! -L $(libdir)/lib$${l}.so; then \
-+	    (cd $(libdir); ln -s lib$${l}.so.$(shared_version) lib$${l}.so); \
++	  if test -f $(DESTDIR)$(libdir)/lib$${l}.so.$(shared_version) -a \! -h $(DESTDIR)$(libdir)/lib$${l}.so; then \
++	    (cd $(DESTDIR)$(libdir); ln -s lib$${l}.so.$(shared_version) lib$${l}.so); \
  	  fi; \
  	done
- 
+ 	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/aclocal
diff --git a/devel/allegro-devel/pkg-plist b/devel/allegro-devel/pkg-plist
index 4822141de246..03f636bedefc 100644
--- a/devel/allegro-devel/pkg-plist
+++ b/devel/allegro-devel/pkg-plist
@@ -1,14 +1,14 @@
 bin/allegro-config
-%%FULL%%bin/colormap
-%%FULL%%bin/dat
-%%FULL%%bin/dat2c
-%%FULL%%bin/dat2s
-%%FULL%%bin/exedat
-%%FULL%%bin/grabber
-%%FULL%%bin/pack
-%%FULL%%bin/pat2dat
-%%FULL%%bin/rgbmap
-%%FULL%%bin/textconv
+%%DEV_UTILS%%bin/colormap
+%%DEV_UTILS%%bin/dat
+%%DEV_UTILS%%bin/dat2c
+%%DEV_UTILS%%bin/dat2s
+%%DEV_UTILS%%bin/exedat
+%%DEV_UTILS%%bin/grabber
+%%DEV_UTILS%%bin/pack
+%%DEV_UTILS%%bin/pat2dat
+%%DEV_UTILS%%bin/rgbmap
+%%DEV_UTILS%%bin/textconv
 include/allegro.h
 include/allegro/3d.h
 include/allegro/3dmaths.h
@@ -28,6 +28,7 @@ include/allegro/fix.h
 include/allegro/fixed.h
 include/allegro/fli.h
 include/allegro/fmaths.h
+include/allegro/font.h
 include/allegro/gfx.h
 include/allegro/graphics.h
 include/allegro/gui.h
@@ -47,6 +48,7 @@ include/allegro/internal/aintvga.h
 include/allegro/internal/alconfig.h
 include/allegro/joystick.h
 include/allegro/keyboard.h
+include/allegro/lzss.h
 include/allegro/matrix.h
 include/allegro/midi.h
 include/allegro/mouse.h
@@ -81,6 +83,7 @@ include/allegro/platform/alunix.h
 include/allegro/platform/alunixac.h
 include/allegro/platform/alwatcom.h
 include/allegro/platform/alwin.h
+include/allegro/platform/astdint.h
 include/allegro/platform/macdef.h
 include/allegro/quat.h
 include/allegro/rle.h
@@ -96,9 +99,16 @@ include/xalleg.h
 lib/allegro/%%SHLIB_VER%%/alleg-dga2.so
 %%ESOUND%%lib/allegro/%%SHLIB_VER%%/alleg-esddigi.so
 lib/allegro/%%SHLIB_VER%%/modules.lst
-lib/liballeg_unsharable.a
+%%DEBUG_LIB%%lib/liballd.so
+%%DEBUG_LIB%%lib/liballd.so.%%SHLIB_VER%%
+%%DEBUG_LIB%%lib/liballd_unsharable.a
 lib/liballeg.so
 lib/liballeg.so.%%SHLIB_VER%%
+lib/liballeg_unsharable.a
+%%PROFILE_LIB%%lib/liballp.so
+%%PROFILE_LIB%%lib/liballp.so.%%SHLIB_VER%%
+%%PROFILE_LIB%%lib/liballp_unsharable.a
+share/aclocal/allegro.m4
 %%PORTDOCS%%%%DOCSDIR%%/abi.html
 %%PORTDOCS%%%%DOCSDIR%%/ahack.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg000.html
@@ -147,13 +157,26 @@ lib/liballeg.so.%%SHLIB_VER%%
 %%PORTDOCS%%%%DOCSDIR%%/alleg043.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg044.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg045.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg046.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg047.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg048.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg049.html
 %%PORTDOCS%%%%DOCSDIR%%/allegro.css
 %%PORTDOCS%%%%DOCSDIR%%/allegro.html
 %%PORTDOCS%%%%DOCSDIR%%/api.html
 %%PORTDOCS%%%%DOCSDIR%%/changes.html
 %%PORTDOCS%%%%DOCSDIR%%/const.html
+%%PORTDOCS%%%%DOCSDIR%%/dat.html
+%%PORTDOCS%%%%DOCSDIR%%/dat2c.html
+%%PORTDOCS%%%%DOCSDIR%%/dat2s.html
+%%PORTDOCS%%%%DOCSDIR%%/datafile.html
 %%PORTDOCS%%%%DOCSDIR%%/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/grabber.html
 %%PORTDOCS%%%%DOCSDIR%%/help.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/license.html
+%%PORTDOCS%%%%DOCSDIR%%/makedoc.html
+%%PORTDOCS%%%%DOCSDIR%%/mistakes.html
 %%PORTDOCS%%%%DOCSDIR%%/packfile.html
 %%PORTDOCS%%%%DOCSDIR%%/readme.html
 %%PORTDOCS%%%%DOCSDIR%%/thanks.html
@@ -163,8 +186,8 @@ lib/liballeg.so.%%SHLIB_VER%%
 %%PORTDOCS%%%%EXAMPLESDIR%%/demo.h
 %%PORTDOCS%%%%EXAMPLESDIR%%/music.txt
 %%PORTDOCS%%%%EXAMPLESDIR%%/readme.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/allegro/%%SHLIB_VER%%
 @dirrm lib/allegro
 @dirrm include/allegro/platform
diff --git a/devel/allegro/Makefile b/devel/allegro/Makefile
index 3459828d3f22..a79a9cc48081 100644
--- a/devel/allegro/Makefile
+++ b/devel/allegro/Makefile
@@ -6,90 +6,134 @@
 #
 
 PORTNAME=	allegro
-PORTVERSION=	4.1.12
-PORTREVISION=	1
+DISTVERSION=	4.2.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	alleg
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	alejandro@varnet.biz
 COMMENT=	A cross-platform library for games and multimedia programming
 
+USE_GMAKE=	yes
+USE_REINPLACE=	yes
 USE_XLIB=	yes
 WANT_GNOME=	yes
-USE_REINPLACE=	yes
-USE_GMAKE=	yes
-USE_AUTOCONF_VER=	253
 
-.if !defined(WITHOUT_THREADS)
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -DHAVE_LIBPTHREAD" \
-		LDFLAGS="${PTHREAD_LIBS}"
-CONFIGURE_ARGS=	--enable-vga=no
-.else
-CONFIGURE_ARGS= --enable-vga=no --enable-pthreads=no
-.endif
+USE_AUTOCONF_VER=	259
+
+.include "Makefile.man"
+
+INFO=		allegro
+
+OPTIONS=	ARTS "Enable Arts support" off \
+		DEBUG_LIB "Build debugging library" off \
+		DEV_UTILS "Build development utilities" on \
+		ESOUND "Enable Esound support" off \
+		OPTIMIZED_CFLAGS "Enable compilation optimizations" on \
+		PROFILE_LIB "Build profiling library" off \
+		THREADS "Enable threads" on
 
 MAKEFILE=	makefile
 ALL_TARGET=	full-build
-INSTALLS_SHLIB=	yes
 
-SHLIB_VER=	41
+INSTALLS_SHLIB=	yes
+SHLIB_VER=	42
 PLIST_SUB=	SHLIB_VER="${SHLIB_VER}"
 DEMO=		demo.c demo.dat demo.h music.txt ../readme.txt
 
-INFO=		allegro
-
 .include <bsd.port.pre.mk>
 
-.if ${HAVE_GNOME:Mesound}!=""
-USE_GNOME+=	esound
-PKGNAMESUFFIX=	-esound
-PLIST_SUB+=	ESOUND=""
-.else
-CONFIGURE_ARGS+=	--enable-esddigi=no
-PLIST_SUB+=	ESOUND="@comment "
+.if ${ARCH} == "alpha" && ${OSVERSION} < 500000
+EXTRA_PATCHES=	${FILESDIR}/extra-patch-include-allegro-inline-fmaths.in
 .endif
 
-.if exists(${LOCALBASE}/lib/libartsc.so.0)
-WITH_ARTS=	yes
-.endif
-.if defined(WITH_ARTS)
+.if defined(WITH_ARTS) || exists(${LOCALBASE}/lib/libartsc.so.0)
 LIB_DEPENDS+=	artsc.0:${PORTSDIR}/audio/arts
+CONFIGURE_ARGS+=	--enable-artsdigi
 PLIST_SUB+=	ARTS=""
 .else
 CONFIGURE_ARGS+=	--disable-artsdigi
 PLIST_SUB+=	ARTS="@comment "
 .endif
 
-.if defined(WITHOUT_DEVEL)
-INSTALL_TARGET=	mini-install install-man install-info
-PLIST_SUB+=	FULL="@comment "
+.if defined(WITH_DEBUG_LIB)
+CONFIGURE_ARGS+=	--enable-dbglib
+PLIST_SUB+=	DEBUG_LIB=""
 .else
+CONFIGURE_ARGS+=	--disable-dbglib
+PLIST_SUB+=	DEBUG_LIB="@comment "
+.endif
+
+.if !defined(WITHOUT_DEV_UTILS)
 INSTALL_TARGET=	full-install install-man install-info
-PLIST_SUB+=	FULL=""
+PLIST_SUB+=	DEV_UTILS=""
+.else
+INSTALL_TARGET=	mini-install install-man install-info
+PLIST_SUB+=	DEV_UTILS="@comment "
 .endif
 
-.if !defined(NOPORTDOCS)
-PLIST_SUB+=	EXAMPLESDIR="share/examples/${PORTNAME}"
+.if defined(WITH_ESOUND) || ${HAVE_GNOME:Mesound}!=""
+USE_GNOME+=	esound
+CONFIGURE_ARGS+=	--enable-esddigi
+PLIST_SUB+=	ESOUND=""
+.else
+CONFIGURE_ARGS+=	--disable-esddigi
+PLIST_SUB+=	ESOUND="@comment "
+.endif
+
+.if defined(WITH_PROFILE_LIB)
+CONFIGURE_ARGS+=	--enable-proflib
+PLIST_SUB+=	PROFILE_LIB=""
+.else
+CONFIGURE_ARGS+=	--disable-proflib
+PLIST_SUB+=	PROFILE_LIB="@comment "
+.endif
+
+.if !defined(WITHOUT_THREADS)
+CONFIGURE_ARGS+=	--enable-pthreads
+CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -DHAVE_LIBPTHREAD" \
+		LDFLAGS="${PTHREAD_LIBS}"
+.else
+CONFIGURE_ARGS+=	--disable-pthreads
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e \
-		's|${PORTVERSION}|${SHLIB_VER}|g' ${WRKSRC}/makefile.ver
-	@${REINPLACE_CMD} -e 's|-l[$$]{lib_type}-[$$]{version}|-l\$${lib_type}|' \
-		${WRKSRC}/misc/allegro-config.in
+# Change "x.y.z" into "xy" in the shared library version.
+	@${REINPLACE_CMD} -e 's|${PORTVERSION}|${SHLIB_VER}|g' \
+		${WRKSRC}/makefile.ver
+
+# Remove architecture specific optimizations.
+	@${REINPLACE_CMD} -e 's|$$TARGET_ARCH||g' \
+		${CONFIGURE_WRKSRC}/configure.in
+
+# Remove "-ffast-math" flag on alpha, because it breaks.
+.if ${ARCH} == "alpha"
+	@${REINPLACE_CMD} -e 's|-ffast-math||g' \
+		${CONFIGURE_WRKSRC}/configure.in
+.endif
+
+# Enable/disable compilation optimizations.
+.if defined(WITHOUT_OPTIMIZED_CFLAGS)
+	@${REINPLACE_CMD} -e 's|-O2||g ; \
+		s|-ffast-math||g ; \
+		s|-fomit-frame-pointer||g ; \
+		s|-funroll-loops||g' \
+			${CONFIGURE_WRKSRC}/configure.in
+.endif
 
 post-install:
+# Documentation.
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/docs/html/*.html ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/html/*.html ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/html/*.css  ${DOCSDIR}
+
+# Examples.
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/demo/demo ${EXAMPLESDIR}
-.for FILE in ${DEMO}
-	${INSTALL_DATA} ${WRKSRC}/demo/${FILE} ${EXAMPLESDIR}
-.endfor
+.   for f in ${DEMO}
+	${INSTALL_DATA} ${WRKSRC}/demo/${f} ${EXAMPLESDIR}
+.   endfor
 .endif
 
-.include "Makefile.man"
 .include <bsd.port.post.mk>
diff --git a/devel/allegro/Makefile.man b/devel/allegro/Makefile.man
index ae663ffea8fb..e1a73fd4a152 100644
--- a/devel/allegro/Makefile.man
+++ b/devel/allegro/Makefile.man
@@ -1,790 +1,250 @@
-MAN3=	\
-	ASSERT.3 \
-	AUDIOSTREAM.3 \
-	BITMAP.3 \
-	COLOR_MAP.3 \
-	COMPILED_SPRITE.3 \
-	DATAFILE.3 \
-	DIALOG.3 \
-	DIALOG_PLAYER.3 \
-	END_OF_MAIN.3 \
-	FONT.3 \
-	GFX_MODE.3 \
-	GFX_MODE_LIST.3 \
-	JOYSTICK_BUTTON_INFO.3 \
-	JOYSTICK_INFO.3 \
-	JOYSTICK_STICK_INFO.3 \
-	JOYSTIC_AXIS_INFO.3 \
-	MASK_COLOR_15.3 \
-	MASK_COLOR_16.3 \
-	MASK_COLOR_24.3 \
-	MASK_COLOR_32.3 \
-	MASK_COLOR_8.3 \
-	MATRIX.3 \
-	MATRIX_f.3 \
-	MENU.3 \
-	MENU_PLAYER.3 \
-	MIDI.3 \
-	PACKFILE.3 \
-	PALETTE.3 \
-	QUAT.3 \
-	RGB.3 \
-	RGB_MAP.3 \
-	RLE_SPRITE.3 \
-	SAMPLE.3 \
-	TRACE.3 \
-	V3D.3 \
-	V3D_f.3 \
-	ZBUFFER.3 \
-	_getpixel.3 \
-	_getpixel15.3 \
-	_getpixel16.3 \
-	_getpixel24.3 \
-	_getpixel32.3 \
-	_putpixel.3 \
-	_putpixel15.3 \
-	_putpixel16.3 \
-	_putpixel24.3 \
-	_putpixel32.3 \
-	_set_color.3 \
-	_ustrdup.3 \
-	acquire_bitmap.3 \
-	acquire_screen.3 \
-	active_dialog.3 \
-	active_menu.3 \
-	adjust_sample.3 \
-	al_assert.3 \
-	al_ffblk.3 \
-	al_findclose.3 \
-	al_findfirst.3 \
-	al_findnext.3 \
-	al_trace.3 \
-	alert.3 \
-	alert3.3 \
-	allegro_404_char.3 \
-	allegro_error.3 \
-	allegro_exit.3 \
-	allegro_id.3 \
-	allegro_init.3 \
-	allegro_message.3 \
-	allocate_voice.3 \
-	append_filename.3 \
-	apply_matrix.3 \
-	apply_matrix_f.3 \
-	apply_quat.3 \
-	arc.3 \
-	bestfit_color.3 \
-	bitmap_color_depth.3 \
-	bitmap_mask_color.3 \
-	black_palette.3 \
-	blit.3 \
-	broadcast_dialog_message.3 \
-	calc_spline.3 \
-	calibrate_joystick.3 \
-	calibrate_joystick_name.3 \
-	canonicalize_filename.3 \
-	centre_dialog.3 \
-	check_cpu.3 \
-	circle.3 \
-	circlefill.3 \
-	clear_bitmap.3 \
-	clear_keybuf.3 \
-	clear_scene.3 \
-	clear_to_color.3 \
-	clear_zbuffer.3 \
-	clip3d.3 \
-	clip3d_f.3 \
-	close_fli.3 \
-	color_map.3 \
-	config_is_hooked.3 \
-	cpu_capabilities.3 \
-	cpu_family.3 \
-	cpu_model.3 \
-	cpu_vendor.3 \
-	create_bitmap.3 \
-	create_bitmap_ex.3 \
-	create_blender_table.3 \
-	create_color_table.3 \
-	create_light_table.3 \
-	create_rgb_table.3 \
-	create_sample.3 \
-	create_scene.3 \
-	create_sub_bitmap.3 \
-	create_sub_zbuffer.3 \
-	create_system_bitmap.3 \
-	create_trans_table.3 \
-	create_video_bitmap.3 \
-	create_zbuffer.3 \
-	cross_product.3 \
-	cross_product_f.3 \
-	d_bitmap_proc.3 \
-	d_box_proc.3 \
-	d_button_proc.3 \
-	d_check_proc.3 \
-	d_clear_proc.3 \
-	d_ctext_proc.3 \
-	d_edit_proc.3 \
-	d_icon_proc.3 \
-	d_keyboard_proc.3 \
-	d_list_proc.3 \
-	d_menu_proc.3 \
-	d_radio_proc.3 \
-	d_rtext_proc.3 \
-	d_shadow_box_proc.3 \
-	d_slider_proc.3 \
-	d_text_list_proc.3 \
-	d_text_proc.3 \
-	d_textbox_proc.3 \
-	d_yield_proc.3 \
-	deallocate_voice.3 \
-	default_palette.3 \
-	delete_file.3 \
-	desktop_color_depth.3 \
-	desktop_palette.3 \
-	destroy_bitmap.3 \
-	destroy_compiled_sprite.3 \
-	destroy_font.3 \
-	destroy_gfx_mode_list.3 \
-	destroy_midi.3 \
-	destroy_rle_sprite.3 \
-	destroy_sample.3 \
-	destroy_scene.3 \
-	destroy_zbuffer.3 \
-	detect_digi_driver.3 \
-	detect_midi_driver.3 \
-	dialog_message.3 \
-	digi_recorder.3 \
-	do_arc.3 \
-	do_circle.3 \
-	do_dialog.3 \
-	do_ellipse.3 \
-	do_line.3 \
-	do_menu.3 \
-	do_uconvert.3 \
-	dot_product.3 \
-	dot_product_f.3 \
-	draw_character_ex.3 \
-	draw_compiled_sprite.3 \
-	draw_gouraud_sprite.3 \
-	draw_lit_rle_sprite.3 \
-	draw_lit_sprite.3 \
-	draw_rle_sprite.3 \
-	draw_sprite.3 \
-	draw_sprite_h_flip.3 \
-	draw_sprite_v_flip.3 \
-	draw_sprite_vh_flip.3 \
-	draw_trans_rle_sprite.3 \
-	draw_trans_sprite.3 \
-	drawing_mode.3 \
-	ellipse.3 \
-	ellipsefill.3 \
-	empty_string.3 \
-	enable_triple_buffer.3 \
-	ex12bit.3 \
-	ex3buf.3 \
-	ex3d.3 \
-	exaccel.3 \
-	exalpha.3 \
-	exbitmap.3 \
-	exblend.3 \
-	excamera.3 \
-	excolmap.3 \
-	exconfig.3 \
-	excustom.3 \
-	exdata.3 \
-	exdbuf.3 \
-	exdodgy.3 \
-	exexedat.3 \
-	exfixed.3 \
-	exflame.3 \
-	exflip.3 \
-	exgui.3 \
-	exhello.3 \
-	exists.3 \
-	exjoy.3 \
-	exkeys.3 \
-	exlights.3 \
-	exmem.3 \
-	exmidi.3 \
-	exmouse.3 \
-	expal.3 \
-	expat.3 \
-	exquat.3 \
-	exrgbhsv.3 \
-	exsample.3 \
-	exscale.3 \
-	exscn3d.3 \
-	exscroll.3 \
-	exshade.3 \
-	exspline.3 \
-	exsprite.3 \
-	exstars.3 \
-	exstream.3 \
-	exswitch.3 \
-	extimer.3 \
-	extrans.3 \
-	extruec.3 \
-	exunicod.3 \
-	exupdate.3 \
-	exxfade.3 \
-	exzbuf.3 \
-	fade_from.3 \
-	fade_from_range.3 \
-	fade_in.3 \
-	fade_in_range.3 \
-	fade_interpolate.3 \
-	fade_out.3 \
-	fade_out_range.3 \
-	file_exists.3 \
-	file_select_ex.3 \
-	file_size.3 \
-	file_time.3 \
-	find_allegro_resource.3 \
-	find_datafile_object.3 \
-	find_dialog_focus.3 \
-	fix_filename_case.3 \
-	fix_filename_slashes.3 \
-	fixacos.3 \
-	fixadd.3 \
-	fixasin.3 \
-	fixatan.3 \
-	fixatan2.3 \
-	fixceil.3 \
-	fixcos.3 \
-	fixdiv.3 \
-	fixed.3 \
-	fixfloor.3 \
-	fixhypot.3 \
-	fixmul.3 \
-	fixsin.3 \
-	fixsqrt.3 \
-	fixsub.3 \
-	fixtan.3 \
-	fixtof.3 \
-	fixtoi.3 \
-	fixtorad_r.3 \
-	fixup_datafile.3 \
-	fli_bitmap.3 \
-	fli_bmp_dirty_from.3 \
-	fli_bmp_dirty_to.3 \
-	fli_frame.3 \
-	fli_pal_dirty_from.3 \
-	fli_pal_dirty_to.3 \
-	fli_palette.3 \
-	fli_timer.3 \
-	floodfill.3 \
-	flush_config_file.3 \
-	font.3 \
-	for_each_file_ex.3 \
-	free_audio_stream_buffer.3 \
-	freeze_mouse_flag.3 \
-	ftofix.3 \
-	generate_332_palette.3 \
-	generate_optimized_palette.3 \
-	get_align_matrix.3 \
-	get_align_matrix_f.3 \
-	get_audio_stream_buffer.3 \
-	get_camera_matrix.3 \
-	get_camera_matrix_f.3 \
-	get_color.3 \
-	get_color_conversion.3 \
-	get_color_depth.3 \
-	get_compiled_sprite.3 \
-	get_config_argv.3 \
-	get_config_float.3 \
-	get_config_hex.3 \
-	get_config_id.3 \
-	get_config_int.3 \
-	get_config_string.3 \
-	get_config_text.3 \
-	get_datafile_property.3 \
-	get_desktop_resolution.3 \
-	get_display_switch_mode.3 \
-	get_executable_name.3 \
-	get_extension.3 \
-	get_filename.3 \
-	get_gfx_mode_list.3 \
-	get_mouse_mickeys.3 \
-	get_palette.3 \
-	get_palette_range.3 \
-	get_refresh_rate.3 \
-	get_rle_sprite.3 \
-	get_rotation_matrix.3 \
-	get_rotation_matrix_f.3 \
-	get_rotation_quat.3 \
-	get_scaling_matrix.3 \
-	get_scaling_matrix_f.3 \
-	get_sound_input_cap_bits.3 \
-	get_sound_input_cap_parm.3 \
-	get_sound_input_cap_rate.3 \
-	get_sound_input_cap_stereo.3 \
-	get_transformation_matrix.3 \
-	get_transformation_matrix_f.3 \
-	get_translation_matrix.3 \
-	get_translation_matrix_f.3 \
-	get_uformat.3 \
-	get_vector_rotation_matrix.3 \
-	get_vector_rotation_matrix_f.3 \
-	get_vector_rotation_quat.3 \
-	get_x_rotate_matrix.3 \
-	get_x_rotate_matrix_f.3 \
-	get_x_rotate_quat.3 \
-	get_y_rotate_matrix.3 \
-	get_y_rotate_matrix_f.3 \
-	get_y_rotate_quat.3 \
-	get_z_rotate_matrix.3 \
-	get_z_rotate_matrix_f.3 \
-	get_z_rotate_quat.3 \
-	geta.3 \
-	geta32.3 \
-	geta_depth.3 \
-	getb.3 \
-	getb15.3 \
-	getb16.3 \
-	getb24.3 \
-	getb32.3 \
-	getb8.3 \
-	getb_depth.3 \
-	getg.3 \
-	getg15.3 \
-	getg16.3 \
-	getg24.3 \
-	getg32.3 \
-	getg8.3 \
-	getg_depth.3 \
-	getpixel.3 \
-	getr.3 \
-	getr15.3 \
-	getr16.3 \
-	getr24.3 \
-	getr32.3 \
-	getr8.3 \
-	getr_depth.3 \
-	gfx_capabilities.3 \
-	gfx_mode_select.3 \
-	gfx_mode_select_ex.3 \
-	gfx_mode_select_filter.3 \
-	gui_bg_color.3 \
-	gui_button_proc.3 \
-	gui_ctext_proc.3 \
-	gui_edit_proc.3 \
-	gui_fg_color.3 \
-	gui_font_baseline.3 \
-	gui_list_proc.3 \
-	gui_menu_draw_menu.3 \
-	gui_menu_draw_menu_item.3 \
-	gui_mg_color.3 \
-	gui_mouse_b.3 \
-	gui_mouse_focus.3 \
-	gui_mouse_x.3 \
-	gui_mouse_y.3 \
-	gui_mouse_z.3 \
-	gui_shadow_box_proc.3 \
-	gui_strlen.3 \
-	gui_text_list_proc.3 \
-	gui_textout_ex.3 \
-	hline.3 \
-	hook_config_section.3 \
-	hsv_to_rgb.3 \
-	identity_matrix.3 \
-	identity_matrix_f.3 \
-	identity_quat.3 \
-	init_dialog.3 \
-	init_menu.3 \
-	initialise_joystick.3 \
-	install_allegro.3 \
-	install_int.3 \
-	install_int_ex.3 \
-	install_joystick.3 \
-	install_keyboard.3 \
-	install_keyboard_hooks.3 \
-	install_mouse.3 \
-	install_param_int.3 \
-	install_param_int_ex.3 \
-	install_sound.3 \
-	install_sound_input.3 \
-	install_timer.3 \
-	is_linear_bitmap.3 \
-	is_memory_bitmap.3 \
-	is_planar_bitmap.3 \
-	is_relative_filename.3 \
-	is_same_bitmap.3 \
-	is_screen_bitmap.3 \
-	is_sub_bitmap.3 \
-	is_system_bitmap.3 \
-	is_video_bitmap.3 \
-	itofix.3 \
-	joy.3 \
-	key.3 \
-	key_led_flag.3 \
-	key_shifts.3 \
-	keyboard_callback.3 \
-	keyboard_lowlevel_callback.3 \
-	keyboard_needs_poll.3 \
-	keyboard_ucallback.3 \
-	keypressed.3 \
-	line.3 \
-	load_bitmap.3 \
-	load_bmp.3 \
-	load_datafile.3 \
-	load_datafile_callback.3 \
-	load_datafile_object.3 \
-	load_ibk.3 \
-	load_joystick_data.3 \
-	load_lbm.3 \
-	load_midi.3 \
-	load_midi_patches.3 \
-	load_pcx.3 \
-	load_sample.3 \
-	load_tga.3 \
-	load_voc.3 \
-	load_wav.3 \
-	lock_bitmap.3 \
-	lock_midi.3 \
-	lock_sample.3 \
-	make_absolute_filename.3 \
-	make_relative_filename.3 \
-	makeacol.3 \
-	makeacol32.3 \
-	makeacol_depth.3 \
-	makecol.3 \
-	makecol15.3 \
-	makecol15_dither.3 \
-	makecol16.3 \
-	makecol16_dither.3 \
-	makecol24.3 \
-	makecol32.3 \
-	makecol8.3 \
-	makecol_depth.3 \
-	masked_blit.3 \
-	masked_stretch_blit.3 \
-	matrix_mul.3 \
-	matrix_mul_f.3 \
-	matrix_to_quat.3 \
-	midi_loop_end.3 \
-	midi_loop_start.3 \
-	midi_meta_callback.3 \
-	midi_msg_callback.3 \
-	midi_out.3 \
-	midi_pause.3 \
-	midi_pos.3 \
-	midi_recorder.3 \
-	midi_resume.3 \
-	midi_seek.3 \
-	midi_sysex_callback.3 \
-	mouse_b.3 \
-	mouse_callback.3 \
-	mouse_needs_poll.3 \
-	mouse_pos.3 \
-	mouse_sprite.3 \
-	mouse_x.3 \
-	mouse_x_focus.3 \
-	mouse_y.3 \
-	mouse_y_focus.3 \
-	mouse_z.3 \
-	need_uconvert.3 \
-	next_fli_frame.3 \
-	normalize_vector.3 \
-	normalize_vector_f.3 \
-	num_joysticks.3 \
-	object_message.3 \
-	offer_focus.3 \
-	open_fli.3 \
-	open_memory_fli.3 \
-	os_multitasking.3 \
-	os_revision.3 \
-	os_type.3 \
-	os_version.3 \
-	override_config_data.3 \
-	override_config_file.3 \
-	pack_fclose.3 \
-	pack_fclose_chunk.3 \
-	pack_feof.3 \
-	pack_ferror.3 \
-	pack_fgets.3 \
-	pack_fopen.3 \
-	pack_fopen_chunk.3 \
-	pack_fputs.3 \
-	pack_fread.3 \
-	pack_fseek.3 \
-	pack_fwrite.3 \
-	pack_getc.3 \
-	pack_igetl.3 \
-	pack_igetw.3 \
-	pack_iputl.3 \
-	pack_iputw.3 \
-	pack_mgetl.3 \
-	pack_mgetw.3 \
-	pack_mputl.3 \
-	pack_mputw.3 \
-	pack_putc.3 \
-	packfile_password.3 \
-	palette_color.3 \
-	persp_project.3 \
-	persp_project_f.3 \
-	pivot_scaled_sprite.3 \
-	pivot_scaled_sprite_v_flip.3 \
-	pivot_sprite.3 \
-	pivot_sprite_v_flip.3 \
-	play_audio_stream.3 \
-	play_fli.3 \
-	play_looped_midi.3 \
-	play_memory_fli.3 \
-	play_midi.3 \
-	play_sample.3 \
-	poll_joystick.3 \
-	poll_keyboard.3 \
-	poll_mouse.3 \
-	poll_scroll.3 \
-	polygon.3 \
-	polygon3d.3 \
-	polygon3d_f.3 \
-	polygon_z_normal.3 \
-	polygon_z_normal_f.3 \
-	pop_config_state.3 \
-	popup_dialog.3 \
-	position_dialog.3 \
-	position_mouse.3 \
-	position_mouse_z.3 \
-	push_config_state.3 \
-	put_backslash.3 \
-	putpixel.3 \
-	qnx_get_window.3 \
-	qscale_matrix.3 \
-	qscale_matrix_f.3 \
-	qtranslate_matrix.3 \
-	qtranslate_matrix_f.3 \
-	quad3d.3 \
-	quad3d_f.3 \
-	quat_interpolate.3 \
-	quat_mul.3 \
-	quat_slerp.3 \
-	quat_to_matrix.3 \
-	radtofix_r.3 \
-	read_sound_input.3 \
-	readkey.3 \
-	reallocate_voice.3 \
-	rect.3 \
-	rectfill.3 \
-	register_assert_handler.3 \
-	register_bitmap_file_type.3 \
-	register_datafile_object.3 \
-	register_sample_file_type.3 \
-	register_trace_handler.3 \
-	register_uformat.3 \
-	release_bitmap.3 \
-	release_screen.3 \
-	release_voice.3 \
-	reload_config_texts.3 \
-	remove_display_switch_callback.3 \
-	remove_int.3 \
-	remove_joystick.3 \
-	remove_keyboard.3 \
-	remove_mouse.3 \
-	remove_param_int.3 \
-	remove_sound.3 \
-	remove_sound_input.3 \
-	remove_timer.3 \
-	render_scene.3 \
-	replace_extension.3 \
-	replace_filename.3 \
-	request_refresh_rate.3 \
-	request_scroll.3 \
-	request_video_bitmap.3 \
-	reserve_voices.3 \
-	reset_fli_variables.3 \
-	rest.3 \
-	rest_callback.3 \
-	retrace_count.3 \
-	retrace_proc.3 \
-	rgb_map.3 \
-	rgb_to_hsv.3 \
-	rotate_scaled_sprite.3 \
-	rotate_scaled_sprite_v_flip.3 \
-	rotate_sprite.3 \
-	rotate_sprite_v_flip.3 \
-	save_bitmap.3 \
-	save_bmp.3 \
-	save_joystick_data.3 \
-	save_pcx.3 \
-	save_sample.3 \
-	save_tga.3 \
-	scancode_to_ascii.3 \
-	scare_mouse.3 \
-	scare_mouse_area.3 \
-	scene_gap.3 \
-	scene_polygon3d.3 \
-	scene_polygon3d_f.3 \
-	screen.3 \
-	scroll_screen.3 \
-	select_palette.3 \
-	set_add_blender.3 \
-	set_alpha_blender.3 \
-	set_blender_mode.3 \
-	set_blender_mode_ex.3 \
-	set_burn_blender.3 \
-	set_clip.3 \
-	set_close_button_callback.3 \
-	set_color.3 \
-	set_color_blender.3 \
-	set_color_conversion.3 \
-	set_color_depth.3 \
-	set_config_data.3 \
-	set_config_file.3 \
-	set_config_float.3 \
-	set_config_hex.3 \
-	set_config_id.3 \
-	set_config_int.3 \
-	set_config_string.3 \
-	set_dialog_color.3 \
-	set_difference_blender.3 \
-	set_display_switch_callback.3 \
-	set_display_switch_mode.3 \
-	set_dissolve_blender.3 \
-	set_dodge_blender.3 \
-	set_gfx_mode.3 \
-	set_hue_blender.3 \
-	set_invert_blender.3 \
-	set_keyboard_rate.3 \
-	set_leds.3 \
-	set_luminance_blender.3 \
-	set_mouse_range.3 \
-	set_mouse_speed.3 \
-	set_mouse_sprite.3 \
-	set_mouse_sprite_focus.3 \
-	set_multiply_blender.3 \
-	set_palette.3 \
-	set_palette_range.3 \
-	set_projection_viewport.3 \
-	set_saturation_blender.3 \
-	set_screen_blender.3 \
-	set_sound_input_source.3 \
-	set_trans_blender.3 \
-	set_ucodepage.3 \
-	set_uformat.3 \
-	set_volume.3 \
-	set_volume_per_voice.3 \
-	set_window_title.3 \
-	set_write_alpha_blender.3 \
-	set_zbuffer.3 \
-	show_mouse.3 \
-	show_video_bitmap.3 \
-	shutdown_dialog.3 \
-	shutdown_menu.3 \
-	simulate_keypress.3 \
-	simulate_ukeypress.3 \
-	solid_mode.3 \
-	spline.3 \
-	start_sound_input.3 \
-	stop_audio_stream.3 \
-	stop_midi.3 \
-	stop_sample.3 \
-	stop_sound_input.3 \
-	stretch_blit.3 \
-	stretch_sprite.3 \
-	text_height.3 \
-	text_length.3 \
-	textout_centre_ex.3 \
-	textout_ex.3 \
-	textout_justify_ex.3 \
-	textout_right_ex.3 \
-	textprintf_centre_ex.3 \
-	textprintf_ex.3 \
-	textprintf_justify_ex.3 \
-	textprintf_right_ex.3 \
-	three_finger_flag.3 \
-	timer_can_simulate_retrace.3 \
-	timer_is_using_retrace.3 \
-	timer_simulate_retrace.3 \
-	triangle.3 \
-	triangle3d.3 \
-	triangle3d_f.3 \
-	uatof.3 \
-	uconvert.3 \
-	uconvert_ascii.3 \
-	uconvert_size.3 \
-	uconvert_toascii.3 \
-	ucwidth.3 \
-	ugetat.3 \
-	ugetc.3 \
-	ugetx.3 \
-	ugetxc.3 \
-	uinsert.3 \
-	uisdigit.3 \
-	uisok.3 \
-	uisspace.3 \
-	unload_datafile.3 \
-	unload_datafile_object.3 \
-	unscare_mouse.3 \
-	unselect_palette.3 \
-	uoffset.3 \
-	update_dialog.3 \
-	update_menu.3 \
-	ureadkey.3 \
-	uremove.3 \
-	usetat.3 \
-	usetc.3 \
-	usprintf.3 \
-	ustrcat.3 \
-	ustrchr.3 \
-	ustrcmp.3 \
-	ustrcpy.3 \
-	ustrdup.3 \
-	ustrerror.3 \
-	ustricmp.3 \
-	ustrlen.3 \
-	ustrlwr.3 \
-	ustrncat.3 \
-	ustrncmp.3 \
-	ustrncpy.3 \
-	ustrnicmp.3 \
-	ustrpbrk.3 \
-	ustrrchr.3 \
-	ustrsize.3 \
-	ustrsizez.3 \
-	ustrstr.3 \
-	ustrtod.3 \
-	ustrtok.3 \
-	ustrtok_r.3 \
-	ustrtol.3 \
-	ustrupr.3 \
-	ustrzcat.3 \
-	ustrzcpy.3 \
-	ustrzncat.3 \
-	ustrzncpy.3 \
-	uszprintf.3 \
-	utolower.3 \
-	utoupper.3 \
-	uvsprintf.3 \
-	uvszprintf.3 \
-	uwidth.3 \
-	uwidth_max.3 \
-	vector_length.3 \
-	vector_length_f.3 \
-	vline.3 \
-	voice_check.3 \
-	voice_get_frequency.3 \
-	voice_get_pan.3 \
-	voice_get_position.3 \
-	voice_get_volume.3 \
-	voice_ramp_volume.3 \
-	voice_set_echo.3 \
-	voice_set_frequency.3 \
-	voice_set_pan.3 \
-	voice_set_playmode.3 \
-	voice_set_position.3 \
-	voice_set_priority.3 \
-	voice_set_tremolo.3 \
-	voice_set_vibrato.3 \
-	voice_set_volume.3 \
-	voice_start.3 \
-	voice_stop.3 \
-	voice_stop_frequency_sweep.3 \
-	voice_stop_pan_sweep.3 \
-	voice_stop_volumeramp.3 \
-	voice_sweep_frequency.3 \
-	voice_sweep_pan.3 \
-	vsync.3 \
-	xor_mode.3 \
-	xwin_set_window_name.3 \
-	yield_timeslice.3
+MAN3=	ALLEGRO_DATE.3 ALLEGRO_DATE_STR.3 ALLEGRO_SUB_VERSION.3 \
+	ALLEGRO_VERSION.3 ALLEGRO_VERSION_STR.3 ALLEGRO_WIP_VERSION.3 \
+	AL_ID.3 ASSERT.3 AUDIOSTREAM.3 BITMAP.3 COLOR_MAP.3 \
+	COMPILED_SPRITE.3 DATAFILE.3 DAT_ID.3 DIALOG.3 DIALOG_PLAYER.3 \
+	END_OF_FUNCTION.3 END_OF_MAIN.3 FONT.3 GFX_MODE.3 \
+	GFX_MODE_LIST.3 JOYSTICK_AXIS_INFO.3 JOYSTICK_BUTTON_INFO.3 \
+	JOYSTICK_INFO.3 JOYSTICK_STICK_INFO.3 LOCK_FUNCTION.3 \
+	LOCK_VARIABLE.3 LZSS_PACK_DATA.3 LZSS_UNPACK_DATA.3 \
+	MAKE_VERSION.3 MASK_COLOR_15.3 MASK_COLOR_16.3 MASK_COLOR_24.3 \
+	MASK_COLOR_32.3 MASK_COLOR_8.3 MATRIX.3 MATRIX_f.3 MENU.3 \
+	MENU_PLAYER.3 MIDI.3 PACKFILE.3 PACKFILE_VTABLE.3 PALETTE.3 \
+	PAL_SIZE.3 POLYTYPE_ATEX.3 POLYTYPE_ATEX_LIT.3 \
+	POLYTYPE_ATEX_MASK.3 POLYTYPE_ATEX_MASK_LIT.3 \
+	POLYTYPE_ATEX_MASK_TRANS.3 POLYTYPE_ATEX_TRANS.3 POLYTYPE_FLAT.3 \
+	POLYTYPE_GCOL.3 POLYTYPE_GRGB.3 POLYTYPE_PTEX.3 \
+	POLYTYPE_PTEX_LIT.3 POLYTYPE_PTEX_MASK.3 \
+	POLYTYPE_PTEX_MASK_LIT.3 POLYTYPE_PTEX_MASK_TRANS.3 \
+	POLYTYPE_PTEX_TRANS.3 QUAT.3 RGB.3 RGB_MAP.3 RLE_SPRITE.3 \
+	SAMPLE.3 SCREEN_H.3 SCREEN_W.3 TRACE.3 V3D.3 V3D_f.3 VIRTUAL_H.3 \
+	VIRTUAL_W.3 ZBUFFER.3 _getpixel.3 _getpixel15.3 _getpixel16.3 \
+	_getpixel24.3 _getpixel32.3 _putpixel.3 _putpixel15.3 \
+	_putpixel16.3 _putpixel24.3 _putpixel32.3 _set_color.3 \
+	_ustrdup.3 acquire_bitmap.3 acquire_screen.3 active_dialog.3 \
+	active_menu.3 add_clip_rect.3 adjust_sample.3 al_assert.3 \
+	al_ffblk.3 al_findclose.3 al_findfirst.3 al_findnext.3 \
+	al_trace.3 alert.3 alert3.3 allegro_404_char.3 allegro_error.3 \
+	allegro_exit.3 allegro_icon.3 allegro_id.3 allegro_init.3 \
+	allegro_message.3 allocate_voice.3 append_filename.3 \
+	apply_matrix.3 apply_matrix_f.3 apply_quat.3 arc.3 \
+	bestfit_color.3 bitmap_color_depth.3 bitmap_mask_color.3 \
+	black_palette.3 blit.3 bmp_read_line.3 bmp_unwrite_line.3 \
+	bmp_write_line.3 broadcast_dialog_message.3 calc_spline.3 \
+	calibrate_joystick.3 calibrate_joystick_name.3 \
+	canonicalize_filename.3 centre_dialog.3 check_cpu.3 circle.3 \
+	circlefill.3 clear_bitmap.3 clear_keybuf.3 clear_scene.3 \
+	clear_to_color.3 clear_zbuffer.3 clip3d.3 clip3d_f.3 close_fli.3 \
+	color_map.3 config_is_hooked.3 cpu_capabilities.3 cpu_family.3 \
+	cpu_model.3 cpu_vendor.3 create_bitmap.3 create_bitmap_ex.3 \
+	create_blender_table.3 create_color_table.3 create_light_table.3 \
+	create_lzss_pack_data.3 create_lzss_unpack_data.3 \
+	create_rgb_table.3 create_sample.3 create_scene.3 \
+	create_sub_bitmap.3 create_sub_zbuffer.3 create_system_bitmap.3 \
+	create_trans_table.3 create_video_bitmap.3 create_zbuffer.3 \
+	cross_product.3 cross_product_f.3 d_bitmap_proc.3 d_box_proc.3 \
+	d_button_proc.3 d_check_proc.3 d_clear_proc.3 d_ctext_proc.3 \
+	d_edit_proc.3 d_icon_proc.3 d_keyboard_proc.3 d_list_proc.3 \
+	d_menu_proc.3 d_radio_proc.3 d_rtext_proc.3 d_shadow_box_proc.3 \
+	d_slider_proc.3 d_text_list_proc.3 d_text_proc.3 \
+	d_textbox_proc.3 d_yield_proc.3 deallocate_voice.3 \
+	default_palette.3 delete_file.3 desktop_color_depth.3 \
+	desktop_palette.3 destroy_bitmap.3 destroy_compiled_sprite.3 \
+	destroy_font.3 destroy_gfx_mode_list.3 destroy_midi.3 \
+	destroy_rle_sprite.3 destroy_sample.3 destroy_scene.3 \
+	destroy_zbuffer.3 detect_digi_driver.3 detect_midi_driver.3 \
+	dialog_message.3 digi_recorder.3 disable_hardware_cursor.3 \
+	do_arc.3 do_circle.3 do_dialog.3 do_ellipse.3 do_line.3 \
+	do_menu.3 do_uconvert.3 dot_product.3 dot_product_f.3 \
+	draw_character_ex.3 draw_compiled_sprite.3 draw_gouraud_sprite.3 \
+	draw_lit_rle_sprite.3 draw_lit_sprite.3 draw_rle_sprite.3 \
+	draw_sprite.3 draw_sprite_h_flip.3 draw_sprite_v_flip.3 \
+	draw_sprite_vh_flip.3 draw_trans_rle_sprite.3 \
+	draw_trans_sprite.3 drawing_mode.3 ellipse.3 ellipsefill.3 \
+	empty_string.3 enable_hardware_cursor.3 enable_triple_buffer.3 \
+	ex12bit.3 ex3buf.3 ex3d.3 exaccel.3 exalpha.3 exbitmap.3 \
+	exblend.3 excamera.3 excolmap.3 exconfig.3 excustom.3 exdata.3 \
+	exdbuf.3 exexedat.3 exfixed.3 exflame.3 exflip.3 exfont.3 \
+	exgui.3 exhello.3 exists.3 exjoy.3 exkeys.3 exlights.3 exmem.3 \
+	exmidi.3 exmouse.3 expackf.3 expal.3 expat.3 exquat.3 exrgbhsv.3 \
+	exsample.3 exscale.3 exscn3d.3 exscroll.3 exshade.3 exspline.3 \
+	exsprite.3 exstars.3 exstream.3 exswitch.3 exsyscur.3 extimer.3 \
+	extract_font_range.3 extrans.3 extruec.3 exunicod.3 exupdate.3 \
+	exxfade.3 exzbuf.3 fade_from.3 fade_from_range.3 fade_in.3 \
+	fade_in_range.3 fade_interpolate.3 fade_out.3 fade_out_range.3 \
+	fastline.3 file_exists.3 file_select_ex.3 file_size.3 \
+	file_time.3 find_allegro_resource.3 find_datafile_object.3 \
+	find_dialog_focus.3 fix_filename_case.3 fix_filename_slashes.3 \
+	fixacos.3 fixadd.3 fixasin.3 fixatan.3 fixatan2.3 fixceil.3 \
+	fixcos.3 fixdiv.3 fixed.3 fixfloor.3 fixhypot.3 fixmul.3 \
+	fixsin.3 fixsqrt.3 fixsub.3 fixtan.3 fixtof.3 fixtoi.3 \
+	fixtorad_r.3 fixup_datafile.3 fli_bitmap.3 fli_bmp_dirty_from.3 \
+	fli_bmp_dirty_to.3 fli_frame.3 fli_pal_dirty_from.3 \
+	fli_pal_dirty_to.3 fli_palette.3 fli_timer.3 floodfill.3 \
+	flush_config_file.3 font.3 for_each_file_ex.3 \
+	free_audio_stream_buffer.3 free_lzss_pack_data.3 \
+	free_lzss_unpack_data.3 freeze_mouse_flag.3 ftofix.3 \
+	generate_332_palette.3 generate_optimized_palette.3 \
+	get_align_matrix.3 get_align_matrix_f.3 \
+	get_audio_stream_buffer.3 get_camera_matrix.3 \
+	get_camera_matrix_f.3 get_clip_rect.3 get_clip_state.3 \
+	get_color.3 get_color_conversion.3 get_color_depth.3 \
+	get_compiled_sprite.3 get_config_argv.3 get_config_float.3 \
+	get_config_hex.3 get_config_id.3 get_config_int.3 \
+	get_config_string.3 get_config_text.3 get_datafile_property.3 \
+	get_desktop_resolution.3 get_display_switch_mode.3 \
+	get_executable_name.3 get_extension.3 get_filename.3 \
+	get_font_range_begin.3 get_font_range_end.3 get_font_ranges.3 \
+	get_gfx_mode_list.3 get_midi_length.3 get_mixer_bits.3 \
+	get_mixer_buffer_length.3 get_mixer_channels.3 \
+	get_mixer_frequency.3 get_mixer_quality.3 get_mixer_voices.3 \
+	get_mouse_mickeys.3 get_palette.3 get_palette_range.3 \
+	get_refresh_rate.3 get_rle_sprite.3 get_rotation_matrix.3 \
+	get_rotation_matrix_f.3 get_rotation_quat.3 get_scaling_matrix.3 \
+	get_scaling_matrix_f.3 get_sound_input_cap_bits.3 \
+	get_sound_input_cap_parm.3 get_sound_input_cap_rate.3 \
+	get_sound_input_cap_stereo.3 get_transformation_matrix.3 \
+	get_transformation_matrix_f.3 get_translation_matrix.3 \
+	get_translation_matrix_f.3 get_uformat.3 \
+	get_vector_rotation_matrix.3 get_vector_rotation_matrix_f.3 \
+	get_vector_rotation_quat.3 get_x_rotate_matrix.3 \
+	get_x_rotate_matrix_f.3 get_x_rotate_quat.3 \
+	get_y_rotate_matrix.3 get_y_rotate_matrix_f.3 \
+	get_y_rotate_quat.3 get_z_rotate_matrix.3 \
+	get_z_rotate_matrix_f.3 get_z_rotate_quat.3 geta.3 geta32.3 \
+	geta_depth.3 getb.3 getb15.3 getb16.3 getb24.3 getb32.3 getb8.3 \
+	getb_depth.3 getg.3 getg15.3 getg16.3 getg24.3 getg32.3 getg8.3 \
+	getg_depth.3 getpixel.3 getr.3 getr15.3 getr16.3 getr24.3 \
+	getr32.3 getr8.3 getr_depth.3 gfx_capabilities.3 \
+	gfx_mode_select.3 gfx_mode_select_ex.3 gfx_mode_select_filter.3 \
+	grab_font_from_bitmap.3 gui_bg_color.3 gui_button_proc.3 \
+	gui_ctext_proc.3 gui_edit_proc.3 gui_fg_color.3 \
+	gui_font_baseline.3 gui_get_screen.3 gui_list_proc.3 \
+	gui_menu_draw_menu.3 gui_menu_draw_menu_item.3 gui_mg_color.3 \
+	gui_mouse_b.3 gui_mouse_focus.3 gui_mouse_x.3 gui_mouse_y.3 \
+	gui_mouse_z.3 gui_set_screen.3 gui_shadow_box_proc.3 \
+	gui_strlen.3 gui_text_list_proc.3 gui_textout_ex.3 hline.3 \
+	hook_config_section.3 hsv_to_rgb.3 identity_matrix.3 \
+	identity_matrix_f.3 identity_quat.3 init_dialog.3 init_menu.3 \
+	initialise_joystick.3 install_allegro.3 install_int.3 \
+	install_int_ex.3 install_joystick.3 install_keyboard.3 \
+	install_keyboard_hooks.3 install_mouse.3 install_param_int.3 \
+	install_param_int_ex.3 install_sound.3 install_sound_input.3 \
+	install_timer.3 is_color_font.3 is_compatible_font.3 \
+	is_inside_bitmap.3 is_linear_bitmap.3 is_memory_bitmap.3 \
+	is_mono_font.3 is_planar_bitmap.3 is_relative_filename.3 \
+	is_same_bitmap.3 is_screen_bitmap.3 is_sub_bitmap.3 \
+	is_system_bitmap.3 is_video_bitmap.3 is_windowed_mode.3 itofix.3 \
+	joy.3 key.3 key_led_flag.3 key_shifts.3 keyboard_callback.3 \
+	keyboard_lowlevel_callback.3 keyboard_needs_poll.3 \
+	keyboard_ucallback.3 keypressed.3 line.3 load_bios_font.3 \
+	load_bitmap.3 load_bitmap_font.3 load_bmp.3 load_bmp_pf.3 \
+	load_dat_font.3 load_datafile.3 load_datafile_callback.3 \
+	load_datafile_object.3 load_font.3 load_grx_font.3 \
+	load_grx_or_bios_font.3 load_ibk.3 load_joystick_data.3 \
+	load_lbm.3 load_midi.3 load_midi_patches.3 load_pcx.3 \
+	load_pcx_pf.3 load_sample.3 load_tga.3 load_tga_pf.3 \
+	load_txt_font.3 load_voc.3 load_voc_pf.3 load_wav.3 \
+	load_wav_pf.3 lock_bitmap.3 lock_midi.3 lock_sample.3 \
+	lzss_read.3 lzss_write.3 make_absolute_filename.3 \
+	make_relative_filename.3 makeacol.3 makeacol32.3 \
+	makeacol_depth.3 makecol.3 makecol15.3 makecol15_dither.3 \
+	makecol16.3 makecol16_dither.3 makecol24.3 makecol32.3 \
+	makecol8.3 makecol_depth.3 masked_blit.3 masked_stretch_blit.3 \
+	matrix_mul.3 matrix_mul_f.3 matrix_to_quat.3 merge_fonts.3 \
+	midi_loop_end.3 midi_loop_start.3 midi_meta_callback.3 \
+	midi_msg_callback.3 midi_out.3 midi_pause.3 midi_pos.3 \
+	midi_recorder.3 midi_resume.3 midi_seek.3 midi_sysex_callback.3 \
+	midi_time.3 mouse_b.3 mouse_callback.3 mouse_needs_poll.3 \
+	mouse_pos.3 mouse_sprite.3 mouse_x.3 mouse_x_focus.3 mouse_y.3 \
+	mouse_y_focus.3 mouse_z.3 need_uconvert.3 next_fli_frame.3 \
+	normalize_vector.3 normalize_vector_f.3 num_joysticks.3 \
+	object_message.3 offer_focus.3 open_fli.3 open_memory_fli.3 \
+	os_multitasking.3 os_revision.3 os_type.3 os_version.3 \
+	override_config_data.3 override_config_file.3 pack_fclose.3 \
+	pack_fclose_chunk.3 pack_feof.3 pack_ferror.3 pack_fgets.3 \
+	pack_fopen.3 pack_fopen_chunk.3 pack_fopen_vtable.3 pack_fputs.3 \
+	pack_fread.3 pack_fseek.3 pack_fwrite.3 pack_getc.3 pack_igetl.3 \
+	pack_igetw.3 pack_iputl.3 pack_iputw.3 pack_mgetl.3 pack_mgetw.3 \
+	pack_mputl.3 pack_mputw.3 pack_putc.3 packfile_password.3 \
+	palette_color.3 persp_project.3 persp_project_f.3 \
+	pivot_scaled_sprite.3 pivot_scaled_sprite_v_flip.3 \
+	pivot_sprite.3 pivot_sprite_v_flip.3 play_audio_stream.3 \
+	play_fli.3 play_looped_midi.3 play_memory_fli.3 play_midi.3 \
+	play_sample.3 poll_joystick.3 poll_keyboard.3 poll_mouse.3 \
+	poll_scroll.3 polygon.3 polygon3d.3 polygon3d_f.3 \
+	polygon_z_normal.3 polygon_z_normal_f.3 pop_config_state.3 \
+	popup_dialog.3 position_dialog.3 position_mouse.3 \
+	position_mouse_z.3 push_config_state.3 put_backslash.3 \
+	putpixel.3 qnx_get_window.3 qscale_matrix.3 qscale_matrix_f.3 \
+	qtranslate_matrix.3 qtranslate_matrix_f.3 quad3d.3 quad3d_f.3 \
+	quat_interpolate.3 quat_mul.3 quat_slerp.3 quat_to_matrix.3 \
+	radtofix_r.3 read_sound_input.3 readkey.3 reallocate_voice.3 \
+	rect.3 rectfill.3 register_assert_handler.3 \
+	register_bitmap_file_type.3 register_datafile_object.3 \
+	register_font_file_type.3 register_sample_file_type.3 \
+	register_trace_handler.3 register_uformat.3 release_bitmap.3 \
+	release_screen.3 release_voice.3 reload_config_texts.3 \
+	remove_display_switch_callback.3 remove_int.3 remove_joystick.3 \
+	remove_keyboard.3 remove_mouse.3 remove_param_int.3 \
+	remove_sound.3 remove_sound_input.3 remove_timer.3 \
+	render_scene.3 replace_extension.3 replace_filename.3 \
+	request_refresh_rate.3 request_scroll.3 request_video_bitmap.3 \
+	reserve_voices.3 reset_fli_variables.3 rest.3 rest_callback.3 \
+	retrace_count.3 rgb_map.3 rgb_to_hsv.3 rotate_scaled_sprite.3 \
+	rotate_scaled_sprite_v_flip.3 rotate_sprite.3 \
+	rotate_sprite_v_flip.3 save_bitmap.3 save_bmp.3 save_bmp_pf.3 \
+	save_joystick_data.3 save_pcx.3 save_pcx_pf.3 save_sample.3 \
+	save_tga.3 save_tga_pf.3 scancode_to_ascii.3 scancode_to_name.3 \
+	scare_mouse.3 scare_mouse_area.3 scene_gap.3 scene_polygon3d.3 \
+	scene_polygon3d_f.3 screen.3 scroll_screen.3 \
+	select_mouse_cursor.3 select_palette.3 set_add_blender.3 \
+	set_allegro_resource_path.3 set_alpha_blender.3 \
+	set_blender_mode.3 set_blender_mode_ex.3 set_burn_blender.3 \
+	set_clip_rect.3 set_clip_state.3 set_close_button_callback.3 \
+	set_color.3 set_color_blender.3 set_color_conversion.3 \
+	set_color_depth.3 set_config_data.3 set_config_file.3 \
+	set_config_float.3 set_config_hex.3 set_config_id.3 \
+	set_config_int.3 set_config_string.3 set_dialog_color.3 \
+	set_difference_blender.3 set_display_switch_callback.3 \
+	set_display_switch_mode.3 set_dissolve_blender.3 \
+	set_dodge_blender.3 set_gfx_mode.3 set_hardware_volume.3 \
+	set_hue_blender.3 set_invert_blender.3 set_keyboard_rate.3 \
+	set_leds.3 set_luminance_blender.3 set_mixer_quality.3 \
+	set_mouse_cursor_bitmap.3 set_mouse_range.3 set_mouse_speed.3 \
+	set_mouse_sprite.3 set_mouse_sprite_focus.3 \
+	set_multiply_blender.3 set_palette.3 set_palette_range.3 \
+	set_projection_viewport.3 set_saturation_blender.3 \
+	set_screen_blender.3 set_sound_input_source.3 \
+	set_trans_blender.3 set_ucodepage.3 set_uformat.3 set_volume.3 \
+	set_volume_per_voice.3 set_window_title.3 \
+	set_write_alpha_blender.3 set_zbuffer.3 show_mouse.3 \
+	show_os_cursor.3 show_video_bitmap.3 shutdown_dialog.3 \
+	shutdown_menu.3 simulate_keypress.3 simulate_ukeypress.3 \
+	solid_mode.3 spline.3 start_sound_input.3 stop_audio_stream.3 \
+	stop_midi.3 stop_sample.3 stop_sound_input.3 stretch_blit.3 \
+	stretch_sprite.3 text_height.3 text_length.3 textout_centre_ex.3 \
+	textout_ex.3 textout_justify_ex.3 textout_right_ex.3 \
+	textprintf_centre_ex.3 textprintf_ex.3 textprintf_justify_ex.3 \
+	textprintf_right_ex.3 three_finger_flag.3 transpose_font.3 \
+	triangle.3 triangle3d.3 triangle3d_f.3 uatof.3 uconvert.3 \
+	uconvert_ascii.3 uconvert_size.3 uconvert_toascii.3 ucwidth.3 \
+	ugetat.3 ugetc.3 ugetx.3 ugetxc.3 uinsert.3 uisdigit.3 uisok.3 \
+	uisspace.3 unload_datafile.3 unload_datafile_object.3 \
+	unscare_mouse.3 unselect_palette.3 uoffset.3 update_dialog.3 \
+	update_menu.3 ureadkey.3 uremove.3 usetat.3 usetc.3 usprintf.3 \
+	ustrcat.3 ustrchr.3 ustrcmp.3 ustrcpy.3 ustrdup.3 ustrerror.3 \
+	ustricmp.3 ustrlen.3 ustrlwr.3 ustrncat.3 ustrncmp.3 ustrncpy.3 \
+	ustrnicmp.3 ustrpbrk.3 ustrrchr.3 ustrsize.3 ustrsizez.3 \
+	ustrstr.3 ustrtod.3 ustrtok.3 ustrtok_r.3 ustrtol.3 ustrupr.3 \
+	ustrzcat.3 ustrzcpy.3 ustrzncat.3 ustrzncpy.3 uszprintf.3 \
+	utolower.3 utoupper.3 uvsprintf.3 uvszprintf.3 uwidth.3 \
+	uwidth_max.3 vector_length.3 vector_length_f.3 vline.3 \
+	voice_check.3 voice_get_frequency.3 voice_get_pan.3 \
+	voice_get_position.3 voice_get_volume.3 voice_ramp_volume.3 \
+	voice_set_echo.3 voice_set_frequency.3 voice_set_pan.3 \
+	voice_set_playmode.3 voice_set_position.3 voice_set_priority.3 \
+	voice_set_tremolo.3 voice_set_vibrato.3 voice_set_volume.3 \
+	voice_start.3 voice_stop.3 voice_stop_frequency_sweep.3 \
+	voice_stop_pan_sweep.3 voice_stop_volumeramp.3 \
+	voice_sweep_frequency.3 voice_sweep_pan.3 vsync.3 xor_mode.3 \
+	xwin_set_window_name.3
diff --git a/devel/allegro/distinfo b/devel/allegro/distinfo
index 0c223ec6c9c6..f36cc80b83be 100644
--- a/devel/allegro/distinfo
+++ b/devel/allegro/distinfo
@@ -1,2 +1,3 @@
-MD5 (allegro-4.1.12.tar.gz) = 93c215aab32b086dcfd8a74c1d383abc
-SIZE (allegro-4.1.12.tar.gz) = 2760323
+MD5 (allegro-4.2.0.tar.gz) = a8b2c85c58b16345fe735f72763f3a6e
+SHA256 (allegro-4.2.0.tar.gz) = d8df27558bc083298d6933c843d4fdaf9afc0aa1607276acc96ed8fa9a39060c
+SIZE (allegro-4.2.0.tar.gz) = 3056173
diff --git a/devel/allegro/files/extra-patch-include-allegro-inline-fmaths.in b/devel/allegro/files/extra-patch-include-allegro-inline-fmaths.in
new file mode 100644
index 000000000000..657cff75a39f
--- /dev/null
+++ b/devel/allegro/files/extra-patch-include-allegro-inline-fmaths.in
@@ -0,0 +1,43 @@
+--- include/allegro/inline/fmaths.inl.orig	Sun Jun  5 18:23:46 2005
++++ include/allegro/inline/fmaths.inl	Thu Aug 11 18:53:53 2005
+@@ -103,40 +103,11 @@
+ 
+ AL_INLINE(fixed, fixmul, (fixed x, fixed y),
+ {
+-   /* In benchmarks conducted circa May 2005 we found that, in the main:
+-    * - IA32 machines performed faster with one implementation;
+-    * - AMD64 and G4 machines performed faster with another implementation.
+-    *
+-    * Benchmarks were mainly done with differing versions of gcc.
+-    * Results varied with other compilers, optimisation levels, etc.
+-    * so this is not optimal, though a tenable compromise.
+-    */
+-   #if (defined ALLEGRO_I386) || (!defined LONG_LONG)
+-
+-      fixed sign = (x^y) & 0x80000000;
+-      int mask_x = x >> 31;
+-      int mask_y = y >> 31;
+-      int mask_result = sign >> 31;
+-      fixed result;
+-
+-      x = (x^mask_x) - mask_x;
+-      y = (y^mask_y) - mask_y;
+-
+-      result = ((y >> 8)*(x >> 8) +
+-		(((y >> 8)*(x&0xff)) >> 8) +
+-		(((x >> 8)*(y&0xff)) >> 8));
+-
+-      return (result^mask_result) - mask_result;
+-
+-   #else
+-
+       LONG_LONG lx = x;
+       LONG_LONG ly = y;
+       LONG_LONG lres = (lx*ly)>>16;
+       int res = lres;
+       return res;
+-
+-   #endif
+ })
+ 
+ 
diff --git a/devel/allegro/files/patch-configure.in b/devel/allegro/files/patch-configure.in
index 2d5542e78287..a3f5c3c6a025 100644
--- a/devel/allegro/files/patch-configure.in
+++ b/devel/allegro/files/patch-configure.in
@@ -1,8 +1,8 @@
---- configure.in.orig	Sun Nov  9 19:43:06 2003
-+++ configure.in	Thu Dec 11 22:22:35 2003
-@@ -256,8 +256,8 @@
-   LINK_WITH_STATIC_LIBS=yes
+--- configure.in.orig	Sun Jun 12 04:53:19 2005
++++ configure.in	Fri Aug  5 15:09:10 2005
+@@ -297,8 +297,8 @@
    allegro_static_libraries=yes
+   _programs="statically linked $_programs"
  else
 -  LIBALLEG="lib/unix/lib${LIB_TO_LINK}-\$(shared_version).so lib/unix/lib${LIB_TO_LINK}_unsharable.a"
 -  LINK_LIBALLEG="-Llib/unix -l${LIB_TO_LINK}-\$(shared_version) -l${LIB_TO_LINK}_unsharable -lm"
@@ -10,45 +10,23 @@
 +  LINK_LIBALLEG="-Llib/unix -l${LIB_TO_LINK} -l${LIB_TO_LINK}_unsharable -lm"
    LINK_WITH_STATIC_LIBS=no
    allegro_shared_libraries=yes
- fi
-@@ -286,13 +286,13 @@
- fi
- if test "X$allegro_shared_libraries" = "Xyes"; then
+   _programs="dynamically linked $_programs"
+@@ -337,15 +337,15 @@
+ 
+   _libraries="$_libraries shared"
    if test "X$allegro_build_normal_library" = "Xyes"; then
 -    ALLEGRO_LIB_TARGETS="$ALLEGRO_LIB_TARGETS lib/unix/liballeg-\$(shared_version).so lib/unix/liballeg_unsharable.a"
 +    ALLEGRO_LIB_TARGETS="$ALLEGRO_LIB_TARGETS lib/unix/liballeg.so.\$(shared_version) lib/unix/liballeg_unsharable.a"
+     _libraries="$_libraries release"
    fi
    if test "X$allegro_build_debugging_library" = "Xyes"; then
 -    ALLEGRO_LIB_TARGETS="$ALLEGRO_LIB_TARGETS lib/unix/liballd-\$(shared_version).so lib/unix/liballd_unsharable.a"
 +    ALLEGRO_LIB_TARGETS="$ALLEGRO_LIB_TARGETS lib/unix/liballd.so.\$(shared_version) lib/unix/liballd_unsharable.a"
+     _libraries="$_libraries debug"
    fi
    if test "X$allegro_build_profiling_library" = "Xyes"; then
 -    ALLEGRO_LIB_TARGETS="$ALLEGRO_LIB_TARGETS lib/unix/liballp-\$(shared_version).so lib/unix/liballp_unsharable.a"
 +    ALLEGRO_LIB_TARGETS="$ALLEGRO_LIB_TARGETS lib/unix/liballp.so.\$(shared_version) lib/unix/liballp_unsharable.a"
+     _libraries="$_libraries profile"
    fi
  fi
- AC_SUBST(ALLEGRO_LIB_TARGETS)
-@@ -647,11 +647,11 @@
-   if test "X$allegro_debug_with_fortify" = "Xyes"; then
-      ALLEGRO_DEBUG_CFLAGS="$ALLEGRO_DEBUG_CFLAGS -DFORTIFY"
-   fi
--  ALLEGRO_PROFILE_CFLAGS="$CFLAGS -pg $TARGET_ARCH -O2 -funroll-loops -ffast-math $WFLAGS"
-+  ALLEGRO_PROFILE_CFLAGS="$CFLAGS -pg $TARGET_ARCH -funroll-loops -ffast-math $WFLAGS"
-   if test "X$allegro_cv_support_fomit_frame_pointer" = "Xyes"; then
--    CFLAGS="$CFLAGS $TARGET_ARCH -O2 -funroll-loops -ffast-math -fomit-frame-pointer $WFLAGS"
-+    CFLAGS="$CFLAGS $TARGET_ARCH $CFLAGS -funroll-loops -ffast-math -fomit-frame-pointer $WFLAGS"
-   else
--    CFLAGS="$CFLAGS $TARGET_ARCH -O2 -funroll-loops -ffast-math $WFLAGS"
-+    CFLAGS="$CFLAGS $TARGET_ARCH $CFLAGS -funroll-loops -ffast-math $WFLAGS"
-   fi
-   ALLEGRO_SFLAGS="-x assembler-with-cpp"
-   ALLEGRO_SHAREDLIB_CFLAGS="-fPIC -DALLEGRO_SHARED"
-@@ -740,7 +740,7 @@
-     ${MAKE-make} depend
-   else
-     AC_MSG_WARN([Non-GNU make detected, trying gmake to build dependencies.])
--    gmake depend
-+    ${MAKE-make} depend
-   fi
- fi
- 
diff --git a/devel/allegro/files/patch-makefile.in b/devel/allegro/files/patch-makefile.in
index ffd14b923f9f..21091761d476 100644
--- a/devel/allegro/files/patch-makefile.in
+++ b/devel/allegro/files/patch-makefile.in
@@ -1,5 +1,5 @@
---- makefile.in.orig	Sun Nov  9 19:43:06 2003
-+++ makefile.in	Thu Dec 11 22:25:58 2003
+--- makefile.in.orig	Sat Sep 10 17:17:51 2005
++++ makefile.in	Sat Nov 12 19:41:57 2005
 @@ -20,7 +20,7 @@
  mandir = @mandir@
  libdir = @libdir@
@@ -26,8 +26,8 @@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_INFO = @INSTALL_INFO@
  
-@@ -325,6 +326,11 @@
- full-build: lib modules programs docs
+@@ -354,6 +355,11 @@
+ endif
  
  lib: $(ALLEGRO_LIB_TARGETS)
 +	@for l in alleg alld allp; do \
@@ -38,29 +38,20 @@
  
  modules: $(ALLEGRO_MODULE_TARGETS)
  
-@@ -436,35 +442,37 @@
+@@ -465,9 +471,9 @@
  	  fi; \
  	done
  	@for l in alleg alld allp; do \
 -	  if test -f $(LIBDIR)/lib$${l}-$(shared_version).so; then \
 -	    echo Installing $(LIBDIR)/lib$${l}-$(shared_version).so to $(DESTDIR)$(libdir); \
--	    $(INSTALL_DATA) $(LIBDIR)/lib$${l}-$(shared_version).so $(DESTDIR)$(libdir)/; \
+-	    $(INSTALL_PROGRAM) $(LIBDIR)/lib$${l}-$(shared_version).so $(DESTDIR)$(libdir)/; \
 +	  if test -f $(LIBDIR)/lib$${l}.so.$(shared_version); then \
 +	    echo Installing $(LIBDIR)/lib$${l}.so.$(shared_version) to $(libdir); \
 +	    $(INSTALL_PROGRAM) $(LIBDIR)/lib$${l}.so.$(shared_version) $(libdir)/; \
  	    $(INSTALL_DATA) $(LIBDIR)/lib$${l}_unsharable.a $(DESTDIR)$(libdir)/; \
  	  fi; \
  	done
- 	@if test -n "$(ALLEGRO_MODULE_TARGETS)"; then \
- 	  $(mkinstalldirs) $(DESTDIR)$(moduledir); \
--	  for m in $(ALLEGRO_MODULE_TARGETS) modules.lst; do \
-+	  for m in $(ALLEGRO_MODULE_TARGETS); do \
- 	   echo Installing $$m to $(DESTDIR)$(moduledir); \
--	   $(INSTALL_DATA) $$m $(DESTDIR)$(moduledir)/; \
-+	   $(INSTALL_PROGRAM) $$m $(DESTDIR)$(moduledir)/; \
- 	  done; \
-+	  echo Installing modules.lst to $(DESTDIR)$(moduledir); \
-+	  $(INSTALL_DATA) modules.lst $(DESTDIR)$(moduledir)/; \
+@@ -481,20 +487,10 @@
  	fi
  	$(mkinstalldirs) $(DESTDIR)$(bindir)
  	@echo Installing allegro-config to $(DESTDIR)$(bindir)
@@ -76,21 +67,11 @@
 -		) ; \
 -	fi
 +	@$(INSTALL_SCRIPT) allegro-config $(DESTDIR)$(bindir)
-+#	@if test -n "$(LIBDIR)/liball*-$(shared_version).so"; then \
-+#		(cat /etc/ld.so.conf | grep $(libdir) >/dev/null || \
-+#		 test $(libdir) = /lib || test $(libdir) = /usr/lib) \
-+#		&& ($(LDCONFIG) $(libdir) || true) || (\
-+#			echo "" ; \
-+#			echo "Warning: shared library destination $(libdir) is not in ldd search path." ; \
-+#			echo "Unless you add it to /etc/ld.so.conf, you must set LD_LIBRARY_PATH to include"; \
-+#			echo "$(libdir) each time you want to run an Allegro program." ; \
-+#		) ; \
-+#	fi
  	@for l in alleg alld allp; do \
 -	  if test -f $(DESTDIR)$(libdir)/lib$${l}-$(shared_version).so -a \! -h $(DESTDIR)$(libdir)/lib$${l}.so.${shared_major_minor}; then \
 -	    (cd $(DESTDIR)$(libdir); ln -s lib$${l}-$(shared_version).so lib$${l}.so.${shared_major_minor}); \
-+	  if test -f $(libdir)/lib$${l}.so.$(shared_version) -a \! -L $(libdir)/lib$${l}.so; then \
-+	    (cd $(libdir); ln -s lib$${l}.so.$(shared_version) lib$${l}.so); \
++	  if test -f $(DESTDIR)$(libdir)/lib$${l}.so.$(shared_version) -a \! -h $(DESTDIR)$(libdir)/lib$${l}.so; then \
++	    (cd $(DESTDIR)$(libdir); ln -s lib$${l}.so.$(shared_version) lib$${l}.so); \
  	  fi; \
  	done
- 
+ 	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/aclocal
diff --git a/devel/allegro/pkg-plist b/devel/allegro/pkg-plist
index 4822141de246..03f636bedefc 100644
--- a/devel/allegro/pkg-plist
+++ b/devel/allegro/pkg-plist
@@ -1,14 +1,14 @@
 bin/allegro-config
-%%FULL%%bin/colormap
-%%FULL%%bin/dat
-%%FULL%%bin/dat2c
-%%FULL%%bin/dat2s
-%%FULL%%bin/exedat
-%%FULL%%bin/grabber
-%%FULL%%bin/pack
-%%FULL%%bin/pat2dat
-%%FULL%%bin/rgbmap
-%%FULL%%bin/textconv
+%%DEV_UTILS%%bin/colormap
+%%DEV_UTILS%%bin/dat
+%%DEV_UTILS%%bin/dat2c
+%%DEV_UTILS%%bin/dat2s
+%%DEV_UTILS%%bin/exedat
+%%DEV_UTILS%%bin/grabber
+%%DEV_UTILS%%bin/pack
+%%DEV_UTILS%%bin/pat2dat
+%%DEV_UTILS%%bin/rgbmap
+%%DEV_UTILS%%bin/textconv
 include/allegro.h
 include/allegro/3d.h
 include/allegro/3dmaths.h
@@ -28,6 +28,7 @@ include/allegro/fix.h
 include/allegro/fixed.h
 include/allegro/fli.h
 include/allegro/fmaths.h
+include/allegro/font.h
 include/allegro/gfx.h
 include/allegro/graphics.h
 include/allegro/gui.h
@@ -47,6 +48,7 @@ include/allegro/internal/aintvga.h
 include/allegro/internal/alconfig.h
 include/allegro/joystick.h
 include/allegro/keyboard.h
+include/allegro/lzss.h
 include/allegro/matrix.h
 include/allegro/midi.h
 include/allegro/mouse.h
@@ -81,6 +83,7 @@ include/allegro/platform/alunix.h
 include/allegro/platform/alunixac.h
 include/allegro/platform/alwatcom.h
 include/allegro/platform/alwin.h
+include/allegro/platform/astdint.h
 include/allegro/platform/macdef.h
 include/allegro/quat.h
 include/allegro/rle.h
@@ -96,9 +99,16 @@ include/xalleg.h
 lib/allegro/%%SHLIB_VER%%/alleg-dga2.so
 %%ESOUND%%lib/allegro/%%SHLIB_VER%%/alleg-esddigi.so
 lib/allegro/%%SHLIB_VER%%/modules.lst
-lib/liballeg_unsharable.a
+%%DEBUG_LIB%%lib/liballd.so
+%%DEBUG_LIB%%lib/liballd.so.%%SHLIB_VER%%
+%%DEBUG_LIB%%lib/liballd_unsharable.a
 lib/liballeg.so
 lib/liballeg.so.%%SHLIB_VER%%
+lib/liballeg_unsharable.a
+%%PROFILE_LIB%%lib/liballp.so
+%%PROFILE_LIB%%lib/liballp.so.%%SHLIB_VER%%
+%%PROFILE_LIB%%lib/liballp_unsharable.a
+share/aclocal/allegro.m4
 %%PORTDOCS%%%%DOCSDIR%%/abi.html
 %%PORTDOCS%%%%DOCSDIR%%/ahack.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg000.html
@@ -147,13 +157,26 @@ lib/liballeg.so.%%SHLIB_VER%%
 %%PORTDOCS%%%%DOCSDIR%%/alleg043.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg044.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg045.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg046.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg047.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg048.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg049.html
 %%PORTDOCS%%%%DOCSDIR%%/allegro.css
 %%PORTDOCS%%%%DOCSDIR%%/allegro.html
 %%PORTDOCS%%%%DOCSDIR%%/api.html
 %%PORTDOCS%%%%DOCSDIR%%/changes.html
 %%PORTDOCS%%%%DOCSDIR%%/const.html
+%%PORTDOCS%%%%DOCSDIR%%/dat.html
+%%PORTDOCS%%%%DOCSDIR%%/dat2c.html
+%%PORTDOCS%%%%DOCSDIR%%/dat2s.html
+%%PORTDOCS%%%%DOCSDIR%%/datafile.html
 %%PORTDOCS%%%%DOCSDIR%%/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/grabber.html
 %%PORTDOCS%%%%DOCSDIR%%/help.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/license.html
+%%PORTDOCS%%%%DOCSDIR%%/makedoc.html
+%%PORTDOCS%%%%DOCSDIR%%/mistakes.html
 %%PORTDOCS%%%%DOCSDIR%%/packfile.html
 %%PORTDOCS%%%%DOCSDIR%%/readme.html
 %%PORTDOCS%%%%DOCSDIR%%/thanks.html
@@ -163,8 +186,8 @@ lib/liballeg.so.%%SHLIB_VER%%
 %%PORTDOCS%%%%EXAMPLESDIR%%/demo.h
 %%PORTDOCS%%%%EXAMPLESDIR%%/music.txt
 %%PORTDOCS%%%%EXAMPLESDIR%%/readme.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/allegro/%%SHLIB_VER%%
 @dirrm lib/allegro
 @dirrm include/allegro/platform