From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Nov 27 18:29:19 2006 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 [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4215C16A412 for ; Mon, 27 Nov 2006 18:29:19 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.FreeBSD.org (Postfix) with ESMTP id D9AAB44649 for ; Mon, 27 Nov 2006 17:49:13 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id kARHoFAu060375 for ; Mon, 27 Nov 2006 17:50:15 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id kARHoF3J060374; Mon, 27 Nov 2006 17:50:15 GMT (envelope-from gnats) Resent-Date: Mon, 27 Nov 2006 17:50:15 GMT Resent-Message-Id: <200611271750.kARHoF3J060374@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, Andriy Gapon Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C2E2C16A492 for ; Mon, 27 Nov 2006 17:47:37 +0000 (UTC) (envelope-from avg@topspin.kiev.ua) Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140]) by mx1.FreeBSD.org (Postfix) with ESMTP id B661443FC6 for ; Mon, 27 Nov 2006 17:31:52 +0000 (GMT) (envelope-from avg@topspin.kiev.ua) Received: from oddity.topspin.kiev.ua (oddity-e.topspin.kiev.ua [212.40.38.87]) by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id TAA16121 for ; Mon, 27 Nov 2006 19:32:47 +0200 (EET) (envelope-from avg@topspin.kiev.ua) Received: from oddity.topspin.kiev.ua (localhost [127.0.0.1]) by oddity.topspin.kiev.ua (8.13.6/8.13.6) with ESMTP id kARHWkX6059109 for ; Mon, 27 Nov 2006 19:32:46 +0200 (EET) (envelope-from avg@oddity.topspin.kiev.ua) Received: (from root@localhost) by oddity.topspin.kiev.ua (8.13.6/8.13.6/Submit) id kARHWkGH059108; Mon, 27 Nov 2006 19:32:46 +0200 (EET) (envelope-from avg) Message-Id: <200611271732.kARHWkGH059108@oddity.topspin.kiev.ua> Date: Mon, 27 Nov 2006 19:32:46 +0200 (EET) From: Andriy Gapon To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/105916: [PATCH] games/oolite: honor X11BASE, update MASTER_SITES 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: Mon, 27 Nov 2006 18:29:19 -0000 >Number: 105916 >Category: ports >Synopsis: [PATCH] games/oolite: honor X11BASE, update MASTER_SITES >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Nov 27 17:50:13 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Andriy Gapon >Release: FreeBSD 6.1-RELEASE-p2 i386 >Organization: >Environment: System: FreeBSD 6.1-RELEASE-p2 i386 >Description: This patch updates port to honor X11BASE value instead of depending on hardcoded /usr/X11RG path. Also, MASTER_SITES is updated to make use of MASTER_SITE_BERLIOS. Indentation is changed for a few lines for better formatting/readabiltiy. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- oolite-1.65_1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/games/oolite.orig/Makefile /usr/ports/games/oolite/Makefile --- /usr/ports/games/oolite.orig/Makefile Mon Nov 27 18:54:51 2006 +++ /usr/ports/games/oolite/Makefile Mon Nov 27 19:24:19 2006 @@ -5,18 +5,18 @@ # $FreeBSD: ports/games/oolite/Makefile,v 1.6 2006/09/20 11:21:18 stas Exp $ # -PORTNAME= oolite -PORTVERSION= 1.65 -PORTREVISION= 1 -CATEGORIES= games -MASTER_SITES= http://download.berlios.de/oolite-linux/ \ - http://download2.berlios.de/oolite-linux/ \ - ftp://ftp.alioth.net/oolite/ -DISTFILES= ${PORTNAME}-${PORTVERSION}-src${EXTRACT_SUFX} \ - ${PORTNAME}-${PORTVERSION}-data${EXTRACT_SUFX} +PORTNAME= oolite +PORTVERSION= 1.65 +PORTREVISION= 1 +CATEGORIES= games +MASTER_SITES= ${MASTER_SITE_BERLIOS} \ + ftp://ftp.alioth.net/%SUBDIR%/:alioth +MASTER_SITE_SUBDIR= oolite-linux oolite/:alioth +DISTFILES= ${PORTNAME}-${PORTVERSION}-src${EXTRACT_SUFX}:DEFAULT,alioth \ + ${PORTNAME}-${PORTVERSION}-data${EXTRACT_SUFX}:DEFAULT,alioth -MAINTAINER= avg@icyb.net.ua -COMMENT= Trade and combat space simulator, clone of Elite +MAINTAINER= avg@icyb.net.ua +COMMENT= Trade and combat space simulator, clone of Elite WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-src USE_SDL= mixer image gfx diff -ruN --exclude=CVS /usr/ports/games/oolite.orig/files/patch-makefile /usr/ports/games/oolite/files/patch-makefile --- /usr/ports/games/oolite.orig/files/patch-makefile Mon Nov 27 18:54:51 2006 +++ /usr/ports/games/oolite/files/patch-makefile Mon Nov 27 18:57:26 2006 @@ -16,9 +16,10 @@ - ADDITIONAL_OBJC_LIBS = -lGLU -lGL -lSDL -lpthread -lSDL_mixer -lSDL_image -lgnustep-base - ADDITIONAL_CFLAGS = -DLINUX -DNEED_STRLCPY `sdl-config --cflags` - ADDITIONAL_OBJCFLAGS = -DLOADSAVEGUI -DLINUX -DHAVE_SOUND -Wno-import `sdl-config --cflags` +- oolite_LIB_DIRS += -L/usr/X11R6/lib/ + ADDITIONAL_OBJC_LIBS = -lGLU -lGL -lSDL_mixer -lSDL_image -lSDL_gfx -lgnustep-base `sdl-config --libs` -+ ADDITIONAL_CFLAGS = -I/usr/X11R6/include -DLINUX `sdl-config --cflags` -+ ADDITIONAL_OBJCFLAGS = -I/usr/X11R6/include -DLOADSAVEGUI -DLINUX -DHAVE_SOUND -Wno-import `sdl-config --cflags` - oolite_LIB_DIRS += -L/usr/X11R6/lib/ ++ ADDITIONAL_CFLAGS = -I${X11BASE}/include -DLINUX `sdl-config --cflags` ++ ADDITIONAL_OBJCFLAGS = -I${X11BASE}/include -DLOADSAVEGUI -DLINUX -DHAVE_SOUND -Wno-import `sdl-config --cflags` ++ oolite_LIB_DIRS += -L${X11BASE}/lib/ endif OBJC_PROGRAM_NAME = oolite --- oolite-1.65_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: