Diff file for patching and building STFL 0.22 on OSX 10.5.8 PPC

gistfile1.diff

diff -crB stfl-0.22-orig/Makefile stfl-0.22/Makefile
*** stfl-0.22-orig/Makefile	2012-08-27 10:41:35.000000000 +0100
--- stfl-0.22/Makefile	2012-08-27 10:59:33.000000000 +0100
***************
*** 20,33 ****
  
  include Makefile.cfg
  
- export CC = gcc -pthread
  export CFLAGS += -I. -Wall -Os -ggdb -D_GNU_SOURCE -fPIC
! export LDLIBS += -lncursesw
  
! SONAME  := libstfl.so.0
  VERSION := 0.22
  
! all: libstfl.so.$(VERSION) libstfl.a example
  
  example: libstfl.a example.o
  
--- 20,32 ----
  
  include Makefile.cfg
  
  export CFLAGS += -I. -Wall -Os -ggdb -D_GNU_SOURCE -fPIC
! export LDLIBS += -lncurses -liconv
  
! SONAME  := libstfl.dylib
  VERSION := 0.22
  
! all: libstfl.$(VERSION).dylib libstfl.a example
  
  example: libstfl.a example.o
  
***************
*** 37,45 ****
  	ar qc $@ $^
  	ranlib $@
  
! libstfl.so.$(VERSION): public.o base.o parser.o dump.o style.o binding.o iconv.o \
                         $(patsubst %.c,%.o,$(wildcard widgets/*.c))
! 	$(CC) -shared -Wl,-soname,$(SONAME) -o $@ $(LDLIBS) $^
  
  clean:
  	rm -f libstfl.a example core core.* *.o Makefile.deps
--- 36,44 ----
  	ar qc $@ $^
  	ranlib $@
  
! libstfl.$(VERSION).dylib: public.o base.o parser.o dump.o style.o binding.o iconv.o \
                         $(patsubst %.c,%.o,$(wildcard widgets/*.c))
! 	$(CC) $(CFLAGS) $(LDLIBS) -dynamiclib -install_name,$(SONAME) -o $@ $(LDLIBS) $^
  
  clean:
  	rm -f libstfl.a example core core.* *.o Makefile.deps
***************
*** 50,60 ****
  	rm -f python/stfl_wrap.c python/stfl_wrap.o
  	rm -f ruby/Makefile ruby/stfl_wrap.c ruby/stfl_wrap.o
  	rm -f ruby/stfl.so ruby/build_ok Makefile.deps_new
! 	rm -f stfl.pc libstfl.so libstfl.so.*
  
  Makefile.deps: *.c widgets/*.c *.h
! 	$(CC) -I. -MM *.c > Makefile.deps_new
! 	$(CC) -I. -MM widgets/*.c | sed 's,^wt_[^ ]*\.o: ,widgets/&,' >> Makefile.deps_new
  	mv -f Makefile.deps_new Makefile.deps
  
  install: all stfl.pc
--- 49,59 ----
  	rm -f python/stfl_wrap.c python/stfl_wrap.o
  	rm -f ruby/Makefile ruby/stfl_wrap.c ruby/stfl_wrap.o
  	rm -f ruby/stfl.so ruby/build_ok Makefile.deps_new
! 	rm -f stfl.pc libstfl.dylib libstfl.*.dylib
  
  Makefile.deps: *.c widgets/*.c *.h
! 	$(CC) $(CFLAGS) $(LDLIBS) -MM *.c > Makefile.deps_new
! 	$(CC) $(CFLAGS) $(LDLIBS) -MM widgets/*.c | sed 's,^wt_[^ ]*\.o: ,widgets/&,' >> Makefile.deps_new
  	mv -f Makefile.deps_new Makefile.deps
  
  install: all stfl.pc
***************
*** 63,70 ****
  	install -m 644 libstfl.a $(DESTDIR)$(prefix)/$(libdir)
  	install -m 644 stfl.h $(DESTDIR)$(prefix)/include/
  	install -m 644 stfl.pc $(DESTDIR)$(prefix)/$(libdir)/pkgconfig/
! 	install -m 644 libstfl.so.$(VERSION) $(DESTDIR)$(prefix)/$(libdir)
! 	ln -fs libstfl.so.$(VERSION) $(DESTDIR)$(prefix)/$(libdir)/libstfl.so
  
  stfl.pc: stfl.pc.in
  	sed 's,@VERSION@,$(VERSION),g' < $< | sed 's,@PREFIX@,$(prefix),g' > $@
--- 62,69 ----
  	install -m 644 libstfl.a $(DESTDIR)$(prefix)/$(libdir)
  	install -m 644 stfl.h $(DESTDIR)$(prefix)/include/
  	install -m 644 stfl.pc $(DESTDIR)$(prefix)/$(libdir)/pkgconfig/
! 	install -m 644 libstfl.$(VERSION).dylib $(DESTDIR)$(prefix)/$(libdir)
! 	ln -fs libstfl.$(VERSION).dylib $(DESTDIR)$(prefix)/$(libdir)/libstfl.dylib
  
  stfl.pc: stfl.pc.in
  	sed 's,@VERSION@,$(VERSION),g' < $< | sed 's,@PREFIX@,$(prefix),g' > $@
***************
*** 73,90 ****
  include spl/Makefile.snippet
  endif
  
- ifeq ($(FOUND_SWIG)$(FOUND_PERL5),11)
- include perl5/Makefile.snippet
- endif
- 
- ifeq ($(FOUND_SWIG)$(FOUND_PYTHON),11)
- include python/Makefile.snippet
- endif
- 
- ifeq ($(FOUND_SWIG)$(FOUND_RUBY),11)
- include ruby/Makefile.snippet
- endif
- 
  .PHONY: all clean install install_spl
  
  include Makefile.deps
--- 72,77 ----
diff -crB stfl-0.22-orig/stfl_internals.h stfl-0.22/stfl_internals.h
*** stfl-0.22-orig/stfl_internals.h	2012-08-27 10:41:36.000000000 +0100
--- stfl-0.22/stfl_internals.h	2012-08-27 10:51:47.000000000 +0100
***************
*** 28,34 ****
  #endif
  
  #include "stfl.h"
! #include <ncursesw/ncurses.h>
  #include <pthread.h>
  
  struct stfl_widget_type;
--- 28,34 ----
  #endif
  
  #include "stfl.h"
! #include <ncurses.h>
  #include <pthread.h>
  
  struct stfl_widget_type;