On Fri, 25 May 2012 16:47:01 +0200, Pascal Stumpf wrote: > Update to latest version, eliminate groff, give more accurate license, > use SUBST_CMD instead of perl and fix version reported by fltk-config. > > graphics/aqsis and x11/flwm need patches to build (attached). Haven't > yet tested palm/pose though (i386 only). > > Maintainer doesn't seem to be active any more. >
ping? > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/x11/fltk/Makefile,v > retrieving revision 1.41 > diff -u -p -r1.41 Makefile > --- Makefile 22 Nov 2010 08:36:56 -0000 1.41 > +++ Makefile 25 May 2012 10:30:40 -0000 > @@ -2,29 +2,28 @@ > > COMMENT= Fast-Light Tool Kit > > -VER= 1.1.7 > -DISTNAME= fltk-${VER} > -REVISION= 2 > +VER= 1.3.0 > +DISTNAME= fltk-${VER}-source > +PKGNAME= fltk-${VER} > > CATEGORIES= x11 > -SHARED_LIBS= fltk 6.0 \ > - fltk_forms 6.0 \ > - fltk_gl 6.0 \ > - fltk_images 6.0 > +SHARED_LIBS= fltk 7.0 \ > + fltk_forms 7.0 \ > + fltk_gl 7.0 \ > + fltk_images 7.0 > > HOMEPAGE= http://www.fltk.org/ > > MAINTAINER= Peter Stromberg <wilfr...@openbsd.org> > > -# LGPL > +# LGPLv2 with exceptions (see COPYING) > PERMIT_PACKAGE_CDROM= Yes > PERMIT_PACKAGE_FTP= Yes > PERMIT_DISTFILES_CDROM= Yes > PERMIT_DISTFILES_FTP= Yes > > -WANTLIB += X11 Xau Xdmcp Xext c m stdc++ z jpeg png pthread > - > -DISTFILES= ${DISTNAME}-source${EXTRACT_SUFX} > +WANTLIB += X11 Xau Xdmcp Xext Xft Xinerama c fontconfig jpeg m > +WANTLIB += png pthread stdc++ z > > MASTER_SITES= > ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk/${VER}/ \ > > ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/${VER}/ \ > @@ -39,7 +38,6 @@ LIB_DEPENDS= graphics/jpeg \ > graphics/png > > NO_REGRESS= Yes > -USE_GROFF = Yes > CONFIGURE_STYLE=autoconf no-autoheader > AUTOCONF_VERSION=2.59 > CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ > @@ -48,15 +46,14 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/ > CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ > CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \ > LIBS="-L${LOCALBASE}/lib" \ > - FL_MAJOR_VERSION=${LIBfltk_VERSION:R} \ > - FL_MINOR_VERSION=${LIBfltk_VERSION:E} \ > - FL_PATCH_VERSION=0 > + LIBfltk_VERSION="${LIBfltk_VERSION}" > .for n v in ${SHARED_LIBS} > MAKE_ENV+= LIB$n_VERSION=${LIB$n_VERSION} > .endfor > > +WRKDIST= ${WRKDIR}/fltk-${VER} > + > pre-build: > - perl -pi -e "s,%%SYSCONFDIR%%,${SYSCONFDIR}," \ > - ${WRKSRC}/src/Fl_Preferences.cxx > + ${SUBST_CMD} ${WRKSRC}/src/Fl_Preferences.cxx > > .include <bsd.port.mk> > Index: distinfo > =================================================================== > RCS file: /cvs/ports/x11/fltk/distinfo,v > retrieving revision 1.10 > diff -u -p -r1.10 distinfo > --- distinfo 5 Apr 2007 17:36:19 -0000 1.10 > +++ distinfo 25 May 2012 10:30:40 -0000 > @@ -1,5 +1,5 @@ > -MD5 (fltk-1.1.7-source.tar.gz) = 7EjJb64FiVbm5cnBzaYVfQ== > -RMD160 (fltk-1.1.7-source.tar.gz) = 4mSPjQLTpnOcuUVZQKTOvpwBqnc= > -SHA1 (fltk-1.1.7-source.tar.gz) = P4pkyRrkZT4TAFZd1njrbbSAVbo= > -SHA256 (fltk-1.1.7-source.tar.gz) = > jWCWJm8TPPQOmK7FLaFehJ1qytQjW2bagnmJ+oLGzC0= > -SIZE (fltk-1.1.7-source.tar.gz) = 2517351 > +MD5 (fltk-1.3.0-source.tar.gz) = RNXXugav3TbqF9prS3A8ow== > +RMD160 (fltk-1.3.0-source.tar.gz) = 3qHrQq4bge+iKlQZiVYhE2filFo= > +SHA1 (fltk-1.3.0-source.tar.gz) = cg8oBL5hMuuumQnU503tzACznSU= > +SHA256 (fltk-1.3.0-source.tar.gz) = > mQZ2gIKUzqTMo96DOtWl3ggHPBG2ZTVtTs810iU1shw= > +SIZE (fltk-1.3.0-source.tar.gz) = 4111004 > Index: patches/patch-Makefile > =================================================================== > RCS file: /cvs/ports/x11/fltk/patches/patch-Makefile,v > retrieving revision 1.4 > diff -u -p -r1.4 patch-Makefile > --- patches/patch-Makefile 19 Oct 2006 09:41:32 -0000 1.4 > +++ patches/patch-Makefile 25 May 2012 10:30:40 -0000 > @@ -1,12 +1,12 @@ > $OpenBSD: patch-Makefile,v 1.4 2006/10/19 09:41:32 wilfried Exp $ > ---- Makefile.orig Sun Jan 15 19:36:16 2006 > -+++ Makefile Thu Oct 19 10:43:24 2006 > +--- Makefile.orig Tue Feb 15 16:29:03 2011 > ++++ Makefile Fri May 25 01:03:08 2012 > @@ -27,7 +27,7 @@ > > include makeinclude > > --DIRS = $(IMAGEDIRS) src fluid test documentation > -+DIRS = $(IMAGEDIRS) src fluid documentation > +-DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid test documentation > ++DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid documentation > > - all: makeinclude > + all: makeinclude fltk-config > for dir in $(DIRS); do\ > Index: patches/patch-configure_in > =================================================================== > RCS file: /cvs/ports/x11/fltk/patches/patch-configure_in,v > retrieving revision 1.12 > diff -u -p -r1.12 patch-configure_in > --- patches/patch-configure_in 22 Sep 2010 12:47:45 -0000 1.12 > +++ patches/patch-configure_in 25 May 2012 10:30:40 -0000 > @@ -1,51 +1,34 @@ > $OpenBSD: patch-configure_in,v 1.12 2010/09/22 12:47:45 ajacoutot Exp $ > ---- configure.in.orig Sun Jan 15 19:36:16 2006 > -+++ configure.in Tue Sep 21 07:55:56 2010 > -@@ -34,9 +34,9 @@ dnl Required file in package... > - AC_INIT(src/Fl.cxx) > - > - dnl FLTK library versions... > --FL_MAJOR_VERSION=1 > --FL_MINOR_VERSION=1 > --FL_PATCH_VERSION=7 > -+#FL_MAJOR_VERSION=1 > -+#FL_MINOR_VERSION=1 > -+#FL_PATCH_VERSION=7 > - FL_API_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION} > +--- configure.in.orig Sun Mar 6 17:54:58 2011 > ++++ configure.in Fri May 25 01:07:10 2012 > +@@ -48,7 +48,7 @@ dnl FLTK library versions... > + FL_MAJOR_VERSION=1 > + FL_MINOR_VERSION=3 > + FL_PATCH_VERSION=0 > +-FL_API_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION} > ++FL_API_VERSION=${LIBfltk_VERSION} > > AC_SUBST(FL_MAJOR_VERSION) > -@@ -530,13 +530,6 @@ dnl Check for pthreads for multi-threaded apps... > - have_pthread=no > - > - if test "x$enable_threads" = xyes; then > -- AC_CHECK_HEADER(pthread.h, AC_DEFINE(HAVE_PTHREAD_H)) > -- AC_CHECK_LIB(pthread, pthread_create) > -- > -- if test "x$ac_cv_lib_pthread_pthread_create" = xyes -a > x$ac_cv_header_pthread_h = xyes; then > -- have_pthread=yes > -- else > -- dnl *BSD uses -pthread option... > - AC_MSG_CHECKING([for pthread_create using -pthread]) > - SAVELIBS="$LIBS" > - LIBS="-pthread $LIBS" > -@@ -546,7 +539,6 @@ if test "x$enable_threads" = xyes; then > - have_pthread=yes, > - LIBS="$SAVELIBS") > - AC_MSG_RESULT([$have_pthread]) > -- fi > - fi > + AC_SUBST(FL_MINOR_VERSION) > +@@ -789,7 +789,7 @@ if test "x$enable_threads" != xno -a x$check_pthread = > > - dnl Define OS-specific stuff... > -@@ -647,7 +639,7 @@ case $uname in > + if test x$ac_cv_header_pthread_h = xyes; then > + dnl Check various threading options for the platforms we support > +- for flag in -lpthreads -lpthread -pthread; do > ++ for flag in -pthread; do > + AC_MSG_CHECKING([for pthread_create using $flag]) > + SAVELIBS="$LIBS" > + LIBS="$flag $LIBS" > +@@ -923,7 +923,7 @@ case $uname_GUI in > AC_MSG_WARN(Ignoring libraries \"$X_PRE_LIBS\" requested by > configure.) > fi > > -- LIBS="$LIBS -lXext -lX11 $X_EXTRA_LIBS" > -+ LIBS="$LIBS -lXext -lX11 -lXdmcp -lXau $X_EXTRA_LIBS" > +- LIBS="$LIBS -lX11 $X_EXTRA_LIBS" > ++ LIBS="$LIBS -lX11 -lXdmcp -lXau $X_EXTRA_LIBS" > CFLAGS="$CFLAGS $X_CFLAGS" > CXXFLAGS="$CXXFLAGS $X_CFLAGS" > LDFLAGS="$X_LIBS $LDFLAGS" > -@@ -844,7 +836,7 @@ if test -n "$GCC"; then > +@@ -1147,7 +1147,7 @@ if test -n "$GCC"; then > if test "x$with_optim" != x; then > OPTIM="$with_optim $OPTIM" > else > Index: patches/patch-documentation_Makefile > =================================================================== > RCS file: patches/patch-documentation_Makefile > diff -N patches/patch-documentation_Makefile > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-documentation_Makefile 25 May 2012 10:30:40 -0000 > @@ -0,0 +1,35 @@ > +$OpenBSD$ > +--- documentation/Makefile.orig Thu Jan 6 00:00:33 2011 > ++++ documentation/Makefile Fri May 25 12:14:18 2012 > +@@ -62,7 +62,7 @@ MANPAGES = $(SRC_DOCDIR)/fltk.$(CAT3EXT) $(SRC_DOCDIR) > + $(SRC_DOCDIR)/fluid.$(CAT1EXT) $(SRC_DOCDIR)/blocks.$(CAT6EXT) \ > + $(SRC_DOCDIR)/checkers.$(CAT6EXT) > $(SRC_DOCDIR)/sudoku.$(CAT6EXT) > + > +-all: $(MANPAGES) > ++all: > + > + # use make dist to create all docs for distribution files > + # you need an installed version of doxygen for this > +@@ -79,9 +79,8 @@ clean: > + > + depend: > + > +-install: $(MANPAGES) > ++install: > + echo "Installing documentation files in $(DESTDIR)$(docdir) ..." > +- -$(INSTALL_DIR) $(DESTDIR)$(docdir) > + if test -f html/index.html ; then \ > + for file in html/* ; do \ > + $(INSTALL_DATA) $$file $(DESTDIR)$(docdir); \ > +@@ -92,11 +91,6 @@ install: $(MANPAGES) > + $(INSTALL_DATA) fltk.pdf $(DESTDIR)$(docdir); \ > + fi > + echo "Installing man pages in $(DESTDIR)$(mandir) ..." > +- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat1 > +- $(INSTALL_MAN) $(SRC_DOCDIR)/fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1 > +- $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.$(CAT1EXT) > $(DESTDIR)$(mandir)/cat1 > +- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat3 > +- $(INSTALL_MAN) $(SRC_DOCDIR)/fltk.$(CAT3EXT) $(DESTDIR)$(mandir)/cat3 > + -$(INSTALL_DIR) $(DESTDIR)$(mandir)/man1 > + $(INSTALL_MAN) $(SRC_DOCDIR)/fluid.man $(DESTDIR)$(mandir)/man1/fluid.1 > + $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.man > $(DESTDIR)$(mandir)/man1/fltk-config.1 > Index: patches/patch-makeinclude_in > =================================================================== > RCS file: /cvs/ports/x11/fltk/patches/patch-makeinclude_in,v > retrieving revision 1.3 > diff -u -p -r1.3 patch-makeinclude_in > --- patches/patch-makeinclude_in 19 Oct 2006 09:41:32 -0000 1.3 > +++ patches/patch-makeinclude_in 25 May 2012 10:30:40 -0000 > @@ -1,7 +1,7 @@ > $OpenBSD: patch-makeinclude_in,v 1.3 2006/10/19 09:41:32 wilfried Exp $ > ---- makeinclude.in.orig Sun Jan 15 19:36:16 2006 > -+++ makeinclude.in Thu Oct 19 10:37:16 2006 > -@@ -110,32 +110,24 @@ CAT6EXT = @CAT6EXT@ > +--- makeinclude.in.orig Thu Dec 23 15:24:29 2010 > ++++ makeinclude.in Fri May 25 01:07:51 2012 > +@@ -139,9 +139,6 @@ INSTALL_SCRIPT = $(INSTALL) -m 755 > INSTALL_DESKTOP = @INSTALL_DESKTOP@ > UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@ > > @@ -9,28 +9,5 @@ $OpenBSD: patch-makeinclude_in,v 1.3 200 > -.SILENT: > - > # Build commands and filename extensions... > - .SUFFIXES: .0 .1 .3 .c .cxx .h .fl .man .o .z $(EXEEXT) > + .SUFFIXES: .0 .1 .3 .6 .c .cxx .mm .h .fl .man .o .z $(EXEEXT) > > - .o$(EXEEXT): > -- echo Linking $@... > - $(CXX) $(CXXFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@ > - $(POSTBUILD) $@ ../FL/mac.r > - > - .c.o: > -- echo Compiling $<... > - $(CC) -I.. @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CFLAGS) -c $< > - > - .cxx.o: > -- echo Compiling $<... > - $(CXX) -I.. @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CXXFLAGS) -c $< > - > - .man.0 .man.1 .man.3: > -- echo Formatting $<... > - rm -f $@ > - $(NROFF) -man $< >$@ > - > - .man.z: > -- echo Formatting $<... > - rm -f $@ t.z > - $(NROFF) -man $< >t > - pack -f t > Index: patches/patch-src_Fl_PNG_Image_cxx > =================================================================== > RCS file: patches/patch-src_Fl_PNG_Image_cxx > diff -N patches/patch-src_Fl_PNG_Image_cxx > --- patches/patch-src_Fl_PNG_Image_cxx 8 Jul 2011 20:36:09 -0000 > 1.1 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,59 +0,0 @@ > -$OpenBSD: patch-src_Fl_PNG_Image_cxx,v 1.1 2011/07/08 20:36:09 naddy Exp $ > - > -Fix build with png-1.5. > - > ---- src/Fl_PNG_Image.cxx.orig Fri Apr 15 18:13:17 2005 > -+++ src/Fl_PNG_Image.cxx Mon Jul 4 16:15:48 2011 > -@@ -66,6 +66,7 @@ Fl_PNG_Image::Fl_PNG_Image(const char *png) // I - Fil > - png_structp pp; // PNG read pointer > - png_infop info; // PNG info pointers > - png_bytep *rows; // PNG row pointers > -+ int num_trans = 0; // PNG # of transp. colors > - > - > - // Open the PNG file... > -@@ -75,7 +76,7 @@ Fl_PNG_Image::Fl_PNG_Image(const char *png) // I - Fil > - pp = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); > - info = png_create_info_struct(pp); > - > -- if (setjmp(pp->jmpbuf)) > -+ if (setjmp(png_jmpbuf(pp))) > - { > - Fl::warning("PNG file \"%s\" contains errors!\n", png); > - return; > -@@ -87,27 +88,28 @@ Fl_PNG_Image::Fl_PNG_Image(const char *png) // I - Fil > - // Get the image dimensions and convert to grayscale or RGB... > - png_read_info(pp, info); > - > -- if (info->color_type == PNG_COLOR_TYPE_PALETTE) > -+ if (png_get_color_type(pp, info) == PNG_COLOR_TYPE_PALETTE) > - png_set_expand(pp); > - > -- if (info->color_type & PNG_COLOR_MASK_COLOR) > -+ if (png_get_color_type(pp, info) & PNG_COLOR_MASK_COLOR) > - channels = 3; > - else > - channels = 1; > - > -- if ((info->color_type & PNG_COLOR_MASK_ALPHA) || info->num_trans) > -+ png_get_tRNS(pp, info, 0, &num_trans, 0); > -+ if ((png_get_color_type(pp, info) & PNG_COLOR_MASK_ALPHA) || num_trans) > - channels ++; > - > -- w((int)(info->width)); > -- h((int)(info->height)); > -+ w((int)(png_get_image_width(pp, info))); > -+ h((int)(png_get_image_height(pp, info))); > - d(channels); > - > -- if (info->bit_depth < 8) > -+ if (png_get_bit_depth(pp, info) < 8) > - { > - png_set_packing(pp); > - png_set_expand(pp); > - } > -- else if (info->bit_depth == 16) > -+ else if (png_get_bit_depth(pp, info) == 16) > - png_set_strip_16(pp); > - > - # if defined(HAVE_PNG_GET_VALID) && defined(HAVE_PNG_SET_TRNS_TO_ALPHA) > Index: patches/patch-src_Fl_Preferences_cxx > =================================================================== > RCS file: /cvs/ports/x11/fltk/patches/patch-src_Fl_Preferences_cxx,v > retrieving revision 1.2 > diff -u -p -r1.2 patch-src_Fl_Preferences_cxx > --- patches/patch-src_Fl_Preferences_cxx 1 Apr 2007 17:48:42 -0000 > 1.2 > +++ patches/patch-src_Fl_Preferences_cxx 25 May 2012 10:30:40 -0000 > @@ -1,12 +1,12 @@ > $OpenBSD: patch-src_Fl_Preferences_cxx,v 1.2 2007/04/01 17:48:42 martynas > Exp $ > ---- src/Fl_Preferences.cxx.orig Sun Nov 27 16:45:48 2005 > -+++ src/Fl_Preferences.cxx Sun Apr 1 18:27:01 2007 > -@@ -673,7 +673,7 @@ Fl_Preferences::RootNode::RootNode( Fl_Preferences *pr > - } > - > +--- src/Fl_Preferences.cxx.orig Wed Jan 19 07:33:48 2011 > ++++ src/Fl_Preferences.cxx Fri May 25 11:59:39 2012 > +@@ -1088,7 +1088,7 @@ Fl_Preferences::RootNode::RootNode( Fl_Preferences *pr > + break; > + } > case SYSTEM: > - strcpy(filename, "/etc/fltk/"); > -+ strlcpy(filename, "%%SYSCONFDIR%%/fltk/", sizeof(filename)); > ++ strlcpy(filename, "${SYSCONFDIR}/fltk/", sizeof(filename)); > break; > - } > - > + } > + snprintf(filename + strlen(filename), sizeof(filename) - strlen(filename), > Index: patches/patch-src_Makefile > =================================================================== > RCS file: /cvs/ports/x11/fltk/patches/patch-src_Makefile,v > retrieving revision 1.8 > diff -u -p -r1.8 patch-src_Makefile > --- patches/patch-src_Makefile 19 Oct 2006 09:41:32 -0000 1.8 > +++ patches/patch-src_Makefile 25 May 2012 10:30:40 -0000 > @@ -1,143 +1,107 @@ > $OpenBSD: patch-src_Makefile,v 1.8 2006/10/19 09:41:32 wilfried Exp $ > ---- src/Makefile.orig Mon Aug 8 02:54:30 2005 > -+++ src/Makefile Thu Oct 19 11:07:34 2006 > -@@ -195,16 +195,12 @@ all: $(LIBNAME) $(DSONAME) \ > - $(IMGLIBNAME) $(IMGDSONAME) > - > - $(LIBNAME): $(OBJECTS) > -- echo $(LIBCOMMAND) $@ ... > - $(RM) $@ > +--- src/Makefile.orig Sun Feb 6 15:08:08 2011 > ++++ src/Makefile Fri May 25 11:57:10 2012 > +@@ -238,11 +238,10 @@ $(LIBNAME): $(OBJECTS) > $(LIBCOMMAND) $@ $(OBJECTS) > $(RANLIB) $@ > > --libfltk.so.1.1: $(OBJECTS) > -- echo $(DSOCOMMAND) $@ ... > +-libfltk.so.1.3: $(OBJECTS) > +libfltk.so.$(LIBfltk_VERSION): $(OBJECTS) > + echo $(DSOCOMMAND) $@ ... > $(DSOCOMMAND) $@ $(OBJECTS) > -- $(RM) libfltk.so > -- $(LN) libfltk.so.1.1 libfltk.so > + $(RM) libfltk.so > +- $(LN) libfltk.so.1.3 libfltk.so > > - libfltk.sl.1.1: $(OBJECTS) > + libfltk.sl.1.3: $(OBJECTS) > echo $(DSOCOMMAND) $@ ... > -@@ -231,16 +227,12 @@ libfltk_s.a: $(OBJECTS) > - $(CHMOD) +x libfltk_s.a > - > - $(FLLIBNAME): $(FLOBJECTS) > -- echo $(LIBCOMMAND) $@ ... > - $(RM) $@ > +@@ -274,11 +273,9 @@ $(FLLIBNAME): $(FLOBJECTS) > $(LIBCOMMAND) $@ $(FLOBJECTS) > $(RANLIB) $@ > > --libfltk_forms.so.1.1: $(FLOBJECTS) libfltk.so.1.1 > -- echo $(DSOCOMMAND) $@ ... > +-libfltk_forms.so.1.3: $(FLOBJECTS) libfltk.so.1.3 > +libfltk_forms.so.$(LIBfltk_forms_VERSION): $(FLOBJECTS) > libfltk.so.$(LIBfltk_VERSION) > + echo $(DSOCOMMAND) $@ ... > $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk > - $(RM) libfltk_forms.so > -- $(LN) libfltk_forms.so.1.1 libfltk_forms.so > +- $(LN) libfltk_forms.so.1.3 libfltk_forms.so > > - libfltk_forms.sl.1.1: $(FLOBJECTS) libfltk.sl.1.1 > + libfltk_forms.sl.1.3: $(FLOBJECTS) libfltk.sl.1.3 > echo $(DSOCOMMAND) $@ ... > -@@ -267,16 +259,12 @@ libfltk_forms_s.a: $(FLOBJECTS) > - $(CHMOD) +x libfltk_forms_s.a > - > - $(GLLIBNAME): $(GLOBJECTS) > -- echo $(LIBCOMMAND) $@ ... > - $(RM) $@ > +@@ -310,11 +307,9 @@ $(GLLIBNAME): $(GLOBJECTS) > $(LIBCOMMAND) $@ $(GLOBJECTS) > $(RANLIB) $@ > > --libfltk_gl.so.1.1: $(GLOBJECTS) libfltk.so.1.1 > -- echo $(DSOCOMMAND) $@ ... > +-libfltk_gl.so.1.3: $(GLOBJECTS) libfltk.so.1.3 > +libfltk_gl.so.$(LIBfltk_gl_VERSION): $(GLOBJECTS) > libfltk.so.$(LIBfltk_VERSION) > + echo $(DSOCOMMAND) $@ ... > $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk > - $(RM) libfltk_gl.so > -- $(LN) libfltk_gl.so.1.1 libfltk_gl.so > +- $(LN) libfltk_gl.so.1.3 libfltk_gl.so > > - libfltk_gl.sl.1.1: $(GLOBJECTS) libfltk.sl.1.1 > + libfltk_gl.sl.1.3: $(GLOBJECTS) libfltk.sl.1.3 > echo $(DSOCOMMAND) $@ ... > -@@ -303,16 +291,12 @@ libfltk_gl_s.a: $(GLOBJECTS) > - $(CHMOD) +x libfltk_gl_s.a > - > - $(IMGLIBNAME): $(IMGOBJECTS) > -- echo $(LIBCOMMAND) $@ ... > - $(RM) $@ > +@@ -346,11 +341,9 @@ $(IMGLIBNAME): $(IMGOBJECTS) > $(LIBCOMMAND) $@ $(IMGOBJECTS) > $(RANLIB) $@ > > --libfltk_images.so.1.1: $(IMGOBJECTS) libfltk.so.1.1 > -- echo $(DSOCOMMAND) $@ ... > +-libfltk_images.so.1.3: $(IMGOBJECTS) libfltk.so.1.3 > +libfltk_images.so.$(LIBfltk_images_VERSION): $(IMGOBJECTS) > libfltk.so.$(LIBfltk_VERSION) > + echo $(DSOCOMMAND) $@ ... > $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk > - $(RM) libfltk_images.so > -- $(LN) libfltk_images.so.1.1 libfltk_images.so > +- $(LN) libfltk_images.so.1.3 libfltk_images.so > > - libfltk_images.sl.1.1: $(IMGOBJECTS) libfltk.sl.1.1 > + libfltk_images.sl.1.3: $(IMGOBJECTS) libfltk.sl.1.3 > echo $(DSOCOMMAND) $@ ... > -@@ -466,7 +450,6 @@ install: $(LIBNAME) $(DSONAME) \ > - $(FLLIBNAME) $(FLDSONAME) \ > - $(GLLIBNAME) $(GLDSONAME) \ > - $(IMGLIBNAME) $(IMGDSONAME) > -- echo "Installing libraries in $(DESTDIR)$(libdir)..." > - -$(MKDIR) $(DESTDIR)$(libdir) > - -$(MKDIR) $(DESTDIR)$(bindir) > - $(RM) $(DESTDIR)$(libdir)/$(LIBNAME) > -@@ -477,11 +460,10 @@ install: $(LIBNAME) $(DSONAME) \ > - $(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBNAME); \ > +@@ -572,10 +565,9 @@ install: $(LIBNAME) $(DSONAME) \ > + $(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBBASENAME); \ > fi > - $(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBNAME) > -- if test x$(DSONAME) = xlibfltk.so.1.1; then\ > + $(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBBASENAME) > +- if test x$(DSONAME) = xlibfltk.so.1.3; then\ > + if test x$(DSONAME) = xlibfltk.so.$(LIBfltk_VERSION); then\ > $(RM) $(DESTDIR)$(libdir)/libfltk.so*;\ > -- $(CP) libfltk.so.1.1 $(DESTDIR)$(libdir); \ > -- $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk.so.1.1; \ > -- $(LN) libfltk.so.1.1 $(DESTDIR)$(libdir)/libfltk.so;\ > -+ $(CP) libfltk.so.$(LIBfltk_VERSION) $(DESTDIR)$(libdir); \ > -+ $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk.so.$(LIBfltk_VERSION); > \ > +- $(INSTALL_LIB) libfltk.so.1.3 $(DESTDIR)$(libdir); \ > +- $(LN) libfltk.so.1.3 $(DESTDIR)$(libdir)/libfltk.so;\ > ++ $(INSTALL_LIB) libfltk.so.$(LIBfltk_VERSION) > $(DESTDIR)$(libdir);\ > fi > - if test x$(DSONAME) = xlibfltk.sl.1.1; then\ > + if test x$(DSONAME) = xlibfltk.sl.1.3; then\ > $(RM) $(DESTDIR)$(libdir)/libfltk.sl*;\ > -@@ -516,11 +498,10 @@ install: $(LIBNAME) $(DSONAME) \ > - $(CP) libfltk.dll.a $(DESTDIR)$(libdir); \ > - $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk.dll.a; \ > +@@ -603,10 +595,9 @@ install: $(LIBNAME) $(DSONAME) \ > + $(RM) $(DESTDIR)$(libdir)/libfltk.dll.a;\ > + $(INSTALL_LIB) libfltk.dll.a $(DESTDIR)$(libdir); \ > fi > -- if test x$(FLDSONAME) = xlibfltk_forms.so.1.1; then\ > +- if test x$(FLDSONAME) = xlibfltk_forms.so.1.3; then\ > + if test x$(FLDSONAME) = xlibfltk_forms.so.$(LIBfltk_forms_VERSION); > then\ > $(RM) $(DESTDIR)$(libdir)/libfltk_forms.so*;\ > -- $(CP) libfltk_forms.so.1.1 $(DESTDIR)$(libdir); \ > -- $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_forms.so.1.1; \ > -- $(LN) libfltk_forms.so.1.1 > $(DESTDIR)$(libdir)/libfltk_forms.so;\ > -+ $(CP) libfltk_forms.so.$(LIBfltk_VERSION) $(DESTDIR)$(libdir); \ > -+ $(CHMOD) 755 > $(DESTDIR)$(libdir)/libfltk_forms.so.$(LIBfltk_VERSION); \ > +- $(INSTALL_LIB) libfltk_forms.so.1.3 $(DESTDIR)$(libdir); \ > +- $(LN) libfltk_forms.so.1.3 > $(DESTDIR)$(libdir)/libfltk_forms.so;\ > ++ $(INSTALL_LIB) libfltk_forms.so.$(LIBfltk_forms_VERSION) > $(DESTDIR)$(libdir);\ > fi > - if test x$(FLDSONAME) = xlibfltk_forms.sl.1.1; then\ > + if test x$(FLDSONAME) = xlibfltk_forms.sl.1.3; then\ > $(RM) $(DESTDIR)$(libdir)/libfltk_forms.sl*;\ > -@@ -555,11 +536,10 @@ install: $(LIBNAME) $(DSONAME) \ > - $(CP) libfltk_forms.dll.a $(DESTDIR)$(libdir); \ > - $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_forms.dll.a; \ > +@@ -634,10 +625,9 @@ install: $(LIBNAME) $(DSONAME) \ > + $(RM) $(DESTDIR)$(libdir)/libfltk_forms.dll.a;\ > + $(INSTALL_LIB) libfltk_forms.dll.a $(DESTDIR)$(libdir); \ > fi > -- if test x$(GLDSONAME) = xlibfltk_gl.so.1.1; then\ > +- if test x$(GLDSONAME) = xlibfltk_gl.so.1.3; then\ > + if test x$(GLDSONAME) = xlibfltk_gl.so.$(LIBfltk_gl_VERSION); then\ > $(RM) $(DESTDIR)$(libdir)/libfltk_gl.so*;\ > -- $(CP) libfltk_gl.so.1.1 $(DESTDIR)$(libdir); \ > -- $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_gl.so.1.1; \ > -- $(LN) libfltk_gl.so.1.1 $(DESTDIR)$(libdir)/libfltk_gl.so;\ > -+ $(CP) libfltk_gl.so.$(LIBfltk_gl_VERSION) $(DESTDIR)$(libdir); \ > -+ $(CHMOD) 755 > $(DESTDIR)$(libdir)/libfltk_gl.so.$(LIBfltk_gl_VERSION); \ > +- $(INSTALL_LIB) libfltk_gl.so.1.3 $(DESTDIR)$(libdir); \ > +- $(LN) libfltk_gl.so.1.3 $(DESTDIR)$(libdir)/libfltk_gl.so;\ > ++ $(INSTALL_LIB) libfltk_gl.so.$(LIBfltk_gl_VERSION) > $(DESTDIR)$(libdir); \ > fi > - if test x$(GLDSONAME) = xlibfltk_gl.sl.1.1; then\ > + if test x$(GLDSONAME) = xlibfltk_gl.sl.1.3; then\ > $(RM) $(DESTDIR)$(libdir)/libfltk_gl.sl*;\ > -@@ -594,11 +574,10 @@ install: $(LIBNAME) $(DSONAME) \ > - $(CP) libfltk_gl.dll.a $(DESTDIR)$(libdir); \ > - $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_gl.dll.a; \ > +@@ -665,10 +655,9 @@ install: $(LIBNAME) $(DSONAME) \ > + $(RM) $(DESTDIR)$(libdir)/libfltk_gl.dll.a;\ > + $(INSTALL_LIB) libfltk_gl.dll.a $(DESTDIR)$(libdir); \ > fi > -- if test x$(IMGDSONAME) = xlibfltk_images.so.1.1; then\ > +- if test x$(IMGDSONAME) = xlibfltk_images.so.1.3; then\ > + if test x$(IMGDSONAME) = xlibfltk_images.so.$(LIBfltk_images_VERSION); > then\ > $(RM) $(DESTDIR)$(libdir)/libfltk_images.so*;\ > -- $(CP) libfltk_images.so.1.1 $(DESTDIR)$(libdir); \ > -- $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_images.so.1.1; \ > -- $(LN) libfltk_images.so.1.1 > $(DESTDIR)$(libdir)/libfltk_images.so;\ > -+ $(CP) libfltk_images.so.$(LIBfltk_images_VERSION) > $(DESTDIR)$(libdir); \ > -+ $(CHMOD) 755 > $(DESTDIR)$(libdir)/libfltk_images.so.$(LIBfltk_images_VERSION); \ > +- $(INSTALL_LIB) libfltk_images.so.1.3 $(DESTDIR)$(libdir); \ > +- $(LN) libfltk_images.so.1.3 > $(DESTDIR)$(libdir)/libfltk_images.so;\ > ++ $(INSTALL_LIB) libfltk_images.so.$(LIBfltk_images_VERSION) > $(DESTDIR)$(libdir); \ > fi > - if test x$(IMGDSONAME) = xlibfltk_images.sl.1.1; then\ > + if test x$(IMGDSONAME) = xlibfltk_images.sl.1.3; then\ > $(RM) $(DESTDIR)$(libdir)/libfltk_images.sl*;\ > Index: patches/patch-src_filename_list_cxx > =================================================================== > RCS file: patches/patch-src_filename_list_cxx > diff -N patches/patch-src_filename_list_cxx > --- patches/patch-src_filename_list_cxx 23 Mar 2012 20:14:47 -0000 > 1.1 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,12 +0,0 @@ > -$OpenBSD: patch-src_filename_list_cxx,v 1.1 2012/03/23 20:14:47 naddy Exp $ > ---- src/filename_list.cxx.orig Fri Mar 23 21:08:06 2012 > -+++ src/filename_list.cxx Fri Mar 23 21:08:43 2012 > -@@ -54,7 +54,7 @@ int fl_filename_list(const char *d, dirent ***list, > - Fl_File_Sort_F *sort) { > - #ifndef HAVE_SCANDIR > - int n = scandir(d, list, 0, sort); > --#elif defined(__hpux) || defined(__CYGWIN__) > -+#elif defined(__hpux) || defined(__CYGWIN__) || defined(__OpenBSD__) > - // HP-UX, Cygwin define the comparison function like this: > - int n = scandir(d, list, 0, (int(*)(const dirent **, const dirent > **))sort); > - #elif defined(__osf__) > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/x11/fltk/pkg/PLIST,v > retrieving revision 1.11 > diff -u -p -r1.11 PLIST > --- pkg/PLIST 22 Sep 2010 12:47:45 -0000 1.11 > +++ pkg/PLIST 25 May 2012 10:30:40 -0000 > @@ -3,422 +3,152 @@ bin/fltk-config > @bin bin/fluid > include/FL/ > include/FL/Enumerations.H > -include/FL/Enumerations.h > include/FL/Fl.H > -include/FL/Fl.h > include/FL/Fl_Adjuster.H > -include/FL/Fl_Adjuster.h > include/FL/Fl_BMP_Image.H > -include/FL/Fl_BMP_Image.h > include/FL/Fl_Bitmap.H > -include/FL/Fl_Bitmap.h > include/FL/Fl_Box.H > -include/FL/Fl_Box.h > include/FL/Fl_Browser.H > -include/FL/Fl_Browser.h > include/FL/Fl_Browser_.H > -include/FL/Fl_Browser_.h > include/FL/Fl_Button.H > -include/FL/Fl_Button.h > +include/FL/Fl_Cairo.H > +include/FL/Fl_Cairo_Window.H > include/FL/Fl_Chart.H > -include/FL/Fl_Chart.h > include/FL/Fl_Check_Browser.H > -include/FL/Fl_Check_Browser.h > include/FL/Fl_Check_Button.H > -include/FL/Fl_Check_Button.h > include/FL/Fl_Choice.H > -include/FL/Fl_Choice.h > include/FL/Fl_Clock.H > -include/FL/Fl_Clock.h > include/FL/Fl_Color_Chooser.H > -include/FL/Fl_Color_Chooser.h > include/FL/Fl_Counter.H > -include/FL/Fl_Counter.h > +include/FL/Fl_Device.H > include/FL/Fl_Dial.H > -include/FL/Fl_Dial.h > include/FL/Fl_Double_Window.H > -include/FL/Fl_Double_Window.h > include/FL/Fl_Export.H > -include/FL/Fl_Export.h > include/FL/Fl_File_Browser.H > -include/FL/Fl_File_Browser.h > include/FL/Fl_File_Chooser.H > -include/FL/Fl_File_Chooser.h > include/FL/Fl_File_Icon.H > -include/FL/Fl_File_Icon.h > include/FL/Fl_File_Input.H > -include/FL/Fl_File_Input.h > include/FL/Fl_Fill_Dial.H > -include/FL/Fl_Fill_Dial.h > include/FL/Fl_Fill_Slider.H > -include/FL/Fl_Fill_Slider.h > include/FL/Fl_Float_Input.H > -include/FL/Fl_Float_Input.h > include/FL/Fl_FormsBitmap.H > -include/FL/Fl_FormsBitmap.h > include/FL/Fl_FormsPixmap.H > -include/FL/Fl_FormsPixmap.h > include/FL/Fl_Free.H > -include/FL/Fl_Free.h > include/FL/Fl_GIF_Image.H > -include/FL/Fl_GIF_Image.h > include/FL/Fl_Gl_Window.H > -include/FL/Fl_Gl_Window.h > include/FL/Fl_Group.H > -include/FL/Fl_Group.h > include/FL/Fl_Help_Dialog.H > -include/FL/Fl_Help_Dialog.h > include/FL/Fl_Help_View.H > -include/FL/Fl_Help_View.h > include/FL/Fl_Hold_Browser.H > -include/FL/Fl_Hold_Browser.h > include/FL/Fl_Hor_Fill_Slider.H > -include/FL/Fl_Hor_Fill_Slider.h > include/FL/Fl_Hor_Nice_Slider.H > -include/FL/Fl_Hor_Nice_Slider.h > include/FL/Fl_Hor_Slider.H > -include/FL/Fl_Hor_Slider.h > include/FL/Fl_Hor_Value_Slider.H > -include/FL/Fl_Hor_Value_Slider.h > include/FL/Fl_Image.H > -include/FL/Fl_Image.h > include/FL/Fl_Input.H > -include/FL/Fl_Input.h > include/FL/Fl_Input_.H > -include/FL/Fl_Input_.h > include/FL/Fl_Input_Choice.H > -include/FL/Fl_Input_Choice.h > include/FL/Fl_Int_Input.H > -include/FL/Fl_Int_Input.h > include/FL/Fl_JPEG_Image.H > -include/FL/Fl_JPEG_Image.h > include/FL/Fl_Light_Button.H > -include/FL/Fl_Light_Button.h > include/FL/Fl_Line_Dial.H > -include/FL/Fl_Line_Dial.h > include/FL/Fl_Menu.H > -include/FL/Fl_Menu.h > include/FL/Fl_Menu_.H > -include/FL/Fl_Menu_.h > include/FL/Fl_Menu_Bar.H > -include/FL/Fl_Menu_Bar.h > include/FL/Fl_Menu_Button.H > -include/FL/Fl_Menu_Button.h > include/FL/Fl_Menu_Item.H > -include/FL/Fl_Menu_Item.h > include/FL/Fl_Menu_Window.H > -include/FL/Fl_Menu_Window.h > include/FL/Fl_Multi_Browser.H > -include/FL/Fl_Multi_Browser.h > include/FL/Fl_Multi_Label.H > -include/FL/Fl_Multi_Label.h > include/FL/Fl_Multiline_Input.H > -include/FL/Fl_Multiline_Input.h > include/FL/Fl_Multiline_Output.H > -include/FL/Fl_Multiline_Output.h > +include/FL/Fl_Native_File_Chooser.H > include/FL/Fl_Nice_Slider.H > -include/FL/Fl_Nice_Slider.h > include/FL/Fl_Object.H > -include/FL/Fl_Object.h > include/FL/Fl_Output.H > -include/FL/Fl_Output.h > include/FL/Fl_Overlay_Window.H > -include/FL/Fl_Overlay_Window.h > include/FL/Fl_PNG_Image.H > -include/FL/Fl_PNG_Image.h > include/FL/Fl_PNM_Image.H > -include/FL/Fl_PNM_Image.h > include/FL/Fl_Pack.H > -include/FL/Fl_Pack.h > +include/FL/Fl_Paged_Device.H > include/FL/Fl_Pixmap.H > -include/FL/Fl_Pixmap.h > +include/FL/Fl_Plugin.H > include/FL/Fl_Positioner.H > -include/FL/Fl_Positioner.h > +include/FL/Fl_PostScript.H > include/FL/Fl_Preferences.H > -include/FL/Fl_Preferences.h > +include/FL/Fl_Printer.H > include/FL/Fl_Progress.H > -include/FL/Fl_Progress.h > +include/FL/Fl_RGB_Image.H > include/FL/Fl_Radio_Button.H > -include/FL/Fl_Radio_Button.h > include/FL/Fl_Radio_Light_Button.H > -include/FL/Fl_Radio_Light_Button.h > include/FL/Fl_Radio_Round_Button.H > -include/FL/Fl_Radio_Round_Button.h > include/FL/Fl_Repeat_Button.H > -include/FL/Fl_Repeat_Button.h > include/FL/Fl_Return_Button.H > -include/FL/Fl_Return_Button.h > include/FL/Fl_Roller.H > -include/FL/Fl_Roller.h > include/FL/Fl_Round_Button.H > -include/FL/Fl_Round_Button.h > include/FL/Fl_Round_Clock.H > -include/FL/Fl_Round_Clock.h > include/FL/Fl_Scroll.H > -include/FL/Fl_Scroll.h > include/FL/Fl_Scrollbar.H > -include/FL/Fl_Scrollbar.h > include/FL/Fl_Secret_Input.H > -include/FL/Fl_Secret_Input.h > include/FL/Fl_Select_Browser.H > -include/FL/Fl_Select_Browser.h > include/FL/Fl_Shared_Image.H > -include/FL/Fl_Shared_Image.h > include/FL/Fl_Simple_Counter.H > -include/FL/Fl_Simple_Counter.h > include/FL/Fl_Single_Window.H > -include/FL/Fl_Single_Window.h > include/FL/Fl_Slider.H > -include/FL/Fl_Slider.h > include/FL/Fl_Spinner.H > -include/FL/Fl_Spinner.h > include/FL/Fl_Sys_Menu_Bar.H > -include/FL/Fl_Sys_Menu_Bar.h > +include/FL/Fl_Table.H > +include/FL/Fl_Table_Row.H > include/FL/Fl_Tabs.H > -include/FL/Fl_Tabs.h > include/FL/Fl_Text_Buffer.H > -include/FL/Fl_Text_Buffer.h > include/FL/Fl_Text_Display.H > -include/FL/Fl_Text_Display.h > include/FL/Fl_Text_Editor.H > -include/FL/Fl_Text_Editor.h > include/FL/Fl_Tile.H > -include/FL/Fl_Tile.h > include/FL/Fl_Tiled_Image.H > -include/FL/Fl_Tiled_Image.h > include/FL/Fl_Timer.H > -include/FL/Fl_Timer.h > include/FL/Fl_Toggle_Button.H > -include/FL/Fl_Toggle_Button.h > include/FL/Fl_Toggle_Light_Button.H > -include/FL/Fl_Toggle_Light_Button.h > include/FL/Fl_Toggle_Round_Button.H > -include/FL/Fl_Toggle_Round_Button.h > include/FL/Fl_Tooltip.H > -include/FL/Fl_Tooltip.h > +include/FL/Fl_Tree.H > +include/FL/Fl_Tree_Item.H > +include/FL/Fl_Tree_Item_Array.H > +include/FL/Fl_Tree_Prefs.H > include/FL/Fl_Valuator.H > -include/FL/Fl_Valuator.h > include/FL/Fl_Value_Input.H > -include/FL/Fl_Value_Input.h > include/FL/Fl_Value_Output.H > -include/FL/Fl_Value_Output.h > include/FL/Fl_Value_Slider.H > -include/FL/Fl_Value_Slider.h > include/FL/Fl_Widget.H > -include/FL/Fl_Widget.h > include/FL/Fl_Window.H > -include/FL/Fl_Window.h > include/FL/Fl_Wizard.H > -include/FL/Fl_Wizard.h > include/FL/Fl_XBM_Image.H > -include/FL/Fl_XBM_Image.h > include/FL/Fl_XPM_Image.H > -include/FL/Fl_XPM_Image.h > +include/FL/Xutf8.h > include/FL/dirent.h > include/FL/filename.H > -include/FL/filename.h > include/FL/fl_ask.H > -include/FL/fl_ask.h > include/FL/fl_draw.H > -include/FL/fl_draw.h > -include/FL/fl_file_chooser.H > -include/FL/fl_file_chooser.h > include/FL/fl_message.H > -include/FL/fl_message.h > include/FL/fl_show_colormap.H > -include/FL/fl_show_colormap.h > include/FL/fl_show_input.H > -include/FL/fl_show_input.h > +include/FL/fl_types.h > +include/FL/fl_utf8.h > include/FL/forms.H > -include/FL/forms.h > include/FL/gl.h > include/FL/gl2opengl.h > include/FL/gl_draw.H > -include/FL/gl_draw.h > +include/FL/glu.h > include/FL/glut.H > -include/FL/glut.h > include/FL/mac.H > -include/FL/mac.h > -include/FL/mac.r > include/FL/math.h > +include/FL/names.h > include/FL/win32.H > -include/FL/win32.h > include/FL/x.H > -include/FL/x.h > -include/Fl > lib/libfltk.a > lib/libfltk_forms.a > lib/libfltk_gl.a > lib/libfltk_images.a > -@comment @man man/cat1/fltk-config.0 > -@comment @man man/cat1/fluid.0 > -@comment @man man/cat3/fltk.0 > @man man/man1/fltk-config.1 > @man man/man1/fluid.1 > @man man/man3/fltk.3 > -share/doc/fltk/ > -share/doc/fltk/FL.gif > -share/doc/fltk/Fl.html > -share/doc/fltk/Fl_Adjuster.html > -share/doc/fltk/Fl_BMP_Image.html > -share/doc/fltk/Fl_Bitmap.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_Browser.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_File_Browser.html > -share/doc/fltk/Fl_File_Chooser.html > -share/doc/fltk/Fl_File_Chooser.jpg > -share/doc/fltk/Fl_File_Icon.html > -share/doc/fltk/Fl_File_Input.gif > -share/doc/fltk/Fl_File_Input.html > -share/doc/fltk/Fl_Float_Input.html > -share/doc/fltk/Fl_Free.html > -share/doc/fltk/Fl_GIF_Image.html > -share/doc/fltk/Fl_Gl_Window.html > -share/doc/fltk/Fl_Group.html > -share/doc/fltk/Fl_Help_Dialog.gif > -share/doc/fltk/Fl_Help_Dialog.html > -share/doc/fltk/Fl_Help_View.html > -share/doc/fltk/Fl_Hold_Browser.html > -share/doc/fltk/Fl_Image.html > -share/doc/fltk/Fl_Input.html > -share/doc/fltk/Fl_Input_.html > -share/doc/fltk/Fl_Input_Choice.html > -share/doc/fltk/Fl_Int_Input.html > -share/doc/fltk/Fl_JPEG_Image.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_PNG_Image.html > -share/doc/fltk/Fl_PNM_Image.html > -share/doc/fltk/Fl_Pack.html > -share/doc/fltk/Fl_Pixmap.html > -share/doc/fltk/Fl_Positioner.html > -share/doc/fltk/Fl_Preferences.html > -share/doc/fltk/Fl_Progress.html > -share/doc/fltk/Fl_RGB_Image.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_Shared_Image.html > -share/doc/fltk/Fl_Single_Window.html > -share/doc/fltk/Fl_Slider.html > -share/doc/fltk/Fl_Spinner.html > -share/doc/fltk/Fl_Tabs.html > -share/doc/fltk/Fl_Text_Buffer.html > -share/doc/fltk/Fl_Text_Display.html > -share/doc/fltk/Fl_Text_Editor.html > -share/doc/fltk/Fl_Tile.gif > -share/doc/fltk/Fl_Tile.html > -share/doc/fltk/Fl_Tiled_Image.html > -share/doc/fltk/Fl_Timer.html > -share/doc/fltk/Fl_Tooltip.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/Fl_Wizard.html > -share/doc/fltk/Fl_XBM_Image.html > -share/doc/fltk/Fl_XPM_Image.html > -share/doc/fltk/adjuster1.gif > -share/doc/fltk/basics.html > -share/doc/fltk/boxtypes.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/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-catgets.gif > -share/doc/fltk/fluid-gettext.gif > -share/doc/fltk/fluid-org.gif > -share/doc/fltk/fluid.html > -share/doc/fltk/fluid1.gif > -share/doc/fltk/fluid2.gif > -share/doc/fltk/fluid3-cxx.gif > -share/doc/fltk/fluid3-gui.gif > -share/doc/fltk/fluid3-style.gif > -share/doc/fltk/fluid4.gif > -share/doc/fltk/fluid_prefs.gif > -share/doc/fltk/fluid_widget_cxx.gif > -share/doc/fltk/fluid_widget_gui.gif > -share/doc/fltk/fluid_widget_style.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/input_choice.jpg > -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/migration.html > -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/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 > %%SHARED%% > > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/graphics/aqsis/Makefile,v > retrieving revision 1.18 > diff -u -p -r1.18 Makefile > --- Makefile 28 Apr 2012 14:08:53 -0000 1.18 > +++ Makefile 25 May 2012 14:10:11 -0000 > @@ -49,7 +49,7 @@ MODCMAKE_WANTCOLOR=No > SEPARATE_BUILD= Yes > MAKE_FLAGS= VERBOSE=1 > > -CFLAGS+= -pthread > +CFLAGS+= -pthread -I${X11BASE}/include > > CONFIGURE_ARGS= > -DAQSIS_BOOST_FILESYSTEM_LIBRARY_NAME=boost_filesystem-mt \ > -DAQSIS_BOOST_REGEX_LIBRARY_NAME=boost_regex-mt \ > > > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/x11/flwm/Makefile,v > retrieving revision 1.26 > diff -u -p -r1.26 Makefile > --- Makefile 22 Nov 2010 08:36:56 -0000 1.26 > +++ Makefile 25 May 2012 14:44:29 -0000 > @@ -12,8 +12,8 @@ HOMEPAGE= http://flwm.sourceforge.net/ > > EXTRACT_SUFX= .tgz > CONFIGURE_STYLE=gnu dest > -CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS} -DFLTK_1_0_COMPAT > -I${LOCALBASE}/include" \ > - LIBS="-L${LOCALBASE}/lib" > +CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS} -DFL_INTERNALS -DFLTK_1_0_COMPAT \ > + -I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib" > > USE_GROFF = Yes > > >