From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Jul 30 13:40:15 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 [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EA0E716A4DF for ; Sun, 30 Jul 2006 13:40:15 +0000 (UTC) (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 9072343D46 for ; Sun, 30 Jul 2006 13:40:14 +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 k6UDeE2Z030605 for ; Sun, 30 Jul 2006 13:40:14 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k6UDeEli030600; Sun, 30 Jul 2006 13:40:14 GMT (envelope-from gnats) Resent-Date: Sun, 30 Jul 2006 13:40:14 GMT Resent-Message-Id: <200607301340.k6UDeEli030600@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, Dmitry Marakasov Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1876816A4DE for ; Sun, 30 Jul 2006 13:39:47 +0000 (UTC) (envelope-from amdmi3@mail.ru) Received: from mx3.mail.ru (mx3.mail.ru [194.67.23.149]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8BE0543D45 for ; Sun, 30 Jul 2006 13:39:46 +0000 (GMT) (envelope-from amdmi3@mail.ru) Received: from [213.148.29.33] (port=14485 helo=nexii.panopticon) by mx3.mail.ru with esmtp id 1G7BWD-0002xZ-00 for FreeBSD-gnats-submit@freebsd.org; Sun, 30 Jul 2006 17:39:45 +0400 Received: from hades.panopticon (hades.panopticon [192.168.0.2]) by nexii.panopticon (Postfix) with ESMTP id BB04411418 for ; Sun, 30 Jul 2006 17:39:41 +0400 (MSD) Received: by hades.panopticon (Postfix, from userid 1000) id C8EE243E2; Sun, 30 Jul 2006 17:39:42 +0400 (MSD) Message-Id: <20060730133942.C8EE243E2@hades.panopticon> Date: Sun, 30 Jul 2006 17:39:42 +0400 (MSD) From: Dmitry Marakasov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/101052: [PATCH] graphics/ogre3d: update to 1.2.2p1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Dmitry Marakasov List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Jul 2006 13:40:16 -0000 >Number: 101052 >Category: ports >Synopsis: [PATCH] graphics/ogre3d: update to 1.2.2p1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Jul 30 13:40:13 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Dmitry Marakasov >Release: FreeBSD 6.1-RELEASE i386 >Organization: >Environment: System: FreeBSD hades.panopticon 6.1-RELEASE FreeBSD 6.1-RELEASE #0: Thu May 11 15:07:32 MSD 2006 amdmi3@hades.panopticon:/usr/obj/usr/src/sys/HADES i386 >Description: * Update to 1.2.2p1 * USE_GCC=3.4+ instead of 3.4 (compiles with GCC 4.0) * use PORTDOCS * other small fixes Note to oliver@ (maintainer): Please note that shared library number was bumped (lib/libOgreMain.so.10 -> lib/libOgreMain.so.11). This means ports that use OGRE should be checked for compatibility and, if compatible, have their LIB_DEPENDS changed accordingly. Otherwise, ogre3d port should be repocopied. I've checked my games/fwp - old version is compatible only with ogre 1.0, but the new version (see next PR) is compatible only with ogre 1.2, so graphics/ogre and games/fwp updates should be committed close to each other. I didn't check games/ember though, hope I didn't make too much trouble for you :) >How-To-Repeat: >Fix: --- ogre3d-1.2.2.patch begins here --- diff -ruN ogre3d.orig/Makefile ogre3d/Makefile --- ogre3d.orig/Makefile Sat Jul 29 14:49:36 2006 +++ ogre3d/Makefile Sun Jul 30 01:40:39 2006 @@ -6,12 +6,11 @@ # PORTNAME= ogre3d -PORTVERSION= 1.0.7 -PORTREVISION= 1 +DISTVERSION= 1-2-2p1 CATEGORIES= graphics devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=ogre -DISTNAME= ogre-linux_osx-v${PORTVERSION:S/./-/g} +DISTNAME= ogre-linux_osx-v${DISTVERSION} MAINTAINER= oliver@FreeBSD.org COMMENT= A scene-oriented, flexible 3D engine written in C++ @@ -23,20 +22,22 @@ CONFIGURE_ARGS= --disable-cg --program-transform-name= --enable-static GNU_CONFIGURE= YES INSTALLS_SHLIB= YES -USE_GCC= 3.4 +USE_GCC= 3.4+ USE_BZIP2= YES USE_X_PREFIX= YES USE_GNOME= gnomehack USE_SDL= sdl USE_GMAKE= YES +CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" + +PORTDOCS= README COPYING AUTHORS post-patch: @${REINPLACE_CMD} -e '\ - s|sdl-config|${SDL_CONFIG}|g ;\ + s|sdl-config|${SDL_CONFIG}|g; \ s|-lpthread|${PTHREAD_LIBS}|g; \ s|"-lIL|"-L${LOCALBASE}/lib -lIL|g; \ - s|-lGL -lGLU|-L${X11BASE}/lib &|g; \ - s|GLSUPPORT_CFLAGS=\$$SDL_CFLAGS|GLSUPPORT_CFLAGS="-I${X11BASE}/include \$$SDL_CFLAGS"|' \ + s|-lGL -lGLU|-L${X11BASE}/lib &|g;' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|Release-Note: >Audit-Trail: >Unformatted: