[24559] trunk/dports/devel/allegro

[source_changes at macosforge.org]

Revision: 24559
          http://trac.macosforge.org/projects/macports/changeset/24559
Author:   markd at macports.org
Date:     2007-04-27 22:01:56 -0700 (Fri, 27 Apr 2007)

Log Message:
-----------
Update to 4.2.1.

Modified Paths:
--------------
    trunk/dports/devel/allegro/Portfile
    trunk/dports/devel/allegro/files/patch-makefile.osx

Removed Paths:
-------------
    trunk/dports/devel/allegro/files/patch-gui.c
    trunk/dports/devel/allegro/files/patch-sound.c

Modified: trunk/dports/devel/allegro/Portfile
===================================================================
--- trunk/dports/devel/allegro/Portfile	2007-04-28 04:00:37 UTC (rev 24558)
+++ trunk/dports/devel/allegro/Portfile	2007-04-28 05:01:56 UTC (rev 24559)
@@ -1,8 +1,7 @@
 # $Id$
 PortSystem 1.0
 name		allegro
-version		4.1.15
-revision	1
+version		4.2.1
 description	A game programming library for C/C++ developers.
 long_description	Allegro is a game programming library for \
 			C/C++ developers distributed freely, supporting \
@@ -12,9 +11,9 @@
 platforms	darwin 
 homepage	http://www.talula.demon.co.uk/allegro/
 master_sites    sourceforge:alleg
-checksums	md5 e125d7665d359f2392b6330c741bdbc6
+checksums	md5 0a09d0144ee8652fb8fa00f6cbb324fe
 depends_lib	lib:libX11:XFree86
-patchfiles	patch-makefile.osx patch-gui.c patch-sound.c
+patchfiles	patch-makefile.osx
 configure	{ 
 	system "cd ${worksrcpath} && sh fix.sh macosx" 
 }
@@ -22,8 +21,3 @@
 build.args	PREFIX=${prefix}
 destroot.target	install install-man
 destroot.args	PREFIX=${prefix}
-post-destroot	{ 
-	file delete ${destroot}${prefix}/share/man/man3/RGB_MAP.3
-	file delete ${destroot}${prefix}/share/man/man3/FONT.3
-	file delete ${destroot}${prefix}/share/man/man3/COLOR_MAP.3
-}

Deleted: trunk/dports/devel/allegro/files/patch-gui.c
===================================================================
--- trunk/dports/devel/allegro/files/patch-gui.c	2007-04-28 04:00:37 UTC (rev 24558)
+++ trunk/dports/devel/allegro/files/patch-gui.c	2007-04-28 05:01:56 UTC (rev 24559)
@@ -1,19 +0,0 @@
---- src/gui.c.orig	2007-01-06 21:02:25.000000000 -0800
-+++ src/gui.c	2007-01-06 21:08:11.000000000 -0800
-@@ -46,6 +46,7 @@
- DIALOG *active_dialog = NULL;
- MENU *active_menu = NULL;
- 
-+static int shutdown_single_menu(MENU_PLAYER *, int *);
- 
- /* list of currently active (initialized) dialog players */
- struct al_active_dialog_player {
-@@ -1784,8 +1785,6 @@
-  */
- int update_menu(MENU_PLAYER *player)
- {
--   static int shutdown_single_menu(MENU_PLAYER *, int *);
--
-    MENU_PLAYER *i;
-    int c, c2;
-    int old_sel, child_ret;

Modified: trunk/dports/devel/allegro/files/patch-makefile.osx
===================================================================
--- trunk/dports/devel/allegro/files/patch-makefile.osx	2007-04-28 04:00:37 UTC (rev 24558)
+++ trunk/dports/devel/allegro/files/patch-makefile.osx	2007-04-28 05:01:56 UTC (rev 24559)
@@ -1,6 +1,6 @@
---- makefile.osx	Fri Jul 30 15:36:23 2004
-+++ makefile.osx.new	Thu Nov 11 13:23:39 2004
-@@ -39,7 +39,7 @@
+--- makefile.osx.org	2006-11-25 18:05:25.000000000 -0800
++++ makefile.osx	2007-04-27 21:26:10.000000000 -0700
+@@ -38,7 +38,7 @@
  TEMPLATE_NAME = Allegro\ Application
  TEMPLATE = $(TEMPLATE_DIR)/$(TEMPLATE_NAME)
  
@@ -9,21 +9,21 @@
  
  
  ifdef STATICLINK
-@@ -55,7 +55,7 @@
+@@ -57,7 +57,7 @@
+ DYLINK_FLAGS+=-arch ppc -arch i386
+ endif
  
- DYLINK_FLAGS = -prebind -seg1addr 0x30000000 -dylib_compatibility_version=4.0.0 -dylib_current_version=$(shared_version)
- 
 -INSTALL_NAME = -install_name lib$(VERSION)-$(shared_major_minor).dylib
-+INSTALL_NAME = -install_name ${PREFIX}/lib/lib$(VERSION)-$(shared_version).dylib
++INSTALL_NAME = -install_name $(PREFIX)/lib/lib$(VERSION)-$(shared_version).dylib
  INSTALL_NAME_EMBED = -install_name "`echo "@executable_path/../Frameworks/$(FRAMEWORK_NAME).framework/Versions/$(shared_version)/$(FRAMEWORK_NAME)" | sed 's!//*!/!g'`"
  
  ifdef EMBED
-@@ -163,7 +163,7 @@
- 
+@@ -175,7 +175,7 @@
  # -------- rules for installing and removing the library files --------
  
--INSTALLDIR = /usr/local
+ DESTDIR =
+-INSTALLDIR = $(DESTDIR)/usr/local
 +INSTALLDIR = $(DESTDIR)$(PREFIX)
+ BINDIR = bin
  LIBDIR = lib
  INCDIR = include
- 

Deleted: trunk/dports/devel/allegro/files/patch-sound.c
===================================================================
--- trunk/dports/devel/allegro/files/patch-sound.c	2007-04-28 04:00:37 UTC (rev 24558)
+++ trunk/dports/devel/allegro/files/patch-sound.c	2007-04-28 05:01:56 UTC (rev 24559)
@@ -1,11 +0,0 @@
---- src/sound.c.orig	2007-01-06 21:10:19.000000000 -0800
-+++ src/sound.c	2007-01-06 21:10:53.000000000 -0800
-@@ -25,7 +25,7 @@
- 
- 
- 
--extern DIGI_DRIVER digi_none;
-+static DIGI_DRIVER digi_none;
- 
- 
- 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070427/7191b6c4/attachment.html