Date: Wed, 9 Apr 2003 09:42:50 +0200 (CEST) From: Igor Pokrovsky <igor.pokrovsky@cnrm.meteo.fr> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/50744: Update port: graphics/openrm (some fixes) Message-ID: <200304090742.h397gohZ060376@exmatis1.cnrm.meteo.fr> Resent-Message-ID: <200304090750.h397oGIw053750@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 50744
>Category: ports
>Synopsis: Update port: graphics/openrm (some fixes)
>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 Apr 09 00:50:13 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:
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.
>How-To-Repeat:
>Fix:
--- openrm.diff begins here ---
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
--- 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?200304090742.h397gohZ060376>