From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Apr 9 00:50:17 2003 Return-Path: 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 8C10D37B401 for ; Wed, 9 Apr 2003 00:50:17 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3EDE943FCB for ; Wed, 9 Apr 2003 00:50:16 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h397oGUp053751 for ; Wed, 9 Apr 2003 00:50:16 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h397oGIw053750; Wed, 9 Apr 2003 00:50:16 -0700 (PDT) Resent-Date: Wed, 9 Apr 2003 00:50:16 -0700 (PDT) Resent-Message-Id: <200304090750.h397oGIw053750@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, Igor Pokrovsky Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8334C37B401 for ; Wed, 9 Apr 2003 00:45:06 -0700 (PDT) Received: from cadillac.meteo.fr (cadillac.meteo.fr [137.129.1.4]) by mx1.FreeBSD.org (Postfix) with ESMTP id 77B6843FE1 for ; Wed, 9 Apr 2003 00:43:44 -0700 (PDT) (envelope-from igor.pokrovsky@cnrm.meteo.fr) Received: from cti825.cnrm.meteo.fr (localhost.meteo.fr [127.0.0.1]) HAA26646 for ; Wed, 9 Apr 2003 07:43:38 GMT Received: from xdata.cnrm.meteo.fr (xdata.cnrm.meteo.fr [137.129.150.2]) JAA05115 for ; Wed, 9 Apr 2003 09:43:36 +0200 (MESTDST) Received: from exmatis1.cnrm.meteo.fr (exmatis1.cnrm.meteo.fr [137.129.157.46]) by xdata.cnrm.meteo.fr with ESMTP (8.9.3 (PHNE_18546)/8.7.1) id JAA27969 for ; Wed, 9 Apr 2003 09:43:32 +0200 (METDST) Received: from exmatis1.cnrm.meteo.fr (localhost [127.0.0.1]) h397gp5f060599 for ; Wed, 9 Apr 2003 09:42:51 +0200 (CEST) (envelope-from pokrovsi@exmatis1.cnrm.meteo.fr) Received: (from pokrovsi@localhost) by exmatis1.cnrm.meteo.fr (8.12.9/8.12.9/Submit) id h397gohZ060376; Wed, 9 Apr 2003 09:42:50 +0200 (CEST) Message-Id: <200304090742.h397gohZ060376@exmatis1.cnrm.meteo.fr> Date: Wed, 9 Apr 2003 09:42:50 +0200 (CEST) From: Igor Pokrovsky To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/50744: Update port: graphics/openrm (some fixes) X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Igor Pokrovsky List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Apr 2003 07:50:18 -0000 >Number: 50744 >Category: ports >Synopsis: Update port: graphics/openrm (some fixes) >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Apr 09 00:50:13 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Igor Pokrovsky >Release: FreeBSD 4.8-STABLE i386 >Organization: >Environment: System: FreeBSD exmatis1.cnrm.meteo.fr 4.8-STABLE FreeBSD 4.8-STABLE #0: Mon Apr 7 15:48:59 CEST 2003 root@exmatis1.cnrm.meteo.fr:/usr/src/sys/compile/KERNEL i386 >Description: What has been changed: 1. Fixed problem with DISTFILES, when WITH_DEMOS=yes flag is specified 2. Added patch for openrm demos. Perhaps it is a kind of bad hack, because I used EXTRA_PATCHES to point to addition patch for demos. I guess, that it would be better to split port in two parts, one containing the main distribution and the other with all demos. Let me know if this is better way. >How-To-Repeat: >Fix: --- openrm.diff begins here --- diff -rNu openrm/Makefile openrm-new/Makefile --- openrm/Makefile Tue Apr 8 22:46:52 2003 +++ openrm-new/Makefile Tue Apr 8 22:47:52 2003 @@ -13,8 +13,8 @@ DISTNAME= ${PORTNAME}-devel-${PORTVERSION} EXTRACT_SUFX= .tgz .ifdef (WITH_DEMOS) -DISTFILES= ${PORTNAME}-devel-${PORTVERSION} \ - ${PORTNAME}-demo-${PORTVERSION} +DISTFILES= ${PORTNAME}-devel-${PORTVERSION}${EXTRACT_SUFX} \ + ${PORTNAME}-demo-${PORTVERSION}${EXTRACT_SUFX} .endif MAINTAINER= tiamat@telegraph.spb.ru @@ -22,13 +22,15 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg -WRKSRC= ${WRKDIR}/rm142 +WRKSRC= ${WRKDIR}/rm${PORTVERSION:S/.//g} .ifdef (WITH_DEMOS) WRKSRC2= ${WRKDIR}/rmdemo +EXTRA_PATCHES= ${PATCHDIR}/makeinclude.diff .endif USE_X_PREFIX= yes USE_MESA= yes +USE_REINPLACE= yes ALL_TARGET= linux docs INSTALLS_SHLIB= yes MAKE_ENV= RM_INSTALL=${X11BASE} @@ -42,6 +44,13 @@ .ifndef (WITH_DEMOS) pre-everything:: @${ECHO} "You can define WITH_DEMOS=yes to fetch and install available demos" +.endif + +.ifdef (WITH_DEMOS) +post-patch: + @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g; \ + s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g; \ + s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC2}/makeinclude .endif do-install: diff -rNu openrm/files/makeinclude.diff openrm-new/files/makeinclude.diff --- /dev/null Thu Jan 1 01:00:00 1970 +++ openrm/files/makeinclude.diff Tue Apr 8 22:46:44 2003 @@ -0,0 +1,35 @@ +--- ../rmdemo/makeinclude~ Mon Jun 17 02:50:21 2002 ++++ ../rmdemo/makeinclude Tue Apr 8 20:54:52 2003 +@@ -2,21 +2,21 @@ + # autogenerated by configure + # on Sun Jun 16 17:50:09 PDT 2002 + # +-RMHOME=/usr/local/rm142 +-RMLIBS=-L/usr/local/rm142/lib -lrm -lrmaux -lrmv -lrmi +-RMCFLAGS=-DRM_X -I/usr/local/rm142/include ++RMHOME=%%X11BASE%% ++RMLIBS=-L%%X11BASE%%/lib -lrm -lrmaux -lrmv -lrmi ++RMCFLAGS=-DRM_X -I%%X11BASE%%/include + # +-OPENGLHOME=/usr +-OPENGLLIBS=-L/usr/lib -lGL -lGLU +-OPENGLCFLAGS=-I/usr/include ++OPENGLHOME=%%X11BASE%% ++OPENGLLIBS=-L%%X11BASE%%/lib -lGL -lGLU ++OPENGLCFLAGS=-I%%X11BASE%%/include + # +-X11HOME=/usr/X11R6 +-X11LIBS=-L/usr/X11R6/lib -lXmu -lX11 -lpthread -lm +-X11CFLAGS=-I/usr/X11R6/include ++X11HOME=%%X11BASE%% ++X11LIBS=-L%%X11BASE%%/lib -lXmu -lX11 %%PTHREAD_LIBS%% -lm ++X11CFLAGS=-I%%X11BASE%%/include + # + OPTFLAGS=-g + ARCHFLAGS=-DLINUX + # + # Location of JPEG stuff on your machine +-JPEGLIB=-ljpeg +-JPEGINC= ++JPEGLIB=-L%%LOCALBASE%%/lib -ljpeg ++JPEGINC=-I%%LOCALBASE%%/include --- openrm.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: