diff options
| author | pav <pav@FreeBSD.org> | 2007-02-13 08:16:29 +0800 |
|---|---|---|
| committer | pav <pav@FreeBSD.org> | 2007-02-13 08:16:29 +0800 |
| commit | e03c6d722481f6f7ccee2da2c2def819dad553a5 (patch) | |
| tree | 42c24cd1a7707170111dcbac87514de8975bf4ee /games | |
| parent | cf9bf9c623b407a743c1d6efdd81a619a5c0e2c9 (diff) | |
| download | freebsd-ports-gnome-e03c6d722481f6f7ccee2da2c2def819dad553a5.tar.gz freebsd-ports-gnome-e03c6d722481f6f7ccee2da2c2def819dad553a5.tar.zst freebsd-ports-gnome-e03c6d722481f6f7ccee2da2c2def819dad553a5.zip | |
- Remove QTDIR from CONFIGURE_ENV, it's in there already thanks to framework
Submitted by: rafan
Tested on: pointyhat
Diffstat (limited to 'games')
| -rw-r--r-- | games/blackjack/Makefile | 3 | ||||
| -rw-r--r-- | games/blackjack/files/patch-aa | 2 | ||||
| -rw-r--r-- | games/q15/Makefile | 3 | ||||
| -rw-r--r-- | games/q15/files/patch-qt.FreeBSD.mk | 2 | ||||
| -rw-r--r-- | games/qgo/Makefile | 1 | ||||
| -rw-r--r-- | games/qnetchess/Makefile | 2 |
6 files changed, 7 insertions, 6 deletions
diff --git a/games/blackjack/Makefile b/games/blackjack/Makefile index c6f3adcd7685..ee5be0a49881 100644 --- a/games/blackjack/Makefile +++ b/games/blackjack/Makefile @@ -19,7 +19,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME} USE_QT_VER= 3 MAKE_ENV= QTCPPFLAGS="${QTCPPFLAGS} ${PTHREAD_CFLAGS}" \ - QTCFGLIBS="${QTCFGLIBS} ${PTHREAD_LIBS}" + QTCFGLIBS="${QTCFGLIBS} ${PTHREAD_LIBS}" \ + QTDIR="${QT_PREFIX}" MAN1= blackjack.1 PLIST_FILES= bin/blackjack diff --git a/games/blackjack/files/patch-aa b/games/blackjack/files/patch-aa index c9c0d511bf4f..5c90a23b2842 100644 --- a/games/blackjack/files/patch-aa +++ b/games/blackjack/files/patch-aa @@ -28,7 +28,7 @@ insurance_window.o $(METAOBJS) -MOC=$(QTDIR)/bin/moc -+MOC=$(X11BASE)/bin/moc ++MOC=$(QTDIR)/bin/moc .SUFFIXES: .cpp diff --git a/games/q15/Makefile b/games/q15/Makefile index 5f5b95a0d215..ebb7363d8317 100644 --- a/games/q15/Makefile +++ b/games/q15/Makefile @@ -16,7 +16,8 @@ COMMENT= A Qt-based game fifteen USE_BZIP2= yes USE_QT_VER= 3 USE_X_PREFIX= yes -MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}" +MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}" \ + QT_PREFIX="${QT_PREFIX}" PLIST_FILES= bin/q15 diff --git a/games/q15/files/patch-qt.FreeBSD.mk b/games/q15/files/patch-qt.FreeBSD.mk index df426ccdd13f..175a4224efe7 100644 --- a/games/q15/files/patch-qt.FreeBSD.mk +++ b/games/q15/files/patch-qt.FreeBSD.mk @@ -4,7 +4,7 @@ # $Id: qt.FreeBSD.mk,v 1.0 2004/11/05 10:22:11 denis Exp $ -QTDIR= /usr/X11R6 -+QTDIR= ${X11BASE} ++QTDIR= ${QT_PREFIX} MOC= ${QTDIR}/bin/moc LUPDATE= ${QTDIR}/bin/lupdate LRELEASE= ${QTDIR}/bin/lrelease diff --git a/games/qgo/Makefile b/games/qgo/Makefile index bf39f155c7f4..3e8fcf273702 100644 --- a/games/qgo/Makefile +++ b/games/qgo/Makefile @@ -19,7 +19,6 @@ USE_QT_VER= 3 USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= QTDIR="${QT_PREFIX}" CONFIGURE_ARGS= --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOHEADER="${TRUE}" \ AUTOMAKE="${TRUE}" diff --git a/games/qnetchess/Makefile b/games/qnetchess/Makefile index 7fa8073ed121..0c9bbe07b4b0 100644 --- a/games/qnetchess/Makefile +++ b/games/qnetchess/Makefile @@ -20,7 +20,7 @@ LOCALE_FILE= "${DATADIR}/${PORTNAME}_ru" USE_BZIP2= yes USE_QT_VER= 3 -MAKE_ARGS+= LOCALE_FILE="${LOCALE_FILE}" QTDIR="${X11BASE}" +MAKE_ARGS+= LOCALE_FILE="${LOCALE_FILE}" QTDIR="${QT_PREFIX}" PLIST_FILES= bin/QNetChess %%DATADIR%%/${PORTNAME}_ru.qm PLIST_DIRS= %%DATADIR%% |