View | Details | Raw Unified | Return to bug 56996
Collapse All | Expand All

(-)/root/openrm-patches/openrm/CVS/Entries (-3 / +3 lines)
Lines 1-5 Link Here
1
/Makefile/1.4/Sat Aug 16 06:27:02 2003//
2
/distinfo/1.2/Tue Apr 29 03:46:43 2003//
3
/pkg-descr/1.1/Sun Apr  6 23:24:39 2003//
1
/pkg-descr/1.1/Sun Apr  6 23:24:39 2003//
4
/pkg-plist/1.2/Tue Apr 29 03:46:43 2003//
5
D/files////
2
D/files////
3
/Makefile/1.4/Wed Sep 10 09:01:00 2003//
4
/distinfo/1.2/Wed Sep 10 09:01:00 2003//
5
/pkg-plist/1.2/Wed Sep 10 09:01:00 2003//
(-)/root/openrm-patches/openrm/Makefile (-15 / +17 lines)
Lines 1-23 Link Here
1
# New ports collection makefile for:	openrm
1
# New ports collection makefile for:	openrm
2
# Date created:		8 July 2002
2
# Date created:		8 July 2002
3
# Whom:			Igor Pokrovsky <tiamat@telegraph.spb.ru>
3
# Whom:			Igor Pokrovsky <tiamat@comset.net>
4
#
4
#
5
# $FreeBSD: ports/graphics/openrm/Makefile,v 1.4 2003/08/16 06:27:02 kris Exp $
5
# $FreeBSD: ports/graphics/openrm/Makefile,v 1.4 2003/08/16 06:27:02 kris Exp $
6
#
6
#
7
7
8
PORTNAME=		openrm
8
PORTNAME=		openrm
9
PORTVERSION=		1.4.3
9
PORTVERSION=		1.5.0
10
CATEGORIES=		graphics
10
CATEGORIES=		graphics
11
MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
11
MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
12
MASTER_SITE_SUBDIR=	${PORTNAME}
12
MASTER_SITE_SUBDIR=	${PORTNAME}
13
DISTNAME=		${PORTNAME}-devel-${PORTVERSION}
13
DISTNAME=		${PORTNAME}-devel-${PORTVERSION}
14
EXTRACT_SUFX=		.tgz
15
.ifdef (WITH_DEMOS)
14
.ifdef (WITH_DEMOS)
16
DISTFILES=		${PORTNAME}-devel-${PORTVERSION}${EXTRACT_SUFX} \
15
DISTFILES=		${PORTNAME}-devel-${PORTVERSION}${EXTRACT_SUFX} \
17
			${PORTNAME}-demo-${PORTVERSION}${EXTRACT_SUFX}
16
			${PORTNAME}-demo-${PORTVERSION}${EXTRACT_SUFX}
18
.endif
17
.endif
19
18
20
MAINTAINER=	ports@FreeBSD.org
19
MAINTAINER=	tiamat@comset.net
21
COMMENT=	Development environment used to build 2D/3D/stereo graphics
20
COMMENT=	Development environment used to build 2D/3D/stereo graphics
22
21
23
LIB_DEPENDS=    jpeg.9:${PORTSDIR}/graphics/jpeg
22
LIB_DEPENDS=    jpeg.9:${PORTSDIR}/graphics/jpeg
Lines 25-37 Link Here
25
WRKSRC=		${WRKDIR}/rm${PORTVERSION:S/.//g}
24
WRKSRC=		${WRKDIR}/rm${PORTVERSION:S/.//g}
26
.ifdef (WITH_DEMOS)
25
.ifdef (WITH_DEMOS)
27
WRKSRC2=	${WRKDIR}/rmdemo
26
WRKSRC2=	${WRKDIR}/rmdemo
28
EXTRA_PATCHES=	${PATCHDIR}/makeinclude.diff ${PATCHDIR}/rm2screen.c.diff
27
EXTRA_PATCHES=	${PATCHDIR}/makeinclude.diff
29
.endif
28
.endif
30
29
31
USE_X_PREFIX=	yes
30
USE_X_PREFIX=	yes
32
USE_MESA=	yes
31
USE_MESA=	yes
33
USE_REINPLACE=	yes
32
USE_REINPLACE=	yes
34
ALL_TARGET=	linux docs
33
ALL_TARGET=	freebsd docs
34
MAKE_ARGS=	AR=${AR} \
35
		CC=${CC} \
36
		CP=${CP} \
37
		ECHO_CMD=${ECHO_CMD} \
38
		LN=${LN} \
39
		RM=${RM} \
40
		STRIP_CMD=${STRIP_CMD} \
41
		X11BASE=${X11BASE}
35
INSTALLS_SHLIB=	yes
42
INSTALLS_SHLIB=	yes
36
ONLY_FOR_ARCHS=	i386
43
ONLY_FOR_ARCHS=	i386
37
44
Lines 46-54 Link Here
46
	@${ECHO} "You can define WITH_DEMOS=yes to fetch and install available demos"
53
	@${ECHO} "You can define WITH_DEMOS=yes to fetch and install available demos"
47
.endif
54
.endif
48
55
49
.ifdef (WITH_DEMOS)
50
post-patch:
56
post-patch:
51
	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g; \
57
	@${CHMOD} 0755 ${WRKSRC}/bin/mklib.freebsd
58
.ifdef (WITH_DEMOS)
59
	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g; \
60
			      s|%%X11BASE%%|${X11BASE}|g; \
52
			      s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g; \
61
			      s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g; \
53
			      s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC2}/makeinclude
62
			      s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC2}/makeinclude
54
.endif
63
.endif
Lines 69-83 Link Here
69
	${INSTALL_DATA} ${WRKSRC}/lib/librmv.a ${PREFIX}/lib
78
	${INSTALL_DATA} ${WRKSRC}/lib/librmv.a ${PREFIX}/lib
70
79
71
# install includes
80
# install includes
72
	${INSTALL_DATA} ${WRKSRC}/include/rm.h ${PREFIX}/include
73
	@${MKDIR} ${PREFIX}/include/rm
81
	@${MKDIR} ${PREFIX}/include/rm
74
	${INSTALL_DATA} ${WRKSRC}/include/rm/*.h ${PREFIX}/include/rm
82
	${INSTALL_DATA} ${WRKSRC}/include/rm/*.h ${PREFIX}/include/rm
75
	@${MKDIR} ${PREFIX}/include/rmaux
76
	${INSTALL_DATA} ${WRKSRC}/include/rmaux/*.h ${PREFIX}/include/rmaux
77
	@${MKDIR} ${PREFIX}/include/rmi
78
	${INSTALL_DATA} ${WRKSRC}/include/rmi/*.h ${PREFIX}/include/rmi
79
	@${MKDIR} ${PREFIX}/include/rmv
80
	${INSTALL_DATA} ${WRKSRC}/include/rmv/*.h ${PREFIX}/include/rmv
81
83
82
.ifdef (WITH_DEMOS)
84
.ifdef (WITH_DEMOS)
83
	@${MKDIR} ${EXAMPLESDIR}
85
	@${MKDIR} ${EXAMPLESDIR}
(-)/root/openrm-patches/openrm/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
MD5 (openrm-devel-1.4.3.tgz) = ab5f22d9e47ffdbe0dd51acdcbb0f45a
1
MD5 (openrm-devel-1.5.0.tar.gz) = 99cdd0e72bf187f359104ba4b596ee3d
2
MD5 (openrm-demo-1.4.3.tgz) = 92c09d6d22821a3797ee76ae6f6cf78b
2
MD5 (openrm-demo-1.5.0.tar.gz) = d0cd62e8fd264657830d71047c1790c2
(-)/root/openrm-patches/openrm/files/CVS/Entries (-1 / +1 lines)
Lines 1-6 Link Here
1
/makeinclude.diff/1.2/Tue Apr 29 03:46:43 2003//
2
/patch-bin-mklib.linux/1.1/Sun Apr  6 23:24:39 2003//
1
/patch-bin-mklib.linux/1.1/Sun Apr  6 23:24:39 2003//
3
/patch-make.cfg/1.1/Sun Apr  6 23:24:39 2003//
2
/patch-make.cfg/1.1/Sun Apr  6 23:24:39 2003//
4
/patch-rm-rminit.c/1.1/Sun Apr  6 23:24:39 2003//
3
/patch-rm-rminit.c/1.1/Sun Apr  6 23:24:39 2003//
4
/makeinclude.diff/1.2/Wed Sep 10 09:01:00 2003//
5
/rm2screen.c.diff/1.1/Tue Apr 29 03:46:43 2003//
5
/rm2screen.c.diff/1.1/Tue Apr 29 03:46:43 2003//
6
D
6
D
(-)/root/openrm-patches/openrm/files/makeinclude.diff (-9 / +9 lines)
Lines 1-15 Link Here
1
--- ../rmdemo/makeinclude~	Mon Jun 17 02:50:21 2002
1
--- ../rmdemo/makeinclude.orig	Sun Apr 13 01:03:18 2003
2
+++ ../rmdemo/makeinclude	Tue Apr  8 20:54:52 2003
2
+++ ../rmdemo/makeinclude	Fri Sep 19 01:06:08 2003
3
@@ -2,21 +2,21 @@
3
@@ -2,21 +2,21 @@
4
 # autogenerated by configure
4
 # autogenerated by configure
5
 # on Sun Jun 16 17:50:09 PDT 2002
5
 # on Sat Apr 12 14:03:02 PDT 2003
6
 # 
6
 # 
7
-RMHOME=/usr/local/rm143
7
-RMHOME=/usr/local/rm150
8
-RMLIBS=-L/usr/local/rm143/lib -lrm -lrmaux -lrmv -lrmi
8
-RMLIBS=-L/usr/local/rm150/lib -lrm -lrmaux -lrmv -lrmi
9
-RMCFLAGS=-DRM_X -I/usr/local/rm143/include
9
-RMCFLAGS=-DRM_X -I/usr/local/rm150/include
10
+RMHOME=%%X11BASE%%
10
+RMHOME=%%PREFIX%%
11
+RMLIBS=-L%%X11BASE%%/lib -lrm -lrmaux -lrmv -lrmi
11
+RMLIBS=-L%%PREFIX%%/lib -lrm -lrmaux -lrmv -lrmi
12
+RMCFLAGS=-DRM_X -I%%X11BASE%%/include
12
+RMCFLAGS=-DRM_X -I%%PREFIX%%/include
13
 #  
13
 #  
14
-OPENGLHOME=/usr
14
-OPENGLHOME=/usr
15
-OPENGLLIBS=-L/usr/lib -lGL -lGLU
15
-OPENGLLIBS=-L/usr/lib -lGL -lGLU
(-)/root/openrm-patches/openrm/files/patch-Makefile (+18 lines)
Line 0 Link Here
1
--- Makefile.orig	Fri Sep 19 10:02:02 2003
2
+++ Makefile	Fri Sep 19 10:02:58 2003
3
@@ -73,6 +73,7 @@
4
 
5
 default:
6
 	@echo "Specify an architecture:"
7
+	@echo "  freebsd"
8
 	@echo "  irix6-32"
9
 	@echo "  irix6-32-debug"
10
 	@echo "  irix6-n32"
11
@@ -93,6 +94,7 @@
12
 subdirs = rm rmaux rmi rmv
13
 
14
 # unix targets
15
+freebsd \
16
 linux \
17
 linux-debug \
18
 linux-cr-debug \
(-)/root/openrm-patches/openrm/files/patch-bin-mklib.freebsd (+62 lines)
Line 0 Link Here
1
--- /dev/null	Fri Sep 19 10:51:17 2003
2
+++ bin/mklib.freebsd	Fri Sep 19 10:51:54 2003
3
@@ -0,0 +1,59 @@
4
+#!/bin/sh
5
+
6
+# Make a FreeBSD ELF shared library
7
+
8
+# $Id$
9
+
10
+#--common--------------------------------------------------------------
11
+
12
+# Usage:  mklib <archflags> <libname> <major> <minor> <file.o ... >
13
+#
14
+# <archflags> are arcitecture specific build flags
15
+# <libname> is name of output library (LIBRARY)
16
+# <major> is major version number (MAJOR)
17
+# <minor> is minor version number (MINOR)
18
+# <file.o ... > remaining arguments are object files (OBJECTS)
19
+# 
20
+# added local installation target prefix (RM_INSTALL)
21
+# tidied up the build
22
+#
23
+# 04/23/01  jdb
24
+#
25
+
26
+ARCHFLAGS=$1
27
+shift 1
28
+
29
+LIBRARY=$1
30
+shift 1
31
+
32
+MAJOR=$1
33
+shift 1
34
+
35
+MINOR=$1
36
+shift 1
37
+
38
+# we don't care about ${MINOR} here
39
+VERSION=$MAJOR
40
+
41
+OBJECTS=$*
42
+
43
+DEPLIBS="-lGL -lGLU -L${X11BASE}/lib -lXmu"
44
+
45
+#--platform------------------------------------------------------------
46
+
47
+# build library objects
48
+${ECHO_CMD} "Building shared object $LIBRARY.so.$VERSION and the archive library $LIBRARY.a"
49
+${RM} -f ${LIBRARY}.a ${LIBRARY}.so.${VERSION}
50
+${AR} qv ${LIBRARY}.a ${OBJECTS}
51
+
52
+# FreeBSD specific build
53
+${CC} -shared -Wl,-soname,${LIBRARY}.so.${VERSION} -o ${LIBRARY}.so.${VERSION} ${OBJECTS} ${DEPLIBS}
54
+if [ ${ARCHFLAGS##*-} != "debug" ]; then
55
+    ${STRIP_CMD} ${LIBRARY}.so.${VERSION}
56
+    ${ECHO_CMD} "library has been stripped (non-debug build)."
57
+fi 
58
+
59
+# code tree
60
+${CP} ${LIBRARY}.a ${LIBRARY}.so.${VERSION} ../lib
61
+${RM} -f ../lib/${LIBRARY}.so
62
+${LN} -s ${LIBRARY}.so.${VERSION} ${LIBRARY}.so
(-)/root/openrm-patches/openrm/files/patch-bin-mklib.linux (-29 lines)
Lines 1-29 Link Here
1
--- bin/mklib.linux.orig	Sun Jun  3 13:56:31 2001
2
+++ bin/mklib.linux	Sun Apr  6 15:26:58 2003
3
@@ -58,7 +58,7 @@
4
 MINOR=$1
5
 shift 1
6
 
7
-VERSION=$MAJOR.$MINOR
8
+VERSION=$MAJOR
9
 
10
 OBJECTS=$*
11
 
12
@@ -71,7 +71,7 @@
13
 
14
 # Linux specific build
15
 gcc -shared -Wl,-soname,${LIBRARY}.so.${VERSION} -o ${LIBRARY}.so.${VERSION} ${OBJECTS}
16
-if [[ ${ARCHFLAGS##*-} != "debug" ]]; then
17
+if [ ${ARCHFLAGS##*-} != "debug" ]; then
18
     strip ${LIBRARY}.so.${VERSION}
19
     echo "library has been stripped (non-debug build)."
20
 fi 
21
@@ -83,7 +83,7 @@
22
 
23
 
24
 # local install
25
-if [[ -n ${RM_INSTALL} ]]; then
26
+if [ -n ${RM_INSTALL} ]; then
27
     echo "Installing ${LIBRARY} librairies locally in ${RM_INSTALL}/lib..."
28
     \cp -f ${LIBRARY}.a ${LIBRARY}.so.${VERSION} ${RM_INSTALL}/lib
29
     \rm -f ${RM_INSTALL}/lib/${LIBRARY}.so
(-)/root/openrm-patches/openrm/files/patch-make.cfg (-38 / +21 lines)
Lines 1-41 Link Here
1
--- make.cfg.orig	Sun Oct 14 16:37:11 2001
1
--- make.cfg.orig	Sun Jul 20 18:11:32 2003
2
+++ make.cfg	Sun Apr  6 15:23:36 2003
2
+++ make.cfg	Fri Sep 19 09:54:52 2003
3
@@ -74,8 +74,9 @@
3
@@ -102,6 +102,21 @@
4
 MINOR=5
5
 VERSION=$MAJOR.$MINOR
6
 
7
+freebsd:
8
+	@$(MAKE) $(MFLAGS) -f Makefile.x11 targets \
9
+	"XINC = -I${X11BASE}/include" \
10
+	"GLINC = -I${X11BASE}/include" \
11
+	"JPEGINC = -I${LOCALBASE}/include" \
12
+	"RMINC = ../include" \
13
+	"CFLAGS = ${CFLAGS} -c -finline-functions -fomit-frame-pointer -DRM_X" \
14
+	"RMLIB = librm" \
15
+	"RMVLIB = librmv" \
16
+	"RMAUXLIB = librmaux" \
17
+	"RMILIB = librmi" \
18
+	"LIBDIR = ../lib" \
19
+	"MAKELIB = ../bin/mklib.freebsd" \
20
+	"ARCHFLAGS = none"
21
+
4
 linux:
22
 linux:
5
 	@$(MAKE) $(MFLAGS) -f Makefile.x11 targets \
23
 	@$(MAKE) $(MFLAGS) -f Makefile.x11 targets \
6
 	"CC = gcc" \
24
 	"CC = gcc" \
7
-	"XINC = /usr/X11R6/include" \
8
-	"GLINC = /usr/include"\
9
+	"XINC = ${X11BASE}/include" \
10
+	"GLINC = ${X11BASE}/include" \
11
+	"JPEGINC = ${LOCALBASE}/include" \
12
 	"RMINC = ../include" \
13
 	"CFLAGS = -c -O2 -m486 -finline-functions -fomit-frame-pointer -DRM_X" \
14
 	"RMLIB = librm" \
15
@@ -89,7 +90,7 @@
16
 linux-debug:
17
 	@$(MAKE) $(MFLAGS) -f Makefile.x11 targets \
18
 	"CC = gcc" \
19
-	"XINC = /usr/X11R6/include" \
20
+	"XINC = ${X11BASE}/include" \
21
 	"GLINC = /usr/include"\
22
 	"RMINC = ../include" \
23
 	"CFLAGS = -c -g -ansi -Wall -Winline -m486 -finline-functions -DRM_X" \
24
@@ -114,7 +115,7 @@
25
 	"XINC = /usr/openwin/include" \
26
 	"GLINC = /usr/openwin/include" \
27
 	"RMINC = ../include" \
28
-	"JPEGINC = /usr/local/include" \
29
+	"JPEGINC = ${LOCALBASE}/include" \
30
 	"CFLAGS = -O -c -Xc -Kpic -v -I/usr/openwin/include -DSOLARIS -DRM_X" \
31
 	"RMLIB = librm" \
32
 	"RMVLIB = librmv" \
33
@@ -130,7 +131,7 @@
34
 	"XINC = /usr/openwin/include" \
35
 	"GLINC = /usr/openwin/include" \
36
 	"RMINC = ../include" \
37
-	"JPEGINC = /usr/local/include" \
38
+	"JPEGINC = ${LOCALBASE}/include" \
39
 	"CFLAGS = -g -c -Xc -Kpic -v -I/usr/openwin/include -DSOLARIS -DRM_X" \
40
 	"RMLIB = librm" \
41
 	"RMVLIB = librmv" \
(-)/root/openrm-patches/openrm/files/patch-rm-rminit.c (-12 lines)
Lines 1-12 Link Here
1
--- rm/rminit.c~	Mon Jul  8 12:53:37 2002
2
+++ rm/rminit.c		Mon Jul  8 12:54:51 2002
3
@@ -91,7 +91,9 @@
4
 #ifdef SOLARIS
5
     glXInitThreadsSUN();
6
 #else
7
+#ifndef __FreeBSD__
8
     pthread_setconcurrency(12);
9
+#endif    
10
 #endif
11
 #endif
12
 
(-)/root/openrm-patches/openrm/files/rm2screen.c.diff (-12 lines)
Lines 1-12 Link Here
1
--- ../rmdemo/rm2screen.c.~	Sat Apr 19 11:10:56 2003
2
+++ ../rmdemo/rm2screen.c	Sat Apr 19 11:12:21 2003
3
@@ -411,7 +411,9 @@
4
 #ifdef SOLARIS
5
     glXInitThreadsSUN();
6
 #else
7
+#ifndef __FreeBSD__
8
     pthread_setconcurrency(12);
9
+#endif
10
 #endif
11
     
12
     rmInit();
(-)/root/openrm-patches/openrm/pkg-plist (-13 / +10 lines)
Lines 1-26 Link Here
1
include/rm.h
1
include/rm/rm.h
2
include/rm/rmaux.h
2
include/rm/rmcmpmgr.h
3
include/rm/rmcmpmgr.h
4
include/rm/rmcr.h
3
include/rm/rmdeflts.h
5
include/rm/rmdeflts.h
4
include/rm/rmdefs.h
6
include/rm/rmdefs.h
7
include/rm/rmi.h
8
include/rm/rmjpeg.h
5
include/rm/rmpipe.h
9
include/rm/rmpipe.h
10
include/rm/rmppm.h
6
include/rm/rmpublic.h
11
include/rm/rmpublic.h
7
include/rm/rmthread.h
12
include/rm/rmthread.h
8
include/rm/rmtypes.h
13
include/rm/rmtypes.h
14
include/rm/rmv.h
15
include/rm/rmvdefs.h
9
include/rm/rmvmap.h
16
include/rm/rmvmap.h
17
include/rm/rmvpub.h
10
include/rm/rmw.h
18
include/rm/rmw.h
11
include/rm/rmx.h
19
include/rm/rmx.h
12
include/rmaux/rmaux.h
13
include/rmi/rmi.h
14
include/rmi/rmjpeg.h
15
include/rmi/rmppm.h
16
include/rmv/rmv.h
17
include/rmv/rmvdefs.h
18
include/rmv/rmvpub.h
19
20
@dirrm include/rm
20
@dirrm include/rm
21
@dirrm include/rmaux
22
@dirrm include/rmi
23
@dirrm include/rmv
24
21
25
lib/librm.a
22
lib/librm.a
26
lib/librm.so
23
lib/librm.so
Lines 131-136 Link Here
131
%%PORTDOCS%%share/doc/openrm/rmclip.c.html
128
%%PORTDOCS%%share/doc/openrm/rmclip.c.html
132
%%PORTDOCS%%share/doc/openrm/rmcmpmgr.c.html
129
%%PORTDOCS%%share/doc/openrm/rmcmpmgr.c.html
133
%%PORTDOCS%%share/doc/openrm/rmcmpmgr.h.html
130
%%PORTDOCS%%share/doc/openrm/rmcmpmgr.h.html
131
%%PORTDOCS%%share/doc/openrm/rmcr.c.html
134
%%PORTDOCS%%share/doc/openrm/rmcreatw.c.html
132
%%PORTDOCS%%share/doc/openrm/rmcreatw.c.html
135
%%PORTDOCS%%share/doc/openrm/rmerror.c.html
133
%%PORTDOCS%%share/doc/openrm/rmerror.c.html
136
%%PORTDOCS%%share/doc/openrm/rmflyui.c.html
134
%%PORTDOCS%%share/doc/openrm/rmflyui.c.html
Lines 165-171 Link Here
165
%%PORTDOCS%%share/doc/openrm/rmvmeshv.c.html
163
%%PORTDOCS%%share/doc/openrm/rmvmeshv.c.html
166
%%PORTDOCS%%share/doc/openrm/rmvsignal.c.html
164
%%PORTDOCS%%share/doc/openrm/rmvsignal.c.html
167
%%PORTDOCS%%share/doc/openrm/rmvutil.c.html
165
%%PORTDOCS%%share/doc/openrm/rmvutil.c.html
168
%%PORTDOCS%%share/doc/openrm/rmw.h.html
169
%%PORTDOCS%%share/doc/openrm/rmwin.c.html
166
%%PORTDOCS%%share/doc/openrm/rmwin.c.html
170
%%PORTDOCS%%share/doc/openrm/rmx.c.html
167
%%PORTDOCS%%share/doc/openrm/rmx.c.html
171
%%PORTDOCS%%share/doc/openrm/rmx.h.html
168
%%PORTDOCS%%share/doc/openrm/rmx.h.html

Return to bug 56996