diff options
| -rw-r--r-- | x11/fltk/Makefile | 34 | ||||
| -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 | 50 | ||||
| -rw-r--r-- | x11/fltk/patches/patch-ab | 102 | ||||
| -rw-r--r-- | x11/fltk/patches/patch-ac | 100 | ||||
| -rw-r--r-- | x11/fltk/patches/patch-ad | 72 | ||||
| -rw-r--r-- | x11/fltk/pkg/COMMENT | 2 | ||||
| -rw-r--r-- | x11/fltk/pkg/DESCR | 6 | ||||
| -rw-r--r-- | x11/fltk/pkg/PLIST | 9 |
10 files changed, 185 insertions, 204 deletions
diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile index 0ee3242f11c..1ea12a23d5a 100644 --- a/x11/fltk/Makefile +++ b/x11/fltk/Makefile @@ -1,17 +1,20 @@ -# $NetBSD: Makefile,v 1.3 1999/09/29 22:58:45 tron Exp $ +# $NetBSD: Makefile,v 1.4 1999/10/31 03:00:34 jlam Exp $ # -DISTNAME= fltk-1.0.3-source -PKGNAME= fltk-1.0.3 +DISTNAME= fltk-1.0.6-source +PKGNAME= ${DISTNAME:S/-source//} +VERS= ${PKGNAME:S/fltk-//} +WRKSRC= ${WRKDIR}/${PKGNAME} CATEGORIES= x11 -MASTER_SITES= ftp://ftp.fltk.org/pub/fltk/1.0.3/ \ - ftp://ftp2.easysw.com/pub/fltk/1.0.3/ \ - ftp://ftp.northamerica.net/pub/ESP/fltk/1.0.3/ \ - ftp://ftp.funet.fi/mirrors/ftp.easysw.com/pub/fltk/1.0.3/ \ - ftp://ftp.kddlabs.co.jp/pub/lang/fltk/1.0.3/ +MASTER_SITES= 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}/ \ + ftp://ftp.kddlabs.co.jp/pub/lang/fltk/${VERS}/ +EXTRACT_SUFX= .tar.bz2 MAINTAINER= packages@netbsd.org -HOMEPAGE= http://fltk.easysw.com/ +HOMEPAGE= http://www.fltk.org/ DEPENDS+= Mesa-*:../../graphics/Mesa @@ -20,11 +23,18 @@ USE_GMAKE= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes -WRKSRC= ${WRKDIR}/${PKGNAME}/ +# 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= 1 +MAKE_ENV+= FLTK_MAJOR="${FLTK_MAJOR}" FLTK_MINOR="${FLTK_MINOR}" + DOCDIR= ${PREFIX}/share/doc/fltk post-install: - @${INSTALL_DATA_DIR} ${DOCDIR} - @${INSTALL_DATA} ${WRKSRC}/documentation/* ${DOCDIR} + ${INSTALL_DATA_DIR} ${DOCDIR} + ${INSTALL_DATA} ${WRKSRC}/documentation/* ${DOCDIR} .include "../../mk/bsd.pkg.mk" diff --git a/x11/fltk/files/md5 b/x11/fltk/files/md5 index 059ee65ff89..0bee358b05e 100644 --- a/x11/fltk/files/md5 +++ b/x11/fltk/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.2 1999/06/10 01:15:47 nathanw Exp $ +$NetBSD: md5,v 1.3 1999/10/31 03:00:35 jlam Exp $ -MD5 (fltk-1.0.3-source.tar.gz) = 2f53d2738bb96583b26f3c2250bc7d57 +MD5 (fltk-1.0.6-source.tar.bz2) = aa54c29c6691bbae518a6cb909420522 diff --git a/x11/fltk/files/patch-sum b/x11/fltk/files/patch-sum index 8260cd56e5e..f7494714480 100644 --- a/x11/fltk/files/patch-sum +++ b/x11/fltk/files/patch-sum @@ -1,6 +1,6 @@ -$NetBSD: patch-sum,v 1.1 1999/07/09 14:23:23 agc Exp $ +$NetBSD: patch-sum,v 1.2 1999/10/31 03:00:36 jlam Exp $ -MD5 (patch-aa) = 0e63450545808dbd0ef43d985e0de240 -MD5 (patch-ab) = 905d0f1da66dea94aa8faf1255f5f182 -MD5 (patch-ac) = 02eadabd3aa8597f68183d6852664d13 -MD5 (patch-ad) = 15a32382cdff89f1ba118422fe221f46 +MD5 (patch-aa) = df882abfbbb82ab40fe05f0852e99025 +MD5 (patch-ab) = e5f58e1d6fd9080b1b028ed4acdb8ee4 +MD5 (patch-ac) = 0943c938b4cc6337c0ce54b92e6a7dc2 +MD5 (patch-ad) = 208adf509fcb151640fc089fba6249e9 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 *~ diff --git a/x11/fltk/pkg/COMMENT b/x11/fltk/pkg/COMMENT index 23102b3bbc4..113c9692b04 100644 --- a/x11/fltk/pkg/COMMENT +++ b/x11/fltk/pkg/COMMENT @@ -1 +1 @@ -C++ graphical user interface toolkit for X. +The Fast Light Tool Kit diff --git a/x11/fltk/pkg/DESCR b/x11/fltk/pkg/DESCR index 1d567378348..d395bde2d82 100644 --- a/x11/fltk/pkg/DESCR +++ b/x11/fltk/pkg/DESCR @@ -1,3 +1,5 @@ -The Fast Light ToolKit. FLTK (pronounced "fulltick") is a LGPL'd C++ graphical user interface -toolkit for X (UNIX, OpenGL, and WIN32). +toolkit for X (UNIX), OpenGL, and Win32. FLTK was designed to be small and +modular enough to be statically linked, but also works fine as a shared +library. FLTK also includes FLUID, an interactive user interface builder +program. diff --git a/x11/fltk/pkg/PLIST b/x11/fltk/pkg/PLIST index 01c37ec2316..31c7861e3dc 100644 --- a/x11/fltk/pkg/PLIST +++ b/x11/fltk/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 1999/05/06 07:23:28 sakamoto Exp $ +@comment $NetBSD: PLIST,v 1.2 1999/10/31 03:00:37 jlam Exp $ bin/fluid include/FL/Enumerations.H include/FL/Enumerations.h @@ -187,10 +187,8 @@ include/FL/win32.H include/FL/win32.h include/FL/x.H include/FL/x.h -@dirrm include/FL -include/Fl lib/libfltk.a -lib/libfltk.so.1.0 +lib/libfltk.so.1.1 share/doc/fltk/FL.gif share/doc/fltk/Fl_Adjuster.html share/doc/fltk/Fl_Box.html @@ -325,4 +323,7 @@ share/doc/fltk/text.gif share/doc/fltk/valuators.gif share/doc/fltk/value_slider.gif share/doc/fltk/widgets.html +@exec ln -sf FL %D/include/Fl +@unexec rm -f %D/include/Fl @dirrm share/doc/fltk +@dirrm include/FL |