diff options
Diffstat (limited to 'x11/fltk')
| -rw-r--r-- | x11/fltk/Makefile | 24 | ||||
| -rw-r--r-- | x11/fltk/files/md5 | 4 | ||||
| -rw-r--r-- | x11/fltk/files/patch-sum | 10 | ||||
| -rw-r--r-- | x11/fltk/patches/patch-aa | 45 | ||||
| -rw-r--r-- | x11/fltk/patches/patch-ab | 51 | ||||
| -rw-r--r-- | x11/fltk/patches/patch-ac | 103 | ||||
| -rw-r--r-- | x11/fltk/patches/patch-ad | 98 | ||||
| -rw-r--r-- | x11/fltk/pkg/PLIST | 273 |
8 files changed, 302 insertions, 306 deletions
diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile index 9b60e1b9ea2..b02f955350f 100644 --- a/x11/fltk/Makefile +++ b/x11/fltk/Makefile @@ -1,12 +1,13 @@ -# $NetBSD: Makefile,v 1.6 2000/06/01 11:23:44 rh Exp $ +# $NetBSD: Makefile,v 1.7 2000/08/04 03:38:12 jlam Exp $ # -DISTNAME= fltk-1.0.7-source +DISTNAME= fltk-1.0.9-source PKGNAME= ${DISTNAME:S/-source//} VERS= ${PKGNAME:S/fltk-//} WRKSRC= ${WRKDIR}/${PKGNAME} CATEGORIES= x11 -MASTER_SITES= ftp://ftp.fltk.org/pub/fltk/${VERS}/ \ +MASTER_SITES= http://download.sourceforge.net/FLTK/ \ + ftp://ftp.fltk.org/pub/fltk/${VERS}/ \ ftp://ftp2.easysw.com/pub/fltk/${VERS}/ \ ftp://ftp.northamerica.net/pub/ESP/fltk/${VERS}/ \ ftp://ftp.funet.fi/mirrors/ftp.easysw.com/pub/fltk/${VERS}/ \ @@ -18,23 +19,26 @@ HOMEPAGE= http://www.fltk.org/ DEPENDS+= Mesa-*:../../graphics/Mesa -USE_X11BASE= yes -USE_GMAKE= yes -USE_PKGLIBTOOL= yes -GNU_CONFIGURE= yes +USE_X11BASE= # defined +USE_GMAKE= # defined +USE_LIBTOOL= # defined + +GNU_CONFIGURE= # defined +CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" +CPPFLAGS+= -I${X11PREFIX}/include # GL/GL.h # When the API changes and breaks binary-compatibility with the previous # version, increment the MAJOR by 1 and reset the MINOR to 0. Otherwise, # bump the MINOR when a new version comes out. # FLTK_MAJOR= 1 -FLTK_MINOR= 2 +FLTK_MINOR= 3 MAKE_ENV+= FLTK_MAJOR="${FLTK_MAJOR}" FLTK_MINOR="${FLTK_MINOR}" -DOCDIR= ${PREFIX}/share/doc/fltk +DOCDIR= ${PREFIX}/share/doc/html/fltk post-install: ${INSTALL_DATA_DIR} ${DOCDIR} - ${INSTALL_DATA} ${WRKSRC}/documentation/* ${DOCDIR} + cd ${WRKSRC}/documentation; ${INSTALL_DATA} *.html *.gif *.jpg ${DOCDIR} .include "../../mk/bsd.pkg.mk" diff --git a/x11/fltk/files/md5 b/x11/fltk/files/md5 index 1f5cdb04342..e75e630151c 100644 --- a/x11/fltk/files/md5 +++ b/x11/fltk/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.4 2000/01/27 19:14:25 jlam Exp $ +$NetBSD: md5,v 1.5 2000/08/04 03:38:15 jlam Exp $ -MD5 (fltk-1.0.7-source.tar.bz2) = 7fc6d2a02f4619a217b9a76afa2384ad +MD5 (fltk-1.0.9-source.tar.bz2) = 139c134098128754f706b4f3a905cbc5 diff --git a/x11/fltk/files/patch-sum b/x11/fltk/files/patch-sum index f7494714480..b9742bce089 100644 --- a/x11/fltk/files/patch-sum +++ b/x11/fltk/files/patch-sum @@ -1,6 +1,6 @@ -$NetBSD: patch-sum,v 1.2 1999/10/31 03:00:36 jlam Exp $ +$NetBSD: patch-sum,v 1.3 2000/08/04 03:38:15 jlam Exp $ -MD5 (patch-aa) = df882abfbbb82ab40fe05f0852e99025 -MD5 (patch-ab) = e5f58e1d6fd9080b1b028ed4acdb8ee4 -MD5 (patch-ac) = 0943c938b4cc6337c0ce54b92e6a7dc2 -MD5 (patch-ad) = 208adf509fcb151640fc089fba6249e9 +MD5 (patch-aa) = 689c196aa6afea369932f70001d0ee4d +MD5 (patch-ab) = 7adc66d24b14b9ccf36715358f991933 +MD5 (patch-ac) = efb0565495b3f17ecd4ef385ba9036cd +MD5 (patch-ad) = a3f99697142bd91bfe444e342ef182e8 diff --git a/x11/fltk/patches/patch-aa b/x11/fltk/patches/patch-aa index 940190d43fa..df5c3f0e37d 100644 --- a/x11/fltk/patches/patch-aa +++ b/x11/fltk/patches/patch-aa @@ -1,39 +1,26 @@ -$NetBSD: patch-aa,v 1.2 1999/10/31 03:00:36 jlam Exp $ +$NetBSD: patch-aa,v 1.3 2000/08/04 03:38:15 jlam Exp $ ---- fluid/Makefile.orig Wed Aug 25 01:37:38 1999 -+++ fluid/Makefile Sat Oct 30 00:59:51 1999 -@@ -49,17 +49,17 @@ +--- fluid/Makefile.orig Mon Jun 5 17:20:41 2000 ++++ fluid/Makefile Thu Aug 3 23:13:08 2000 +@@ -51,7 +51,7 @@ - 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) + $(PROGRAM) : $(OBJECTS) ../lib/$(LIBNAME) + echo Linking $@... +- $(CXX) -L../lib $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) -lfltk $(LDLIBS) ++ $(CXX) -L../lib $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) $(FLTKLIB) $(LDLIBS) clean : -@ rm -f *.o $(PROGRAM) $(CLEAN) core *~ makedepend -@@ -71,10 +71,8 @@ +@@ -63,10 +63,8 @@ install: $(PROGRAM) - @echo "Installing FLUID..." -- @strip $(PROGRAM) -- @-mkdir -p $(bindir) -- @cp $(PROGRAM) $(bindir)/$(PROGRAM) -- @chmod 755 $(bindir)/$(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) ++ $(LIBTOOL) $(BSD_INSTALL_PROGRAM) $(PROGRAM) $(bindir) uninstall: - -@ rm -f $(bindir)/$(PROGRAM) + -rm -f $(bindir)/$(PROGRAM) diff --git a/x11/fltk/patches/patch-ab b/x11/fltk/patches/patch-ab index 3630b022d40..509c8c89aaf 100644 --- a/x11/fltk/patches/patch-ab +++ b/x11/fltk/patches/patch-ab @@ -1,13 +1,48 @@ -$NetBSD: patch-ab,v 1.3 1999/10/31 03:00:36 jlam Exp $ +$NetBSD: patch-ab,v 1.4 2000/08/04 03:38:15 jlam Exp $ ---- 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@ +--- makeinclude.in.orig Mon Jun 5 17:20:17 2000 ++++ makeinclude.in Thu Aug 3 23:13:46 2000 +@@ -34,14 +34,15 @@ + + # compiler names: +-CXX =@CXX@ +-CC =@CC@ ++CXX =${LIBTOOL} @CXX@ ++CC =${LIBTOOL} @CC@ + MAKEDEPEND =@MAKEDEPEND@ + + # flags for C++ compiler: +-CFLAGS =@CFLAGS@ @X_CFLAGS@ +-CXXFLAGS =@CXXFLAGS@ @X_CFLAGS@ ++CFLAGS =@CFLAGS@ @X_CFLAGS@ @CPPFLAGS@ ++CXXFLAGS =@CXXFLAGS@ @X_CFLAGS@ @CPPFLAGS@ # program to make the archive: --LIBNAME =@LIBNAME@ -+LIBNAME =libfltk.la + LIBNAME =@LIBNAME@ ++FLTKLIB =../src/libfltk.la LIBCOMMAND =@LIBCOMMAND@ RANLIB =@RANLIB@ - DSONAME =@DSONAME@ +@@ -50,5 +51,5 @@ + + # libraries to link with: +-LDLIBS =@LDFLAGS@ @LIBS@ -lX11 -lXext @X_EXTRA_LIBS@ -lm ++LDLIBS =$(GLDLIBS) + GLDLIBS =@LDFLAGS@ @LIBS@ @GLLIB@ -lX11 -lXext @X_EXTRA_LIBS@ -lm + +@@ -61,13 +62,13 @@ + .cxx: + echo Compiling and linking $@... +- $(CXX) -I.. -L../lib $(CXXFLAGS) $< -lfltk $(LDLIBS) -o $@ ++ $(CXX) -I.. -L../lib $(CXXFLAGS) $< $(FLTKLIB) $(LDLIBS) -o $@ + + .c.o: + echo Compiling $@... +- $(CC) -I.. $(CXXFLAGS) $< -c ++ $(CC) -I.. $(CXXFLAGS) -c $< + + .cxx.o: + echo Compiling $@... +- $(CXX) -I.. $(CXXFLAGS) $< -c ++ $(CXX) -I.. $(CXXFLAGS) -c $< + + # diff --git a/x11/fltk/patches/patch-ac b/x11/fltk/patches/patch-ac index db3febd7032..8c05ae94758 100644 --- a/x11/fltk/patches/patch-ac +++ b/x11/fltk/patches/patch-ac @@ -1,74 +1,53 @@ -$NetBSD: patch-ac,v 1.2 1999/10/31 03:00:36 jlam Exp $ +$NetBSD: patch-ac,v 1.3 2000/08/04 03:38:15 jlam Exp $ ---- 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 - --LIBRARY = ../lib/$(LIBNAME) -+LIBRARY = $(LIBNAME) +--- src/Makefile.orig Mon Jun 5 17:21:03 2000 ++++ src/Makefile Thu Aug 3 23:13:08 2000 +@@ -152,7 +152,13 @@ OBJECTS = $(CPPFILES:.cxx=.o) $(CFILES:.c=.o) -all: $(LIBRARY) $(DSONAME) -+all: $(LIBRARY) ++all: libfltk.la ++ ++libfltk.la: $(OBJECTS) ++ $(CXX) -o $@ $(OBJECTS:.o=.lo) -rpath $(prefix)/lib \ ++ -version-info $(FLTK_MAJOR):$(FLTK_MINOR) ++ $(RM) -f $(LIBRARY) ++ echo timestamp > $(LIBRARY) $(LIBRARY): $(OBJECTS) -- @echo $(LIBCOMMAND) $@ ... -- @$(LIBCOMMAND) $@ $(OBJECTS) -- @$(RANLIB) $@ -- --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.o : -- $(CC) -I.. $(CFLAGS) -c -o $@ $< -+ $(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 + echo $(LIBCOMMAND) $@ ... +@@ -174,7 +180,14 @@ - 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 +-install: $(LIBRARY) $(DSONAME) ++install: install-la install-includes ++ ++install-la: libfltk.la ++ echo "Installing libraries..." + $(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/* ++ $(LIBTOOL) $(BSD_INSTALL_DATA) libfltk.la $(libdir) ++ ++install-lib: $(LIBRARY) $(DSONAME) + echo "Installing libraries..." + -mkdir -p $(libdir) + rm -f $(libdir)/$(LIBNAME) +@@ -192,13 +205,11 @@ + chmod 755 $(libdir)/libfltk.sl.1; \ + ln -s libfltk.sl.1 $(libdir)/libfltk.sl;\ + fi ++ ++install-includes: + echo "Installing include files..." +- -mkdir -p $(includedir) +- rm -rf $(includedir)/FL +- mkdir $(includedir)/FL +- cp ../FL/*.[hH] $(includedir)/FL +- -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;\ + cd $(includedir)/FL;\ + for file in *.H; do\ + ln -s $$file "`basename $$file H`h";\ diff --git a/x11/fltk/patches/patch-ad b/x11/fltk/patches/patch-ad index c3fe99b24cc..5a3b1a4badc 100644 --- a/x11/fltk/patches/patch-ad +++ b/x11/fltk/patches/patch-ad @@ -1,76 +1,68 @@ -$NetBSD: patch-ad,v 1.2 1999/10/31 03:00:37 jlam Exp $ +$NetBSD: patch-ad,v 1.3 2000/08/04 03:38:15 jlam Exp $ ---- 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) -+LIB_TO_LINK = ../src/$(LIBNAME) -+ -+$(ALL): $(LIB_TO_LINK) - - .SUFFIXES: .cxx .c .o .fl .h - - .cxx: -- $(CXX) -I.. $(CXXFLAGS) $< -L../lib -lfltk $(LDLIBS) -o $@ -+ $(LIBTOOL) --mode=link $(CXX) -I.. $(CXXFLAGS) $< $(LIB_TO_LINK) $(LDLIBS) $(GLDLIBS) -o $@ - - .cxx.o: - $(CXX) -I.. $(CXXFLAGS) $< -c -@@ -63,41 +65,40 @@ - +--- test/Makefile.orig Mon Jun 5 17:21:15 2000 ++++ test/Makefile Thu Aug 3 23:13:08 2000 +@@ -56,7 +56,7 @@ .fl: + echo Generating, compiling, and linking $@... ../fluid/fluid -c $< -- $(CXX) -I.. $(CXXFLAGS) $@.cxx -L../lib -lfltk $(LDLIBS) -o $@ -+ $(LIBTOOL) --mode=link $(CXX) -I.. $(CXXFLAGS) $@.cxx $(LIB_TO_LINK) $(LDLIBS) $(GLDLIBS) -o $@ +- $(CXX) -I.. -L../lib $(CXXFLAGS) $@.cxx -lfltk $(LDLIBS) -o $@ ++ $(CXX) -I.. -L../lib $(CXXFLAGS) $@.cxx $(FLTKLIB) $(LDLIBS) -o $@ - # Other programs needing special "help"... + + $(ALL): ../lib/$(LIBNAME) +@@ -65,43 +65,43 @@ CubeView: CubeMain.o CubeView.o CubeViewUI.o -- $(CXX) -I.. $(CXXFLAGS) CubeMain.o CubeView.o CubeViewUI.o \ -- -L../lib -lfltk $(GLDLIBS) -o $@ -+ $(LIBTOOL) --mode=link $(CXX) -I.. $(CXXFLAGS) CubeMain.o CubeView.o CubeViewUI.o $(LIB_TO_LINK) $(GLDLIBS) -o $@ + echo Compiling and linking $@... + $(CXX) -I.. -L../lib $(CXXFLAGS) CubeMain.o CubeView.o CubeViewUI.o \ +- -lfltk $(GLDLIBS) -o $@ ++ $(FLTKLIB) $(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 $@ -+ $(LIBTOOL) --mode=link $(CXX) -I.. $(CXXFLAGS) cube.cxx $(LIB_TO_LINK) $(GLDLIBS) -o $@ + echo Compiling and linking $@... +- $(CXX) -I.. -L../lib $(CXXFLAGS) cube.cxx -lfltk $(GLDLIBS) -o $@ ++ $(CXX) -I.. -L../lib $(CXXFLAGS) cube.cxx $(FLTKLIB) $(GLDLIBS) -o $@ fractals: fractals.cxx -- $(CXX) -I.. $(CXXFLAGS) fractals.cxx -L../lib -lfltk $(GLDLIBS) -o $@ -+ $(LIBTOOL) --mode=link $(CXX) -I.. $(CXXFLAGS) fractals.cxx $(LIB_TO_LINK) $(GLDLIBS) -o $@ + echo Compiling and linking $@... +- $(CXX) -I.. -L../lib $(CXXFLAGS) fractals.cxx -lfltk $(GLDLIBS) -o $@ ++ $(CXX) -I.. -L../lib $(CXXFLAGS) fractals.cxx $(FLTKLIB) $(GLDLIBS) -o $@ fullscreen: fullscreen.cxx -- $(CXX) -I.. $(CXXFLAGS) fullscreen.cxx -L../lib -lfltk $(GLDLIBS) -o $@ -+ $(LIBTOOL) --mode=link $(CXX) -I.. $(CXXFLAGS) fullscreen.cxx $(LIB_TO_LINK) $(GLDLIBS) -o $@ + echo Compiling and linking $@... +- $(CXX) -I.. -L../lib $(CXXFLAGS) fullscreen.cxx -lfltk $(GLDLIBS) -o $@ ++ $(CXX) -I.. -L../lib $(CXXFLAGS) fullscreen.cxx $(FLTKLIB) $(GLDLIBS) -o $@ glpuzzle: glpuzzle.cxx -- $(CXX) -I.. $(CXXFLAGS) glpuzzle.cxx -L../lib -lfltk $(GLDLIBS) -o $@ -+ $(LIBTOOL) --mode=link $(CXX) -I.. $(CXXFLAGS) glpuzzle.cxx $(LIB_TO_LINK) $(GLDLIBS) -o $@ + echo Compiling and linking $@... +- $(CXX) -I.. -L../lib $(CXXFLAGS) glpuzzle.cxx -lfltk $(GLDLIBS) -o $@ ++ $(CXX) -I.. -L../lib $(CXXFLAGS) glpuzzle.cxx $(FLTKLIB) $(GLDLIBS) -o $@ gl_overlay: gl_overlay.cxx -- $(CXX) -I.. $(CXXFLAGS) gl_overlay.cxx -L../lib -lfltk $(GLDLIBS) -o $@ -+ $(LIBTOOL) --mode=link $(CXX) -I.. $(CXXFLAGS) gl_overlay.cxx $(LIB_TO_LINK) $(GLDLIBS) -o $@ + echo Compiling and linking $@... +- $(CXX) -I.. -L../lib $(CXXFLAGS) gl_overlay.cxx -lfltk $(GLDLIBS) -o $@ ++ $(CXX) -I.. -L../lib $(CXXFLAGS) gl_overlay.cxx $(FLTKLIB) $(GLDLIBS) -o $@ shiny: shiny.cxx shiny_panel.cxx -- $(CXX) -I.. $(CXXFLAGS) shiny.cxx -L../lib -lfltk $(GLDLIBS) -o $@ -+ $(LIBTOOL) --mode=link $(CXX) -I.. $(CXXFLAGS) shiny.cxx $(LIB_TO_LINK) $(GLDLIBS) -o $@ + echo Compiling and linking $@... +- $(CXX) -I.. -L../lib $(CXXFLAGS) shiny.cxx -lfltk $(GLDLIBS) -o $@ ++ $(CXX) -I.. -L../lib $(CXXFLAGS) shiny.cxx $(FLTKLIB) $(GLDLIBS) -o $@ keyboard: keyboard.cxx keyboard_ui.cxx -- $(CXX) -I.. $(CXXFLAGS) keyboard.cxx -L../lib -lfltk $(LDLIBS) -o $@ -+ $(LIBTOOL) --mode=link $(CXX) -I.. $(CXXFLAGS) keyboard.cxx $(LIB_TO_LINK) $(LDLIBS) $(GLDLIBS) -o $@ + echo Compiling and linking $@... +- $(CXX) -I.. -L../lib $(CXXFLAGS) keyboard.cxx -lfltk $(LDLIBS) -o $@ ++ $(CXX) -I.. -L../lib $(CXXFLAGS) keyboard.cxx $(FLTKLIB) $(LDLIBS) -o $@ mandelbrot: mandelbrot.cxx mandelbrot_ui.cxx -- $(CXX) -I.. $(CXXFLAGS) mandelbrot.cxx -L../lib -lfltk $(LDLIBS) -o $@ -+ $(LIBTOOL) --mode=link $(CXX) -I.. $(CXXFLAGS) mandelbrot.cxx $(LIB_TO_LINK) $(LDLIBS) $(GLDLIBS) -o $@ + echo Compiling and linking $@... +- $(CXX) -I.. -L../lib $(CXXFLAGS) mandelbrot.cxx -lfltk $(LDLIBS) -o $@ ++ $(CXX) -I.. -L../lib $(CXXFLAGS) mandelbrot.cxx $(FLTKLIB) $(LDLIBS) -o $@ shape: shape.cxx -- $(CXX) -I.. $(CXXFLAGS) shape.cxx -L../lib -lfltk $(GLDLIBS) -o $@ -+ $(LIBTOOL) --mode=link $(CXX) -I.. $(CXXFLAGS) shape.cxx $(LIB_TO_LINK) $(GLDLIBS) -o $@ + echo Compiling and linking $@... +- $(CXX) -I.. -L../lib $(CXXFLAGS) shape.cxx -lfltk $(GLDLIBS) -o $@ ++ $(CXX) -I.. -L../lib $(CXXFLAGS) shape.cxx $(FLTKLIB) $(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 $@ -+ $(LIBTOOL) --mode=link $(CXX) -I.. $(CXXFLAGS) -I../../../local/jpeg-6b -L../../../local/jpeg-6b jpeg_image.cxx $(LIB_TO_LINK) $(LDLIBS) -ljpeg -lXext -o $@ + echo Compiling and linking $@... +- $(CXX) -I.. -L../lib $(CXXFLAGS) -I../../../local/jpeg-6b -L../../../local/jpeg-6b jpeg_image.cxx -lfltk $(LDLIBS) -ljpeg -lXext -o $@ ++ $(CXX) -I.. -L../lib $(CXXFLAGS) -I../../../local/jpeg-6b -L../../../local/jpeg-6b jpeg_image.cxx $(FLTKLIB) $(LDLIBS) -ljpeg -lXext -o $@ depend: -- $(MAKEDEPEND) -I.. $(CXXFLAGS) $(CPPFILES) > makedepend -+ $(LIBTOOL) --mode=link $(MAKEDEPEND) -I.. $(CXXFLAGS) $(CPPFILES) > makedepend - - clean: - -@ rm -f $(ALL) jpeg_image *.o core *~ + $(MAKEDEPEND) -I.. $(CXXFLAGS) $(CPPFILES) > makedepend diff --git a/x11/fltk/pkg/PLIST b/x11/fltk/pkg/PLIST index fbde885d9dd..f830bd3de8a 100644 --- a/x11/fltk/pkg/PLIST +++ b/x11/fltk/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2000/01/27 19:14:25 jlam Exp $ +@comment $NetBSD: PLIST,v 1.4 2000/08/04 03:38:16 jlam Exp $ bin/fluid include/FL/Enumerations.H include/FL/Enumerations.h @@ -188,142 +188,141 @@ include/FL/win32.h include/FL/x.H include/FL/x.h lib/libfltk.a -lib/libfltk.so.1.2 -share/doc/fltk/FL.gif -share/doc/fltk/Fl_Adjuster.html -share/doc/fltk/Fl_Box.html -share/doc/fltk/Fl_Browser.html -share/doc/fltk/Fl_Browser_.html -share/doc/fltk/Fl_Button.html -share/doc/fltk/Fl_Chart.html -share/doc/fltk/Fl_Check_Button.gif -share/doc/fltk/Fl_Check_Button.html -share/doc/fltk/Fl_Choice.html -share/doc/fltk/Fl_Clock.html -share/doc/fltk/Fl_Color_Chooser.html -share/doc/fltk/Fl_Counter.html -share/doc/fltk/Fl_Dial.html -share/doc/fltk/Fl_Double_Window.html -share/doc/fltk/Fl_End.html -share/doc/fltk/Fl_Float_Input.html -share/doc/fltk/Fl_Free.html -share/doc/fltk/Fl_Gl_Window.html -share/doc/fltk/Fl_Group.html -share/doc/fltk/Fl_Hold_Browser.html -share/doc/fltk/Fl_Input.html -share/doc/fltk/Fl_Input_.html -share/doc/fltk/Fl_Int_Input.html -share/doc/fltk/Fl_Light_Button.gif -share/doc/fltk/Fl_Light_Button.html -share/doc/fltk/Fl_Menu_.html -share/doc/fltk/Fl_Menu_Bar.html -share/doc/fltk/Fl_Menu_Button.html -share/doc/fltk/Fl_Menu_Item.html -share/doc/fltk/Fl_Menu_Window.html -share/doc/fltk/Fl_Multi_Browser.html -share/doc/fltk/Fl_Multiline_Input.html -share/doc/fltk/Fl_Multiline_Output.html -share/doc/fltk/Fl_Output.html -share/doc/fltk/Fl_Overlay_Window.html -share/doc/fltk/Fl_Pack.html -share/doc/fltk/Fl_Positioner.html -share/doc/fltk/Fl_Repeat_Button.html -share/doc/fltk/Fl_Return_Button.gif -share/doc/fltk/Fl_Return_Button.html -share/doc/fltk/Fl_Roller.gif -share/doc/fltk/Fl_Roller.html -share/doc/fltk/Fl_Round_Button.gif -share/doc/fltk/Fl_Round_Button.html -share/doc/fltk/Fl_Scroll.gif -share/doc/fltk/Fl_Scroll.html -share/doc/fltk/Fl_Scrollbar.html -share/doc/fltk/Fl_Secret_Input.html -share/doc/fltk/Fl_Select_Browser.html -share/doc/fltk/Fl_Single_Window.html -share/doc/fltk/Fl_Slider.html -share/doc/fltk/Fl_Tabs.html -share/doc/fltk/Fl_Tile.gif -share/doc/fltk/Fl_Tile.html -share/doc/fltk/Fl_Timer.html -share/doc/fltk/Fl_Valuator.html -share/doc/fltk/Fl_Value_Input.gif -share/doc/fltk/Fl_Value_Input.html -share/doc/fltk/Fl_Value_Output.gif -share/doc/fltk/Fl_Value_Output.html -share/doc/fltk/Fl_Value_Slider.html -share/doc/fltk/Fl_Widget.html -share/doc/fltk/Fl_Window.html -share/doc/fltk/Makefile -share/doc/fltk/README -share/doc/fltk/adjuster1.gif -share/doc/fltk/ask.C.gif -share/doc/fltk/basics.html -share/doc/fltk/bglogo.gif -share/doc/fltk/boxtypes.gif -share/doc/fltk/button.C.gif -share/doc/fltk/buttons.gif -share/doc/fltk/charts.gif -share/doc/fltk/choice.gif -share/doc/fltk/clock.gif -share/doc/fltk/common.html -share/doc/fltk/counter.gif -share/doc/fltk/cubeview.gif -share/doc/fltk/dial.gif -share/doc/fltk/drawing.html -share/doc/fltk/editor-replace.gif -share/doc/fltk/editor.gif -share/doc/fltk/editor.html -share/doc/fltk/enumerations.html -share/doc/fltk/events.html -share/doc/fltk/filechooser.gif -share/doc/fltk/fl_alert.gif -share/doc/fltk/fl_ask.gif -share/doc/fltk/fl_choice.gif -share/doc/fltk/fl_color_chooser.jpg -share/doc/fltk/fl_input.gif -share/doc/fltk/fl_message.gif -share/doc/fltk/fl_password.gif -share/doc/fltk/fl_show_colormap.gif -share/doc/fltk/fluid-org.gif -share/doc/fltk/fluid.1 -share/doc/fltk/fluid.gif -share/doc/fltk/fluid.html -share/doc/fltk/fluid.z -share/doc/fltk/fluid1.gif -share/doc/fltk/fluid2.gif -share/doc/fltk/fluid3.gif -share/doc/fltk/fluid4.gif -share/doc/fltk/fluid_main.gif -share/doc/fltk/fluid_prefs.gif -share/doc/fltk/fluid_widget.gif -share/doc/fltk/forms.html -share/doc/fltk/functions.html -share/doc/fltk/glut.html -share/doc/fltk/hello.C.gif -share/doc/fltk/index.html -share/doc/fltk/intro.html -share/doc/fltk/license.html -share/doc/fltk/menu.gif -share/doc/fltk/menu_button.gif -share/doc/fltk/menubar.gif -share/doc/fltk/opengl.html -share/doc/fltk/osissues.html -share/doc/fltk/positioner.gif -share/doc/fltk/preface.html -share/doc/fltk/resizebox1.gif -share/doc/fltk/resizebox2.gif -share/doc/fltk/round_clock.gif -share/doc/fltk/scrollbar.gif -share/doc/fltk/shape.C.gif -share/doc/fltk/slider.gif -share/doc/fltk/subclassing.html -share/doc/fltk/symbols.gif -share/doc/fltk/tabs.gif -share/doc/fltk/text.gif -share/doc/fltk/valuators.gif -share/doc/fltk/value_slider.gif -share/doc/fltk/widgets.html +lib/libfltk.la +lib/libfltk.so.1.3 +share/doc/html/fltk/FL.gif +share/doc/html/fltk/Fl_Adjuster.html +share/doc/html/fltk/Fl_Box.html +share/doc/html/fltk/Fl_Browser.html +share/doc/html/fltk/Fl_Browser_.html +share/doc/html/fltk/Fl_Button.html +share/doc/html/fltk/Fl_Chart.html +share/doc/html/fltk/Fl_Check_Button.gif +share/doc/html/fltk/Fl_Check_Button.html +share/doc/html/fltk/Fl_Choice.html +share/doc/html/fltk/Fl_Clock.html +share/doc/html/fltk/Fl_Color_Chooser.html +share/doc/html/fltk/Fl_Counter.html +share/doc/html/fltk/Fl_Dial.html +share/doc/html/fltk/Fl_Double_Window.html +share/doc/html/fltk/Fl_End.html +share/doc/html/fltk/Fl_Float_Input.html +share/doc/html/fltk/Fl_Free.html +share/doc/html/fltk/Fl_Gl_Window.html +share/doc/html/fltk/Fl_Group.html +share/doc/html/fltk/Fl_Hold_Browser.html +share/doc/html/fltk/Fl_Input.html +share/doc/html/fltk/Fl_Input_.html +share/doc/html/fltk/Fl_Int_Input.html +share/doc/html/fltk/Fl_Light_Button.gif +share/doc/html/fltk/Fl_Light_Button.html +share/doc/html/fltk/Fl_Menu_.html +share/doc/html/fltk/Fl_Menu_Bar.html +share/doc/html/fltk/Fl_Menu_Button.html +share/doc/html/fltk/Fl_Menu_Item.html +share/doc/html/fltk/Fl_Menu_Window.html +share/doc/html/fltk/Fl_Multi_Browser.html +share/doc/html/fltk/Fl_Multiline_Input.html +share/doc/html/fltk/Fl_Multiline_Output.html +share/doc/html/fltk/Fl_Output.html +share/doc/html/fltk/Fl_Overlay_Window.html +share/doc/html/fltk/Fl_Pack.html +share/doc/html/fltk/Fl_Positioner.html +share/doc/html/fltk/Fl_Repeat_Button.html +share/doc/html/fltk/Fl_Return_Button.gif +share/doc/html/fltk/Fl_Return_Button.html +share/doc/html/fltk/Fl_Roller.gif +share/doc/html/fltk/Fl_Roller.html +share/doc/html/fltk/Fl_Round_Button.gif +share/doc/html/fltk/Fl_Round_Button.html +share/doc/html/fltk/Fl_Scroll.gif +share/doc/html/fltk/Fl_Scroll.html +share/doc/html/fltk/Fl_Scrollbar.html +share/doc/html/fltk/Fl_Secret_Input.html +share/doc/html/fltk/Fl_Select_Browser.html +share/doc/html/fltk/Fl_Single_Window.html +share/doc/html/fltk/Fl_Slider.html +share/doc/html/fltk/Fl_Tabs.html +share/doc/html/fltk/Fl_Tile.gif +share/doc/html/fltk/Fl_Tile.html +share/doc/html/fltk/Fl_Timer.html +share/doc/html/fltk/Fl_Valuator.html +share/doc/html/fltk/Fl_Value_Input.gif +share/doc/html/fltk/Fl_Value_Input.html +share/doc/html/fltk/Fl_Value_Output.gif +share/doc/html/fltk/Fl_Value_Output.html +share/doc/html/fltk/Fl_Value_Slider.html +share/doc/html/fltk/Fl_Widget.html +share/doc/html/fltk/Fl_Window.html +share/doc/html/fltk/adjuster1.gif +share/doc/html/fltk/ask.C.gif +share/doc/html/fltk/basics.html +share/doc/html/fltk/bglogo.gif +share/doc/html/fltk/boxtypes.gif +share/doc/html/fltk/button.C.gif +share/doc/html/fltk/buttons.gif +share/doc/html/fltk/charts.gif +share/doc/html/fltk/choice.gif +share/doc/html/fltk/clock.gif +share/doc/html/fltk/common.html +share/doc/html/fltk/counter.gif +share/doc/html/fltk/cubeview.gif +share/doc/html/fltk/dial.gif +share/doc/html/fltk/drawing.html +share/doc/html/fltk/editor-replace.gif +share/doc/html/fltk/editor.gif +share/doc/html/fltk/editor.html +share/doc/html/fltk/enumerations.html +share/doc/html/fltk/events.html +share/doc/html/fltk/filechooser.gif +share/doc/html/fltk/fl_alert.gif +share/doc/html/fltk/fl_ask.gif +share/doc/html/fltk/fl_choice.gif +share/doc/html/fltk/fl_color_chooser.jpg +share/doc/html/fltk/fl_input.gif +share/doc/html/fltk/fl_message.gif +share/doc/html/fltk/fl_password.gif +share/doc/html/fltk/fl_show_colormap.gif +share/doc/html/fltk/fluid-catgets.gif +share/doc/html/fltk/fluid-gettext.gif +share/doc/html/fltk/fluid-org.gif +share/doc/html/fltk/fluid.gif +share/doc/html/fltk/fluid.html +share/doc/html/fltk/fluid1.gif +share/doc/html/fltk/fluid2.gif +share/doc/html/fltk/fluid3.gif +share/doc/html/fltk/fluid4.gif +share/doc/html/fltk/fluid_main.gif +share/doc/html/fltk/fluid_prefs.gif +share/doc/html/fltk/fluid_widget.gif +share/doc/html/fltk/forms.html +share/doc/html/fltk/functions.html +share/doc/html/fltk/glut.html +share/doc/html/fltk/hello.C.gif +share/doc/html/fltk/index.html +share/doc/html/fltk/intro.html +share/doc/html/fltk/license.html +share/doc/html/fltk/menu.gif +share/doc/html/fltk/menu_button.gif +share/doc/html/fltk/menubar.gif +share/doc/html/fltk/opengl.html +share/doc/html/fltk/osissues.html +share/doc/html/fltk/positioner.gif +share/doc/html/fltk/preface.html +share/doc/html/fltk/resizebox1.gif +share/doc/html/fltk/resizebox2.gif +share/doc/html/fltk/round_clock.gif +share/doc/html/fltk/scrollbar.gif +share/doc/html/fltk/shape.C.gif +share/doc/html/fltk/slider.gif +share/doc/html/fltk/subclassing.html +share/doc/html/fltk/symbols.gif +share/doc/html/fltk/tabs.gif +share/doc/html/fltk/text.gif +share/doc/html/fltk/valuators.gif +share/doc/html/fltk/value_slider.gif +share/doc/html/fltk/widgets.html @exec ln -sf FL %D/include/Fl @unexec rm -f %D/include/Fl -@dirrm share/doc/fltk +@dirrm share/doc/html/fltk @dirrm include/FL |