Date: Thu, 22 Jan 2004 07:54:17 +0300 (MSK) From: Igor Pokrovsky <tiamat@comset.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/61707: Update port: graphics/openrm 1.5.0 -> 1.5.1 Message-ID: <200401220454.i0M4sHi5005827@doom.homeunix.org> Resent-Message-ID: <200401220500.i0M50avE013002@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 61707
>Category: ports
>Synopsis: Update port: graphics/openrm 1.5.0 -> 1.5.1
>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 Jan 21 21:00:36 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Igor Pokrovsky
>Release: FreeBSD 4.9-STABLE i386
>Organization:
>Environment:
System: FreeBSD doom.homeunix.org 4.9-STABLE FreeBSD 4.9-STABLE #1: Sun Dec 14 13:12:44 MSK 2003 root@doom.homeunix.org:/usr/obj/usr/src/sys/KERNEL i386
>Description:
Updating 1.5.0 -> 1.5.1
FreeBSD specific patches are now included in the OpenRM distribution.
>How-To-Repeat:
>Fix:
--- openrm.diff begins here ---
diff -ruN /usr/ports/graphics/openrm/Makefile openrm/Makefile
--- /usr/ports/graphics/openrm/Makefile Sat Sep 27 04:45:42 2003
+++ openrm/Makefile Thu Jan 22 07:37:32 2004
@@ -6,13 +6,13 @@
#
PORTNAME= openrm
-PORTVERSION= 1.5.0
+PORTVERSION= 1.5.1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= ${PORTNAME}-devel-${PORTVERSION}
.ifdef (WITH_DEMOS)
-DISTFILES= ${PORTNAME}-devel-${PORTVERSION}${EXTRACT_SUFX} \
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
${PORTNAME}-demo-${PORTVERSION}${EXTRACT_SUFX}
.endif
@@ -28,7 +28,7 @@
.endif
USE_X_PREFIX= yes
-USE_MESA= yes
+USE_GL= yes
USE_REINPLACE= yes
ALL_TARGET= freebsd docs
MAKE_ARGS= AR=${AR} \
@@ -53,9 +53,8 @@
@${ECHO_MSG} "You can define WITH_DEMOS=yes to fetch and install available demos"
.endif
-post-patch:
- @${CHMOD} 0755 ${WRKSRC}/bin/mklib.freebsd
.ifdef (WITH_DEMOS)
+post-patch:
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g; \
s|%%X11BASE%%|${X11BASE}|g; \
s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g; \
diff -ruN /usr/ports/graphics/openrm/distinfo openrm/distinfo
--- /usr/ports/graphics/openrm/distinfo Wed Sep 24 13:03:27 2003
+++ openrm/distinfo Thu Jan 22 07:22:20 2004
@@ -1,2 +1,2 @@
-MD5 (openrm-devel-1.5.0.tar.gz) = 99cdd0e72bf187f359104ba4b596ee3d
-MD5 (openrm-demo-1.5.0.tar.gz) = d0cd62e8fd264657830d71047c1790c2
+MD5 (openrm-devel-1.5.1.tar.gz) = f12359cfafb5e83e947b0961a5351110
+MD5 (openrm-demo-1.5.1.tar.gz) = 35e022241c5ca9cb8f8813109b016c80
diff -ruN /usr/ports/graphics/openrm/files/makeinclude.diff openrm/files/makeinclude.diff
--- /usr/ports/graphics/openrm/files/makeinclude.diff Wed Sep 24 13:03:27 2003
+++ openrm/files/makeinclude.diff Thu Jan 22 07:28:35 2004
@@ -1,12 +1,12 @@
---- ../rmdemo/makeinclude.orig Sun Apr 13 01:03:18 2003
-+++ ../rmdemo/makeinclude Fri Sep 19 01:06:08 2003
+--- ../rmdemo/makeinclude.orig Thu Jan 22 07:24:15 2004
++++ ../rmdemo/makeinclude Thu Jan 22 07:27:09 2004
@@ -2,21 +2,21 @@
# autogenerated by configure
- # on Sat Apr 12 14:03:02 PDT 2003
+ # on Fri Jan 16 19:52:16 PST 2004
#
--RMHOME=/usr/local/rm150
--RMLIBS=-L/usr/local/rm150/lib -lrm -lrmaux -lrmv -lrmi
--RMCFLAGS=-DRM_X -I/usr/local/rm150/include
+-RMHOME=/usr/local/rm151
+-RMLIBS=-L/usr/local/rm151/lib -lrm -lrmaux -lrmv -lrmi
+-RMCFLAGS=-DRM_X -I/usr/local/rm151/include
+RMHOME=%%PREFIX%%
+RMLIBS=-L%%PREFIX%%/lib -lrm -lrmaux -lrmv -lrmi
+RMCFLAGS=-DRM_X -I%%PREFIX%%/include
diff -ruN /usr/ports/graphics/openrm/files/patch-Makefile openrm/files/patch-Makefile
--- /usr/ports/graphics/openrm/files/patch-Makefile Wed Sep 24 13:03:27 2003
+++ openrm/files/patch-Makefile Thu Jan 1 03:00:00 1970
@@ -1,18 +0,0 @@
---- Makefile.orig Fri Sep 19 10:02:02 2003
-+++ Makefile Fri Sep 19 10:02:58 2003
-@@ -73,6 +73,7 @@
-
- default:
- @echo "Specify an architecture:"
-+ @echo " freebsd"
- @echo " irix6-32"
- @echo " irix6-32-debug"
- @echo " irix6-n32"
-@@ -93,6 +94,7 @@
- subdirs = rm rmaux rmi rmv
-
- # unix targets
-+freebsd \
- linux \
- linux-debug \
- linux-cr-debug \
diff -ruN /usr/ports/graphics/openrm/files/patch-bin-mklib.freebsd openrm/files/patch-bin-mklib.freebsd
--- /usr/ports/graphics/openrm/files/patch-bin-mklib.freebsd Wed Sep 24 13:03:28 2003
+++ openrm/files/patch-bin-mklib.freebsd Thu Jan 1 03:00:00 1970
@@ -1,62 +0,0 @@
---- /dev/null Fri Sep 19 10:51:17 2003
-+++ bin/mklib.freebsd Fri Sep 19 10:51:54 2003
-@@ -0,0 +1,59 @@
-+#!/bin/sh
-+
-+# Make a FreeBSD ELF shared library
-+
-+# $Id$
-+
-+#--common--------------------------------------------------------------
-+
-+# Usage: mklib <archflags> <libname> <major> <minor> <file.o ... >
-+#
-+# <archflags> are arcitecture specific build flags
-+# <libname> is name of output library (LIBRARY)
-+# <major> is major version number (MAJOR)
-+# <minor> is minor version number (MINOR)
-+# <file.o ... > remaining arguments are object files (OBJECTS)
-+#
-+# added local installation target prefix (RM_INSTALL)
-+# tidied up the build
-+#
-+# 04/23/01 jdb
-+#
-+
-+ARCHFLAGS=$1
-+shift 1
-+
-+LIBRARY=$1
-+shift 1
-+
-+MAJOR=$1
-+shift 1
-+
-+MINOR=$1
-+shift 1
-+
-+# we don't care about ${MINOR} here
-+VERSION=$MAJOR
-+
-+OBJECTS=$*
-+
-+DEPLIBS="-lGL -lGLU -L${X11BASE}/lib -lXmu"
-+
-+#--platform------------------------------------------------------------
-+
-+# build library objects
-+${ECHO_CMD} "Building shared object $LIBRARY.so.$VERSION and the archive library $LIBRARY.a"
-+${RM} -f ${LIBRARY}.a ${LIBRARY}.so.${VERSION}
-+${AR} qv ${LIBRARY}.a ${OBJECTS}
-+
-+# FreeBSD specific build
-+${CC} -shared -Wl,-soname,${LIBRARY}.so.${VERSION} -o ${LIBRARY}.so.${VERSION} ${OBJECTS} ${DEPLIBS}
-+if [ ${ARCHFLAGS##*-} != "debug" ]; then
-+ ${STRIP_CMD} ${LIBRARY}.so.${VERSION}
-+ ${ECHO_CMD} "library has been stripped (non-debug build)."
-+fi
-+
-+# code tree
-+${CP} ${LIBRARY}.a ${LIBRARY}.so.${VERSION} ../lib
-+${RM} -f ../lib/${LIBRARY}.so
-+${LN} -s ${LIBRARY}.so.${VERSION} ${LIBRARY}.so
diff -ruN /usr/ports/graphics/openrm/files/patch-make.cfg openrm/files/patch-make.cfg
--- /usr/ports/graphics/openrm/files/patch-make.cfg Wed Sep 24 13:03:28 2003
+++ openrm/files/patch-make.cfg Thu Jan 1 03:00:00 1970
@@ -1,24 +0,0 @@
---- make.cfg.orig Sun Jul 20 18:11:32 2003
-+++ make.cfg Fri Sep 19 09:54:52 2003
-@@ -102,6 +102,21 @@
- MINOR=5
- VERSION=$MAJOR.$MINOR
-
-+freebsd:
-+ @$(MAKE) $(MFLAGS) -f Makefile.x11 targets \
-+ "XINC = -I${X11BASE}/include" \
-+ "GLINC = -I${X11BASE}/include" \
-+ "JPEGINC = -I${LOCALBASE}/include" \
-+ "RMINC = ../include" \
-+ "CFLAGS = ${CFLAGS} -c -finline-functions -fomit-frame-pointer -DRM_X" \
-+ "RMLIB = librm" \
-+ "RMVLIB = librmv" \
-+ "RMAUXLIB = librmaux" \
-+ "RMILIB = librmi" \
-+ "LIBDIR = ../lib" \
-+ "MAKELIB = ../bin/mklib.freebsd" \
-+ "ARCHFLAGS = none"
-+
- linux:
- @$(MAKE) $(MFLAGS) -f Makefile.x11 targets \
- "CC = gcc" \
diff -ruN /usr/ports/graphics/openrm/pkg-descr openrm/pkg-descr
--- /usr/ports/graphics/openrm/pkg-descr Mon Apr 7 03:24:39 2003
+++ openrm/pkg-descr Thu Jan 22 07:34:52 2004
@@ -7,6 +7,7 @@
x86 Linux (s/w via Mesa, h/w using vendor drivers, e.g., nVidia)
Irix
Solaris
+ FreeBSD
Win32 (95/98/NT/2K/ME).
OpenRM is a derivative work of RM Scene Graph (tm), a commercial
@@ -19,4 +20,4 @@
WWW: http://openrm.sourceforge.net
- Igor Pokrovsky
-tiamat@telegraph.spb.ru
+tiamat@comset.net
diff -ruN /usr/ports/graphics/openrm/pkg-plist openrm/pkg-plist
--- /usr/ports/graphics/openrm/pkg-plist Wed Sep 24 13:03:27 2003
+++ openrm/pkg-plist Thu Jan 22 06:59:15 2004
@@ -74,6 +74,7 @@
%%WITH_DEMOS%%share/examples/openrm/elev.c
%%WITH_DEMOS%%share/examples/openrm/elevImage.c
%%WITH_DEMOS%%share/examples/openrm/fogtest.c
+%%WITH_DEMOS%%share/examples/openrm/fpsVis3d.c
%%WITH_DEMOS%%share/examples/openrm/glxinfo.c
%%WITH_DEMOS%%share/examples/openrm/imgMirror.c
%%WITH_DEMOS%%share/examples/openrm/isodrv-mt.c
@@ -151,6 +152,7 @@
%%PORTDOCS%%share/doc/openrm/rmtext.c.html
%%PORTDOCS%%share/doc/openrm/rmthread.c.html
%%PORTDOCS%%share/doc/openrm/rmthread.h.html
+%%PORTDOCS%%share/doc/openrm/rmtime.c.html
%%PORTDOCS%%share/doc/openrm/rmtxture.c.html
%%PORTDOCS%%share/doc/openrm/rmtypes.h.html
%%PORTDOCS%%share/doc/openrm/rmutil.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?200401220454.i0M4sHi5005827>