devel/allegro: updating to 4.1.4 (devel version).

	This PR updates allegro to the last 4.1.4, fixes allegro-config,
	and adds samples.

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

8 files changed, 141 insertions, 39 deletions

diff --git a/devel/allegro/Makefile b/devel/allegro/Makefile
index 4f5fc605c55d..4e2d632078f9 100644
--- a/devel/allegro/Makefile
+++ b/devel/allegro/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	allegro
-PORTVERSION=	4.0.2
-PORTREVISION=	2
+PORTVERSION=	4.1.4
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	alleg
@@ -27,8 +26,9 @@ CONFIGURE_ARGS=	--enable-vga=no
 MAKEFILE=	makefile
 INSTALLS_SHLIB=	yes
 
-SHLIB_VER=	4
+SHLIB_VER=	41
 PLIST_SUB=	SHLIB_VER="${SHLIB_VER}"
+DEMO=		demo.c demo.dat demo.h music.txt ../readme.txt
 
 .include <bsd.port.pre.mk>
 
@@ -49,6 +49,10 @@ INSTALL_TARGET=	full-install install-man install-info
 PLIST_SUB+=	FULL=""
 .endif
 
+.if !defined(NOPORTDOCS)
+PLIST_SUB+=	EXAMPLESDIR="share/examples/${PORTNAME}"
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|${PORTVERSION}|${SHLIB_VER}|g' ${WRKSRC}/makefile.ver
@@ -59,6 +63,12 @@ post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/docs/html/*.html ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/html/*.css  ${DOCSDIR}
+	@${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/demo/demo ${EXAMPLESDIR}
+.for FILE in ${DEMO}
+	${INSTALL_DATA} ${WRKSRC}/demo/${FILE} ${EXAMPLESDIR}
+.endfor
 .endif
 
 .include "Makefile.man"
diff --git a/devel/allegro/Makefile.man b/devel/allegro/Makefile.man
index 4989daac5985..b5a42f8142ad 100644
--- a/devel/allegro/Makefile.man
+++ b/devel/allegro/Makefile.man
@@ -1,11 +1,39 @@
 MAN3=	\
 	ASSERT.3 \
+	AUDIOSTREAM.3 \
+	BITMAP.3 \
+	COLOR_MAP.3 \
+	COMPILED_SPRITE.3 \
+	DATAFILE.3 \
+	DIALOG.3 \
+	DIALOG_PLAYER.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 \
+	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 \
@@ -24,6 +52,7 @@ MAN3=	\
 	active_menu.3 \
 	adjust_sample.3 \
 	al_assert.3 \
+	al_ffblk.3 \
 	al_findclose.3 \
 	al_findfirst.3 \
 	al_findnext.3 \
@@ -136,6 +165,7 @@ MAN3=	\
 	dot_product.3 \
 	dot_product_f.3 \
 	draw_character.3 \
+	draw_character_ex.3 \
 	draw_compiled_sprite.3 \
 	draw_gouraud_sprite.3 \
 	draw_lit_rle_sprite.3 \
@@ -179,6 +209,7 @@ MAN3=	\
 	fixceil.3 \
 	fixcos.3 \
 	fixdiv.3 \
+	fixed.3 \
 	fixfloor.3 \
 	fixhypot.3 \
 	fixmul.3 \
@@ -188,6 +219,7 @@ MAN3=	\
 	fixtan.3 \
 	fixtof.3 \
 	fixtoi.3 \
+	fixtorad_r.3 \
 	fixup_datafile.3 \
 	fli_bitmap.3 \
 	fli_bmp_dirty_from.3 \
@@ -305,6 +337,7 @@ MAN3=	\
 	gui_strlen.3 \
 	gui_text_list_proc.3 \
 	gui_textout.3 \
+	gui_textout_ex.3 \
 	hline.3 \
 	hook_config_section.3 \
 	hsv_to_rgb.3 \
@@ -478,6 +511,7 @@ MAN3=	\
 	quat_mul.3 \
 	quat_slerp.3 \
 	quat_to_matrix.3 \
+	radtofix_r.3 \
 	read_sound_input.3 \
 	readkey.3 \
 	reallocate_voice.3 \
@@ -486,6 +520,7 @@ MAN3=	\
 	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 \
@@ -523,6 +558,7 @@ MAN3=	\
 	save_bmp.3 \
 	save_joystick_data.3 \
 	save_pcx.3 \
+	save_sample.3 \
 	save_tga.3 \
 	scancode_to_ascii.3 \
 	scare_mouse.3 \
@@ -602,12 +638,20 @@ MAN3=	\
 	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 \
 	timer_is_using_retrace.3 \
@@ -652,6 +696,7 @@ MAN3=	\
 	ustrncat.3 \
 	ustrncmp.3 \
 	ustrncpy.3 \
+	ustrnicmp.3 \
 	ustrpbrk.3 \
 	ustrrchr.3 \
 	ustrsize.3 \
@@ -700,4 +745,5 @@ MAN3=	\
 	voice_sweep_pan.3 \
 	vsync.3 \
 	xor_mode.3 \
+	xwin_set_window_name.3 \
 	yield_timeslice.3
diff --git a/devel/allegro/distinfo b/devel/allegro/distinfo
index b99dcbed292f..0d5e290d0b91 100644
--- a/devel/allegro/distinfo
+++ b/devel/allegro/distinfo
@@ -1 +1 @@
-MD5 (allegro-4.0.2.tar.gz) = c9b610c7868d0986dfb3153ca9d12f2a
+MD5 (allegro-4.1.4.tar.gz) = 6be4c094310e98615982bc980e832338
diff --git a/devel/allegro/files/patch-configure.in b/devel/allegro/files/patch-configure.in
index 3504cae06a03..46f3f0e2aaff 100644
--- a/devel/allegro/files/patch-configure.in
+++ b/devel/allegro/files/patch-configure.in
@@ -1,6 +1,6 @@
---- configure.in.orig	Thu Jul  4 05:17:59 2002
-+++ configure.in	Wed Nov  6 02:19:16 2002
-@@ -169,12 +169,12 @@
+--- 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
@@ -13,10 +13,10 @@
    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 "$allegro_cv_support_asm" != i386; then
-     CFLAGS="$CFLAGS -DALLEGRO_USE_C"
-     ALLEGRO_DEBUG_CFLAGS="$ALLEGRO_DEBUG_CFLAGS -DALLEGRO_USE_C"
-@@ -226,8 +226,8 @@
+   if test "X$allegro_cv_can_use_pipe" = "Xyes"; then
+     CFLAGS="-pipe $CFLAGS"
+     ALLEGRO_DEBUG_CFLAGS="-pipe $ALLEGRO_DEBUG_CFLAGS"
+@@ -245,8 +245,8 @@
    LINK_WITH_STATIC_LIBS=yes
    allegro_static_libraries=yes
  else
@@ -27,7 +27,7 @@
    LINK_WITH_STATIC_LIBS=no
    allegro_shared_libraries=yes
  fi
-@@ -254,13 +254,13 @@
+@@ -273,13 +273,13 @@
  fi
  if test "X$allegro_shared_libraries" = "Xyes"; then
    if test "X$allegro_build_normal_library" = "Xyes"; then
@@ -44,7 +44,7 @@
    fi
  fi
  AC_SUBST(ALLEGRO_LIB_TARGETS)
-@@ -504,7 +504,7 @@
+@@ -550,7 +550,7 @@
      ${MAKE-make} depend
    else
      AC_MSG_WARN([Non-GNU make detected, trying gmake to build dependencies.])
diff --git a/devel/allegro/files/patch-makefile.in b/devel/allegro/files/patch-makefile.in
index e4a8c951e1c4..67f7668497eb 100644
--- a/devel/allegro/files/patch-makefile.in
+++ b/devel/allegro/files/patch-makefile.in
@@ -1,8 +1,17 @@
---- makefile.in.orig	Thu Jul  4 05:20:02 2002
-+++ makefile.in	Wed Nov  6 02:02:31 2002
-@@ -28,10 +28,10 @@
- LIBDIR = lib/unix
+--- makefile.in.orig	Wed Oct 23 08:08:26 2002
++++ makefile.in	Sun Nov 10 23:37:39 2002
+@@ -20,7 +20,7 @@
+ mandir = @mandir@
+ libdir = @libdir@
+ modulebasedir = @libdir@/allegro
+-moduledir = $(modulebasedir)/$(shared_major_minor)
++moduledir = $(modulebasedir)/$(shared_version)
+ 
+ EXE =
+ OBJ = .o
+@@ -29,13 +29,14 @@
  INFO_DIR = $(infodir)/dir
+ DESTDIR =
  
 -ACLOCAL = aclocal
 +ACLOCAL = true
@@ -14,7 +23,11 @@
  
  INSTALL = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -249,6 +249,11 @@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_INFO = @INSTALL_INFO@
+ 
+@@ -262,6 +263,11 @@
  all: lib modules programs docs
  
  lib: $(ALLEGRO_LIB_TARGETS)
@@ -26,24 +39,33 @@
  
  modules: $(ALLEGRO_MODULE_TARGETS)
  
-@@ -332,9 +337,9 @@
+@@ -349,35 +355,37 @@
  	  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 $(libdir); \
--	    $(INSTALL_DATA) $(LIBDIR)/lib$${l}-$(shared_version).so $(libdir)/; \
+-	    echo Installing $(LIBDIR)/lib$${l}-$(shared_version).so to $(DESTDIR)$(libdir); \
+-	    $(INSTALL_DATA) $(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_DATA) $(LIBDIR)/lib$${l}.so.$(shared_version) $(libdir)/; \
- 	    $(INSTALL_DATA) $(LIBDIR)/lib$${l}_unsharable.a $(libdir)/; \
++	    $(INSTALL_PROGRAM) $(LIBDIR)/lib$${l}.so.$(shared_version) $(libdir)/; \
+ 	    $(INSTALL_DATA) $(LIBDIR)/lib$${l}_unsharable.a $(DESTDIR)$(libdir)/; \
  	  fi; \
  	done
-@@ -347,20 +352,20 @@
+ 	@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)/; \
  	fi
- 	$(mkinstalldirs) $(bindir)
- 	@echo Installing allegro-config to $(bindir)
--	@$(INSTALL_PROGRAM) allegro-config $(bindir)
+ 	$(mkinstalldirs) $(DESTDIR)$(bindir)
+ 	@echo Installing allegro-config to $(DESTDIR)$(bindir)
+-	@$(INSTALL_PROGRAM) 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) \
@@ -54,7 +76,7 @@
 -			echo "$(libdir) each time you want to run an Allegro program." ; \
 -		) ; \
 -	fi
-+	@$(INSTALL) allegro-config $(bindir)
++	@$(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) \
@@ -66,8 +88,8 @@
 +#		) ; \
 +#	fi
  	@for l in alleg alld allp; do \
--	  if test -f $(libdir)/lib$${l}-$(shared_version).so -a \! -L $(libdir)/lib$${l}.so.${shared_major_minor}; then \
--	    (cd $(libdir); ln -s lib$${l}-$(shared_version).so lib$${l}.so.${shared_major_minor}); \
+-	  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); \
  	  fi; \
diff --git a/devel/allegro/files/patch-misc::allegro-config.in b/devel/allegro/files/patch-misc::allegro-config.in
new file mode 100644
index 000000000000..d060f8fd3641
--- /dev/null
+++ b/devel/allegro/files/patch-misc::allegro-config.in
@@ -0,0 +1,11 @@
+--- misc/allegro-config.in.orig	Wed Oct 23 08:10:01 2002
++++ misc/allegro-config.in	Mon Nov 11 18:41:09 2002
+@@ -167,7 +167,7 @@
+    if test "$static_libs" = "yes"; then
+       echo $libdirs $allegro_ldflags -l${lib_type} $allegro_libs
+    else
+-      echo $libdirs $allegro_ldflags -l${lib_type}-${version} -l${lib_type}_unsharable
++      echo $libdirs $allegro_ldflags -l${lib_type} -l${lib_type}_unsharable
+    fi
+ fi
+ 
diff --git a/devel/allegro/files/patch-misc::deplib.sh b/devel/allegro/files/patch-misc::deplib.sh
index 499f6d447aa0..3c3a1f7b4078 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	Thu Jul  4 05:18:01 2002
-+++ misc/deplib.sh	Tue Nov  5 22:56:54 2002
+--- misc/deplib.sh.orig	Wed Oct 23 08:08:27 2002
++++ misc/deplib.sh	Sun Nov 10 00:40:21 2002
 @@ -10,7 +10,7 @@
      staticlib="lib${1}.a"
      staticobj="\$(${2}_OBJECTS)"
@@ -13,8 +13,8 @@
      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,-soname,lib${1}.so.\$(shared_major_minor) \$(LIBS)"
-+    echo "	\$(CC) -shared -o \$@ ${shareobj} \$(LDFLAGS) -Wl,-soname,lib${1}.so.\$(shared_version) \$(LIBS)"
+-    echo "	\$(CC) -shared -o \$@ ${shareobj} \$(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}"
      echo "	rm -f \$@"
diff --git a/devel/allegro/pkg-plist b/devel/allegro/pkg-plist
index 3bc4dd04cbee..3b84019682c9 100644
--- a/devel/allegro/pkg-plist
+++ b/devel/allegro/pkg-plist
@@ -1,6 +1,7 @@
 bin/allegro-config
 %%FULL%%bin/colormap
 %%FULL%%bin/dat
+%%FULL%%bin/dat2c
 %%FULL%%bin/dat2s
 %%FULL%%bin/exedat
 %%FULL%%bin/grabber
@@ -28,6 +29,7 @@ include/allegro/fixed.h
 include/allegro/fli.h
 include/allegro/fmaths.h
 include/allegro/gfx.h
+include/allegro/graphics.h
 include/allegro/gui.h
 include/allegro/inline/3dmaths.inl
 include/allegro/inline/asm.inl
@@ -37,7 +39,6 @@ include/allegro/inline/file.inl
 include/allegro/inline/fix.inl
 include/allegro/inline/fmaths.inl
 include/allegro/inline/gfx.inl
-include/allegro/inline/gui.inl
 include/allegro/inline/matrix.inl
 include/allegro/inline/rle.inl
 include/allegro/inline/system.inl
@@ -91,9 +92,9 @@ 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/4.0/alleg-esddigi.so
-lib/allegro/4.0/alleg-dga2.so
-lib/allegro/4.0/modules.lst
+%%ESOUND%%lib/allegro/%%SHLIB_VER%%/alleg-esddigi.so
+lib/allegro/%%SHLIB_VER%%/alleg-dga2.so
+lib/allegro/%%SHLIB_VER%%/modules.lst
 lib/liballeg_unsharable.a
 lib/liballeg.so
 lib/liballeg.so.%%SHLIB_VER%%
@@ -142,14 +143,26 @@ lib/liballeg.so.%%SHLIB_VER%%
 %%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%%%%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
-@dirrm lib/allegro/4.0
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+@dirrm lib/allegro/%%SHLIB_VER%%
 @dirrm lib/allegro
 @dirrm include/allegro/platform
 @dirrm include/allegro/internal