3 files changed, 33 insertions, 35 deletions
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}"