diff options
| author | Chris Piazza <cpiazza@FreeBSD.org> | 1999-11-26 21:21:34 +0000 |
|---|---|---|
| committer | Chris Piazza <cpiazza@FreeBSD.org> | 1999-11-26 21:21:34 +0000 |
| commit | 0c489cb2cbc1a04b5d65053238906c89fb448daa (patch) | |
| tree | 3dad1bdd7a5e162459cf4da281a614986d245736 /editors/fine/files/patch-aa | |
| parent | Activate the freetds port. (diff) | |
Update to fine 2.3 to unbreak this port.
Fine now works with qt2 so we use that to unbreak for systems without
at least egcs (old gcc built qt, new gcc needed to build fine, new gcc
is used for qt2).
Notes
Notes:
svn path=/head/; revision=23419
Diffstat (limited to 'editors/fine/files/patch-aa')
| -rw-r--r-- | editors/fine/files/patch-aa | 38 |
1 files changed, 21 insertions, 17 deletions
diff --git a/editors/fine/files/patch-aa b/editors/fine/files/patch-aa index 05ee1bbf4bce..2b746ab88c59 100644 --- a/editors/fine/files/patch-aa +++ b/editors/fine/files/patch-aa @@ -1,28 +1,32 @@ ---- Makefile.orig Tue Mar 16 09:14:22 1999 -+++ Makefile Tue Aug 17 16:15:41 1999 -@@ -1,14 +1,15 @@ --INCLUDE = -I$(QTDIR)/include -I. -I$(HOME)/include -I./icons +--- Makefile.orig Fri Nov 26 13:11:08 1999 ++++ Makefile Fri Nov 26 13:11:11 1999 +@@ -1,16 +1,17 @@ +-INCLUDE = -I. -I$(QTDIR)/include -I$(HOME)/include -I./icons -DESTLIB = $(HOME)/lib # where to put library -LIB = -L/usr/X11R6/lib -L$(QTDIR)/lib -L$(DESTLIB) -+QTDIR = ${X11BASE} -+INCLUDE = -I$(QTDIR)/include -I ${QTDIR}/include/X11/qt -I. -I$(HOME)/include -I./icons -+DESTLIB = ${PREFIX}/lib -+LIB = -L${LOCALBASE}/lib -L$(QTDIR)/lib -L$(DESTLIB) -L. - - MOC = $(QTDIR)/bin/moc +- +-MOC = $(QTDIR)/bin/moc -CC = g++ -C = gcc -+#CC = ${CX -+#CXX = ${CXX} ++QTDIR= ${X11BASE} ++INCLUDE = -I. -I$(QTDIR)/include -I$(QTDIR)/include/qt2 -I$(HOME)/include -I./icons ++DESTLIB = ${PREFIX}/lib ++LIB = -L${X11BASE}/lib -L${LOCALBASE}/lib -L$(QTDIR)/lib -L$(DESTLIB) -L. ++ ++MOC = $(QTDIR)/bin/moc2 ++#CC = g++ ++#C = gcc AR = ar M = moc_ + RM = rm -f + KDOC = kdoc -H -d doc -e -OPTIONS = -g -ansi -fguiding-decls +OPTIONS = ${CFLAGS} -fguiding-decls -DFINEDIR=\""${PREFIX}/share/fine\"" OBJ = qsmartedit.o qcolormultilinedit.o undoredo.o qeditor.o qfontselect.o qcolordialog.o qcolorlistboxitem.o qkeyworddialog.o qhotkeydialog.o METAOBJ = qsmartedit.mo qcolormultilinedit.mo qeditor.mo qfontselect.mo qcolordialog.mo qkeyworddialog.mo qhotkeydialog.mo -@@ -27,14 +28,13 @@ +@@ -35,14 +36,13 @@ $(TARGET): $(OBJ) $(METAOBJ) $(AR) r $(TARGET) $(OBJ) $(METAOBJ) @@ -33,10 +37,10 @@ + $(CXX) -c $(OPTIONS) $(INCLUDE) $< %.mo: %.h - $(MOC) $< -o $(subst .h,.C,m$<) -- $(CC) -c $(OPTIONS) $(INCLUDE) $(subst .h,.C,m$<) -o $(subst .h,.mo,$<) -+ $(CXX) -c $(OPTIONS) $(INCLUDE) $(subst .h,.C,m$<) -o $(subst .h,.mo,$<) + $(MOC) $< -o $(subst .h,.C,$(M)$<) +- $(CC) -c $(OPTIONS) $(INCLUDE) $(subst .h,.C,$(M)$<) -o $(subst .h,.mo,$<) ++ $(CXX) -c $(OPTIONS) $(INCLUDE) $(subst .h,.C,$(M)$<) -o $(subst .h,.mo,$<) fine: fine.o fine.mo - $(CC) -g -ofine fine.o fine.mo $(OPTIONS) $(LIB) -lFine -lqt -lX11 -lXext -+ $(CXX) -g -ofine fine.o fine.mo $(OPTIONS) $(LIB) -lFine -lqt -lX11 -lXext ++ $(CXX) -ofine fine.o fine.mo $(OPTIONS) $(LIB) -lFine -lqt2 -lX11 -lXext |