cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to fltk-1.1.0rc5 and take maintainership

Browse Source
This commit is contained in:
wilfried 2002-08-10 19:57:20 +00:00
parent 1a97aa582c
commit 84389bc1ec
8 changed files with 167 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
x11/fltk/Makefile
View File

@ -1,32 +1,37 @@
# $OpenBSD: Makefile,v 1.20 2002/07/10 11:56:35 matt Exp $
# $OpenBSD: Makefile,v 1.21 2002/08/10 19:57:20 wilfried Exp $
COMMENT= "Fast-Light Tool Kit"
VER= 1.0.11
VER= 1.1.0rc5
DISTNAME= fltk-${VER}
CATEGORIES= x11
HOMEPAGE= http://www.fltk.org/
MAINTAINER= Peter Stromberg <wilfried@openbsd.org>
# LGPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ftp://ftp.fltk.org/pub/fltk/${VER}/
DISTFILES= ${DISTNAME}-source${EXTRACT_SUFX}
MASTER_SITES= ftp://ftp.easysw.com/pub/fltk/${VER}/ \
ftp://ftp2.easysw.com/pub/fltk/${VER}/ \
ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk/${VER}/ \
ftp://gd.tuwien.ac.at/hci/fltk/${VER}/
USE_X11= Yes
CONFIGURE_STYLE=autoconf dest
CONFIGURE_ARGS= ${CONFIGURE_SHARED}
MAKE_FLAGS= DSONAME=libfltk.so.1.0
FAKE_FLAGS= ${MAKE_FLAGS} DESTDIR=${WRKINST}
LIB_DEPENDS= jpeg.62::graphics/jpeg \
png.2::graphics/png
NO_REGRESS= Yes
USE_X11= Yes
CONFIGURE_STYLE=autoconf dest
CONFIGURE_ARGS= ${CONFIGURE_SHARED}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
.include <bsd.port.mk>

6
x11/fltk/distinfo
View File

@ -1,3 +1,3 @@
MD5 (fltk-1.0.11-source.tar.gz) = 4c4b7ade9fc3273496b6f1fe049c9796
RMD160 (fltk-1.0.11-source.tar.gz) = 7e1da8813f4399207a1d15ee25bdf30b4e0870ae
SHA1 (fltk-1.0.11-source.tar.gz) = b649459e7bd746b8862c6368fa69eb06dfe32f14
MD5 (fltk-1.1.0rc5-source.tar.gz) = fc25f7a9d834f057006391b196e220c5
RMD160 (fltk-1.1.0rc5-source.tar.gz) = f3497add4644ae4b89b85f0733e6bca32f0e462c
SHA1 (fltk-1.1.0rc5-source.tar.gz) = 98082241440472b17bbc31bdf0a92f1d8ae99f5c

16
x11/fltk/patches/patch-Makefile
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-Makefile,v 1.1 2001/04/15 03:14:15 matt Exp $
--- Makefile.orig Fri Jun 30 00:23:12 2000
+++ Makefile Thu Apr 12 19:00:30 2001
@@ -25,7 +25,7 @@
$OpenBSD: patch-Makefile,v 1.2 2002/08/10 19:57:20 wilfried Exp $
--- Makefile.orig Wed May 1 21:35:53 2002
+++ Makefile Fri Aug 9 15:47:51 2002
@@ -26,7 +26,7 @@
include makeinclude
SHELL=/bin/sh
-DIRS = src fluid test
+DIRS = src fluid
SHELL = /bin/sh
-DIRS = src fluid test documentation
+DIRS = src fluid documentation
all: makeinclude
@for dir in $(DIRS); do\

71
x11/fltk/patches/patch-configure_in
View File

@ -1,71 +0,0 @@
$OpenBSD: patch-configure_in,v 1.2 2001/06/07 02:28:25 matt Exp $
--- configure.in.orig Mon May 7 10:34:22 2001
+++ configure.in Wed Jun 6 22:14:02 2001
@@ -80,7 +80,7 @@ if eval "test x$enable_shared = xyes"; t
;;
FreeBSD* | NetBSD* | OpenBSD*)
DSONAME="libfltk.so.1"
- DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ -shared \$(OPTIM) -o"
+ DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ -fPIC -shared \$(OPTIM) -o"
;;
AIX*)
PICFLAG=0
@@ -178,10 +178,10 @@ dnl Check for OpenGL unless disabled...
GLLIB=
if test x$enable_gl != xno; then
+ SAVE_ac_cpp=$ac_cpp
+ ac_cpp="$ac_cpp -I$x_includes"
AC_CHECK_HEADER(GL/gl.h,
- AC_CHECK_LIB(GL, glXMakeCurrent, AC_DEFINE(HAVE_GL) GLLIB="-lGL", \
- AC_CHECK_LIB(MesaGL,glXMakeCurrent, AC_DEFINE(HAVE_GL) GLLIB=" -lMesaGL",,\
- -lX11 -lXext $X_EXTRA_LIBS -lm), \
+ AC_CHECK_LIB(GLU, gluCylinder, AC_DEFINE(HAVE_GL) GLLIB="-lGL", \
-lX11 -lXext $X_EXTRA_LIBS -lm)
)
AC_CHECK_HEADER(GL/glu.h,
@@ -189,19 +189,20 @@ if test x$enable_gl != xno; then
if test x$ac_cv_lib_GL_glXMakeCurrent = xyes; then
GLLIB="-lGLU $GLLIB"
fi
- if test x$ac_cv_lib_MesaGL_glXMakeCurrent = xyes; then
- GLLIB="-lMesaGLU $GLLIB"
- fi
)
+ ac_cpp=$SAVE_ac_cpp
fi
AC_SUBST(GLLIB)
dnl Check for the Xdbe extension...
+SAVE_ac_cpp=$ac_cpp
+ac_cpp="$ac_cpp -I$x_includes"
AC_CHECK_HEADER(X11/extensions/Xdbe.h, \
if test "$uname" != "SunOS"; then
AC_DEFINE(HAVE_XDBE)
fi)
+ac_cpp=$SAVE_ac_cpp
dnl Check for overlay visuals...
AC_CACHE_CHECK("for X overlay visuals", ac_cv_have_overlay,
@@ -263,20 +264,6 @@ if test -n "$GXX"; then
# Use gcc instead of c++ or g++, since we don't need the C++
# library to depend on...
CXX="$CC"
- CFLAGS="-Wall $CFLAGS"
- CXXFLAGS="-Wall $CXXFLAGS"
- if test -z "$DEBUGFLAG"; then
- #
- # Note: Can't use -fomit-frame-pointer - prevents tools like
- # libsafe from working!
- #
- # Don't use -fforce-mem, -fforce-addr, or -fcaller-saves.
- # They all seem to make either no difference or enlarge
- # the code by a few hundred bytes.
- #
- CFLAGS="-O2 $CFLAGS"
- CXXFLAGS="-O2 $CXXFLAGS"
- fi
if test $PICFLAG = 1; then
CFLAGS="-fPIC $CFLAGS"
CXXFLAGS="-fPIC $CXXFLAGS"

36
x11/fltk/patches/patch-makeinclude_in Normal file
View File

@ -0,0 +1,36 @@
$OpenBSD: patch-makeinclude_in,v 1.1 2002/08/10 19:57:20 wilfried Exp $
--- makeinclude.in.orig Tue Jul 16 01:38:11 2002
+++ makeinclude.in Sat Aug 10 18:09:06 2002
@@ -97,32 +97,24 @@ POSTBUILD = @POSTBUILD@
CAT1EXT = @CAT1EXT@
CAT3EXT = @CAT3EXT@
-# Be quiet when building...
-.SILENT:
-
# Build commands and filename extensions...
.SUFFIXES: .0 .1 .3 .c .cxx .h .fl .man .o .z $(EXEEXT)
.o$(EXEEXT):
- echo Linking $@...
$(CXX) -I.. $(CXXFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@
$(POSTBUILD) $@ ../FL/mac.r
.c.o:
- echo Compiling $<...
$(CC) -I.. $(CFLAGS) -c $<
.cxx.o:
- echo Compiling $<...
$(CXX) -I.. $(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

24
x11/fltk/patches/patch-src_Makefile
View File

@ -1,24 +0,0 @@
$OpenBSD: patch-src_Makefile,v 1.1 2002/03/30 21:27:24 naddy Exp $
--- src/Makefile.orig Sat Mar 30 22:10:44 2002
+++ src/Makefile Sat Mar 30 22:12:43 2002
@@ -159,7 +159,7 @@ $(LIBRARY): $(OBJECTS)
$(LIBCOMMAND) $@ $(OBJECTS)
$(RANLIB) $@
-libfltk.so.1 libfltk.sl.1: $(OBJECTS)
+$(DSONAME): $(OBJECTS)
echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ $(OBJECTS)
@@ -185,6 +185,11 @@ install: $(LIBRARY) $(DSONAME)
cp libfltk.so.1 $(libdir); \
chmod 755 $(libdir)/libfltk.so.1; \
ln -s libfltk.so.1 $(libdir)/libfltk.so;\
+ fi
+ if test "$(DSONAME)" = libfltk.so.1.0; then\
+ rm -f $(libdir)/libfltk.so*;\
+ cp libfltk.so.1.0 $(libdir); \
+ chmod 755 $(libdir)/libfltk.so.1.0; \
fi
if test "$(DSONAME)" = libfltk.sl.1; then\
rm -f $(libdir)/libfltk.sl*;\

9
x11/fltk/pkg/PFRAG.shared
View File

@ -1,3 +1,6 @@
@comment $OpenBSD: PFRAG.shared,v 1.3 2002/03/27 10:28:47 espie Exp $
lib/libfltk.so.1.0
DYNLIBDIR(%D/lib)
@comment $OpenBSD: PFRAG.shared,v 1.4 2002/08/10 19:57:20 wilfried Exp $
lib/libfltk.so.1.1
lib/libfltk_forms.so.1.1
lib/libfltk_gl.so.1.1
lib/libfltk_images.so.1.1
DYNLIBDIR(%B)

111
x11/fltk/pkg/PLIST
View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.5 2002/03/27 10:28:47 espie Exp $
@comment $OpenBSD: PLIST,v 1.6 2002/08/10 19:57:20 wilfried Exp $
bin/fltk-config
bin/fluid
include/FL/Enumerations.H
include/FL/Enumerations.h
@ -6,6 +7,8 @@ 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
@ -18,6 +21,8 @@ include/FL/Fl_Button.H
include/FL/Fl_Button.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
@ -32,6 +37,16 @@ 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
@ -44,10 +59,16 @@ 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
@ -66,6 +87,8 @@ include/FL/Fl_Input_.H
include/FL/Fl_Input_.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
@ -98,12 +121,20 @@ 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_Pixmap.H
include/FL/Fl_Pixmap.h
include/FL/Fl_Positioner.H
include/FL/Fl_Positioner.h
include/FL/Fl_Preferences.H
include/FL/Fl_Preferences.h
include/FL/Fl_Progress.H
include/FL/Fl_Progress.h
include/FL/Fl_Radio_Button.H
include/FL/Fl_Radio_Button.h
include/FL/Fl_Radio_Light_Button.H
@ -128,16 +159,28 @@ 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_Sys_Menu_Bar.H
include/FL/Fl_Sys_Menu_Bar.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
@ -146,6 +189,8 @@ 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_Valuator.H
include/FL/Fl_Valuator.h
include/FL/Fl_Value_Input.H
@ -158,6 +203,12 @@ 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/dirent.h
include/FL/filename.H
include/FL/filename.h
@ -181,20 +232,28 @@ include/FL/gl_draw.H
include/FL/gl_draw.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/menubar.h
include/FL/win32.H
include/FL/win32.h
include/FL/x.H
include/FL/x.h
include/Fl
lib/libfltk.a
man/cat1/fluid.0
man/cat3/fltk.0
lib/libfltk_forms.a
lib/libfltk_gl.a
lib/libfltk_images.a
%%SHARED%%
man/man1/fltk-config.1
man/man1/fluid.1
man/man3/fltk.3
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
@ -209,14 +268,26 @@ 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_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
@ -229,8 +300,14 @@ 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
@ -243,12 +320,18 @@ 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_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
@ -257,12 +340,12 @@ 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/ask.C.gif
share/doc/fltk/basics.html
share/doc/fltk/bglogo.gif
share/doc/fltk/boxtypes.gif
share/doc/fltk/button.C.gif
share/doc/fltk/buttons.gif
share/doc/fltk/charts.gif
share/doc/fltk/choice.gif
@ -277,7 +360,6 @@ share/doc/fltk/editor.gif
share/doc/fltk/editor.html
share/doc/fltk/enumerations.html
share/doc/fltk/events.html
share/doc/fltk/filechooser.gif
share/doc/fltk/fl_alert.gif
share/doc/fltk/fl_ask.gif
share/doc/fltk/fl_choice.gif
@ -289,15 +371,17 @@ 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.gif
share/doc/fltk/fluid.html
share/doc/fltk/fluid1.gif
share/doc/fltk/fluid2.gif
share/doc/fltk/fluid3.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_main.gif
share/doc/fltk/fluid_prefs.gif
share/doc/fltk/fluid_widget.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
@ -308,6 +392,7 @@ 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
@ -316,7 +401,6 @@ share/doc/fltk/resizebox1.gif
share/doc/fltk/resizebox2.gif
share/doc/fltk/round_clock.gif
share/doc/fltk/scrollbar.gif
share/doc/fltk/shape.C.gif
share/doc/fltk/slider.gif
share/doc/fltk/subclassing.html
share/doc/fltk/symbols.gif
@ -325,6 +409,5 @@ share/doc/fltk/text.gif
share/doc/fltk/valuators.gif
share/doc/fltk/value_slider.gif
share/doc/fltk/widgets.html
%%SHARED%%
@dirrm share/doc/fltk
@dirrm include/FL