Attachment 30022 Details for Bug 50744 – openrm.diff

[patch] openrm.diff

openrm.diff (text/plain), 2.42 KB, created by Igor Pokrovsky on 2003-04-09 08:50:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Igor Pokrovsky

Created: 2003-04-09 08:50:13 UTC

Size: 2.42 KB

patch

obsolete

>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

Actions: View | Diff

Attachments on bug 50744: 30022