From owner-freebsd-ports  Thu Apr 19 12: 0:17 2001
Delivered-To: freebsd-ports@hub.freebsd.org
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 020A837B43E
	for <freebsd-ports@hub.freebsd.org>; Thu, 19 Apr 2001 12:00:07 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.11.1/8.11.1) id f3JJ06234493;
	Thu, 19 Apr 2001 12:00:06 -0700 (PDT)
	(envelope-from gnats)
Received: from server.aeolon.com (server.aeolon.com [64.209.179.250])
	by hub.freebsd.org (Postfix) with SMTP id AAE9B37B422
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 19 Apr 2001 11:55:41 -0700 (PDT)
	(envelope-from malyn@aeolon.com)
Received: (qmail 56117 invoked from network); 19 Apr 2001 18:55:33 -0000
Received: from c1550260-a.stcla1.sfba.home.com (HELO sonic.eng.aeolon.com) (24.12.2.91)
  by server.aeolon.com with SMTP; 19 Apr 2001 18:55:33 -0000
Received: (qmail 1292 invoked by uid 1000); 19 Apr 2001 18:56:07 -0000
Message-Id: <20010419185607.1291.qmail@sonic.eng.aeolon.com>
Date: 19 Apr 2001 18:56:07 -0000
From: malyn@strangeGizmo.com
Reply-To: malyn@strangeGizmo.com
To: FreeBSD-gnats-submit@freebsd.org
X-Send-Pr-Version: 3.2
Subject: ports/26708: [MAINTAINER] Update alephone to work with sdl12
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         26708
>Category:       ports
>Synopsis:       [MAINTAINER] Update alephone to work with sdl12
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Apr 19 12:00:06 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     Michael Alyn Miller
>Release:        FreeBSD 4.2-RELEASE i386
>Organization:
strangeGizmo.com
>Environment:

>Description:

	A change in sdl12 broke the alephone port.  This has been fixed.
	Please note that this change includes both a patch to the Makefile and
	a patch file (should be named `patch-aa') for insertion in the `files'
	directory of the port.

>How-To-Repeat:

>Fix:


MAKEFILE PATCH:

*** Makefile	2001/04/17 17:21:29	1.4
--- Makefile	2001/04/19 18:49:18
***************
*** 7,13 ****
  
  PORTNAME=	alephone
  PORTVERSION=	0.11.1
! PORTREVISION=	1
  CATEGORIES=	games
  MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
  MASTER_SITE_SUBDIR=	marathon
--- 7,13 ----
  
  PORTNAME=	alephone
  PORTVERSION=	0.11.1
! PORTREVISION=	2
  CATEGORIES=	games
  MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
  MASTER_SITE_SUBDIR=	marathon
***************
*** 22,30 ****
  USE_X_PREFIX=	yes
  GNU_CONFIGURE=	yes
  CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}"
- 
- pre-configure:
- 	${PERL} -pi -e "s@uint8 red@Uint16 red@g" ${WRKSRC}/Source_Files/Misc/screen_sdl.cpp
  
  post-install:
  .if !defined(NOPORTDOCS)
--- 22,27 ----


PATCH FILE `patch-aa':

*** Source_Files/Misc/screen_sdl.cpp.orig	Fri Jan 19 16:40:27 2001
--- Source_Files/Misc/screen_sdl.cpp	Thu Apr 19 11:36:26 2001
***************
*** 625,631 ****
  		build_sdl_color_table(color_table, colors);
  		SDL_SetPalette(main_surface, SDL_PHYSPAL, colors, 0, 256);
  	} else {
! #if SDL_PATCHLEVEL > 6
  		// SDL 1.1.7 defines these as 16-bit arrays...
  		uint16 red[256], green[256], blue[256];
  		for (int i=0; i<color_table->color_count; i++) {
--- 625,631 ----
  		build_sdl_color_table(color_table, colors);
  		SDL_SetPalette(main_surface, SDL_PHYSPAL, colors, 0, 256);
  	} else {
! #if SDL_VERSION_ATLEAST(1,1,7)
  		// SDL 1.1.7 defines these as 16-bit arrays...
  		uint16 red[256], green[256], blue[256];
  		for (int i=0; i<color_table->color_count; i++) {
>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message