On 03/22/13 17:33, Stuart Henderson wrote:
On 2013/03/22 17:10, Brian Callahan wrote:
This patch does not include sthen's nitems patch from last month, but willing
to discuss it.
Hold off on the nitems patch, haven't checked but this is likely
in the big headers cleanup diff.
-SHARED_LIBS= fltk 7.0 \
- fltk_forms 7.0 \
- fltk_gl 7.0 \
- fltk_images 7.0
+SHARED_LIBS= fltk 7.1 \
+ fltk_forms 7.1 \
+ fltk_gl 7.1 \
+ fltk_images 7.1
fltk bump is correct, but there's no ABI change in fltk_forms,
fltk_gl, fltk_images
I get build errors unless all the SO numbers match, for example:
make: don't know how to make libfltk_forms.so.7.1 (prerequisite of: all)
(and same for the other two)
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
It's better to patch the autoconf input files as was done in the
previous version, it reduces chance of problems if a future upstream
version moves to a newer autoconf.
That's fine. I changed the AUTOCONF_VERSION to 2.68 since that is what is
expected from the script.
-@@ -1147,7 +1147,7 @@ if test -n "$GCC"; then
- if test "x$with_optim" != x; then
- OPTIM="$with_optim $OPTIM"
- else
-- OPTIM="-Os $OPTIM"
-+ : # OPTIM="-Os $OPTIM"
- fi
so now it builds like this,
c++ -I.. -Os -Wall -Wunused -Wno-format-y2k -fPIC -fno-exceptions
-fno-strict-aliasing -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_THREAD_SAFE
-D_REENTRANT -I/usr/X11R6/include/freetype2 -I/usr/X11R6/include
-I/usr/local/include -I/usr/local/include/libpng -I/usr/X11R6/include/freetype2
-I/usr/X11R6/include -O2 -pipe -I/usr/local/include -I/usr/X11R6/include
-DFL_LIBRARY -c Fl_Gl_Device_Plugin.cxx -o Fl_Gl_Device_Plugin.o
I forget the precedence order of -O options, but probably better to keep
this in the patch.
IIRC, last takes precedence, but it's better to keep it in the patch, so I have.
Attached is the new patch.
~Brian
? fltk132-2.diff
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/fltk/Makefile,v
retrieving revision 1.45
diff -u -p -r1.45 Makefile
--- Makefile 11 Mar 2013 11:46:09 -0000 1.45
+++ Makefile 22 Mar 2013 21:56:49 -0000
@@ -2,19 +2,20 @@
COMMENT= Fast-Light Tool Kit
-VER= 1.3.0
+VER= 1.3.2
DISTNAME= fltk-${VER}-source
PKGNAME= fltk-${VER}
-REVISION= 0
CATEGORIES= x11
-SHARED_LIBS= fltk 7.0 \
- fltk_forms 7.0 \
- fltk_gl 7.0 \
- fltk_images 7.0
+SHARED_LIBS= fltk 7.1 \
+ fltk_forms 7.1 \
+ fltk_gl 7.1 \
+ fltk_images 7.1
HOMEPAGE= http://www.fltk.org/
+MAINTAINER = Brian Callahan <bcal...@openbsd.org>
+
# LGPLv2 with exceptions (see COPYING)
PERMIT_PACKAGE_CDROM= Yes
@@ -30,7 +31,7 @@ LIB_DEPENDS= graphics/jpeg \
NO_TEST= Yes
CONFIGURE_STYLE=autoconf no-autoheader
-AUTOCONF_VERSION=2.59
+AUTOCONF_VERSION=2.68
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--enable-threads
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/fltk/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo 5 Feb 2013 22:41:35 -0000 1.12
+++ distinfo 22 Mar 2013 21:56:49 -0000
@@ -1,2 +1,2 @@
-SHA256 (fltk-1.3.0-source.tar.gz) = mQZ2gIKUzqTMo96DOtWl3ggHPBG2ZTVtTs810iU1shw=
-SIZE (fltk-1.3.0-source.tar.gz) = 4111004
+SHA256 (fltk-1.3.2-source.tar.gz) = F2BE35TzG9U6WAbPUFTKeLGAv5rifOR2SWCIM2le5KQ=
+SIZE (fltk-1.3.2-source.tar.gz) = 4260874
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/x11/fltk/patches/patch-Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 patch-Makefile
--- patches/patch-Makefile 4 Aug 2012 18:07:03 -0000 1.5
+++ patches/patch-Makefile 22 Mar 2013 21:56:49 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile,v 1.5 2012/08/04 18:07:03 pascal Exp $
---- Makefile.orig Tue Feb 15 16:29:03 2011
-+++ Makefile Fri May 25 01:03:08 2012
-@@ -27,7 +27,7 @@
+--- Makefile.orig Tue Jul 19 00:49:30 2011
++++ Makefile Fri Mar 22 17:43:11 2013
+@@ -18,7 +18,7 @@
include makeinclude
Index: patches/patch-configure_in
===================================================================
RCS file: /cvs/ports/x11/fltk/patches/patch-configure_in,v
retrieving revision 1.13
diff -u -p -r1.13 patch-configure_in
--- patches/patch-configure_in 4 Aug 2012 18:07:03 -0000 1.13
+++ patches/patch-configure_in 22 Mar 2013 21:56:49 -0000
@@ -1,25 +1,16 @@
$OpenBSD: patch-configure_in,v 1.13 2012/08/04 18:07:03 pascal Exp $
---- 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...
+--- configure.in.orig Fri Mar 22 17:39:21 2013
++++ configure.in Fri Mar 22 17:41:32 2013
+@@ -39,7 +39,7 @@ dnl FLTK library versions...
FL_MAJOR_VERSION=1
FL_MINOR_VERSION=3
- FL_PATCH_VERSION=0
+ FL_PATCH_VERSION=1
-FL_API_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}
+FL_API_VERSION=${LIBfltk_VERSION}
AC_SUBST(FL_MAJOR_VERSION)
AC_SUBST(FL_MINOR_VERSION)
-@@ -789,7 +789,7 @@ if test "x$enable_threads" != xno -a x$check_pthread =
-
- 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
+@@ -914,7 +914,7 @@ case $uname_GUI in
AC_MSG_WARN(Ignoring libraries \"$X_PRE_LIBS\" requested by configure.)
fi
@@ -28,7 +19,7 @@ $OpenBSD: patch-configure_in,v 1.13 2012
CFLAGS="$CFLAGS $X_CFLAGS"
CXXFLAGS="$CXXFLAGS $X_CFLAGS"
LDFLAGS="$X_LIBS $LDFLAGS"
-@@ -1147,7 +1147,7 @@ if test -n "$GCC"; then
+@@ -1138,7 +1138,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: /cvs/ports/x11/fltk/patches/patch-documentation_Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 patch-documentation_Makefile
--- patches/patch-documentation_Makefile 4 Aug 2012 18:07:03 -0000 1.1
+++ patches/patch-documentation_Makefile 22 Mar 2013 21:56:49 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-documentation_Makefile,v 1.1 2012/08/04 18:07:03 pascal Exp $
---- 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)
+--- documentation/Makefile.orig Mon Oct 24 22:17:29 2011
++++ documentation/Makefile Fri Mar 22 17:43:11 2013
+@@ -54,7 +54,7 @@ MANPAGES = $(SRC_DOCDIR)/fltk.$(CAT3EXT) $(SRC_DOCDIR)
$(SRC_DOCDIR)/fluid.$(CAT1EXT) $(SRC_DOCDIR)/blocks.$(CAT6EXT) \
$(SRC_DOCDIR)/checkers.$(CAT6EXT) $(SRC_DOCDIR)/sudoku.$(CAT6EXT)
@@ -10,7 +10,7 @@ $OpenBSD: patch-documentation_Makefile,v
# use make dist to create all docs for distribution files
# you need an installed version of doxygen for this
-@@ -79,9 +79,8 @@ clean:
+@@ -71,9 +71,8 @@ clean:
depend:
@@ -21,7 +21,7 @@ $OpenBSD: patch-documentation_Makefile,v
if test -f html/index.html ; then \
for file in html/* ; do \
$(INSTALL_DATA) $$file $(DESTDIR)$(docdir); \
-@@ -92,11 +91,6 @@ install: $(MANPAGES)
+@@ -84,11 +83,6 @@ install: $(MANPAGES)
$(INSTALL_DATA) fltk.pdf $(DESTDIR)$(docdir); \
fi
echo "Installing man pages in $(DESTDIR)$(mandir) ..."
Index: patches/patch-makeinclude_in
===================================================================
RCS file: /cvs/ports/x11/fltk/patches/patch-makeinclude_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-makeinclude_in
--- patches/patch-makeinclude_in 4 Aug 2012 18:07:03 -0000 1.4
+++ patches/patch-makeinclude_in 22 Mar 2013 21:56:49 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-makeinclude_in,v 1.4 2012/08/04 18:07:03 pascal Exp $
---- 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
+--- makeinclude.in.orig Wed Dec 5 09:53:03 2012
++++ makeinclude.in Fri Mar 22 17:43:11 2013
+@@ -130,9 +130,6 @@ INSTALL_SCRIPT = $(INSTALL) -m 755
INSTALL_DESKTOP = @INSTALL_DESKTOP@
UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@
Index: patches/patch-src_Fl_Preferences_cxx
===================================================================
RCS file: /cvs/ports/x11/fltk/patches/patch-src_Fl_Preferences_cxx,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_Fl_Preferences_cxx
--- patches/patch-src_Fl_Preferences_cxx 4 Aug 2012 18:07:03 -0000 1.3
+++ patches/patch-src_Fl_Preferences_cxx 22 Mar 2013 21:56:49 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_Fl_Preferences_cxx,v 1.3 2012/08/04 18:07:03 pascal Exp $
---- 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
+--- src/Fl_Preferences.cxx.orig Mon Apr 9 08:36:23 2012
++++ src/Fl_Preferences.cxx Fri Mar 22 17:43:11 2013
+@@ -1079,7 +1079,7 @@ Fl_Preferences::RootNode::RootNode( Fl_Preferences *pr
break;
}
case SYSTEM:
Index: patches/patch-src_Makefile
===================================================================
RCS file: /cvs/ports/x11/fltk/patches/patch-src_Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 patch-src_Makefile
--- patches/patch-src_Makefile 4 Aug 2012 18:07:03 -0000 1.9
+++ patches/patch-src_Makefile 22 Mar 2013 21:56:49 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_Makefile,v 1.9 2012/08/04 18:07:03 pascal Exp $
---- 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)
+--- src/Makefile.orig Tue Nov 6 16:13:54 2012
++++ src/Makefile Fri Mar 22 17:43:11 2013
+@@ -229,11 +229,10 @@ $(LIBNAME): $(OBJECTS)
$(LIBCOMMAND) $@ $(OBJECTS)
$(RANLIB) $@
@@ -14,7 +14,7 @@ $OpenBSD: patch-src_Makefile,v 1.9 2012/
libfltk.sl.1.3: $(OBJECTS)
echo $(DSOCOMMAND) $@ ...
-@@ -274,11 +273,9 @@ $(FLLIBNAME): $(FLOBJECTS)
+@@ -265,11 +264,9 @@ $(FLLIBNAME): $(FLOBJECTS)
$(LIBCOMMAND) $@ $(FLOBJECTS)
$(RANLIB) $@
@@ -27,7 +27,7 @@ $OpenBSD: patch-src_Makefile,v 1.9 2012/
libfltk_forms.sl.1.3: $(FLOBJECTS) libfltk.sl.1.3
echo $(DSOCOMMAND) $@ ...
-@@ -310,11 +307,9 @@ $(GLLIBNAME): $(GLOBJECTS)
+@@ -301,11 +298,9 @@ $(GLLIBNAME): $(GLOBJECTS)
$(LIBCOMMAND) $@ $(GLOBJECTS)
$(RANLIB) $@
@@ -40,7 +40,7 @@ $OpenBSD: patch-src_Makefile,v 1.9 2012/
libfltk_gl.sl.1.3: $(GLOBJECTS) libfltk.sl.1.3
echo $(DSOCOMMAND) $@ ...
-@@ -346,11 +341,9 @@ $(IMGLIBNAME): $(IMGOBJECTS)
+@@ -337,11 +332,9 @@ $(IMGLIBNAME): $(IMGOBJECTS)
$(LIBCOMMAND) $@ $(IMGOBJECTS)
$(RANLIB) $@
@@ -53,7 +53,7 @@ $OpenBSD: patch-src_Makefile,v 1.9 2012/
libfltk_images.sl.1.3: $(IMGOBJECTS) libfltk.sl.1.3
echo $(DSOCOMMAND) $@ ...
-@@ -572,10 +565,9 @@ install: $(LIBNAME) $(DSONAME) \
+@@ -563,10 +556,9 @@ install: $(LIBNAME) $(DSONAME) \
$(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBBASENAME); \
fi
$(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBBASENAME)
@@ -66,7 +66,7 @@ $OpenBSD: patch-src_Makefile,v 1.9 2012/
fi
if test x$(DSONAME) = xlibfltk.sl.1.3; then\
$(RM) $(DESTDIR)$(libdir)/libfltk.sl*;\
-@@ -603,10 +595,9 @@ install: $(LIBNAME) $(DSONAME) \
+@@ -594,10 +586,9 @@ install: $(LIBNAME) $(DSONAME) \
$(RM) $(DESTDIR)$(libdir)/libfltk.dll.a;\
$(INSTALL_LIB) libfltk.dll.a $(DESTDIR)$(libdir); \
fi
@@ -79,7 +79,7 @@ $OpenBSD: patch-src_Makefile,v 1.9 2012/
fi
if test x$(FLDSONAME) = xlibfltk_forms.sl.1.3; then\
$(RM) $(DESTDIR)$(libdir)/libfltk_forms.sl*;\
-@@ -634,10 +625,9 @@ install: $(LIBNAME) $(DSONAME) \
+@@ -625,10 +616,9 @@ install: $(LIBNAME) $(DSONAME) \
$(RM) $(DESTDIR)$(libdir)/libfltk_forms.dll.a;\
$(INSTALL_LIB) libfltk_forms.dll.a $(DESTDIR)$(libdir); \
fi
@@ -92,7 +92,7 @@ $OpenBSD: patch-src_Makefile,v 1.9 2012/
fi
if test x$(GLDSONAME) = xlibfltk_gl.sl.1.3; then\
$(RM) $(DESTDIR)$(libdir)/libfltk_gl.sl*;\
-@@ -665,10 +655,9 @@ install: $(LIBNAME) $(DSONAME) \
+@@ -656,10 +646,9 @@ install: $(LIBNAME) $(DSONAME) \
$(RM) $(DESTDIR)$(libdir)/libfltk_gl.dll.a;\
$(INSTALL_LIB) libfltk_gl.dll.a $(DESTDIR)$(libdir); \
fi
Index: pkg/PFRAG.shared
===================================================================
RCS file: pkg/PFRAG.shared
diff -N pkg/PFRAG.shared
--- pkg/PFRAG.shared 25 Dec 2005 20:23:18 -0000 1.10
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.10 2005/12/25 20:23:18 naddy Exp $
-@lib lib/libfltk.so.${LIBfltk_VERSION}
-@lib lib/libfltk_forms.so.${LIBfltk_forms_VERSION}
-@lib lib/libfltk_gl.so.${LIBfltk_gl_VERSION}
-@lib lib/libfltk_images.so.${LIBfltk_images_VERSION}
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/fltk/pkg/PLIST,v
retrieving revision 1.12
diff -u -p -r1.12 PLIST
--- pkg/PLIST 4 Aug 2012 18:07:03 -0000 1.12
+++ pkg/PLIST 22 Mar 2013 21:56:49 -0000
@@ -145,10 +145,13 @@ include/FL/names.h
include/FL/win32.H
include/FL/x.H
lib/libfltk.a
+@lib lib/libfltk.so.${LIBfltk_VERSION}
lib/libfltk_forms.a
+@lib lib/libfltk_forms.so.${LIBfltk_forms_VERSION}
lib/libfltk_gl.a
+@lib lib/libfltk_gl.so.${LIBfltk_gl_VERSION}
lib/libfltk_images.a
+@lib lib/libfltk_images.so.${LIBfltk_images_VERSION}
@man man/man1/fltk-config.1
@man man/man1/fluid.1
@man man/man3/fltk.3
-%%SHARED%%
