diff options
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/fltk/Makefile | 11 | ||||
| -rw-r--r-- | x11/fltk/files/md5 | 4 | ||||
| -rw-r--r-- | x11/fltk/files/patch-sum | 5 | ||||
| -rw-r--r-- | x11/fltk/patches/patch-ab | 33 | ||||
| -rw-r--r-- | x11/fltk/patches/patch-af | 13 | ||||
| -rw-r--r-- | x11/fltk/pkg/PLIST | 4 |
6 files changed, 42 insertions, 28 deletions
diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile index 3a94ecbf408..4973bded380 100644 --- a/x11/fltk/Makefile +++ b/x11/fltk/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2000/11/11 17:49:29 tron Exp $ +# $NetBSD: Makefile,v 1.11 2001/01/02 22:11:17 jlam Exp $ # -DISTNAME= fltk-1.0.9-source +DISTNAME= fltk-1.0.10-source PKGNAME= ${DISTNAME:S/-source//} VERS= ${PKGNAME:S/fltk-//} WRKSRC= ${WRKDIR}/${PKGNAME} @@ -33,7 +33,12 @@ MAKE_ENV+= INSTALL_DATA="${INSTALL_DATA}" # bump the MINOR when a new version comes out. # FLTK_MAJOR= 1 -FLTK_MINOR= 3 +FLTK_MINOR= 4 MAKE_ENV+= FLTK_MAJOR="${FLTK_MAJOR}" FLTK_MINOR="${FLTK_MINOR}" +PLIST_SUBST+= FLTK_MAJOR=${FLTK_MAJOR} FLTK_MINOR=${FLTK_MINOR} + +test: + @cd ${WRKSRC}/test && \ + ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} all .include "../../mk/bsd.pkg.mk" diff --git a/x11/fltk/files/md5 b/x11/fltk/files/md5 index e75e630151c..b9d4c3f869c 100644 --- a/x11/fltk/files/md5 +++ b/x11/fltk/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.5 2000/08/04 03:38:15 jlam Exp $ +$NetBSD: md5,v 1.6 2001/01/02 22:11:18 jlam Exp $ -MD5 (fltk-1.0.9-source.tar.bz2) = 139c134098128754f706b4f3a905cbc5 +MD5 (fltk-1.0.10-source.tar.bz2) = e76cc38b6c0bdb046a8ac5cd31a7e65e diff --git a/x11/fltk/files/patch-sum b/x11/fltk/files/patch-sum index bd222cf24dd..bd29b30e357 100644 --- a/x11/fltk/files/patch-sum +++ b/x11/fltk/files/patch-sum @@ -1,7 +1,8 @@ -$NetBSD: patch-sum,v 1.4 2000/08/28 13:38:57 wiz Exp $ +$NetBSD: patch-sum,v 1.5 2001/01/02 22:11:18 jlam Exp $ MD5 (patch-aa) = 689c196aa6afea369932f70001d0ee4d -MD5 (patch-ab) = 7adc66d24b14b9ccf36715358f991933 +MD5 (patch-ab) = 9014b1f80dcaa846ba49e31dcfdd1ef9 MD5 (patch-ac) = efb0565495b3f17ecd4ef385ba9036cd MD5 (patch-ad) = a3f99697142bd91bfe444e342ef182e8 MD5 (patch-ae) = 5145619039bc160ea54572b5ba5fcc7e +MD5 (patch-af) = 8ee41943607d46514840ad2ae6511856 diff --git a/x11/fltk/patches/patch-ab b/x11/fltk/patches/patch-ab index 509c8c89aaf..0147fed29b8 100644 --- a/x11/fltk/patches/patch-ab +++ b/x11/fltk/patches/patch-ab @@ -1,8 +1,9 @@ -$NetBSD: patch-ab,v 1.4 2000/08/04 03:38:15 jlam Exp $ +$NetBSD: patch-ab,v 1.5 2001/01/02 22:11:18 jlam Exp $ ---- makeinclude.in.orig Mon Jun 5 17:20:17 2000 -+++ makeinclude.in Thu Aug 3 23:13:46 2000 -@@ -34,14 +34,15 @@ +--- makeinclude.in.orig Mon Nov 20 10:10:00 2000 ++++ makeinclude.in +@@ -33,23 +33,24 @@ + VPATH =@srcdir@ # compiler names: -CXX =@CXX@ @@ -12,24 +13,27 @@ $NetBSD: patch-ab,v 1.4 2000/08/04 03:38:15 jlam Exp $ MAKEDEPEND =@MAKEDEPEND@ # flags for C++ compiler: --CFLAGS =@CFLAGS@ @X_CFLAGS@ --CXXFLAGS =@CXXFLAGS@ @X_CFLAGS@ -+CFLAGS =@CFLAGS@ @X_CFLAGS@ @CPPFLAGS@ -+CXXFLAGS =@CXXFLAGS@ @X_CFLAGS@ @CPPFLAGS@ +-CFLAGS =@CFLAGS@ +-CXXFLAGS =@CXXFLAGS@ ++CFLAGS =@CFLAGS@ @CPPFLAGS@ ++CXXFLAGS =@CXXFLAGS@ @CPPFLAGS@ # program to make the archive: LIBNAME =@LIBNAME@ +FLTKLIB =../src/libfltk.la LIBCOMMAND =@LIBCOMMAND@ RANLIB =@RANLIB@ -@@ -50,5 +51,5 @@ + DSONAME =@DSONAME@ + DSOCOMMAND =@DSOCOMMAND@ # 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 @@ + # Be quiet when building... +@@ -60,7 +61,7 @@ + .cxx: echo Compiling and linking $@... - $(CXX) -I.. -L../lib $(CXXFLAGS) $< -lfltk $(LDLIBS) -o $@ @@ -37,12 +41,3 @@ $NetBSD: patch-ab,v 1.4 2000/08/04 03:38:15 jlam Exp $ .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-af b/x11/fltk/patches/patch-af new file mode 100644 index 00000000000..1425b8ed4ca --- /dev/null +++ b/x11/fltk/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.1 2001/01/02 22:11:18 jlam Exp $ + +--- Makefile.orig Fri Jun 30 00:23:12 2000 ++++ Makefile +@@ -25,7 +25,7 @@ + + SHELL=/bin/sh + +-DIRS = src fluid test ++DIRS = src fluid + + all: makeinclude + @for dir in $(DIRS); do\ diff --git a/x11/fltk/pkg/PLIST b/x11/fltk/pkg/PLIST index f830bd3de8a..057fa42ae7c 100644 --- a/x11/fltk/pkg/PLIST +++ b/x11/fltk/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2000/08/04 03:38:16 jlam Exp $ +@comment $NetBSD: PLIST,v 1.5 2001/01/02 22:11:18 jlam Exp $ bin/fluid include/FL/Enumerations.H include/FL/Enumerations.h @@ -189,7 +189,7 @@ include/FL/x.H include/FL/x.h lib/libfltk.a lib/libfltk.la -lib/libfltk.so.1.3 +lib/libfltk.so.${FLTK_MAJOR}.${FLTK_MINOR} share/doc/html/fltk/FL.gif share/doc/html/fltk/Fl_Adjuster.html share/doc/html/fltk/Fl_Box.html |