update to 1.1.7

This commit is contained in:
wilfried 2006-10-19 09:41:32 +00:00
parent 6e3e04ec3b
commit 0e6e8c31da
7 changed files with 137 additions and 107 deletions

View File

@ -1,15 +1,14 @@
# $OpenBSD: Makefile,v 1.32 2006/08/04 00:10:42 espie Exp $
# $OpenBSD: Makefile,v 1.33 2006/10/19 09:41:32 wilfried Exp $
COMMENT= "Fast-Light Tool Kit"
VER= 1.1.4
VER= 1.1.7
DISTNAME= fltk-${VER}
PKGNAME= ${DISTNAME}p0
CATEGORIES= x11
SHARED_LIBS= fltk 5.0 \
fltk_forms 5.0 \
fltk_gl 5.0 \
fltk_images 5.0
SHARED_LIBS= fltk 6.0 \
fltk_forms 6.0 \
fltk_gl 6.0 \
fltk_images 6.0
HOMEPAGE= http://www.fltk.org/
@ -23,17 +22,22 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB= X11 Xext c m stdc++ z
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}/
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}/ \
http://mirror.nu6.org//ftp.easysw.com/pub/fltk/${VER}/ \
http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk/${VER}/ \
http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/${VER}/ \
http://ftp.easysw.com/pub/fltk/${VER}/ \
ftp://ftp.easysw.com/pub/fltk/${VER}/ \
ftp://ftp3.easysw.com/pub/fltk/${VER}/
LIB_DEPENDS= jpeg.>=62::graphics/jpeg \
png.>=2::graphics/png
NO_REGRESS= Yes
USE_X11= Yes
CONFIGURE_STYLE=autoconf dest no-autoheader
CONFIGURE_STYLE=autoconf no-autoheader
AUTOCONF_VERSION=2.54
CONFIGURE_ARGS= ${CONFIGURE_SHARED}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \

View File

@ -1,4 +1,4 @@
MD5 (fltk-1.1.4-source.tar.gz) = d0f334a46d583d26171f9071d1ff278a
RMD160 (fltk-1.1.4-source.tar.gz) = accad8af6d9361a1012ff4d7c6476bd405da6f94
SHA1 (fltk-1.1.4-source.tar.gz) = f990d5d2fbc6e3c39dc861fb870afb2e9400d4d3
SIZE (fltk-1.1.4-source.tar.gz) = 1536963
MD5 (fltk-1.1.7-source.tar.gz) = ec48c96fae058956e6e5c9c1cda6157d
RMD160 (fltk-1.1.7-source.tar.gz) = e2648f8d02d3a6739cb9455940a4cebe9c01aa77
SHA1 (fltk-1.1.7-source.tar.gz) = 3f8a64c91ae4653e1300565dd678eb6db48055ba
SIZE (fltk-1.1.7-source.tar.gz) = 2517351

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-Makefile,v 1.3 2002/09/17 15:19:29 wilfried Exp $
--- Makefile.orig Tue Jul 30 16:07:24 2002
+++ Makefile Tue Sep 17 17:05:25 2002
@@ -25,7 +25,7 @@
$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
@@ -27,7 +27,7 @@
include makeinclude
-DIRS = src fluid test documentation
+DIRS = src fluid documentation
-DIRS = $(IMAGEDIRS) src fluid test documentation
+DIRS = $(IMAGEDIRS) src fluid documentation
all: makeinclude
for dir in $(DIRS); do\

View File

@ -1,34 +1,25 @@
$OpenBSD: patch-configure_in,v 1.9 2005/12/25 20:23:18 naddy Exp $
--- configure.in.orig 2003-08-06 00:40:45.000000000 +0200
+++ configure.in 2003-12-26 14:53:25.000000000 +0100
@@ -32,9 +32,9 @@ dnl Required file in package...
$OpenBSD: patch-configure_in,v 1.10 2006/10/19 09:41:32 wilfried Exp $
--- configure.in.orig Sun Jan 15 19:36:16 2006
+++ configure.in Thu Oct 19 10:43:04 2006
@@ -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=4
-FL_PATCH_VERSION=7
+#FL_MAJOR_VERSION=1
+#FL_MINOR_VERSION=1
+#FL_PATCH_VERSION=4
FL_RELEASE_VERSION=
+#FL_PATCH_VERSION=7
FL_API_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}
@@ -668,7 +668,7 @@ if test -n "$GCC"; then
;;
esac
- CXX="$CC"
+ : # CXX="$CC"
# Show all standard warnings + unused variables when compiling...
OPTIM="-Wall -Wunused $OPTIM"
@@ -695,7 +695,7 @@ if test -n "$GCC"; then
AC_SUBST(FL_MAJOR_VERSION)
@@ -844,7 +844,7 @@ if test -n "$GCC"; then
if test "x$with_optim" != x; then
OPTIM="$with_optim $OPTIM"
else
- OPTIM="-O2 $OPTIM"
+ : # OPTIM="-O2 $OPTIM"
- OPTIM="-Os $OPTIM"
+ : # OPTIM="-Os $OPTIM"
fi
fi

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-makeinclude_in,v 1.2 2002/12/16 16:58:12 wilfried Exp $
--- makeinclude.in.orig Mon Aug 5 19:58:16 2002
+++ makeinclude.in Mon Dec 16 17:27:38 2002
@@ -98,32 +98,24 @@ POSTBUILD = @POSTBUILD@
CAT1EXT = @CAT1EXT@
CAT3EXT = @CAT3EXT@
$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@
INSTALL_DESKTOP = @INSTALL_DESKTOP@
UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@
-# Be quiet when building...
-.SILENT:
@ -13,16 +13,16 @@ $OpenBSD: patch-makeinclude_in,v 1.2 2002/12/16 16:58:12 wilfried Exp $
.o$(EXEEXT):
- echo Linking $@...
$(CXX) -I.. $(CXXFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@
$(CXX) $(CXXFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@
$(POSTBUILD) $@ ../FL/mac.r
.c.o:
- echo Compiling $<...
$(CC) -I.. $(CFLAGS) -c $<
$(CC) -I.. @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CFLAGS) -c $<
.cxx.o:
- echo Compiling $<...
$(CXX) -I.. $(CXXFLAGS) -c $<
$(CXX) -I.. @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CXXFLAGS) -c $<
.man.0 .man.1 .man.3:
- echo Formatting $<...

View File

@ -1,115 +1,143 @@
$OpenBSD: patch-src_Makefile,v 1.7 2005/12/25 20:23:18 naddy Exp $
--- src/Makefile.orig 2003-08-24 15:09:06.000000000 +0200
+++ src/Makefile 2003-12-26 14:58:32.000000000 +0100
@@ -198,11 +198,9 @@ $(LIBNAME): $(OBJECTS)
$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) $@
$(LIBCOMMAND) $@ $(OBJECTS)
$(RANLIB) $@
-libfltk.so.1.1: $(OBJECTS)
- echo $(DSOCOMMAND) $@ ...
+libfltk.so.$(LIBfltk_VERSION): $(OBJECTS)
echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ $(OBJECTS)
- -$(RM) libfltk.so
- $(RM) libfltk.so
- $(LN) libfltk.so.1.1 libfltk.so
libfltk.sl.1.1: $(OBJECTS)
echo $(DSOCOMMAND) $@ ...
@@ -234,11 +232,9 @@ $(FLLIBNAME): $(FLOBJECTS)
@@ -231,16 +227,12 @@ libfltk_s.a: $(OBJECTS)
$(CHMOD) +x libfltk_s.a
$(FLLIBNAME): $(FLOBJECTS)
- echo $(LIBCOMMAND) $@ ...
$(RM) $@
$(LIBCOMMAND) $@ $(FLOBJECTS)
$(RANLIB) $@
-libfltk_forms.so.1.1: $(FLOBJECTS) libfltk.so.1.1
- echo $(DSOCOMMAND) $@ ...
+libfltk_forms.so.$(LIBfltk_forms_VERSION): $(FLOBJECTS) libfltk.so.$(LIBfltk_VERSION)
echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk
- -$(RM) libfltk_forms.so
- $(RM) libfltk_forms.so
- $(LN) libfltk_forms.so.1.1 libfltk_forms.so
libfltk_forms.sl.1.1: $(FLOBJECTS) libfltk.sl.1.1
echo $(DSOCOMMAND) $@ ...
@@ -270,11 +266,9 @@ $(GLLIBNAME): $(GLOBJECTS)
@@ -267,16 +259,12 @@ libfltk_forms_s.a: $(FLOBJECTS)
$(CHMOD) +x libfltk_forms_s.a
$(GLLIBNAME): $(GLOBJECTS)
- echo $(LIBCOMMAND) $@ ...
$(RM) $@
$(LIBCOMMAND) $@ $(GLOBJECTS)
$(RANLIB) $@
-libfltk_gl.so.1.1: $(GLOBJECTS) libfltk.so.1.1
- echo $(DSOCOMMAND) $@ ...
+libfltk_gl.so.$(LIBfltk_gl_VERSION): $(GLOBJECTS) libfltk.so.$(LIBfltk_VERSION)
echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk
- -$(RM) libfltk_gl.so
- $(RM) libfltk_gl.so
- $(LN) libfltk_gl.so.1.1 libfltk_gl.so
libfltk_gl.sl.1.1: $(GLOBJECTS) libfltk.sl.1.1
echo $(DSOCOMMAND) $@ ...
@@ -306,11 +300,9 @@ $(IMGLIBNAME): $(IMGOBJECTS)
@@ -303,16 +291,12 @@ libfltk_gl_s.a: $(GLOBJECTS)
$(CHMOD) +x libfltk_gl_s.a
$(IMGLIBNAME): $(IMGOBJECTS)
- echo $(LIBCOMMAND) $@ ...
$(RM) $@
$(LIBCOMMAND) $@ $(IMGOBJECTS)
$(RANLIB) $@
-libfltk_images.so.1.1: $(IMGOBJECTS) libfltk.so.1.1
- echo $(DSOCOMMAND) $@ ...
+libfltk_images.so.$(LIBfltk_images_VERSION): $(IMGOBJECTS) libfltk.so.$(LIBfltk_VERSION)
echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ $(IMGOBJECTS) $(IMAGELIBS) -L. -lfltk
- -$(RM) libfltk_images.so
$(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk
- $(RM) libfltk_images.so
- $(LN) libfltk_images.so.1.1 libfltk_images.so
libfltk_images.sl.1.1: $(IMGOBJECTS) libfltk.sl.1.1
echo $(DSOCOMMAND) $@ ...
@@ -428,11 +420,10 @@ install: $(LIBNAME) $(DSONAME) \
$(RANLIB) $(libdir)/$(GLLIBNAME); \
@@ -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); \
fi
$(RANLIB) $(libdir)/$(IMGLIBNAME)
$(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBNAME)
- if test x$(DSONAME) = xlibfltk.so.1.1; then\
+ if test x$(DSONAME) = xlibfltk.so.$(LIBfltk_VERSION); then\
$(RM) $(libdir)/libfltk.so*;\
- $(CP) libfltk.so.1.1 $(libdir); \
- $(CHMOD) 755 $(libdir)/libfltk.so.1.1; \
- $(LN) libfltk.so.1.1 $(libdir)/libfltk.so;\
+ $(CP) libfltk.so.$(LIBfltk_VERSION) $(libdir); \
+ $(CHMOD) 755 $(libdir)/libfltk.so.$(LIBfltk_VERSION); \
$(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); \
fi
if test x$(DSONAME) = xlibfltk.sl.1.1; then\
$(RM) $(libdir)/libfltk.sl*;\
@@ -451,11 +442,10 @@ install: $(LIBNAME) $(DSONAME) \
$(CP) libfltk_s.a $(libdir); \
$(CHMOD) 755 $(libdir)/libfltk_s.a; \
$(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; \
fi
- if test x$(FLDSONAME) = xlibfltk_forms.so.1.1; then\
+ if test x$(FLDSONAME) = xlibfltk_forms.so.$(LIBfltk_forms_VERSION); then\
$(RM) $(libdir)/libfltk_forms.so*;\
- $(CP) libfltk_forms.so.1.1 $(libdir); \
- $(CHMOD) 755 $(libdir)/libfltk_forms.so.1.1; \
- $(LN) libfltk_forms.so.1.1 $(libdir)/libfltk_forms.so;\
+ $(CP) libfltk_forms.so.$(LIBfltk_forms_VERSION) $(libdir); \
+ $(CHMOD) 755 $(libdir)/libfltk_forms.so.$(LIBfltk_forms_VERSION); \
$(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); \
fi
if test x$(FLDSONAME) = xlibfltk_forms.sl.1.1; then\
$(RM) $(libdir)/libfltk_forms.sl*;\
@@ -474,11 +464,10 @@ install: $(LIBNAME) $(DSONAME) \
$(CP) libfltk_forms_s.a $(libdir); \
$(CHMOD) 755 $(libdir)/libfltk_forms.a; \
$(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; \
fi
- if test x$(GLDSONAME) = xlibfltk_gl.so.1.1; then\
+ if test x$(GLDSONAME) = xlibfltk_gl.so.$(LIBfltk_gl_VERSION); then\
$(RM) $(libdir)/libfltk_gl.so*;\
- $(CP) libfltk_gl.so.1.1 $(libdir); \
- $(CHMOD) 755 $(libdir)/libfltk_gl.so.1.1; \
- $(LN) libfltk_gl.so.1.1 $(libdir)/libfltk_gl.so;\
+ $(CP) libfltk_gl.so.$(LIBfltk_gl_VERSION) $(libdir); \
+ $(CHMOD) 755 $(libdir)/libfltk_gl.so.$(LIBfltk_gl_VERSION); \
$(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); \
fi
if test x$(GLDSONAME) = xlibfltk_gl.sl.1.1; then\
$(RM) $(libdir)/libfltk_gl.sl*;\
@@ -497,11 +486,10 @@ install: $(LIBNAME) $(DSONAME) \
$(CP) libfltk_gl_s.a $(libdir); \
$(CHMOD) 755 $(libdir)/libfltk_gl.a; \
$(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; \
fi
- if test x$(IMGDSONAME) = xlibfltk_images.so.1.1; then\
+ if test x$(IMGDSONAME) = xlibfltk_images.so.$(LIBfltk_images_VERSION); then\
$(RM) $(libdir)/libfltk_images.so*;\
- $(CP) libfltk_images.so.1.1 $(libdir); \
- $(CHMOD) 755 $(libdir)/libfltk_images.so.1.1; \
- $(LN) libfltk_images.so.1.1 $(libdir)/libfltk_images.so;\
+ $(CP) libfltk_images.so.$(LIBfltk_images_VERSION) $(libdir); \
+ $(CHMOD) 755 $(libdir)/libfltk_images.so.$(LIBfltk_images_VERSION); \
$(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); \
fi
if test x$(IMGDSONAME) = xlibfltk_images.sl.1.1; then\
$(RM) $(libdir)/libfltk_images.sl*;\
$(RM) $(DESTDIR)$(libdir)/libfltk_images.sl*;\

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.9 2004/09/15 19:26:28 espie Exp $
@comment $OpenBSD: PLIST,v 1.10 2006/10/19 09:41:32 wilfried Exp $
bin/fltk-config
bin/fluid
include/FL/
@ -86,6 +86,8 @@ 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
@ -168,6 +170,8 @@ 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_Tabs.H
@ -291,6 +295,7 @@ 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
@ -328,6 +333,7 @@ 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
@ -392,6 +398,7 @@ 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