diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
| commit | 3e4ed01146cfe2bdca465bd0e4d199341f62a0b6 (patch) | |
| tree | d573ea09b2bf6be67cb497df199932da9e2707c4 /graphics/openrm | |
| parent | 40049f4af2200d0dcf33596508688623fc75f764 (diff) | |
| download | ports-3e4ed01146cfe2bdca465bd0e4d199341f62a0b6.tar.gz ports-3e4ed01146cfe2bdca465bd0e4d199341f62a0b6.zip | |
- Remove unneeded dependency from gtk12/gtk20 [1]
- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG
- Remove X11BASE support in favor of LOCALBASE or PREFIX
- Use USE_LDCONFIG instead of INSTALLS_SHLIB
- Remove unneeded USE_GCC 3.4+
Thanks to all Helpers:
Dmitry Marakasov, Chess Griffin, beech@, dinoex, rafan, gahr,
ehaupt, nox, itetcu, flz, pav
PR: 116263
Tested on: pointyhat
Approved by: portmgr (pav)
Notes
Notes:
svn path=/head/; revision=211584
Diffstat (limited to 'graphics/openrm')
| -rw-r--r-- | graphics/openrm/Makefile | 12 | ||||
| -rw-r--r-- | graphics/openrm/files/makeinclude.diff | 4 |
2 files changed, 6 insertions, 10 deletions
diff --git a/graphics/openrm/Makefile b/graphics/openrm/Makefile index 8127e33ed5f1..634d50c6655f 100644 --- a/graphics/openrm/Makefile +++ b/graphics/openrm/Makefile @@ -7,10 +7,9 @@ PORTNAME= openrm PORTVERSION= 1.6.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= ${PORTNAME}-devel-${PORTVERSION}-1 .ifdef (WITH_DEMOS) DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ @@ -28,8 +27,7 @@ WRKSRC2= ${WRKDIR}/rmdemo EXTRA_PATCHES= ${PATCHDIR}/makeinclude.diff .endif -USE_X_PREFIX= yes -USE_GL= yes +USE_GL= glu USE_PERL5_BUILD=yes ALL_TARGET= freebsd docs MAKE_ARGS= AR=${AR} \ @@ -38,8 +36,7 @@ MAKE_ARGS= AR=${AR} \ ECHO_CMD=${ECHO_CMD} \ LN=${LN} \ RM=${RM} \ - STRIP_CMD=${STRIP_CMD} \ - X11BASE=${X11BASE} + STRIP_CMD=${STRIP_CMD} USE_LDCONFIG= yes ONLY_FOR_ARCHS= i386 @@ -57,7 +54,6 @@ pre-everything:: .ifdef (WITH_DEMOS) post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g; \ - s|%%X11BASE%%|${X11BASE}|g; \ s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g; \ s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC2}/makeinclude .endif diff --git a/graphics/openrm/files/makeinclude.diff b/graphics/openrm/files/makeinclude.diff index 1ba5236b68e0..0c1219a908bc 100644 --- a/graphics/openrm/files/makeinclude.diff +++ b/graphics/openrm/files/makeinclude.diff @@ -14,14 +14,14 @@ -OPENGLHOME=/usr -OPENGLLIBS=-L/usr/lib -lGL -lGLU -OPENGLCFLAGS=-I/usr/include -+OPENGLHOME=%%X11BASE%% ++OPENGLHOME=%%LOCALBASE%% +OPENGLLIBS=-L${OPENGLHOME}/lib -lGL -lGLU +OPENGLCFLAGS=-I${OPENGLHOME}/include # -X11HOME=/usr/X11R6 -X11LIBS=-L/usr/X11R6/lib -lXmu -lX11 -lpthread -lm -X11CFLAGS=-I/usr/X11R6/include -+X11HOME=%%X11BASE%% ++X11HOME=%%LOCALBASE%% +X11LIBS=-L${X11HOME}/lib -lXmu -lX11 %%PTHREAD_LIBS%% -lm +X11CFLAGS=-I${X11HOME}/include # |