diff options
| author | edwin <edwin@FreeBSD.org> | 2003-04-13 19:07:30 +0800 |
|---|---|---|
| committer | edwin <edwin@FreeBSD.org> | 2003-04-13 19:07:30 +0800 |
| commit | 76c0d614e2cc8fa4a0fc7666b812fd504dc8a8a0 (patch) | |
| tree | 922e528fe953eb01bb92b7f14bedf379f5833f67 /graphics | |
| parent | 535dc7a0a212315ad6fbb48e6b26631508af223d (diff) | |
| download | freebsd-ports-gnome-76c0d614e2cc8fa4a0fc7666b812fd504dc8a8a0.tar.gz freebsd-ports-gnome-76c0d614e2cc8fa4a0fc7666b812fd504dc8a8a0.tar.zst freebsd-ports-gnome-76c0d614e2cc8fa4a0fc7666b812fd504dc8a8a0.zip | |
Update port: graphics/openrm (some fixes)
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.
PR: ports/50744
Submitted by: Igor Pokrovsky <igor.pokrovsky@cnrm.meteo.fr>
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/openrm/Makefile | 15 | ||||
| -rw-r--r-- | graphics/openrm/files/makeinclude.diff | 35 |
2 files changed, 47 insertions, 3 deletions
diff --git a/graphics/openrm/Makefile b/graphics/openrm/Makefile index 99c4071b1f7e..c23879252039 100644 --- a/graphics/openrm/Makefile +++ b/graphics/openrm/Makefile @@ -13,8 +13,8 @@ MASTER_SITE_SUBDIR= ${PORTNAME} 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 @@ COMMENT= Development environment used to build 2D/3D/stereo graphics 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} @@ -44,6 +46,13 @@ 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: # install libraries ${INSTALL_PROGRAM} ${WRKSRC}/lib/librm.so.1 ${PREFIX}/lib diff --git a/graphics/openrm/files/makeinclude.diff b/graphics/openrm/files/makeinclude.diff new file mode 100644 index 000000000000..2c7d9ef04c44 --- /dev/null +++ b/graphics/openrm/files/makeinclude.diff @@ -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 |