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 /math/xgfe | |
| 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 'math/xgfe')
| -rw-r--r-- | math/xgfe/Makefile | 2 | ||||
| -rw-r--r-- | math/xgfe/files/patch-aa | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/math/xgfe/Makefile b/math/xgfe/Makefile index 3915fb01dce3..309dec60ec84 100644 --- a/math/xgfe/Makefile +++ b/math/xgfe/Makefile @@ -21,7 +21,7 @@ USE_QT_VER= 3 USE_X_PREFIX= yes MAKE_ENV+= DOCSDIR=$(DOCSDIR) PTHREAD_CFLAGS="$(PTHREAD_CFLAGS)" \ - PTHREAD_LIBS="$(PTHREAD_LIBS)" + PTHREAD_LIBS="$(PTHREAD_LIBS)" QT_PREFIX="${QT_PREFIX}" .if defined(NOPORTDOCS) MAKE_ENV+= NOPORTDOCS=$(NOPORTDOCS) .endif diff --git a/math/xgfe/files/patch-aa b/math/xgfe/files/patch-aa index dd2b7a94a91e..41d270410049 100644 --- a/math/xgfe/files/patch-aa +++ b/math/xgfe/files/patch-aa @@ -10,14 +10,14 @@ -LINK = gcc +#CC = gcc +CXXFLAGS += ${PTHREAD_CFLAGS} -+QTDIR = $(X11BASE) ++QTDIR = $(QT_PREFIX) +INCPATH = -I$(X11BASE)/include +LINK = $(CXX) LFLAGS = -LIBS = -L$(QTDIR)/lib -lqt -L/usr/X11R6/lib -lX11 -MOC = moc +LIBS = -L$(X11BASE)/lib -lqt-mt -lX11 ${PTHREAD_LIBS} -+MOC = ${X11BASE}/bin/moc ++MOC = ${QTDIR}/bin/moc ####### Files |