One of x11/fltk's headers uses nitems, which conflicts with ours
in param.h, noticed when writing a port for fldigi.
Am I mistaken or was there some talk of pushing this behind
#ifdef _KERNEL? Certainly most places in userland (notable exception
ikectl/iked) do define their own copy if needed.
Diff for fltk to #undef it below (plus minor tweaks), but I'm not
particularly keen..
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/fltk/Makefile,v
retrieving revision 1.44
diff -u -p -r1.44 Makefile
--- Makefile 5 Feb 2013 22:41:35 -0000 1.44
+++ Makefile 6 Feb 2013 00:13:06 -0000
@@ -5,7 +5,7 @@ COMMENT= Fast-Light Tool Kit
VER= 1.3.0
DISTNAME= fltk-${VER}-source
PKGNAME= fltk-${VER}
-REVISION= 0
+REVISION= 1
CATEGORIES= x11
SHARED_LIBS= fltk 7.0 \
@@ -33,7 +33,7 @@ LIB_DEPENDS= graphics/jpeg \
NO_REGRESS= Yes
CONFIGURE_STYLE=autoconf no-autoheader
-AUTOCONF_VERSION=2.59
+AUTOCONF_VERSION=2.61
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--enable-threads
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng"
\
Index: patches/patch-FL_Fl_Check_Browser_H
===================================================================
RCS file: patches/patch-FL_Fl_Check_Browser_H
diff -N patches/patch-FL_Fl_Check_Browser_H
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-FL_Fl_Check_Browser_H 6 Feb 2013 00:13:06 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+conflicts with sys/param.h
+
+--- FL/Fl_Check_Browser.H.orig Tue Feb 5 22:56:50 2013
++++ FL/Fl_Check_Browser.H Tue Feb 5 22:57:14 2013
+@@ -88,6 +88,9 @@ class FL_EXPORT Fl_Check_Browser : public Fl_Browser_
+ Returns how many lines are in the browser. The last line number is equal
to
+ this.
+ */
++#ifdef nitems
++#undef nitems
++#endif
+ int nitems() const { return nitems_; }
+ /** Returns how many items are currently checked. */
+ int nchecked() const { return nchecked_; }
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 6 Feb 2013 00:13:06 -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%%
