From a1f28f3bd07274fdb765ef42c4637b794408fd8a Mon Sep 17 00:00:00 2001 From: wilfried Date: Mon, 2 Apr 2001 15:10:25 +0000 Subject: [PATCH] Import of flvw-20000224 FLTK Virtual Styles, List, Table, and Complex Table Widgets --- x11/flvw/Makefile | 39 +++++++++++++ x11/flvw/files/md5 | 3 + x11/flvw/patches/patch-1_0_FL_Flv_Style_H | 11 ++++ x11/flvw/patches/patch-1_0_Makefile | 29 ++++++++++ x11/flvw/patches/patch-1_0_configure | 12 ++++ x11/flvw/patches/patch-1_0_configure_in | 12 ++++ x11/flvw/patches/patch-1_0_makeinclude_in | 57 +++++++++++++++++++ x11/flvw/patches/patch-1_0_src_Flv_Style_cxx | 19 +++++++ x11/flvw/patches/patch-1_0_src_Flve_Combo_cxx | 20 +++++++ x11/flvw/pkg/DESCR | 3 + x11/flvw/pkg/PLIST | 10 ++++ 11 files changed, 215 insertions(+) create mode 100644 x11/flvw/Makefile create mode 100644 x11/flvw/files/md5 create mode 100644 x11/flvw/patches/patch-1_0_FL_Flv_Style_H create mode 100644 x11/flvw/patches/patch-1_0_Makefile create mode 100644 x11/flvw/patches/patch-1_0_configure create mode 100644 x11/flvw/patches/patch-1_0_configure_in create mode 100644 x11/flvw/patches/patch-1_0_makeinclude_in create mode 100644 x11/flvw/patches/patch-1_0_src_Flv_Style_cxx create mode 100644 x11/flvw/patches/patch-1_0_src_Flve_Combo_cxx create mode 100644 x11/flvw/pkg/DESCR create mode 100644 x11/flvw/pkg/PLIST diff --git a/x11/flvw/Makefile b/x11/flvw/Makefile new file mode 100644 index 00000000000..a8b06a1e483 --- /dev/null +++ b/x11/flvw/Makefile @@ -0,0 +1,39 @@ +# $OpenBSD: Makefile,v 1.1.1.1 2001/04/02 15:10:25 wilfried Exp $ + +COMMENT= 'FLTK Virtual Styles, List, Table, and Complex Table Widgets' + +DISTNAME= flvw-20000224 +PKGNAME= flvw-1.0 +CATEGORIES= devel +NEED_VERSION= 1.380 + +HOMEPAGE= http://flvw.sourceforge.net/ + +MAINTAINER= Peter Stromberg + +PERMIT_PACKAGE_CDROM= Yes +PERMIT_PACKAGE_FTP= Yes +PERMIT_DISTFILES_CDROM= Yes +PERMIT_DISTFILES_FTP= Yes + +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITE_SUBDIR= flvw + +EXTRACT_SUFX= .tgz + +BUILD_DEPENDS= ${LOCALBASE}/lib/libfltk.a::x11/fltk + +USE_X11= Yes +CONFIGURE_STYLE= gnu +CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \ + LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" + +WRKDIST= ${WRKDIR}/flvw +WRKSRC= ${WRKDIST}/1.0 + +do-install: + ${INSTALL_DATA} ${WRKBUILD}/lib/libflvw.a ${PREFIX}/lib + ${INSTALL_DATA_DIR} ${PREFIX}/include/FL + ${INSTALL_DATA} ${WRKSRC}/FL/*H ${PREFIX}/include/FL + +.include diff --git a/x11/flvw/files/md5 b/x11/flvw/files/md5 new file mode 100644 index 00000000000..7f23ff92a0b --- /dev/null +++ b/x11/flvw/files/md5 @@ -0,0 +1,3 @@ +MD5 (flvw-20000224.tgz) = 0412103fcb01ff2c0cdb699b37af385e +RMD160 (flvw-20000224.tgz) = 5a87e35c20c4aeb5d38c0cac3a0bef52bc0fbe74 +SHA1 (flvw-20000224.tgz) = e7b7d2a79c1db470b4000c70b63a1bab833eb997 diff --git a/x11/flvw/patches/patch-1_0_FL_Flv_Style_H b/x11/flvw/patches/patch-1_0_FL_Flv_Style_H new file mode 100644 index 00000000000..5d86ae2791a --- /dev/null +++ b/x11/flvw/patches/patch-1_0_FL_Flv_Style_H @@ -0,0 +1,11 @@ +$OpenBSD: patch-1_0_FL_Flv_Style_H,v 1.1.1.1 2001/04/02 15:10:26 wilfried Exp $ +--- 1.0/FL/Flv_Style.H.orig Sun Jan 30 13:38:46 2000 ++++ 1.0/FL/Flv_Style.H Sat Feb 10 18:49:06 2001 +@@ -79,6 +79,7 @@ class Flv_Style_List + { + public: + Flv_Style_List(); ++ ~Flv_Style_List(); + + void clear(void); // Undefine all styles in list + void compact(void); // Release any unused style memory diff --git a/x11/flvw/patches/patch-1_0_Makefile b/x11/flvw/patches/patch-1_0_Makefile new file mode 100644 index 00000000000..c9f0c545581 --- /dev/null +++ b/x11/flvw/patches/patch-1_0_Makefile @@ -0,0 +1,29 @@ +$OpenBSD: patch-1_0_Makefile,v 1.1.1.1 2001/04/02 15:10:26 wilfried Exp $ +--- 1.0/Makefile.orig Sat Jan 22 14:16:06 2000 ++++ 1.0/Makefile Sat Feb 10 15:52:45 2001 +@@ -26,7 +26,7 @@ + + SHELL=/bin/sh + +-DIRS = src test ++DIRS = src + + all: makeinclude + @for dir in $(DIRS); do\ +@@ -36,16 +36,6 @@ all: makeinclude + fi;\ + (cd $$dir;$(MAKE));\ + done +- @echo "" +- @echo "" +- @echo "libflvw.a has been built successfully." +- @echo " For further information see the example" +- @echo " programs in the test directory and the" +- @echo " documentation in documentation/html." +- @echo "" +- @echo "Enjoy :)" +- @echo "" +- @echo "" + + install: makeinclude + @for dir in $(DIRS); do\ diff --git a/x11/flvw/patches/patch-1_0_configure b/x11/flvw/patches/patch-1_0_configure new file mode 100644 index 00000000000..4022a347c90 --- /dev/null +++ b/x11/flvw/patches/patch-1_0_configure @@ -0,0 +1,12 @@ +$OpenBSD: patch-1_0_configure,v 1.1.1.1 2001/04/02 15:10:26 wilfried Exp $ +--- 1.0/configure.orig Sun Feb 20 15:14:52 2000 ++++ 1.0/configure Mon Apr 2 15:35:23 2001 +@@ -990,7 +990,7 @@ else + fi + + +-LDFLAGS="$CXXFLAGS" ++#LDFLAGS="$CXXFLAGS" + + + echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 diff --git a/x11/flvw/patches/patch-1_0_configure_in b/x11/flvw/patches/patch-1_0_configure_in new file mode 100644 index 00000000000..a32df037904 --- /dev/null +++ b/x11/flvw/patches/patch-1_0_configure_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-1_0_configure_in,v 1.1.1.1 2001/04/02 15:10:26 wilfried Exp $ +--- 1.0/configure.in.orig Sat Jan 22 14:18:28 2000 ++++ 1.0/configure.in Wed Mar 21 17:18:12 2001 +@@ -18,7 +18,7 @@ AC_PATH_PROG(AR,ar) + AC_PATH_PROG(RM,rm) + + dnl Check for libraries... +-LDFLAGS="$CXXFLAGS" ++#LDFLAGS="$CXXFLAGS" + AC_SUBST(LDFLAGS) + + AC_PATH_X diff --git a/x11/flvw/patches/patch-1_0_makeinclude_in b/x11/flvw/patches/patch-1_0_makeinclude_in new file mode 100644 index 00000000000..2df5f75cc8f --- /dev/null +++ b/x11/flvw/patches/patch-1_0_makeinclude_in @@ -0,0 +1,57 @@ +$OpenBSD: patch-1_0_makeinclude_in,v 1.1.1.1 2001/04/02 15:10:26 wilfried Exp $ +--- 1.0/makeinclude.in.orig Sat Jan 22 14:18:28 2000 ++++ 1.0/makeinclude.in Wed Mar 21 17:21:25 2001 +@@ -30,27 +30,27 @@ CXX = @CXX@ + RANLIB = @RANLIB@ + RM = @RM@ -f + SHELL = /bin/sh +-LIBDIR = /usr/local/lib ++LIBDIR = @prefix@/lib + + # + # Version options + # + +-ifdef V1 +-DEFVER = +-else +-DEFVER = -DFLTK_2 +-endif ++#ifdef V1 ++#DEFVER = ++#else ++#DEFVER = -DFLTK_2 ++#endif + + # + # Program options... + # + +-ARFLAGS = crvs +-CFLAGS = @CFLAGS@ -I.. $(DEFVER) +-CXXFLAGS = @CXXFLAGS@ -I.. $(DEFVER) +-LIBS = -lflvw @LIBS@ -lX11 -lXext -rdynamic -lm -ldl +-LDFLAGS = @LDFLAGS@ -L../lib ++ARFLAGS = r ++CFLAGS = @CFLAGS@ $(DEFVER) ++CXXFLAGS = @CXXFLAGS@ $(DEFVER) ++LIBS = -lflvw @LIBS@ -lX11 -lXext -lm ++LDFLAGS = @LDFLAGS@ + + # + # Rules... +@@ -59,12 +59,10 @@ LDFLAGS = @LDFLAGS@ -L../lib + .SUFFIXES: .c .cxx .h .o + + .c.o: +- @echo Compiling $<... +- @$(CC) $(CFLAGS) -c $< ++ $(CC) $(CFLAGS) -c $< + + .cxx.o: +- @echo Compiling $<... +- @$(CXX) $(CXXFLAGS) -I. -c $< ++ $(CXX) $(CXXFLAGS) -I.. -c $< + + # + # End of makeinclude diff --git a/x11/flvw/patches/patch-1_0_src_Flv_Style_cxx b/x11/flvw/patches/patch-1_0_src_Flv_Style_cxx new file mode 100644 index 00000000000..383a43d891e --- /dev/null +++ b/x11/flvw/patches/patch-1_0_src_Flv_Style_cxx @@ -0,0 +1,19 @@ +$OpenBSD: patch-1_0_src_Flv_Style_cxx,v 1.1.1.1 2001/04/02 15:10:26 wilfried Exp $ +--- 1.0/src/Flv_Style.cxx.orig Sat Jan 22 14:28:44 2000 ++++ 1.0/src/Flv_Style.cxx Sat Feb 10 19:44:38 2001 +@@ -471,6 +471,15 @@ Flv_Style_List::Flv_Style_List() + vcount = vallocated = vcurrent = 0; + } + ++Flv_Style_List::~Flv_Style_List() ++{ ++ if(list) { ++ for (int t=0; tclear_all(); ++ delete []list; ++ } ++} ++ + void Flv_Style_List::compact(void) + { + int n, t; diff --git a/x11/flvw/patches/patch-1_0_src_Flve_Combo_cxx b/x11/flvw/patches/patch-1_0_src_Flve_Combo_cxx new file mode 100644 index 00000000000..c8d12eec222 --- /dev/null +++ b/x11/flvw/patches/patch-1_0_src_Flve_Combo_cxx @@ -0,0 +1,20 @@ +$OpenBSD: patch-1_0_src_Flve_Combo_cxx,v 1.1.1.1 2001/04/02 15:10:26 wilfried Exp $ +--- 1.0/src/Flve_Combo.cxx.orig Thu Jan 27 13:32:00 2000 ++++ 1.0/src/Flve_Combo.cxx Sat Feb 10 19:45:26 2001 +@@ -590,11 +590,12 @@ void Flv_Combo_Items::sort(void) + void Flv_Combo_Items::clear(void) // Clear list + { + int t; +- for (t=0; t