summaryrefslogtreecommitdiff
path: root/x11/fltk/patches
diff options
context:
space:
mode:
Diffstat (limited to 'x11/fltk/patches')
-rw-r--r--x11/fltk/patches/patch-aa50
-rw-r--r--x11/fltk/patches/patch-ab102
-rw-r--r--x11/fltk/patches/patch-ac100
-rw-r--r--x11/fltk/patches/patch-ad72
4 files changed, 146 insertions, 178 deletions
diff --git a/x11/fltk/patches/patch-aa b/x11/fltk/patches/patch-aa
index dc76ac0fb19..940190d43fa 100644
--- a/x11/fltk/patches/patch-aa
+++ b/x11/fltk/patches/patch-aa
@@ -1,13 +1,39 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/05/06 07:23:28 sakamoto Exp $
+$NetBSD: patch-aa,v 1.2 1999/10/31 03:00:36 jlam 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@
+--- fluid/Makefile.orig Wed Aug 25 01:37:38 1999
++++ fluid/Makefile Sat Oct 30 00:59:51 1999
+@@ -49,17 +49,17 @@
+
+ include ../makeinclude
+
++LIB_TO_LINK = ../src/$(LIBNAME)
++
+ .SUFFIXES : .cxx .c .o
+
+ .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) $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) -L../lib -lfltk $(LDLIBS)
++$(PROGRAM) : $(OBJECTS) $(LIB_TO_LINK)
++ $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) $(LIB_TO_LINK) $(LDLIBS) $(GLDLIBS)
+
+ clean :
+ -@ rm -f *.o $(PROGRAM) $(CLEAN) core *~ makedepend
+@@ -71,10 +71,8 @@
+
+ install: $(PROGRAM)
+ @echo "Installing FLUID..."
+- @strip $(PROGRAM)
+- @-mkdir -p $(bindir)
+- @cp $(PROGRAM) $(bindir)/$(PROGRAM)
+- @chmod 755 $(bindir)/$(PROGRAM)
++ $(BSD_INSTALL_PROGRAM_DIR) $(bindir)
++ $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) $(PROGRAM) $(bindir)
+
+ uninstall:
+ -@ rm -f $(bindir)/$(PROGRAM)
diff --git a/x11/fltk/patches/patch-ab b/x11/fltk/patches/patch-ab
index 19901f45061..3630b022d40 100644
--- a/x11/fltk/patches/patch-ab
+++ b/x11/fltk/patches/patch-ab
@@ -1,91 +1,13 @@
-$NetBSD: patch-ab,v 1.2 1999/06/10 01:15:47 nathanw Exp $
+$NetBSD: patch-ab,v 1.3 1999/10/31 03:00:36 jlam Exp $
---- src/Makefile.orig Mon Apr 26 08:36:17 1999
-+++ src/Makefile Sun Jun 6 17:31:02 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) $@
--
--libfltk.so.1 libfltk.sl.1: $(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,34 +173,17 @@
-
- ################################################################
-
--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
-
- #
+--- makeinclude.in.orig Thu Mar 25 10:26:28 1999
++++ makeinclude.in Sat Oct 30 00:30:16 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-ac b/x11/fltk/patches/patch-ac
index 9e614bebb8d..db3febd7032 100644
--- a/x11/fltk/patches/patch-ac
+++ b/x11/fltk/patches/patch-ac
@@ -1,48 +1,74 @@
-$NetBSD: patch-ac,v 1.1.1.1 1999/05/06 07:23:28 sakamoto Exp $
+$NetBSD: patch-ac,v 1.2 1999/10/31 03:00:36 jlam Exp $
---- fluid/Makefile.orig Mon Apr 19 23:01:23 1999
-+++ fluid/Makefile Mon Apr 26 13:52:02 1999
-@@ -45,21 +45,20 @@
+--- src/Makefile.orig Mon Apr 26 08:36:17 1999
++++ src/Makefile Sat Oct 30 00:30:16 1999
+@@ -146,30 +146,24 @@
- ################################################################
+ include ../makeinclude
--OBJECTS = $(CPPFILES:.cxx=.o)
-+OBJECTS = $(CPPFILES:.cxx=.lo)
+-LIBRARY = ../lib/$(LIBNAME)
++LIBRARY = $(LIBNAME)
- include ../makeinclude
+ OBJECTS = $(CPPFILES:.cxx=.o) $(CFILES:.c=.o)
--.SUFFIXES : .cxx .c .o
-+.SUFFIXES : .cxx .c .lo
+-all: $(LIBRARY) $(DSONAME)
++all: $(LIBRARY)
--.cxx.o :
-- $(CXX) -I.. $(CXXFLAGS) -c $<
--.c.o :
-- $(CC) -I.. $(CFLAGS) -c $<
--.cxx :
-- $(CXX) -I.. $(CXXFLAGS) -o $@ $< -L../lib -lfltk $(LDLIBS)
+ $(LIBRARY): $(OBJECTS)
+- @echo $(LIBCOMMAND) $@ ...
+- @$(LIBCOMMAND) $@ $(OBJECTS)
+- @$(RANLIB) $@
-
--$(PROGRAM) : $(OBJECTS) ../lib/$(LIBNAME)
-- $(CXX) $(CXXFLAGS) -o $(PROGRAM) $(OBJECTS) -L../lib -lfltk $(LDLIBS)
-+.cxx.lo :
+-libfltk.so.1 libfltk.sl.1: $(OBJECTS)
+- @echo $(DSOCOMMAND) $@ ...
+- @$(DSOCOMMAND) $@ $(OBJECTS)
++ $(LIBTOOL) --cplusplus --mode=link $(CXX) -o $@ $(OBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info $(FLTK_MAJOR):$(FLTK_MINOR)
+
+ .SUFFIXES: .cxx .h .o
+
+ .cxx.o :
+- $(CXX) -I.. $(CXXFLAGS) -c $<
+ $(LIBTOOL) --mode=compile $(CXX) -I.. $(CXXFLAGS) -c $<
-+.c.lo :
+ .c.o :
+- $(CC) -I.. $(CFLAGS) -c -o $@ $<
+ $(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)
+- -@ rm -f *.o *.do $(DSONAME) $(LIBRARY) $(CLEAN) core *~ ../include/*~ makedepend cmap
++ -@ rm -f *.o *.do $(LIBRARY) $(CLEAN) core *~ ../include/*~ makedepend cmap
+ @touch makedepend
+
+ depend:
+@@ -180,28 +174,11 @@
+
+ install: $(LIBRARY) $(DSONAME)
+ @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
++ $(BSD_INSTALL_DATA_DIR) $(libdir)
++ $(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/*
++ $(BSD_INSTALL_DATA_DIR) $(includedir)/FL
++ $(BSD_INSTALL_DATA) ../FL/* $(includedir)/FL
+ @for file in $(includedir)/FL/*.H; do\
+ newfile="`basename $$file H`h";\
+ ln -s $$file $(includedir)/FL/$$newfile;\
diff --git a/x11/fltk/patches/patch-ad b/x11/fltk/patches/patch-ad
index ec56d4b2f73..c3fe99b24cc 100644
--- a/x11/fltk/patches/patch-ad
+++ b/x11/fltk/patches/patch-ad
@@ -1,82 +1,76 @@
-$NetBSD: patch-ad,v 1.1.1.1 1999/05/06 07:23:28 sakamoto Exp $
+$NetBSD: patch-ad,v 1.2 1999/10/31 03:00:37 jlam Exp $
---- test/Makefile.orig Fri Mar 26 00:26:43 1999
-+++ test/Makefile Mon Apr 26 13:52:17 1999
-@@ -48,53 +48,55 @@
+--- test/Makefile.orig Thu Mar 25 10:26:43 1999
++++ test/Makefile Sat Oct 30 00:58:02 1999
+@@ -48,12 +48,14 @@
include ../makeinclude
-$(ALL): ../lib/$(LIBNAME)
-+CXX_:= $(LIBTOOL) --mode=link $(CXX)
-+LDLIBS:= ../src/$(LIBNAME) $(LDLIBS)
-+GLDLIBS:= ../src/$(LIBNAME) $(GLDLIBS)
++LIB_TO_LINK = ../src/$(LIBNAME)
++
++$(ALL): $(LIB_TO_LINK)
--.SUFFIXES: .cxx .c .o .fl .h
-+$(ALL): ../src/$(LIBNAME)
+ .SUFFIXES: .cxx .c .o .fl .h
--.cxx:
+ .cxx:
- $(CXX) -I.. $(CXXFLAGS) $< -L../lib -lfltk $(LDLIBS) -o $@
-+.SUFFIXES: .cxx .c .lo .fl .h
++ $(LIBTOOL) --mode=link $(CXX) -I.. $(CXXFLAGS) $< $(LIB_TO_LINK) $(LDLIBS) $(GLDLIBS) -o $@
--.cxx.o:
-- $(CXX) -I.. $(CXXFLAGS) $< -c
-+.cxx.lo:
-+ $(LIBTOOL) --mode=compile $(CXX) -I.. $(CXXFLAGS) -c $<
-
- .fl.cxx .fl.h:
- ../fluid/fluid -c $<
+ .cxx.o:
+ $(CXX) -I.. $(CXXFLAGS) $< -c
+@@ -63,41 +65,40 @@
.fl:
../fluid/fluid -c $<
- $(CXX) -I.. $(CXXFLAGS) $@.cxx -L../lib -lfltk $(LDLIBS) -o $@
-+ $(LIBTOOL) --mode=link $(CXX) -I.. $(CXXFLAGS) $@.cxx \
-+ $(LIB_) $(LDLIBS) -o $@
++ $(LIBTOOL) --mode=link $(CXX) -I.. $(CXXFLAGS) $@.cxx $(LIB_TO_LINK) $(LDLIBS) $(GLDLIBS) -o $@
# Other programs needing special "help"...
--CubeView: CubeMain.o CubeView.o CubeViewUI.o
+ 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
++ $(LIBTOOL) --mode=link $(CXX) -I.. $(CXXFLAGS) CubeMain.o CubeView.o CubeViewUI.o $(LIB_TO_LINK) $(GLDLIBS) -o $@
+ CubeMain.o: CubeViewUI.h CubeView.h
+ CubeView.o: CubeView.h
cube: cube.cxx
- $(CXX) -I.. $(CXXFLAGS) cube.cxx -L../lib -lfltk $(GLDLIBS) -o $@
-+ $(CXX_) -I.. $(CXXFLAGS) cube.cxx $(GLDLIBS) -o $@
++ $(LIBTOOL) --mode=link $(CXX) -I.. $(CXXFLAGS) cube.cxx $(LIB_TO_LINK) $(GLDLIBS) -o $@
fractals: fractals.cxx
- $(CXX) -I.. $(CXXFLAGS) fractals.cxx -L../lib -lfltk $(GLDLIBS) -o $@
-+ $(CXX_) -I.. $(CXXFLAGS) fractals.cxx $(GLDLIBS) -o $@
++ $(LIBTOOL) --mode=link $(CXX) -I.. $(CXXFLAGS) fractals.cxx $(LIB_TO_LINK) $(GLDLIBS) -o $@
fullscreen: fullscreen.cxx
- $(CXX) -I.. $(CXXFLAGS) fullscreen.cxx -L../lib -lfltk $(GLDLIBS) -o $@
-+ $(CXX_) -I.. $(CXXFLAGS) fullscreen.cxx $(GLDLIBS) -o $@
++ $(LIBTOOL) --mode=link $(CXX) -I.. $(CXXFLAGS) fullscreen.cxx $(LIB_TO_LINK) $(GLDLIBS) -o $@
glpuzzle: glpuzzle.cxx
- $(CXX) -I.. $(CXXFLAGS) glpuzzle.cxx -L../lib -lfltk $(GLDLIBS) -o $@
-+ $(CXX_) -I.. $(CXXFLAGS) glpuzzle.cxx $(GLDLIBS) -o $@
++ $(LIBTOOL) --mode=link $(CXX) -I.. $(CXXFLAGS) glpuzzle.cxx $(LIB_TO_LINK) $(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 $@
++ $(LIBTOOL) --mode=link $(CXX) -I.. $(CXXFLAGS) gl_overlay.cxx $(LIB_TO_LINK) $(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 $@
++ $(LIBTOOL) --mode=link $(CXX) -I.. $(CXXFLAGS) shiny.cxx $(LIB_TO_LINK) $(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 $@
++ $(LIBTOOL) --mode=link $(CXX) -I.. $(CXXFLAGS) keyboard.cxx $(LIB_TO_LINK) $(LDLIBS) $(GLDLIBS) -o $@
mandelbrot: mandelbrot.cxx mandelbrot_ui.cxx
- $(CXX) -I.. $(CXXFLAGS) mandelbrot.cxx -L../lib -lfltk $(LDLIBS) -o $@
-+ $(CXX_) -I.. $(CXXFLAGS) mandelbrot.cxx $(LDLIBS) -o $@
++ $(LIBTOOL) --mode=link $(CXX) -I.. $(CXXFLAGS) mandelbrot.cxx $(LIB_TO_LINK) $(LDLIBS) $(GLDLIBS) -o $@
shape: shape.cxx
- $(CXX) -I.. $(CXXFLAGS) shape.cxx -L../lib -lfltk $(GLDLIBS) -o $@
-+ $(CXX_) -I.. $(CXXFLAGS) shape.cxx $(GLDLIBS) -o $@
++ $(LIBTOOL) --mode=link $(CXX) -I.. $(CXXFLAGS) shape.cxx $(LIB_TO_LINK) $(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 $@
++ $(LIBTOOL) --mode=link $(CXX) -I.. $(CXXFLAGS) -I../../../local/jpeg-6b -L../../../local/jpeg-6b jpeg_image.cxx $(LIB_TO_LINK) $(LDLIBS) -ljpeg -lXext -o $@
depend:
- $(MAKEDEPEND) -I.. $(CXXFLAGS) $(CPPFILES) > makedepend
+- $(MAKEDEPEND) -I.. $(CXXFLAGS) $(CPPFILES) > makedepend
++ $(LIBTOOL) --mode=link $(MAKEDEPEND) -I.. $(CXXFLAGS) $(CPPFILES) > makedepend
+
+ clean:
+ -@ rm -f $(ALL) jpeg_image *.o core *~
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-08 03:19:39 +0000