From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Jun 26 17:10:21 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8372A16A426 for ; Sun, 26 Jun 2005 17:10:21 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4F4DE43D48 for ; Sun, 26 Jun 2005 17:10:21 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j5QHALoT081757 for ; Sun, 26 Jun 2005 17:10:21 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j5QHAKgJ081756; Sun, 26 Jun 2005 17:10:20 GMT (envelope-from gnats) Resent-Date: Sun, 26 Jun 2005 17:10:20 GMT Resent-Message-Id: <200506261710.j5QHAKgJ081756@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 958C516A41C for ; Sun, 26 Jun 2005 17:01:35 +0000 (GMT) (envelope-from tkato432@yahoo.com) Received: from hfep01.dion.ne.jp (hfep01.dion.ne.jp [203.181.105.67]) by mx1.FreeBSD.org (Postfix) with ESMTP id D72E043D1D for ; Sun, 26 Jun 2005 17:01:34 +0000 (GMT) (envelope-from tkato432@yahoo.com) Received: from localhost ([219.108.136.217]) by hfep01.dion.ne.jp with SMTP id <20050626170130458.KOQH@hfep01.dion.ne.jp> for ; Mon, 27 Jun 2005 02:01:30 +0900 Message-Id: <20050627020018.5af52dd9.tkato432@yahoo.com> Date: Mon, 27 Jun 2005 02:00:18 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/82677: Update port: games/tomatoes X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Jun 2005 17:10:21 -0000 >Number: 82677 >Category: ports >Synopsis: Update port: games/tomatoes >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Jun 26 17:10:20 GMT 2005 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.11-RELEASE-p10 i386 >Organization: >Environment: >Description: - Fix build on 4-stable - Fix LIB_DEPENDS - Support PLIST_FILES Remove file: files/patch-makefile pkg-plist >How-To-Repeat: >Fix: diff -urN /usr/ports/games/tomatoes/Makefile games/tomatoes/Makefile --- /usr/ports/games/tomatoes/Makefile Mon Mar 28 02:45:46 2005 +++ games/tomatoes/Makefile Sun Jun 26 23:41:07 2005 @@ -7,7 +7,7 @@ PORTNAME= tomatoes PORTVERSION= 1.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -17,26 +17,45 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Tomato-smashing, Q-Bert style -LIB_DEPENDS= mikmod:${PORTSDIR}/audio/libmikmod - -USE_BZIP2= yes WRKSRC= ${WRKDIR}/tomatoes-${PORTVERSION}5 TDATA= ${WRKDIR}/tomatoes-${PORTVERSION} +USE_BZIP2= yes USE_X_PREFIX= yes -MAKEFILE= makefile +USE_SDL= mixer image +USE_GL= yes USE_GMAKE= yes -USE_SDL= mixer image sound +MAKEFILE= makefile +MAKE_ARGS= CC="${CXX}" \ + MPKDIR="${DATADIR}/" \ + MUSICDIR="${DATADIR}/music/" \ + HISCOREDIR="${DATADIR}/" \ + CONFIGDIR="${DATADIR}/" \ + CFLAGS="${CXXFLAGS} ${SDL_CFLAGS}" \ + LDFLAGS="${SDL_LDFLAGS}" + +PLIST_FILES= bin/tomatoes \ + %%DATADIR%%/config.cfg \ + %%DATADIR%%/music/IHaveNoTomatoes.it \ + %%DATADIR%%/tomatoes.mpk +PLIST_DIRS= %%DATADIR%%/music \ + %%DATADIR%% + +SDL_CFLAGS= `${SDL_CONFIG} --cflags` -I${X11BASE}/include +SDL_LDFLAGS= `${SDL_CONFIG} --libs` -lSDL_image -lSDL_mixer \ + -L${X11BASE}/lib -lGL -lGLU .include -.if ${OSVERSION} < 500000 -BROKEN= Does not build on 4.X -.endif - .if ${ARCH} != "i386" BROKEN= "Does not compile on !i386" .endif + +post-patch: +.for file in include/font.h + cd ${WRKSRC} && ${CP} ${file} ${file}.bak \ + && ${TR} -d '\r' < ${file}.bak > ${file} +.endfor do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin diff -urN /usr/ports/games/tomatoes/files/patch-makefile games/tomatoes/files/patch-makefile --- /usr/ports/games/tomatoes/files/patch-makefile Tue Feb 8 09:24:24 2005 +++ games/tomatoes/files/patch-makefile Thu Jan 1 09:00:00 1970 @@ -1,62 +0,0 @@ ---- makefile.orig Sat Nov 20 13:50:09 2004 -+++ makefile Mon Feb 7 18:53:49 2005 -@@ -4,7 +4,7 @@ - - .PHONY: all clean veryclean rebuild compress - --CC = g++ -+CC ?= g++ - COMPRESS = upx --best - TARGET = ./tomatoes - MARCH = pentium -@@ -14,18 +14,18 @@ - # necessary. Remember to include the trailing / - - # MPK directory (where 'tomatoes.mpk' is), default: ./ --MPKDIR = ./ -+MPKDIR = ${PREFIX}/share/tomatoes/ - - # Music directory (where the music files are), default: ./music/ --MUSICDIR = ./music/ -+MUSICDIR = ${PREFIX}/share/tomatoes/music/ - - # Hiscore directory (where the hiscores are written to), default: ./ - # We need read/write access! --HISCOREDIR = ./ -+HISCOREDIR = ${PREFIX}/share/tomatoes/ - - # Config directory (where the 'config.cfg' is), default: ./ - # We need read/write access! --CONFIGDIR = ./ -+CONFIGDIR = ${PREFIX}/share/tomatoes/ - - # Override directory (unused at the moment), default: ./data/ - OVERRIDEDIR = ./data/ -@@ -35,20 +35,20 @@ - - - # SDL flags --SDL_FLAGS = `sdl-config --cflags` -+SDL_FLAGS = `sdl11-config --cflags` - - - # Debugmode stuff - ifdef DEBUGMODE --CFLAGS = -MMD -g3 -W -Wall -mcpu=$(MARCH) -DDEBUGMODE --LDFLAGS = `sdl-config --libs` -lSDL_image -lSDL_mixer -lGL -lGLU -+CFLAGS += -MMD -g3 -W -Wall -mcpu=$(MARCH) -DDEBUGMODE -+LDFLAGS += `sdl11-config --libs` -lSDL_image -lSDL_mixer -lGL -lGLU - else - ifdef PROFILE --CFLAGS = -MMD -g3 -O3 -march=$(MARCH) -Wall -pg --LDFLAGS = `sdl-config --libs` -lSDL_image -lSDL_mixer -lGL -lGLU -pg -+CFLAGS += -MMD -g3 -march=$(MARCH) -Wall -pg -+LDFLAGS += `sdl11-config --libs` -lSDL_image -lSDL_mixer -lGL -lGLU -pg - else --CFLAGS = -MMD -O3 -march=$(MARCH) -Wall $(SDL_FLAGS) --LDFLAGS = `sdl-config --libs` -lSDL_image -lSDL_mixer -lGL -lGLU -s -+CFLAGS += -MMD -march=$(MARCH) -Wall $(SDL_FLAGS) -I${X11BASE}/include -+LDFLAGS += `sdl11-config --libs` -L${X11BASE}/lib -lSDL_image -lSDL_mixer -lGL -lGLU -s -lSDL_sound - endif - endif - diff -urN /usr/ports/games/tomatoes/pkg-plist games/tomatoes/pkg-plist --- /usr/ports/games/tomatoes/pkg-plist Tue Feb 8 09:24:24 2005 +++ games/tomatoes/pkg-plist Thu Jan 1 09:00:00 1970 @@ -1,6 +0,0 @@ -bin/tomatoes -share/tomatoes/config.cfg -share/tomatoes/music/IHaveNoTomatoes.it -share/tomatoes/tomatoes.mpk -@dirrm share/tomatoes/music -@dirrm share/tomatoes >Release-Note: >Audit-Trail: >Unformatted: