FLTK, C++ graphical user interface toolkit for X.

4 files changed, 236 insertions, 0 deletions

diff --git a/x11/fltk/patches/patch-aa b/x11/fltk/patches/patch-aa
new file mode 100644
index 00000000000..dc76ac0fb19
--- /dev/null
+++ b/x11/fltk/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1.1.1 1999/05/06 07:23:28 sakamoto Exp $
+
+--- makeinclude.in.orig	Fri Mar 26 00:26:28 1999
++++ makeinclude.in	Mon Apr 26 13:41:23 1999
+@@ -42,7 +42,7 @@
+ CXXFLAGS	=@CXXFLAGS@ @X_CFLAGS@
+ 
+ # program to make the archive:
+-LIBNAME		=@LIBNAME@
++LIBNAME		=libfltk.la
+ LIBCOMMAND	=@LIBCOMMAND@
+ RANLIB		=@RANLIB@
+ DSONAME		=@DSONAME@
diff --git a/x11/fltk/patches/patch-ab b/x11/fltk/patches/patch-ab
new file mode 100644
index 00000000000..c9d0df64f69
--- /dev/null
+++ b/x11/fltk/patches/patch-ab
@@ -0,0 +1,93 @@
+$NetBSD: patch-ab,v 1.1.1.1 1999/05/06 07:23:28 sakamoto Exp $
+
+--- src/Makefile.orig	Tue Mar 30 02:39:28 1999
++++ src/Makefile	Mon Apr 26 13:49:20 1999
+@@ -146,30 +146,25 @@
+ 
+ include ../makeinclude
+ 
+-LIBRARY = ../lib/$(LIBNAME)
++LIBRARY = $(LIBNAME)
+ 
+-OBJECTS = $(CPPFILES:.cxx=.o) $(CFILES:.c=.o)
++OBJECTS = $(CPPFILES:.cxx=.lo) $(CFILES:.c=.lo)
+ 
+-all:	$(LIBRARY) $(DSONAME)
++all:	$(LIBRARY)
+ 
+ $(LIBRARY): $(OBJECTS)
+-	@echo $(LIBCOMMAND) $@ ...
+-	@$(LIBCOMMAND) $@ $(OBJECTS)
+-	@$(RANLIB) $@
+-
+-$(DSONAME): $(OBJECTS)
+-	@echo $(DSOCOMMAND) $@ ...
+-	@$(DSOCOMMAND) $@ $(OBJECTS)
+-
+-.SUFFIXES:	.cxx .h .o
+-
+-.cxx.o :
+-	$(CXX) -I.. $(CXXFLAGS) -c $<
+-.c.o :
+-	$(CC) -I.. $(CFLAGS) -c -o $@ $<
++	$(LIBTOOL) --mode=link $(CXX) -o $@ $(OBJECTS) \
++		-rpath $(PREFIX)/lib -version-info 1:0
++
++.SUFFIXES:	.cxx .h .lo
++
++.cxx.lo :
++	$(LIBTOOL) --mode=compile $(CXX) -I.. $(CXXFLAGS) -c $<
++.c.lo :
++	$(LIBTOOL) --mode=compile $(CC) -I.. $(CFLAGS) -c $<
+ 
+ clean :
+-	-@ rm -f *.o *.do $(DSONAME) $(LIBRARY) $(CLEAN) core *~ ../include/*~ makedepend cmap
++	-@ rm -f *.o *.do $(LIBRARY) $(CLEAN) core *~ ../include/*~ makedepend cmap
+ 	@touch makedepend
+ 
+ depend:
+@@ -178,36 +173,19 @@
+ 
+ ################################################################
+ 
+-install: $(LIBRARY) $(DSONAME)
++install: all
+ 	@echo "Installing libraries..."
+-	@-mkdir -p $(libdir)
+-	@rm -f $(libdir)/$(LIBNAME)
+-	@-cp $(LIBRARY) $(libdir)
+-	@-chmod 644 $(libdir)/$(LIBNAME)
+-	@if test "$(DSONAME)" = libfltk.so.1; then\
+-		rm -f $(libdir)/libfltk.so*;\
+-		cp libfltk.so.1 $(libdir); \
+-		chmod 755 $(libdir)/libfltk.so.1; \
+-		ln -s $(libdir)/libfltk.so.1 $(libdir)/libfltk.so;\
+-	fi
+-	@if test "$(DSONAME)" = libfltk.sl.1; then\
+-		rm -f $(libdir)/libfltk.sl*;\
+-		cp libfltk.sl.1 $(libdir); \
+-		chmod 755 $(libdir)/libfltk.sl.1; \
+-		ln -s $(libdir)/libfltk.sl.1 $(libdir)/libfltk.sl;\
+-	fi
++	$(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) $(LIBNAME) $(libdir)
+ 	@echo "Installing include files..."
+-	@-mkdir -p $(includedir)
+-	@rm -rf $(includedir)/FL $(includedir)/Fl
+-	@-cp -r ../FL $(includedir)
+-	@-chmod 755 $(includedir)/FL
+-	@-chmod 644 $(includedir)/FL/*
+-	@for file in $(includedir)/FL/*.H; do\
++	$(BSD_INSTALL_DATA_DIR) $(includedir)/FL
++	$(BSD_INSTALL_DATA) ../FL/* $(includedir)/FL
++	@(cd $(includedir)/FL; \
++	  for file in *.H; do\
+ 		newfile="`basename $$file H`h";\
+-		ln -s $$file $(includedir)/FL/$$newfile;\
+-	done
++		ln -s $$file $$newfile;\
++	  done)
+ 	@-ln -s FL $(includedir)/Fl
+ 
+ #
+ # End of "$Id: patch-ab,v 1.1.1.1 1999/05/06 07:23:28 sakamoto Exp $".
+ #
diff --git a/x11/fltk/patches/patch-ac b/x11/fltk/patches/patch-ac
new file mode 100644
index 00000000000..9e614bebb8d
--- /dev/null
+++ b/x11/fltk/patches/patch-ac
@@ -0,0 +1,48 @@
+$NetBSD: patch-ac,v 1.1.1.1 1999/05/06 07:23:28 sakamoto Exp $
+
+--- fluid/Makefile.orig	Mon Apr 19 23:01:23 1999
++++ fluid/Makefile	Mon Apr 26 13:52:02 1999
+@@ -45,21 +45,20 @@
+ 
+ ################################################################
+ 
+-OBJECTS = $(CPPFILES:.cxx=.o)
++OBJECTS = $(CPPFILES:.cxx=.lo)
+ 
+ include ../makeinclude
+ 
+-.SUFFIXES : .cxx .c .o
++.SUFFIXES : .cxx .c .lo
+ 
+-.cxx.o :
+-	$(CXX) -I.. $(CXXFLAGS) -c $<
+-.c.o :
+-	$(CC) -I.. $(CFLAGS) -c $<
+-.cxx :
+-	$(CXX) -I.. $(CXXFLAGS) -o $@ $< -L../lib -lfltk $(LDLIBS)
+-
+-$(PROGRAM) : $(OBJECTS) ../lib/$(LIBNAME)
+-	$(CXX) $(CXXFLAGS) -o $(PROGRAM) $(OBJECTS) -L../lib -lfltk $(LDLIBS)
++.cxx.lo :
++	$(LIBTOOL) --mode=compile $(CXX) -I.. $(CXXFLAGS) -c $<
++.c.lo :
++	$(LIBTOOL) --mode=compile $(CC) -I.. $(CFLAGS) -c $<
++
++$(PROGRAM) : $(OBJECTS) ../src/$(LIBNAME)
++	$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) \
++		../src/$(LIBNAME) $(LDLIBS)
+ 
+ clean :
+ 	-@ rm -f *.o $(PROGRAM) $(CLEAN) core *~ makedepend
+@@ -71,10 +70,7 @@
+ 
+ install: $(PROGRAM)
+ 	@echo "Installing FLUID..."
+-	@strip $(PROGRAM)
+-	@-mkdir -p $(bindir)
+-	@cp $(PROGRAM) $(bindir)/$(PROGRAM)
+-	@chmod 755 $(bindir)/$(PROGRAM)
++	$(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) $(PROGRAM) $(bindir)
+ 
+ uninstall:
+ 	-@ rm -f $(bindir)/$(PROGRAM)
diff --git a/x11/fltk/patches/patch-ad b/x11/fltk/patches/patch-ad
new file mode 100644
index 00000000000..ec56d4b2f73
--- /dev/null
+++ b/x11/fltk/patches/patch-ad
@@ -0,0 +1,82 @@
+$NetBSD: patch-ad,v 1.1.1.1 1999/05/06 07:23:28 sakamoto Exp $
+
+--- test/Makefile.orig	Fri Mar 26 00:26:43 1999
++++ test/Makefile	Mon Apr 26 13:52:17 1999
+@@ -48,53 +48,55 @@
+ 
+ include ../makeinclude
+ 
+-$(ALL):  ../lib/$(LIBNAME)
++CXX_:=	$(LIBTOOL) --mode=link $(CXX)
++LDLIBS:= ../src/$(LIBNAME) $(LDLIBS)
++GLDLIBS:= ../src/$(LIBNAME) $(GLDLIBS)
+ 
+-.SUFFIXES: .cxx .c .o .fl .h
++$(ALL):  ../src/$(LIBNAME)
+ 
+-.cxx:
+-	$(CXX) -I.. $(CXXFLAGS) $< -L../lib -lfltk $(LDLIBS) -o $@
++.SUFFIXES: .cxx .c .lo .fl .h
+ 
+-.cxx.o:
+-	$(CXX) -I.. $(CXXFLAGS) $< -c
++.cxx.lo:
++	$(LIBTOOL) --mode=compile $(CXX) -I.. $(CXXFLAGS) -c $<
+ 
+ .fl.cxx .fl.h:
+ 	../fluid/fluid -c $<
+ 
+ .fl:
+ 	../fluid/fluid -c $<
+-	$(CXX) -I.. $(CXXFLAGS) $@.cxx -L../lib -lfltk $(LDLIBS) -o $@
++	$(LIBTOOL) --mode=link $(CXX) -I.. $(CXXFLAGS) $@.cxx \
++		$(LIB_) $(LDLIBS) -o $@
+ 
+ # Other programs needing special "help"...
+-CubeView: CubeMain.o CubeView.o CubeViewUI.o
+-	$(CXX) -I.. $(CXXFLAGS) CubeMain.o CubeView.o CubeViewUI.o \
+-		-L../lib -lfltk $(GLDLIBS) -o $@
+-CubeMain.o: CubeViewUI.h CubeView.h
+-CubeView.o: CubeView.h
++CubeView: CubeMain.lo CubeView.lo CubeViewUI.lo
++	$(CXX_) -I.. $(CXXFLAGS) CubeMain.lo CubeView.lo CubeViewUI.lo \
++		$(GLDLIBS) -o $@
++CubeMain.lo: CubeViewUI.h CubeView.h
++CubeView.lo: CubeView.h
+ 
+ cube: cube.cxx
+-	$(CXX) -I.. $(CXXFLAGS) cube.cxx -L../lib -lfltk $(GLDLIBS) -o $@
++	$(CXX_) -I.. $(CXXFLAGS) cube.cxx $(GLDLIBS) -o $@
+ fractals: fractals.cxx
+-	$(CXX) -I.. $(CXXFLAGS) fractals.cxx -L../lib -lfltk $(GLDLIBS) -o $@
++	$(CXX_) -I.. $(CXXFLAGS) fractals.cxx $(GLDLIBS) -o $@
+ fullscreen: fullscreen.cxx
+-	$(CXX) -I.. $(CXXFLAGS) fullscreen.cxx -L../lib -lfltk $(GLDLIBS) -o $@
++	$(CXX_) -I.. $(CXXFLAGS) fullscreen.cxx $(GLDLIBS) -o $@
+ glpuzzle: glpuzzle.cxx
+-	$(CXX) -I.. $(CXXFLAGS) glpuzzle.cxx -L../lib -lfltk $(GLDLIBS) -o $@
++	$(CXX_) -I.. $(CXXFLAGS) glpuzzle.cxx $(GLDLIBS) -o $@
+ gl_overlay: gl_overlay.cxx
+-	$(CXX) -I.. $(CXXFLAGS) gl_overlay.cxx -L../lib -lfltk $(GLDLIBS) -o $@
++	$(CXX_) -I.. $(CXXFLAGS) gl_overlay.cxx $(GLDLIBS) -o $@
+ shiny: shiny.cxx shiny_panel.cxx
+-	$(CXX) -I.. $(CXXFLAGS) shiny.cxx -L../lib -lfltk $(GLDLIBS) -o $@
++	$(CXX_) -I.. $(CXXFLAGS) shiny.cxx $(GLDLIBS) -o $@
+ keyboard: keyboard.cxx keyboard_ui.cxx
+-	$(CXX) -I.. $(CXXFLAGS) keyboard.cxx -L../lib -lfltk $(LDLIBS) -o $@
++	$(CXX_) -I.. $(CXXFLAGS) keyboard.cxx $(LDLIBS) -o $@
+ mandelbrot: mandelbrot.cxx mandelbrot_ui.cxx
+-	$(CXX) -I.. $(CXXFLAGS) mandelbrot.cxx -L../lib -lfltk $(LDLIBS) -o $@
++	$(CXX_) -I.. $(CXXFLAGS) mandelbrot.cxx $(LDLIBS) -o $@
+ shape: shape.cxx
+-	$(CXX) -I.. $(CXXFLAGS) shape.cxx -L../lib -lfltk $(GLDLIBS) -o $@
++	$(CXX_) -I.. $(CXXFLAGS) shape.cxx $(GLDLIBS) -o $@
+ 
+ # If you have libjpeg installed, you might want to try this test program:
+ 
+ jpeg_image: jpeg_image.cxx
+-	$(CXX) -I.. $(CXXFLAGS) -I../../../local/jpeg-6b -L../../../local/jpeg-6b jpeg_image.cxx -L../lib -lfltk $(LDLIBS) -ljpeg -lXext -o $@
++	$(CXX_) -I.. $(CXXFLAGS) -I../../../local/jpeg-6b -L../../../local/jpeg-6b jpeg_image.cxx $(LDLIBS) -ljpeg -lXext -o $@
+ 
+ depend:
+ 	$(MAKEDEPEND) -I.. $(CXXFLAGS) $(CPPFILES) > makedepend