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/ftgl | |
| parent | 40049f4af2200d0dcf33596508688623fc75f764 (diff) | |
- 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/ftgl')
| -rw-r--r-- | graphics/ftgl/Makefile | 8 | ||||
| -rw-r--r-- | graphics/ftgl/files/makefile.ex | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/graphics/ftgl/Makefile b/graphics/ftgl/Makefile index 52558461ad7f..2158ea4bc0fa 100644 --- a/graphics/ftgl/Makefile +++ b/graphics/ftgl/Makefile @@ -7,7 +7,7 @@ PORTNAME= ftgl PORTVERSION= 2.12 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://opengl.geek.nz/ftgl/ DISTNAME= ${PORTNAME}-${PORTVERSION:C/([[:digit:]])$/.\1/} @@ -19,13 +19,12 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/doxygen:${PORTSDIR}/devel/doxygen LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 USE_GMAKE= yes -USE_GL= yes -USE_X_PREFIX= yes +USE_GL= gl GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/${PORTNAME:U} CONFIGURE_WRKSRC= ${WRKSRC}/unix CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --with-gl-inc=${X11BASE}/include --with-gl-lib=${X11BASE}/lib +CONFIGURE_ARGS= --with-gl-inc=${LOCALBASE}/include --with-gl-lib=${LOCALBASE}/lib BUILD_WRKSRC= ${CONFIGURE_WRKSRC} INSTALL_WRKSRC= ${CONFIGURE_WRKSRC} MAKE_ENV= MKDIR="${MKDIR}" @@ -47,7 +46,6 @@ post-install: s|%%CFLAGS%%|${CFLAGS}|g; \ s|%%CXXFLAGS%%|${CXXFLAGS}|g; \ s|%%PREFIX%%|${PREFIX}|g; \ - s|%%X11BASE%%|${X11BASE}|g; \ s|%%LOCALBASE%%|${LOCALBASE}|g' \ <${FILESDIR}/makefile.ex >${EXAMPLESDIR}/makefile diff --git a/graphics/ftgl/files/makefile.ex b/graphics/ftgl/files/makefile.ex index 87cb60068063..791f527a0a19 100644 --- a/graphics/ftgl/files/makefile.ex +++ b/graphics/ftgl/files/makefile.ex @@ -6,9 +6,9 @@ CC= %%CC%% CXX= %%CXX%% RM= %%RM%% -CFLAGS= %%CFLAGS%% -I. -I%%X11BASE%%/include -I%%PREFIX%%/include/FTGL -CXXFLAGS= %%CXXFLAGS%% -I. -I%%X11BASE%%/include -I%%PREFIX%%/include/FTGL -LDFLAGS= -L%%X11BASE%%/lib -L%%PREFIX%%/lib -lglut -lftgl +CFLAGS= %%CFLAGS%% -I. -I%%LOCALBASE%%/include -I%%PREFIX%%/include/FTGL +CXXFLAGS= %%CXXFLAGS%% -I. -I%%LOCALBASE%%/include -I%%PREFIX%%/include/FTGL +LDFLAGS= -L%%LOCALBASE%%/lib -L%%LOCALBASE%%/lib -lglut -lftgl FREETYPE_CFLAGS!=%%LOCALBASE%%/bin/freetype-config --cflags FREETYPE_LFLAGS!=%%LOCALBASE%%/bin/freetype-config --libs |