Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 22 Apr 2003 10:32:23 +0200 (CEST)
From:      Igor Pokrovsky <igor.pokrovsky@cnrm.meteo.fr>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/51267: Update port: graphics/openrm bento fix and 1.4.2 -> 1.4.3
Message-ID:  <200304220832.h3M8WNlo080373@exmatis1.cnrm.meteo.fr>
Resent-Message-ID: <200304220840.h3M8eDrJ072547@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help 

>Number:         51267
>Category:       ports
>Synopsis:       Update port: graphics/openrm bento fix and 1.4.2 -> 1.4.3
>Confidential:   no
>Severity:       non-critical
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Apr 22 01:40:10 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:
	1. Fixed bento error (was not buildable on alpha)
	2. Updating 1.4.2 -> 1.4.3
	3. Removed RM_INSTALL=${X11BASE} from port makefile,
	   because it was forcing OpenRM makefiles to install things
	   even during port build phase.
	4. Fixed calls to pthread_setconcurrency in demo programs.
	   Now they all are buildable.

>How-To-Repeat:
	
>Fix:

	

--- openrm.diff begins here ---
diff -rNu openrm/Makefile openrm-new/Makefile
--- openrm/Makefile	Tue Apr 22 10:18:42 2003
+++ openrm-new/Makefile	Tue Apr 22 10:21:26 2003
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		openrm
-PORTVERSION=		1.4.2
+PORTVERSION=		1.4.3
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -25,7 +25,7 @@
 WRKSRC=		${WRKDIR}/rm${PORTVERSION:S/.//g}
 .ifdef (WITH_DEMOS)
 WRKSRC2=	${WRKDIR}/rmdemo
-EXTRA_PATCHES=	${PATCHDIR}/makeinclude.diff
+EXTRA_PATCHES=	${PATCHDIR}/makeinclude.diff ${PATCHDIR}/rm2screen.c.diff
 .endif
 
 USE_X_PREFIX=	yes
@@ -33,7 +33,7 @@
 USE_REINPLACE=	yes
 ALL_TARGET=	linux docs
 INSTALLS_SHLIB=	yes
-MAKE_ENV=	RM_INSTALL=${X11BASE}
+ONLY_FOR_ARCHS=	i386
 
 .if !defined(WITH_DEMOS)
 PLIST_SUB=	WITH_DEMOS="@comment "
diff -rNu openrm/distinfo openrm-new/distinfo
--- openrm/distinfo	Tue Apr 22 10:18:42 2003
+++ openrm-new/distinfo	Tue Apr 22 10:18:30 2003
@@ -1,2 +1,2 @@
-MD5 (openrm-devel-1.4.2.tgz) = 15e882d50fdcb009ec1000a73441b40b
-MD5 (openrm-demo-1.4.2.tgz) = 465d7cfa9ab66b77e075b8c0ef099bc7
+MD5 (openrm-devel-1.4.3.tgz) = ab5f22d9e47ffdbe0dd51acdcbb0f45a
+MD5 (openrm-demo-1.4.3.tgz) = 92c09d6d22821a3797ee76ae6f6cf78b
diff -rNu openrm/files/makeinclude.diff openrm-new/files/makeinclude.diff
--- openrm/files/makeinclude.diff	Tue Apr 22 10:18:42 2003
+++ openrm-new/files/makeinclude.diff	Tue Apr 22 10:18:30 2003
@@ -4,9 +4,9 @@
  # 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=/usr/local/rm143
+-RMLIBS=-L/usr/local/rm143/lib -lrm -lrmaux -lrmv -lrmi
+-RMCFLAGS=-DRM_X -I/usr/local/rm143/include
 +RMHOME=%%X11BASE%%
 +RMLIBS=-L%%X11BASE%%/lib -lrm -lrmaux -lrmv -lrmi
 +RMCFLAGS=-DRM_X -I%%X11BASE%%/include
diff -rNu openrm/files/rm2screen.c.diff openrm-new/files/rm2screen.c.diff
--- /dev/null	Thu Jan  1 01:00:00 1970
+++ openrm/files/rm2screen.c.diff	Tue Apr 22 10:18:30 2003
@@ -0,0 +1,12 @@
+--- ../rmdemo/rm2screen.c.~	Sat Apr 19 11:10:56 2003
++++ ../rmdemo/rm2screen.c	Sat Apr 19 11:12:21 2003
+@@ -411,7 +411,9 @@
+ #ifdef SOLARIS
+     glXInitThreadsSUN();
+ #else
++#ifndef __FreeBSD__
+     pthread_setconcurrency(12);
++#endif
+ #endif
+     
+     rmInit();
diff -rNu openrm/pkg-plist openrm-new/pkg-plist
--- openrm/pkg-plist	Tue Apr 22 10:18:42 2003
+++ openrm-new/pkg-plist	Tue Apr 22 10:18:30 2003
@@ -52,6 +52,8 @@
 %%WITH_DEMOS%%share/examples/openrm/data/func10-yoffset.dio
 %%WITH_DEMOS%%share/examples/openrm/data/func10.dio
 %%WITH_DEMOS%%share/examples/openrm/data/greenpaper.x
+%%WITH_DEMOS%%share/examples/openrm/data/hydro.dat
+%%WITH_DEMOS%%share/examples/openrm/data/hydro.dio
 %%WITH_DEMOS%%share/examples/openrm/data/left.x
 %%WITH_DEMOS%%share/examples/openrm/data/op.small.x
 %%WITH_DEMOS%%share/examples/openrm/data/orangegrid.x
@@ -88,6 +90,7 @@
 %%WITH_DEMOS%%share/examples/openrm/makeinclude
 %%WITH_DEMOS%%share/examples/openrm/markers2d.c
 %%WITH_DEMOS%%share/examples/openrm/offscreen.c
+%%WITH_DEMOS%%share/examples/openrm/orderTest.c
 %%WITH_DEMOS%%share/examples/openrm/pdb.c
 %%WITH_DEMOS%%share/examples/openrm/pdbwork.c
 %%WITH_DEMOS%%share/examples/openrm/pickListTest.c
@@ -97,9 +100,11 @@
 %%WITH_DEMOS%%share/examples/openrm/rm2screen.c
 %%WITH_DEMOS%%share/examples/openrm/skeleton.c
 %%WITH_DEMOS%%share/examples/openrm/spotlight.c
+%%WITH_DEMOS%%share/examples/openrm/spriteTest.c
 %%WITH_DEMOS%%share/examples/openrm/switchtest.c
 %%WITH_DEMOS%%share/examples/openrm/tcube.c
 %%WITH_DEMOS%%share/examples/openrm/text2d.c
+%%WITH_DEMOS%%share/examples/openrm/textureTest.c
 %%WITH_DEMOS%%share/examples/openrm/tfly.c
 %%WITH_DEMOS%%share/examples/openrm/tmap2d.c
 %%WITH_DEMOS%%share/examples/openrm/trans2d.c
@@ -124,6 +129,7 @@
 %%PORTDOCS%%share/doc/openrm/rmbitmap.c.html
 %%PORTDOCS%%share/doc/openrm/rmcamera.c.html
 %%PORTDOCS%%share/doc/openrm/rmclip.c.html
+%%PORTDOCS%%share/doc/openrm/rmcmpmgr.c.html
 %%PORTDOCS%%share/doc/openrm/rmcmpmgr.h.html
 %%PORTDOCS%%share/doc/openrm/rmcreatw.c.html
 %%PORTDOCS%%share/doc/openrm/rmerror.c.html
--- openrm.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200304220832.h3M8WNlo080373>