diff options
author | Steve Price <steve@FreeBSD.org> | 1999-05-09 16:50:10 +0000 |
---|---|---|
committer | Steve Price <steve@FreeBSD.org> | 1999-05-09 16:50:10 +0000 |
commit | ce7b19e8a738e7b73ae7c1372ac2edc40778adb5 (patch) | |
tree | c1f73dfeb9603eb25da751f9d69cb3972f67b6d3 /devel/qtarch/files/patch-aa | |
parent | 6b5c462ce243d5fd588bdb69bfbbf75da8285949 (diff) | |
download | ports-ce7b19e8a738e7b73ae7c1372ac2edc40778adb5.tar.gz ports-ce7b19e8a738e7b73ae7c1372ac2edc40778adb5.zip |
Notes
Diffstat (limited to 'devel/qtarch/files/patch-aa')
-rw-r--r-- | devel/qtarch/files/patch-aa | 75 |
1 files changed, 71 insertions, 4 deletions
diff --git a/devel/qtarch/files/patch-aa b/devel/qtarch/files/patch-aa index 498fd04c8c2f..57de6c07917e 100644 --- a/devel/qtarch/files/patch-aa +++ b/devel/qtarch/files/patch-aa @@ -1,11 +1,78 @@ ---- bmp/Makefile.orig Fri Sep 4 00:24:06 1998 -+++ bmp/Makefile Thu Dec 24 19:05:06 1998 -@@ -83,7 +83,7 @@ +--- Makefile.orig Sun Apr 4 01:59:09 1999 ++++ Makefile Sat May 8 00:50:27 1999 +@@ -128,6 +128,7 @@ + ModulesPrefPage.moc.o + + TARGET = qtarch ++INSTALLDIR = ${PREFIX} + + + include Makefile.common +@@ -160,7 +161,8 @@ + @echo + @echo "Linking $(TARGET)" + @$(CC) $(OBJECTS) $(OBJMETA) -o $(TARGET) $(LFLAGS) +- ++ @echo ++ @$(MAKE) -C module/kde + + efence: $(OBJECTS) $(OBJMETA) + efence: bmp_d prop_d widget_d layout_d pixmap_d +@@ -208,3 +210,5 @@ + doc: + @$(MAKE) -C doc doc + ++ ++include Makefile.install +--- Makefile.common.orig Sat Apr 3 23:31:22 1999 ++++ Makefile.common Sat May 8 00:55:23 1999 +@@ -5,10 +5,10 @@ + #endif + + ifndef QTDIR +-QTDIR = /usr/local/lib/qt ++QTDIR = ${X11BASE} + endif + +-INCDIR = -I$(QTDIR)/include -I$(TOPDIR) ++INCDIR = -I$(QTDIR)/include/X11/qt -I$(TOPDIR) + #CFLAGS = -O2 -fno-strength-reduce -W -Wtemplate-debugging -Wparentheses \ + # -Wuninitialized -Wchar-subscripts -Wformat -Wtrigraphs -Wcomment \ + # -Wswitch -Wunused -Wreturn-type -Wimplicit -Wpointer-arith -Wsynth \ +@@ -26,7 +26,7 @@ + bmp/libbmp.a \ + layout/liblayout.a \ + pixmap/libpixmap.a \ +- -lfl -lqt -lstdc++ -ldl -rdynamic ++ -lfl -lqt -lstdc++ -lX11 -lm -rdynamic + ARFLAGS = -crs + CC = g++ + AR = ar +--- bmp/Makefile.orig Fri Jan 29 04:41:35 1999 ++++ bmp/Makefile Sat May 8 00:50:27 1999 +@@ -85,7 +85,7 @@ include ../Makefile.common qembed: qembed.o - $(CC) qembed.o -o qembed -L$(QTDIR)/lib -lqt -+ $(CC) qembed.o -o qembed $(EXTRA_LFLAGS) -L$(QTDIR)/lib -lqt -lX11 ++ $(CC) qembed.o -o qembed -L$(QTDIR)/lib -lqt -lX11 $(BMPSOURCE): $(BMPS) qembed ./qembed $(BMPHEADER) $(BMPSOURCE) $(BMPS) +--- module/kde/Makefile.orig Sun Apr 4 06:03:24 1999 ++++ module/kde/Makefile Sat May 8 01:01:42 1999 +@@ -1,4 +1,4 @@ +-INCDIR = -I$(QTDIR)/include -I../.. -I/opt/kde/include ++INCDIR = -I$(X11BASE)/include/X11/qt -I../.. -I$(PREFIX)/include + + ifdef BUILD_RELEASE + CFLAGS = -O2 -fno-strength-reduce -Wall -W -pipe -fPIC +@@ -6,7 +6,7 @@ + CFLAGS = -g -Wall -W -pipe -fPIC + endif + +-LDFLAGS = -g -shared -L$(QTDIR)/lib -L/opt/kde/lib -lqt -lkdecore -lkdeui ++LDFLAGS = -g -shared -L$(X11BASE)/lib -L$(PREFIX)/lib -lqt -lkdecore -lkdeui + CC = g++ + MOC = moc + QTARCHBIN = ../../qtarch |