- Update to 4.1.12

- Add knob to enable to arts sound driver
- Use PORTSDOC
- Use INFO

PR:		ports/60193
Submitted by:	Thierry Thomas <thierry@pompo.net>

14 files changed, 350 insertions, 238 deletions

diff --git a/devel/allegro-devel/Makefile b/devel/allegro-devel/Makefile
index 7e813351de65..c3d6f91d9a64 100644
--- a/devel/allegro-devel/Makefile
+++ b/devel/allegro-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	allegro
-PORTVERSION=	4.1.4
+PORTVERSION=	4.1.12
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	alleg
@@ -18,17 +18,20 @@ USE_XLIB=	yes
 WANT_GNOME=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_AUTOCONF_VER=	213
+USE_AUTOCONF_VER=	253
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -DHAVE_LIBPTHREAD" \
 		LDFLAGS="${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--enable-vga=no
 MAKEFILE=	makefile
+ALL_TARGET=	full-build
 INSTALLS_SHLIB=	yes
 
 SHLIB_VER=	41
 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}!=""
@@ -40,6 +43,17 @@ CONFIGURE_ARGS+=	--enable-esddigi=no
 PLIST_SUB+=	ESOUND="@comment "
 .endif
 
+.if exists(${LOCALBASE}/lib/libartsc.so.0)
+WITH_ARTS=	yes
+.endif
+.if defined(WITH_ARTS)
+LIB_DEPENDS+=	artsc.0:${PORTSDIR}/audio/arts
+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 "
diff --git a/devel/allegro-devel/Makefile.man b/devel/allegro-devel/Makefile.man
index b5a42f8142ad..ae663ffea8fb 100644
--- a/devel/allegro-devel/Makefile.man
+++ b/devel/allegro-devel/Makefile.man
@@ -7,6 +7,7 @@ MAN3=	\
 	DATAFILE.3 \
 	DIALOG.3 \
 	DIALOG_PLAYER.3 \
+	END_OF_MAIN.3 \
 	FONT.3 \
 	GFX_MODE.3 \
 	GFX_MODE_LIST.3 \
@@ -22,6 +23,7 @@ MAN3=	\
 	MATRIX.3 \
 	MATRIX_f.3 \
 	MENU.3 \
+	MENU_PLAYER.3 \
 	MIDI.3 \
 	PACKFILE.3 \
 	PALETTE.3 \
@@ -76,18 +78,15 @@ MAN3=	\
 	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.3 \
 	clear_bitmap.3 \
 	clear_keybuf.3 \
 	clear_scene.3 \
@@ -164,7 +163,6 @@ MAN3=	\
 	do_uconvert.3 \
 	dot_product.3 \
 	dot_product_f.3 \
-	draw_character.3 \
 	draw_character_ex.3 \
 	draw_compiled_sprite.3 \
 	draw_gouraud_sprite.3 \
@@ -182,7 +180,54 @@ MAN3=	\
 	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 \
@@ -191,7 +236,6 @@ MAN3=	\
 	fade_out.3 \
 	fade_out_range.3 \
 	file_exists.3 \
-	file_select.3 \
 	file_select_ex.3 \
 	file_size.3 \
 	file_time.3 \
@@ -199,7 +243,6 @@ MAN3=	\
 	find_datafile_object.3 \
 	find_dialog_focus.3 \
 	fix_filename_case.3 \
-	fix_filename_path.3 \
 	fix_filename_slashes.3 \
 	fixacos.3 \
 	fixadd.3 \
@@ -232,7 +275,7 @@ MAN3=	\
 	floodfill.3 \
 	flush_config_file.3 \
 	font.3 \
-	for_each_file.3 \
+	for_each_file_ex.3 \
 	free_audio_stream_buffer.3 \
 	freeze_mouse_flag.3 \
 	ftofix.3 \
@@ -244,6 +287,8 @@ MAN3=	\
 	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 \
@@ -318,6 +363,7 @@ MAN3=	\
 	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 \
@@ -336,7 +382,6 @@ MAN3=	\
 	gui_shadow_box_proc.3 \
 	gui_strlen.3 \
 	gui_text_list_proc.3 \
-	gui_textout.3 \
 	gui_textout_ex.3 \
 	hline.3 \
 	hook_config_section.3 \
@@ -345,6 +390,7 @@ MAN3=	\
 	identity_matrix_f.3 \
 	identity_quat.3 \
 	init_dialog.3 \
+	init_menu.3 \
 	initialise_joystick.3 \
 	install_allegro.3 \
 	install_int.3 \
@@ -361,6 +407,7 @@ MAN3=	\
 	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 \
@@ -395,6 +442,8 @@ MAN3=	\
 	lock_bitmap.3 \
 	lock_midi.3 \
 	lock_sample.3 \
+	make_absolute_filename.3 \
+	make_relative_filename.3 \
 	makeacol.3 \
 	makeacol32.3 \
 	makeacol_depth.3 \
@@ -575,6 +624,7 @@ MAN3=	\
 	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 \
@@ -614,14 +664,13 @@ MAN3=	\
 	set_uformat.3 \
 	set_volume.3 \
 	set_volume_per_voice.3 \
-	set_window_close_button.3 \
-	set_window_close_hook.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 \
@@ -635,22 +684,13 @@ MAN3=	\
 	stretch_sprite.3 \
 	text_height.3 \
 	text_length.3 \
-	text_mode.3 \
-	textout.3 \
-	textout_centre.3 \
 	textout_centre_ex.3 \
 	textout_ex.3 \
-	textout_justify.3 \
 	textout_justify_ex.3 \
-	textout_right.3 \
 	textout_right_ex.3 \
-	textprintf.3 \
-	textprintf_centre.3 \
 	textprintf_centre_ex.3 \
 	textprintf_ex.3 \
-	textprintf_justify.3 \
 	textprintf_justify_ex.3 \
-	textprintf_right.3 \
 	textprintf_right_ex.3 \
 	three_finger_flag.3 \
 	timer_can_simulate_retrace.3 \
@@ -679,6 +719,7 @@ MAN3=	\
 	unselect_palette.3 \
 	uoffset.3 \
 	update_dialog.3 \
+	update_menu.3 \
 	ureadkey.3 \
 	uremove.3 \
 	usetat.3 \
diff --git a/devel/allegro-devel/distinfo b/devel/allegro-devel/distinfo
index 0d5e290d0b91..058292160ba4 100644
--- a/devel/allegro-devel/distinfo
+++ b/devel/allegro-devel/distinfo
@@ -1 +1 @@
-MD5 (allegro-4.1.4.tar.gz) = 6be4c094310e98615982bc980e832338
+MD5 (allegro-4.1.12.tar.gz) = 93c215aab32b086dcfd8a74c1d383abc
diff --git a/devel/allegro-devel/files/patch-configure.in b/devel/allegro-devel/files/patch-configure.in
index 46f3f0e2aaff..2d5542e78287 100644
--- a/devel/allegro-devel/files/patch-configure.in
+++ b/devel/allegro-devel/files/patch-configure.in
@@ -1,22 +1,6 @@
---- configure.in.orig	Wed Oct 23 08:08:26 2002
-+++ configure.in	Sun Nov 10 00:24:54 2002
-@@ -183,12 +183,12 @@
-     TARGET_ARCH=
-   fi
-   if test "X$allegro_cv_support_fomit_frame_pointer" = "Xyes"; then
--    CFLAGS="$TARGET_ARCH -O2 -funroll-loops -ffast-math -fomit-frame-pointer $WFLAGS"
-+    CFLAGS="$TARGET_ARCH $CFLAGS -funroll-loops -ffast-math -fomit-frame-pointer $WFLAGS"
-   else
--    CFLAGS="$TARGET_ARCH -O2 -funroll-loops -ffast-math $WFLAGS"
-+    CFLAGS="$TARGET_ARCH $CFLAGS -funroll-loops -ffast-math $WFLAGS"
-   fi
-   ALLEGRO_DEBUG_CFLAGS="-g $WFLAGS -DDEBUGMODE"
--  ALLEGRO_PROFILE_CFLAGS="-pg $TARGET_ARCH -O2 -funroll-loops -ffast-math $WFLAGS"
-+  ALLEGRO_PROFILE_CFLAGS="-pg $TARGET_ARCH $CFLAGS -funroll-loops -ffast-math $WFLAGS"
-   if test "X$allegro_cv_can_use_pipe" = "Xyes"; then
-     CFLAGS="-pipe $CFLAGS"
-     ALLEGRO_DEBUG_CFLAGS="-pipe $ALLEGRO_DEBUG_CFLAGS"
-@@ -245,8 +245,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
    allegro_static_libraries=yes
  else
@@ -27,7 +11,7 @@
    LINK_WITH_STATIC_LIBS=no
    allegro_shared_libraries=yes
  fi
-@@ -273,13 +273,13 @@
+@@ -286,13 +286,13 @@
  fi
  if test "X$allegro_shared_libraries" = "Xyes"; then
    if test "X$allegro_build_normal_library" = "Xyes"; then
@@ -44,12 +28,27 @@
    fi
  fi
  AC_SUBST(ALLEGRO_LIB_TARGETS)
-@@ -550,7 +550,7 @@
+@@ -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
-     AC_MSG_WARN([You need to use GNU make to build Allegro.])
-     AC_MSG_WARN([This might be called gmake on your system.])
    fi
+ fi
+ 
diff --git a/devel/allegro-devel/files/patch-makefile.in b/devel/allegro-devel/files/patch-makefile.in
index 67f7668497eb..ffd14b923f9f 100644
--- a/devel/allegro-devel/files/patch-makefile.in
+++ b/devel/allegro-devel/files/patch-makefile.in
@@ -1,23 +1,22 @@
---- makefile.in.orig	Wed Oct 23 08:08:26 2002
-+++ makefile.in	Sun Nov 10 23:37:39 2002
+--- makefile.in.orig	Sun Nov  9 19:43:06 2003
++++ makefile.in	Thu Dec 11 22:25:58 2003
 @@ -20,7 +20,7 @@
  mandir = @mandir@
  libdir = @libdir@
- modulebasedir = @libdir@/allegro
+ modulebasedir = $(libdir)/allegro
 -moduledir = $(modulebasedir)/$(shared_major_minor)
 +moduledir = $(modulebasedir)/$(shared_version)
  
  EXE =
  OBJ = .o
-@@ -29,13 +29,14 @@
+@@ -29,12 +29,13 @@
  INFO_DIR = $(infodir)/dir
  DESTDIR =
  
 -ACLOCAL = aclocal
-+ACLOCAL = true
- ACLOCAL_M4 = $(srcdir)/aclocal.m4
 -AUTOCONF = autoconf
 -AUTOHEADER = autoheader
++ACLOCAL = true
 +AUTOCONF = true
 +AUTOHEADER = true
  
@@ -27,8 +26,8 @@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_INFO = @INSTALL_INFO@
  
-@@ -262,6 +263,11 @@
- all: lib modules programs docs
+@@ -325,6 +326,11 @@
+ full-build: lib modules programs docs
  
  lib: $(ALLEGRO_LIB_TARGETS)
 +	@for l in alleg alld allp; do \
@@ -39,7 +38,7 @@
  
  modules: $(ALLEGRO_MODULE_TARGETS)
  
-@@ -349,35 +355,37 @@
+@@ -436,35 +442,37 @@
  	  fi; \
  	done
  	@for l in alleg alld allp; do \
diff --git a/devel/allegro-devel/files/patch-misc::deplib.sh b/devel/allegro-devel/files/patch-misc::deplib.sh
index 3c3a1f7b4078..2e0a7b4f3e2d 100644
--- a/devel/allegro-devel/files/patch-misc::deplib.sh
+++ b/devel/allegro-devel/files/patch-misc::deplib.sh
@@ -1,5 +1,5 @@
---- misc/deplib.sh.orig	Wed Oct 23 08:08:27 2002
-+++ misc/deplib.sh	Sun Nov 10 00:40:21 2002
+--- misc/deplib.sh.orig	Sun Nov  9 19:43:07 2003
++++ misc/deplib.sh	Thu Dec 11 22:32:16 2003
 @@ -10,7 +10,7 @@
      staticlib="lib${1}.a"
      staticobj="\$(${2}_OBJECTS)"
@@ -13,7 +13,7 @@
      echo "	rm -f \$@"
      # gf: This bit is obviously gcc-specific
      # eb: Yes, but the GNU C Compiler doesn't always spell 'gcc'
--    echo "	\$(CC) -shared -o \$@ ${shareobj} \$(LDFLAGS) -Wl,-h,lib${1}.so.\$(shared_major_minor) \$(LIBS)"
+-    echo "	\$(CC) -shared -o \$@ ${shareobj} ${3} \$(LDFLAGS) -Wl,-h,lib${1}.so.\$(shared_major_minor) \$(LIBS)"
 +    echo "	\$(CC) -shared -o \$@ ${shareobj} \$(LDFLAGS) -Wl,-h,lib${1}.so.\$(shared_version) \$(LIBS)"
      echo ""
      echo "\$(LIBDIR)/${unsharelib}: ${unshareobj}"
diff --git a/devel/allegro-devel/pkg-plist b/devel/allegro-devel/pkg-plist
index 3b84019682c9..4822141de246 100644
--- a/devel/allegro-devel/pkg-plist
+++ b/devel/allegro-devel/pkg-plist
@@ -55,6 +55,7 @@ include/allegro/platform/aintbeos.h
 include/allegro/platform/aintdos.h
 include/allegro/platform/aintlnx.h
 include/allegro/platform/aintmac.h
+include/allegro/platform/aintosx.h
 include/allegro/platform/aintqnx.h
 include/allegro/platform/aintunix.h
 include/allegro/platform/aintwin.h
@@ -70,6 +71,8 @@ include/allegro/platform/almac.h
 include/allegro/platform/almaccfg.h
 include/allegro/platform/almngw32.h
 include/allegro/platform/almsvc.h
+include/allegro/platform/alosx.h
+include/allegro/platform/alosxcfg.h
 include/allegro/platform/alplatf.h
 include/allegro/platform/alqnx.h
 include/allegro/platform/alqnxcfg.h
@@ -89,78 +92,78 @@ include/allegro/timer.h
 include/allegro/unicode.h
 include/linalleg.h
 include/xalleg.h
-@unexec install-info --delete %D/info/allegro.info %D/info/dir
-info/allegro.info
-@exec install-info --delete %D/info/allegro.info %D/info/dir
-%%ESOUND%%lib/allegro/%%SHLIB_VER%%/alleg-esddigi.so
+%%ARTS%%lib/allegro/%%SHLIB_VER%%/alleg-artsdigi.so
 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
 lib/liballeg.so
 lib/liballeg.so.%%SHLIB_VER%%
-%%PORTDOCS%%share/doc/allegro/abi.html
-%%PORTDOCS%%share/doc/allegro/ahack.html
-%%PORTDOCS%%share/doc/allegro/alleg000.html
-%%PORTDOCS%%share/doc/allegro/alleg001.html
-%%PORTDOCS%%share/doc/allegro/alleg002.html
-%%PORTDOCS%%share/doc/allegro/alleg003.html
-%%PORTDOCS%%share/doc/allegro/alleg004.html
-%%PORTDOCS%%share/doc/allegro/alleg005.html
-%%PORTDOCS%%share/doc/allegro/alleg006.html
-%%PORTDOCS%%share/doc/allegro/alleg007.html
-%%PORTDOCS%%share/doc/allegro/alleg008.html
-%%PORTDOCS%%share/doc/allegro/alleg009.html
-%%PORTDOCS%%share/doc/allegro/alleg010.html
-%%PORTDOCS%%share/doc/allegro/alleg011.html
-%%PORTDOCS%%share/doc/allegro/alleg012.html
-%%PORTDOCS%%share/doc/allegro/alleg013.html
-%%PORTDOCS%%share/doc/allegro/alleg014.html
-%%PORTDOCS%%share/doc/allegro/alleg015.html
-%%PORTDOCS%%share/doc/allegro/alleg016.html
-%%PORTDOCS%%share/doc/allegro/alleg017.html
-%%PORTDOCS%%share/doc/allegro/alleg018.html
-%%PORTDOCS%%share/doc/allegro/alleg019.html
-%%PORTDOCS%%share/doc/allegro/alleg020.html
-%%PORTDOCS%%share/doc/allegro/alleg021.html
-%%PORTDOCS%%share/doc/allegro/alleg022.html
-%%PORTDOCS%%share/doc/allegro/alleg023.html
-%%PORTDOCS%%share/doc/allegro/alleg024.html
-%%PORTDOCS%%share/doc/allegro/alleg025.html
-%%PORTDOCS%%share/doc/allegro/alleg026.html
-%%PORTDOCS%%share/doc/allegro/alleg027.html
-%%PORTDOCS%%share/doc/allegro/alleg028.html
-%%PORTDOCS%%share/doc/allegro/alleg029.html
-%%PORTDOCS%%share/doc/allegro/alleg030.html
-%%PORTDOCS%%share/doc/allegro/alleg031.html
-%%PORTDOCS%%share/doc/allegro/alleg032.html
-%%PORTDOCS%%share/doc/allegro/alleg033.html
-%%PORTDOCS%%share/doc/allegro/alleg034.html
-%%PORTDOCS%%share/doc/allegro/alleg035.html
-%%PORTDOCS%%share/doc/allegro/alleg036.html
-%%PORTDOCS%%share/doc/allegro/alleg037.html
-%%PORTDOCS%%share/doc/allegro/alleg038.html
-%%PORTDOCS%%share/doc/allegro/alleg039.html
-%%PORTDOCS%%share/doc/allegro/alleg040.html
-%%PORTDOCS%%share/doc/allegro/alleg041.html
-%%PORTDOCS%%share/doc/allegro/alleg042.html
-%%PORTDOCS%%share/doc/allegro/alleg043.html
-%%PORTDOCS%%share/doc/allegro/allegro.css
-%%PORTDOCS%%share/doc/allegro/allegro.html
-%%PORTDOCS%%share/doc/allegro/api.html
-%%PORTDOCS%%share/doc/allegro/changes.html
-%%PORTDOCS%%share/doc/allegro/const.html
-%%PORTDOCS%%share/doc/allegro/faq.html
-%%PORTDOCS%%share/doc/allegro/help.html
-%%PORTDOCS%%share/doc/allegro/packfile.html
-%%PORTDOCS%%share/doc/allegro/readme.html
-%%PORTDOCS%%share/doc/allegro/thanks.html
+%%PORTDOCS%%%%DOCSDIR%%/abi.html
+%%PORTDOCS%%%%DOCSDIR%%/ahack.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg000.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg001.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg002.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg003.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg004.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg005.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg006.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg007.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg008.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg009.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg010.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg011.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg012.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg013.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg014.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg015.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg016.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg017.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg018.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg019.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg020.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg021.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg022.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg023.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg024.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg025.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg026.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg027.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg028.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg029.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg030.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg031.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg032.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg033.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg034.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg035.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg036.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg037.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg038.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg039.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg040.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg041.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg042.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg043.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg044.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg045.html
+%%PORTDOCS%%%%DOCSDIR%%/allegro.css
+%%PORTDOCS%%%%DOCSDIR%%/allegro.html
+%%PORTDOCS%%%%DOCSDIR%%/api.html
+%%PORTDOCS%%%%DOCSDIR%%/changes.html
+%%PORTDOCS%%%%DOCSDIR%%/const.html
+%%PORTDOCS%%%%DOCSDIR%%/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/help.html
+%%PORTDOCS%%%%DOCSDIR%%/packfile.html
+%%PORTDOCS%%%%DOCSDIR%%/readme.html
+%%PORTDOCS%%%%DOCSDIR%%/thanks.html
 %%PORTDOCS%%%%EXAMPLESDIR%%/demo
 %%PORTDOCS%%%%EXAMPLESDIR%%/demo.c
 %%PORTDOCS%%%%EXAMPLESDIR%%/demo.dat
 %%PORTDOCS%%%%EXAMPLESDIR%%/demo.h
 %%PORTDOCS%%%%EXAMPLESDIR%%/music.txt
 %%PORTDOCS%%%%EXAMPLESDIR%%/readme.txt
-%%PORTDOCS%%@dirrm share/doc/allegro
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 @dirrm lib/allegro/%%SHLIB_VER%%
 @dirrm lib/allegro
diff --git a/devel/allegro/Makefile b/devel/allegro/Makefile
index 7e813351de65..c3d6f91d9a64 100644
--- a/devel/allegro/Makefile
+++ b/devel/allegro/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	allegro
-PORTVERSION=	4.1.4
+PORTVERSION=	4.1.12
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	alleg
@@ -18,17 +18,20 @@ USE_XLIB=	yes
 WANT_GNOME=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_AUTOCONF_VER=	213
+USE_AUTOCONF_VER=	253
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -DHAVE_LIBPTHREAD" \
 		LDFLAGS="${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--enable-vga=no
 MAKEFILE=	makefile
+ALL_TARGET=	full-build
 INSTALLS_SHLIB=	yes
 
 SHLIB_VER=	41
 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}!=""
@@ -40,6 +43,17 @@ CONFIGURE_ARGS+=	--enable-esddigi=no
 PLIST_SUB+=	ESOUND="@comment "
 .endif
 
+.if exists(${LOCALBASE}/lib/libartsc.so.0)
+WITH_ARTS=	yes
+.endif
+.if defined(WITH_ARTS)
+LIB_DEPENDS+=	artsc.0:${PORTSDIR}/audio/arts
+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 "
diff --git a/devel/allegro/Makefile.man b/devel/allegro/Makefile.man
index b5a42f8142ad..ae663ffea8fb 100644
--- a/devel/allegro/Makefile.man
+++ b/devel/allegro/Makefile.man
@@ -7,6 +7,7 @@ MAN3=	\
 	DATAFILE.3 \
 	DIALOG.3 \
 	DIALOG_PLAYER.3 \
+	END_OF_MAIN.3 \
 	FONT.3 \
 	GFX_MODE.3 \
 	GFX_MODE_LIST.3 \
@@ -22,6 +23,7 @@ MAN3=	\
 	MATRIX.3 \
 	MATRIX_f.3 \
 	MENU.3 \
+	MENU_PLAYER.3 \
 	MIDI.3 \
 	PACKFILE.3 \
 	PALETTE.3 \
@@ -76,18 +78,15 @@ MAN3=	\
 	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.3 \
 	clear_bitmap.3 \
 	clear_keybuf.3 \
 	clear_scene.3 \
@@ -164,7 +163,6 @@ MAN3=	\
 	do_uconvert.3 \
 	dot_product.3 \
 	dot_product_f.3 \
-	draw_character.3 \
 	draw_character_ex.3 \
 	draw_compiled_sprite.3 \
 	draw_gouraud_sprite.3 \
@@ -182,7 +180,54 @@ MAN3=	\
 	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 \
@@ -191,7 +236,6 @@ MAN3=	\
 	fade_out.3 \
 	fade_out_range.3 \
 	file_exists.3 \
-	file_select.3 \
 	file_select_ex.3 \
 	file_size.3 \
 	file_time.3 \
@@ -199,7 +243,6 @@ MAN3=	\
 	find_datafile_object.3 \
 	find_dialog_focus.3 \
 	fix_filename_case.3 \
-	fix_filename_path.3 \
 	fix_filename_slashes.3 \
 	fixacos.3 \
 	fixadd.3 \
@@ -232,7 +275,7 @@ MAN3=	\
 	floodfill.3 \
 	flush_config_file.3 \
 	font.3 \
-	for_each_file.3 \
+	for_each_file_ex.3 \
 	free_audio_stream_buffer.3 \
 	freeze_mouse_flag.3 \
 	ftofix.3 \
@@ -244,6 +287,8 @@ MAN3=	\
 	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 \
@@ -318,6 +363,7 @@ MAN3=	\
 	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 \
@@ -336,7 +382,6 @@ MAN3=	\
 	gui_shadow_box_proc.3 \
 	gui_strlen.3 \
 	gui_text_list_proc.3 \
-	gui_textout.3 \
 	gui_textout_ex.3 \
 	hline.3 \
 	hook_config_section.3 \
@@ -345,6 +390,7 @@ MAN3=	\
 	identity_matrix_f.3 \
 	identity_quat.3 \
 	init_dialog.3 \
+	init_menu.3 \
 	initialise_joystick.3 \
 	install_allegro.3 \
 	install_int.3 \
@@ -361,6 +407,7 @@ MAN3=	\
 	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 \
@@ -395,6 +442,8 @@ MAN3=	\
 	lock_bitmap.3 \
 	lock_midi.3 \
 	lock_sample.3 \
+	make_absolute_filename.3 \
+	make_relative_filename.3 \
 	makeacol.3 \
 	makeacol32.3 \
 	makeacol_depth.3 \
@@ -575,6 +624,7 @@ MAN3=	\
 	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 \
@@ -614,14 +664,13 @@ MAN3=	\
 	set_uformat.3 \
 	set_volume.3 \
 	set_volume_per_voice.3 \
-	set_window_close_button.3 \
-	set_window_close_hook.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 \
@@ -635,22 +684,13 @@ MAN3=	\
 	stretch_sprite.3 \
 	text_height.3 \
 	text_length.3 \
-	text_mode.3 \
-	textout.3 \
-	textout_centre.3 \
 	textout_centre_ex.3 \
 	textout_ex.3 \
-	textout_justify.3 \
 	textout_justify_ex.3 \
-	textout_right.3 \
 	textout_right_ex.3 \
-	textprintf.3 \
-	textprintf_centre.3 \
 	textprintf_centre_ex.3 \
 	textprintf_ex.3 \
-	textprintf_justify.3 \
 	textprintf_justify_ex.3 \
-	textprintf_right.3 \
 	textprintf_right_ex.3 \
 	three_finger_flag.3 \
 	timer_can_simulate_retrace.3 \
@@ -679,6 +719,7 @@ MAN3=	\
 	unselect_palette.3 \
 	uoffset.3 \
 	update_dialog.3 \
+	update_menu.3 \
 	ureadkey.3 \
 	uremove.3 \
 	usetat.3 \
diff --git a/devel/allegro/distinfo b/devel/allegro/distinfo
index 0d5e290d0b91..058292160ba4 100644
--- a/devel/allegro/distinfo
+++ b/devel/allegro/distinfo
@@ -1 +1 @@
-MD5 (allegro-4.1.4.tar.gz) = 6be4c094310e98615982bc980e832338
+MD5 (allegro-4.1.12.tar.gz) = 93c215aab32b086dcfd8a74c1d383abc
diff --git a/devel/allegro/files/patch-configure.in b/devel/allegro/files/patch-configure.in
index 46f3f0e2aaff..2d5542e78287 100644
--- a/devel/allegro/files/patch-configure.in
+++ b/devel/allegro/files/patch-configure.in
@@ -1,22 +1,6 @@
---- configure.in.orig	Wed Oct 23 08:08:26 2002
-+++ configure.in	Sun Nov 10 00:24:54 2002
-@@ -183,12 +183,12 @@
-     TARGET_ARCH=
-   fi
-   if test "X$allegro_cv_support_fomit_frame_pointer" = "Xyes"; then
--    CFLAGS="$TARGET_ARCH -O2 -funroll-loops -ffast-math -fomit-frame-pointer $WFLAGS"
-+    CFLAGS="$TARGET_ARCH $CFLAGS -funroll-loops -ffast-math -fomit-frame-pointer $WFLAGS"
-   else
--    CFLAGS="$TARGET_ARCH -O2 -funroll-loops -ffast-math $WFLAGS"
-+    CFLAGS="$TARGET_ARCH $CFLAGS -funroll-loops -ffast-math $WFLAGS"
-   fi
-   ALLEGRO_DEBUG_CFLAGS="-g $WFLAGS -DDEBUGMODE"
--  ALLEGRO_PROFILE_CFLAGS="-pg $TARGET_ARCH -O2 -funroll-loops -ffast-math $WFLAGS"
-+  ALLEGRO_PROFILE_CFLAGS="-pg $TARGET_ARCH $CFLAGS -funroll-loops -ffast-math $WFLAGS"
-   if test "X$allegro_cv_can_use_pipe" = "Xyes"; then
-     CFLAGS="-pipe $CFLAGS"
-     ALLEGRO_DEBUG_CFLAGS="-pipe $ALLEGRO_DEBUG_CFLAGS"
-@@ -245,8 +245,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
    allegro_static_libraries=yes
  else
@@ -27,7 +11,7 @@
    LINK_WITH_STATIC_LIBS=no
    allegro_shared_libraries=yes
  fi
-@@ -273,13 +273,13 @@
+@@ -286,13 +286,13 @@
  fi
  if test "X$allegro_shared_libraries" = "Xyes"; then
    if test "X$allegro_build_normal_library" = "Xyes"; then
@@ -44,12 +28,27 @@
    fi
  fi
  AC_SUBST(ALLEGRO_LIB_TARGETS)
-@@ -550,7 +550,7 @@
+@@ -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
-     AC_MSG_WARN([You need to use GNU make to build Allegro.])
-     AC_MSG_WARN([This might be called gmake on your system.])
    fi
+ fi
+ 
diff --git a/devel/allegro/files/patch-makefile.in b/devel/allegro/files/patch-makefile.in
index 67f7668497eb..ffd14b923f9f 100644
--- a/devel/allegro/files/patch-makefile.in
+++ b/devel/allegro/files/patch-makefile.in
@@ -1,23 +1,22 @@
---- makefile.in.orig	Wed Oct 23 08:08:26 2002
-+++ makefile.in	Sun Nov 10 23:37:39 2002
+--- makefile.in.orig	Sun Nov  9 19:43:06 2003
++++ makefile.in	Thu Dec 11 22:25:58 2003
 @@ -20,7 +20,7 @@
  mandir = @mandir@
  libdir = @libdir@
- modulebasedir = @libdir@/allegro
+ modulebasedir = $(libdir)/allegro
 -moduledir = $(modulebasedir)/$(shared_major_minor)
 +moduledir = $(modulebasedir)/$(shared_version)
  
  EXE =
  OBJ = .o
-@@ -29,13 +29,14 @@
+@@ -29,12 +29,13 @@
  INFO_DIR = $(infodir)/dir
  DESTDIR =
  
 -ACLOCAL = aclocal
-+ACLOCAL = true
- ACLOCAL_M4 = $(srcdir)/aclocal.m4
 -AUTOCONF = autoconf
 -AUTOHEADER = autoheader
++ACLOCAL = true
 +AUTOCONF = true
 +AUTOHEADER = true
  
@@ -27,8 +26,8 @@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_INFO = @INSTALL_INFO@
  
-@@ -262,6 +263,11 @@
- all: lib modules programs docs
+@@ -325,6 +326,11 @@
+ full-build: lib modules programs docs
  
  lib: $(ALLEGRO_LIB_TARGETS)
 +	@for l in alleg alld allp; do \
@@ -39,7 +38,7 @@
  
  modules: $(ALLEGRO_MODULE_TARGETS)
  
-@@ -349,35 +355,37 @@
+@@ -436,35 +442,37 @@
  	  fi; \
  	done
  	@for l in alleg alld allp; do \
diff --git a/devel/allegro/files/patch-misc::deplib.sh b/devel/allegro/files/patch-misc::deplib.sh
index 3c3a1f7b4078..2e0a7b4f3e2d 100644
--- a/devel/allegro/files/patch-misc::deplib.sh
+++ b/devel/allegro/files/patch-misc::deplib.sh
@@ -1,5 +1,5 @@
---- misc/deplib.sh.orig	Wed Oct 23 08:08:27 2002
-+++ misc/deplib.sh	Sun Nov 10 00:40:21 2002
+--- misc/deplib.sh.orig	Sun Nov  9 19:43:07 2003
++++ misc/deplib.sh	Thu Dec 11 22:32:16 2003
 @@ -10,7 +10,7 @@
      staticlib="lib${1}.a"
      staticobj="\$(${2}_OBJECTS)"
@@ -13,7 +13,7 @@
      echo "	rm -f \$@"
      # gf: This bit is obviously gcc-specific
      # eb: Yes, but the GNU C Compiler doesn't always spell 'gcc'
--    echo "	\$(CC) -shared -o \$@ ${shareobj} \$(LDFLAGS) -Wl,-h,lib${1}.so.\$(shared_major_minor) \$(LIBS)"
+-    echo "	\$(CC) -shared -o \$@ ${shareobj} ${3} \$(LDFLAGS) -Wl,-h,lib${1}.so.\$(shared_major_minor) \$(LIBS)"
 +    echo "	\$(CC) -shared -o \$@ ${shareobj} \$(LDFLAGS) -Wl,-h,lib${1}.so.\$(shared_version) \$(LIBS)"
      echo ""
      echo "\$(LIBDIR)/${unsharelib}: ${unshareobj}"
diff --git a/devel/allegro/pkg-plist b/devel/allegro/pkg-plist
index 3b84019682c9..4822141de246 100644
--- a/devel/allegro/pkg-plist
+++ b/devel/allegro/pkg-plist
@@ -55,6 +55,7 @@ include/allegro/platform/aintbeos.h
 include/allegro/platform/aintdos.h
 include/allegro/platform/aintlnx.h
 include/allegro/platform/aintmac.h
+include/allegro/platform/aintosx.h
 include/allegro/platform/aintqnx.h
 include/allegro/platform/aintunix.h
 include/allegro/platform/aintwin.h
@@ -70,6 +71,8 @@ include/allegro/platform/almac.h
 include/allegro/platform/almaccfg.h
 include/allegro/platform/almngw32.h
 include/allegro/platform/almsvc.h
+include/allegro/platform/alosx.h
+include/allegro/platform/alosxcfg.h
 include/allegro/platform/alplatf.h
 include/allegro/platform/alqnx.h
 include/allegro/platform/alqnxcfg.h
@@ -89,78 +92,78 @@ include/allegro/timer.h
 include/allegro/unicode.h
 include/linalleg.h
 include/xalleg.h
-@unexec install-info --delete %D/info/allegro.info %D/info/dir
-info/allegro.info
-@exec install-info --delete %D/info/allegro.info %D/info/dir
-%%ESOUND%%lib/allegro/%%SHLIB_VER%%/alleg-esddigi.so
+%%ARTS%%lib/allegro/%%SHLIB_VER%%/alleg-artsdigi.so
 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
 lib/liballeg.so
 lib/liballeg.so.%%SHLIB_VER%%
-%%PORTDOCS%%share/doc/allegro/abi.html
-%%PORTDOCS%%share/doc/allegro/ahack.html
-%%PORTDOCS%%share/doc/allegro/alleg000.html
-%%PORTDOCS%%share/doc/allegro/alleg001.html
-%%PORTDOCS%%share/doc/allegro/alleg002.html
-%%PORTDOCS%%share/doc/allegro/alleg003.html
-%%PORTDOCS%%share/doc/allegro/alleg004.html
-%%PORTDOCS%%share/doc/allegro/alleg005.html
-%%PORTDOCS%%share/doc/allegro/alleg006.html
-%%PORTDOCS%%share/doc/allegro/alleg007.html
-%%PORTDOCS%%share/doc/allegro/alleg008.html
-%%PORTDOCS%%share/doc/allegro/alleg009.html
-%%PORTDOCS%%share/doc/allegro/alleg010.html
-%%PORTDOCS%%share/doc/allegro/alleg011.html
-%%PORTDOCS%%share/doc/allegro/alleg012.html
-%%PORTDOCS%%share/doc/allegro/alleg013.html
-%%PORTDOCS%%share/doc/allegro/alleg014.html
-%%PORTDOCS%%share/doc/allegro/alleg015.html
-%%PORTDOCS%%share/doc/allegro/alleg016.html
-%%PORTDOCS%%share/doc/allegro/alleg017.html
-%%PORTDOCS%%share/doc/allegro/alleg018.html
-%%PORTDOCS%%share/doc/allegro/alleg019.html
-%%PORTDOCS%%share/doc/allegro/alleg020.html
-%%PORTDOCS%%share/doc/allegro/alleg021.html
-%%PORTDOCS%%share/doc/allegro/alleg022.html
-%%PORTDOCS%%share/doc/allegro/alleg023.html
-%%PORTDOCS%%share/doc/allegro/alleg024.html
-%%PORTDOCS%%share/doc/allegro/alleg025.html
-%%PORTDOCS%%share/doc/allegro/alleg026.html
-%%PORTDOCS%%share/doc/allegro/alleg027.html
-%%PORTDOCS%%share/doc/allegro/alleg028.html
-%%PORTDOCS%%share/doc/allegro/alleg029.html
-%%PORTDOCS%%share/doc/allegro/alleg030.html
-%%PORTDOCS%%share/doc/allegro/alleg031.html
-%%PORTDOCS%%share/doc/allegro/alleg032.html
-%%PORTDOCS%%share/doc/allegro/alleg033.html
-%%PORTDOCS%%share/doc/allegro/alleg034.html
-%%PORTDOCS%%share/doc/allegro/alleg035.html
-%%PORTDOCS%%share/doc/allegro/alleg036.html
-%%PORTDOCS%%share/doc/allegro/alleg037.html
-%%PORTDOCS%%share/doc/allegro/alleg038.html
-%%PORTDOCS%%share/doc/allegro/alleg039.html
-%%PORTDOCS%%share/doc/allegro/alleg040.html
-%%PORTDOCS%%share/doc/allegro/alleg041.html
-%%PORTDOCS%%share/doc/allegro/alleg042.html
-%%PORTDOCS%%share/doc/allegro/alleg043.html
-%%PORTDOCS%%share/doc/allegro/allegro.css
-%%PORTDOCS%%share/doc/allegro/allegro.html
-%%PORTDOCS%%share/doc/allegro/api.html
-%%PORTDOCS%%share/doc/allegro/changes.html
-%%PORTDOCS%%share/doc/allegro/const.html
-%%PORTDOCS%%share/doc/allegro/faq.html
-%%PORTDOCS%%share/doc/allegro/help.html
-%%PORTDOCS%%share/doc/allegro/packfile.html
-%%PORTDOCS%%share/doc/allegro/readme.html
-%%PORTDOCS%%share/doc/allegro/thanks.html
+%%PORTDOCS%%%%DOCSDIR%%/abi.html
+%%PORTDOCS%%%%DOCSDIR%%/ahack.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg000.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg001.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg002.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg003.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg004.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg005.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg006.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg007.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg008.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg009.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg010.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg011.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg012.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg013.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg014.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg015.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg016.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg017.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg018.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg019.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg020.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg021.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg022.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg023.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg024.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg025.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg026.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg027.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg028.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg029.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg030.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg031.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg032.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg033.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg034.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg035.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg036.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg037.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg038.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg039.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg040.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg041.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg042.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg043.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg044.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg045.html
+%%PORTDOCS%%%%DOCSDIR%%/allegro.css
+%%PORTDOCS%%%%DOCSDIR%%/allegro.html
+%%PORTDOCS%%%%DOCSDIR%%/api.html
+%%PORTDOCS%%%%DOCSDIR%%/changes.html
+%%PORTDOCS%%%%DOCSDIR%%/const.html
+%%PORTDOCS%%%%DOCSDIR%%/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/help.html
+%%PORTDOCS%%%%DOCSDIR%%/packfile.html
+%%PORTDOCS%%%%DOCSDIR%%/readme.html
+%%PORTDOCS%%%%DOCSDIR%%/thanks.html
 %%PORTDOCS%%%%EXAMPLESDIR%%/demo
 %%PORTDOCS%%%%EXAMPLESDIR%%/demo.c
 %%PORTDOCS%%%%EXAMPLESDIR%%/demo.dat
 %%PORTDOCS%%%%EXAMPLESDIR%%/demo.h
 %%PORTDOCS%%%%EXAMPLESDIR%%/music.txt
 %%PORTDOCS%%%%EXAMPLESDIR%%/readme.txt
-%%PORTDOCS%%@dirrm share/doc/allegro
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 @dirrm lib/allegro/%%SHLIB_VER%%
 @dirrm lib/allegro