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/inventor | |
| 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/inventor')
| -rw-r--r-- | graphics/inventor/Makefile | 3 | ||||
| -rw-r--r-- | graphics/inventor/files/patch-ivcommondefs | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/graphics/inventor/Makefile b/graphics/inventor/Makefile index 23aa65a190b6..3db6c2940deb 100644 --- a/graphics/inventor/Makefile +++ b/graphics/inventor/Makefile @@ -25,9 +25,8 @@ USE_GL= glw USE_GMAKE= yes USE_ICONV= yes USE_MOTIF= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes ONLY_FOR_ARCHS= i386 -#PREFIX= ${X11BASE} # not a good manner WRKSRC= ${WRKDIR}/${PORTNAME} MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/lib:${WRKSRC}/libSoXt diff --git a/graphics/inventor/files/patch-ivcommondefs b/graphics/inventor/files/patch-ivcommondefs index bda11238ef45..53aaf37ce68d 100644 --- a/graphics/inventor/files/patch-ivcommondefs +++ b/graphics/inventor/files/patch-ivcommondefs @@ -18,7 +18,7 @@ LCOPTS += $(LINUXOPTS) -X11DIR = /usr/X11R6 -+X11DIR = ${X11BASE} ++X11DIR = ${LOCALBASE} X11INCDIR = $(X11DIR)/include X11LIBDIR = $(X11DIR)/lib @@ -61,7 +61,7 @@ # +ifeq ($(usingFreeBSD), 1) -+IVPREFIX = ${X11BASE} ++IVPREFIX = ${LOCALBASE} +else IVPREFIX = /usr +endif |