diff options
author | Trevor Johnson <trevor@FreeBSD.org> | 2001-03-05 22:37:30 +0000 |
---|---|---|
committer | Trevor Johnson <trevor@FreeBSD.org> | 2001-03-05 22:37:30 +0000 |
commit | 024647601aa605bbad87331eaf46e4fa9bc04dc7 (patch) | |
tree | 6b369e61804a82f20e2c6d16c3e7fbc467a0305c /audio/xwave | |
parent | a88e468b8c3c447c84f37344e5b65b676dd643d8 (diff) | |
download | ports-024647601aa605bbad87331eaf46e4fa9bc04dc7.tar.gz ports-024647601aa605bbad87331eaf46e4fa9bc04dc7.zip |
Notes
Diffstat (limited to 'audio/xwave')
-rw-r--r-- | audio/xwave/files/patch-aa | 34 | ||||
-rw-r--r-- | audio/xwave/files/patch-ap | 41 |
2 files changed, 68 insertions, 7 deletions
diff --git a/audio/xwave/files/patch-aa b/audio/xwave/files/patch-aa index 9743c8cbb01e..88a801c071c2 100644 --- a/audio/xwave/files/patch-aa +++ b/audio/xwave/files/patch-aa @@ -1,10 +1,36 @@ ---- src/Imakefile.orig Mon Nov 9 08:22:55 1998 -+++ src/Imakefile Fri Jun 30 20:10:38 2000 -@@ -14,7 +14,7 @@ + If /usr/X11R6/lib/libfwf.a exists on the system, (e.g. as a consequence + of building the port /usr/ports/x11-toolkits/FWF before), xwave + links this file instead of its own (older) libfwf.a. + + In src/Imakefile the line + + XLIBS= -L../lib -lfwf -lXaw -lXpm -lXmu -lXt -lX11 + + cannot guarantee, that libfwf.a is taken from ../lib, because imake + includes -L/usr/X11R6/lib _BEFORE_ -L../lib. + + I am not experienced in compiler options, but replacing the above line + by + + XLIBS= ../lib/libfwf.a -lXaw -lXpm -lXmu -lXt -lX11 + + does the job. + +--- src/Imakefile.orig Mon Nov 9 00:22:55 1998 ++++ src/Imakefile Mon Jan 1 12:49:37 2001 +@@ -13,8 +13,14 @@ + PROGRAMS= xwave AUDIOLIBS=-L../ccitt -lccitt -L../adpcm2pcm -ladpcm -L../ieee -lieee - XLIBS= -L../lib -lfwf -lXaw -lXpm -lXmu -lXt -lX11 +-XLIBS= -L../lib -lfwf -lXaw -lXpm -lXmu -lXt -lX11 -LIBS= $(OSLIBS) $(XLIBS) $(AUDIOLIBS) -lm -lc ++ ++# XLIBS= -L../lib -lfwf -lXaw -lXpm -lXmu -lXt -lX11 ++# "-L../lib -lfwf" substituted by "../lib/libfwf.a" because Linker ++# used /usr/X11R6/lib/libfwf.a on systems, where this file exists. ++# 2001-01-01 Martin Kraft ++ ++XLIBS= ../lib/libfwf.a -lXaw -lXpm -lXmu -lXt -lX11 +LIBS= $(OSLIBS) $(XLIBS) $(AUDIOLIBS) -lm NormalProgramTarget(xwave,$(OBJS),,$(LIBS),) diff --git a/audio/xwave/files/patch-ap b/audio/xwave/files/patch-ap index b6fc646a8d0d..7876d1053ba3 100644 --- a/audio/xwave/files/patch-ap +++ b/audio/xwave/files/patch-ap @@ -1,6 +1,21 @@ ---- FWF/Imakefile.orig Mon Nov 9 08:22:54 1998 -+++ FWF/Imakefile Fri Jun 30 19:53:17 2000 -@@ -9,6 +9,7 @@ + The second (and more serious) problem arises during the build of + xwave's own libfwf.a. Randomly, at least one of the OBJS is not + 'ar'ed into libfwf. Is this a problem of the parallelized make? + You can not repeat exactly the error; the next time, another of + FWF's OBJS might be missing in libfwf.a. + + Maybe there is a problem related to the change in FWF/FWF.rules + in VERSION 3.65 (see FWF/README.NOTES: "Hacked FWF.rules to + make AddToLibrary try to build library only if objects are + newer than library."). + + Since I am not at all a compiler and linker specialist, I propose, + to do a final 'ar' of all OBJS after all of them are build. This + can be done by adding an auxiliary target in FWF/Imakefile. + +--- FWF/Imakefile.orig Mon Nov 9 00:22:54 1998 ++++ FWF/Imakefile Mon Jan 1 15:47:50 2001 +@@ -9,14 +9,25 @@ MakeDirectories(all,$(ALLDIRS)) InitSubdirs($(SUBDIRS)) @@ -8,3 +23,23 @@ MakeObjectsSubdirs($(SUBDIRS)) MakeExecsSubdirs($(SUBDIRS)) GatherDescriptionSubdirs($(SUBDIRS)) + ++MAINOBJS = src/Board/Board.o src/Button/Button.o src/Common/Common.o src/Frame/Frame.o src/Group/Group.o src/Label/Label.o src/RadioGroup/RadioGrp.o src/RowCol/RowCol.o src/Toggle/Toggle.o ++MISCOBJS = src/misc/VarArgs.o ++CONVOBJS = src/converters/long.o src/converters/icon.o src/converters/choosecol.o src/converters/StrToPmap.o src/converters/Pen.o src/converters/strarray.o ++STRGOBJS = src/tabstring/DrawImageString.o src/tabstring/DrawString.o src/tabstring/Tablist2Tabs.o src/tabstring/TextWidth.o src/tabstring/strnchr.o ++ ++$(FWF_LIBDIR)/auxtarget: $(MAINOBJS) $(MISCOBJS) $(CONVOBJS) $(STRGOBJS) ++ ar -r $(FWF_LIBDIR)/$(FWF_LIBNAME) $(MAINOBJS) $(MISCOBJS) $(CONVOBJS) $(STRGOBJS) ++ ranlib $(FWF_LIBDIR)/$(FWF_LIBNAME) ++ echo "lib complete." > $(FWF_LIBDIR)/auxtarget ++ + #ifdef BuildExecs +-AllTarget(init objects execs $(FWF_MANDIR)/fwf.man) ++AllTarget(init objects execs $(FWF_LIBDIR)/auxtarget $(FWF_MANDIR)/fwf.man) + #else +-AllTarget(init objects $(FWF_MANDIR)/fwf.man) ++AllTarget(init objects $(FWF_LIBDIR)/auxtarget $(FWF_MANDIR)/fwf.man) + #endif + + ConstructIndex(init) |