diff options
author | miwi <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
---|---|---|
committer | miwi <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
commit | bce9b81f9d6099820f3839d7809d6b08c1d2ae7b (patch) | |
tree | f5dd7c3a8dbebad79bdb5e844aeb69c59a9fd12c /audio/festival+OGI | |
parent | 2eea5f1d2e44418020f8f4db08d40bea6915b6e8 (diff) | |
download | FreeBSD-ports-bce9b81f9d6099820f3839d7809d6b08c1d2ae7b.zip FreeBSD-ports-bce9b81f9d6099820f3839d7809d6b08c1d2ae7b.tar.gz |
- 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)
Diffstat (limited to 'audio/festival+OGI')
-rw-r--r-- | audio/festival+OGI/Makefile | 4 | ||||
-rw-r--r-- | audio/festival+OGI/files/FreeBSD.mak | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/audio/festival+OGI/Makefile b/audio/festival+OGI/Makefile index 1075fcd..a626e07 100644 --- a/audio/festival+OGI/Makefile +++ b/audio/festival+OGI/Makefile @@ -38,7 +38,7 @@ MAKE_ENV+= PKG_EST_HOME=${SPEECHTOOLS} \ PKG_FESTIVAL_BUILD_HOME=${FESTIVAL} \ PKG_FESTIVAL_HOME=${FHOME} \ PKG_COMPILER="${CC}" \ - PKG_X11BASE=${X11BASE} \ + PKG_LOCALBASE=${LOCALBASE} \ PKG_PREFIX=${PREFIX} \ GCC27_CC="${CC}" \ GCC27_CXX="${CXX}" \ @@ -77,7 +77,7 @@ post-patch: ${SPEECHTOOLS}/config/systems/${FESTIVAL_ARCH}_FreeBSD${ii}.${jj}.mak .endfor .endfor - @${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},g' \ + @${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' \ ${WRKSRC}/speech_tools/config/systems/default.mak do-install: diff --git a/audio/festival+OGI/files/FreeBSD.mak b/audio/festival+OGI/files/FreeBSD.mak index 26854d2..9def3f8 100644 --- a/audio/festival+OGI/files/FreeBSD.mak +++ b/audio/festival+OGI/files/FreeBSD.mak @@ -5,11 +5,11 @@ ECHO_N = /usr/bin/printf "%s" NAWK=awk -NAS_LIB=$(PKG_X11BASE)/lib -NAS_INCLUDE=$(PKG_X11BASE)/include +NAS_LIB=$(PKG_LOCALBASE)/lib +NAS_INCLUDE=$(PKG_LOCALBASE)/include -X11_LIB=$(PKG_X11BASE)/lib -X11_INCLUDE=$(PKG_X11BASE)/include +X11_LIB=$(PKG_LOCALBASE)/lib +X11_INCLUDE=$(PKG_LOCALBASE)/include OS_INCLUDES+=-I$(PKG_PREFIX)/include OS_LIBS+=-L$(PKG_PREFIX)/lib |