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

update fltk to 1.1.4

Browse Source
This commit is contained in:
wilfried 2003-12-26 14:18:30 +00:00
parent 22bde39578
commit 1e435bb51d
7 changed files with 60 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/fltk/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.26 2003/08/28 10:56:02 sturm Exp $
# $OpenBSD: Makefile,v 1.27 2003/12/26 14:18:30 wilfried Exp $
COMMENT= "Fast-Light Tool Kit"
VER= 1.1.3
VER= 1.1.4
DISTNAME= fltk-${VER}
CATEGORIES= x11

6
x11/fltk/distinfo
View File

@ -1,3 +1,3 @@
MD5 (fltk-1.1.3-source.tar.gz) = 7eb1de3085112dc2ff6bda20540cbe7b
RMD160 (fltk-1.1.3-source.tar.gz) = 29f027e86c0cdbba104698a23841958b78c1acdb
SHA1 (fltk-1.1.3-source.tar.gz) = f618558926ef63e0a39aa989c30c9dacb7f269e4
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

14
x11/fltk/patches/patch-configure
View File

@ -1,20 +1,20 @@
$OpenBSD: patch-configure,v 1.6 2003/04/02 12:58:43 wilfried Exp $
--- configure.orig Thu Feb 13 22:48:00 2003
+++ configure Wed Apr 2 14:36:54 2003
$OpenBSD: patch-configure,v 1.7 2003/12/26 14:18:30 wilfried Exp $
--- configure.orig 2003-09-08 21:18:58.000000000 +0200
+++ configure 2003-12-26 14:54:28.000000000 +0100
@@ -1208,9 +1208,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-FL_MAJOR_VERSION=1
-FL_MINOR_VERSION=1
-FL_PATCH_VERSION=3
+FL_MAJOR_VERSION=3
-FL_PATCH_VERSION=4
+FL_MAJOR_VERSION=4
+FL_MINOR_VERSION=0
+FL_PATCH_VERSION=0
FL_RELEASE_VERSION=
FL_API_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}
@@ -8878,7 +8878,7 @@ echo "${ECHO_T}yes" >&6
@@ -8919,7 +8919,7 @@ echo "${ECHO_T}yes" >&6
;;
esac
@ -23,7 +23,7 @@ $OpenBSD: patch-configure,v 1.6 2003/04/02 12:58:43 wilfried Exp $
# Show all standard warnings + unused variables when compiling...
OPTIM="-Wall -Wunused $OPTIM"
@@ -8905,7 +8905,7 @@ echo "${ECHO_T}yes" >&6
@@ -8946,7 +8946,7 @@ echo "${ECHO_T}yes" >&6
if test "x$with_optim" != x; then
OPTIM="$with_optim $OPTIM"
else

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

@ -1,20 +1,20 @@
$OpenBSD: patch-configure_in,v 1.7 2003/04/02 12:58:43 wilfried Exp $
--- configure.in.orig Thu Jan 30 22:38:18 2003
+++ configure.in Wed Apr 2 14:36:56 2003
$OpenBSD: patch-configure_in,v 1.8 2003/12/26 14:18:30 wilfried 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...
AC_INIT(src/Fl.cxx)
dnl FLTK library versions...
-FL_MAJOR_VERSION=1
-FL_MINOR_VERSION=1
-FL_PATCH_VERSION=3
+FL_MAJOR_VERSION=3
-FL_PATCH_VERSION=4
+FL_MAJOR_VERSION=4
+FL_MINOR_VERSION=0
+FL_PATCH_VERSION=0
FL_RELEASE_VERSION=
FL_API_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}
@@ -664,7 +664,7 @@ if test -n "$GCC"; then
@@ -668,7 +668,7 @@ if test -n "$GCC"; then
;;
esac
@ -23,7 +23,7 @@ $OpenBSD: patch-configure_in,v 1.7 2003/04/02 12:58:43 wilfried Exp $
# Show all standard warnings + unused variables when compiling...
OPTIM="-Wall -Wunused $OPTIM"
@@ -691,7 +691,7 @@ if test -n "$GCC"; then
@@ -695,7 +695,7 @@ if test -n "$GCC"; then
if test "x$with_optim" != x; then
OPTIM="$with_optim $OPTIM"
else

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

@ -1,115 +1,115 @@
$OpenBSD: patch-src_Makefile,v 1.5 2003/04/02 12:58:43 wilfried Exp $
--- src/Makefile.orig Thu Jan 30 22:43:17 2003
+++ src/Makefile Wed Apr 2 14:36:42 2003
$OpenBSD: patch-src_Makefile,v 1.6 2003/12/26 14:18:30 wilfried 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)
$(LIBCOMMAND) $@ $(OBJECTS)
$(RANLIB) $@
-libfltk.so.1.1: $(OBJECTS)
+libfltk.so.3.0: $(OBJECTS)
+libfltk.so.4.0: $(OBJECTS)
echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ $(OBJECTS) $(IMAGELIBS)
$(DSOCOMMAND) $@ $(OBJECTS)
- -$(RM) libfltk.so
- $(LN) libfltk.so.1.1 libfltk.so
libfltk.sl.1.1: $(OBJECTS)
echo $(DSOCOMMAND) $@ ...
@@ -230,11 +228,9 @@ $(FLLIBNAME): $(FLOBJECTS)
@@ -234,11 +232,9 @@ $(FLLIBNAME): $(FLOBJECTS)
$(LIBCOMMAND) $@ $(FLOBJECTS)
$(RANLIB) $@
-libfltk_forms.so.1.1: $(FLOBJECTS)
+libfltk_forms.so.3.0: $(FLOBJECTS)
-libfltk_forms.so.1.1: $(FLOBJECTS) libfltk.so.1.1
+libfltk_forms.so.4.0: $(FLOBJECTS) libfltk.so.4.0
echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ $(FLOBJECTS)
$(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk
- -$(RM) libfltk_forms.so
- $(LN) libfltk_forms.so.1.1 libfltk_forms.so
libfltk_forms.sl.1.1: $(FLOBJECTS)
libfltk_forms.sl.1.1: $(FLOBJECTS) libfltk.sl.1.1
echo $(DSOCOMMAND) $@ ...
@@ -262,11 +258,9 @@ $(GLLIBNAME): $(GLOBJECTS)
@@ -270,11 +266,9 @@ $(GLLIBNAME): $(GLOBJECTS)
$(LIBCOMMAND) $@ $(GLOBJECTS)
$(RANLIB) $@
-libfltk_gl.so.1.1: $(GLOBJECTS)
+libfltk_gl.so.3.0: $(GLOBJECTS)
-libfltk_gl.so.1.1: $(GLOBJECTS) libfltk.so.1.1
+libfltk_gl.so.4.0: $(GLOBJECTS) libfltk.so.4.0
echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ $(GLOBJECTS)
$(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk
- -$(RM) libfltk_gl.so
- $(LN) libfltk_gl.so.1.1 libfltk_gl.so
libfltk_gl.sl.1.1: $(GLOBJECTS)
libfltk_gl.sl.1.1: $(GLOBJECTS) libfltk.sl.1.1
echo $(DSOCOMMAND) $@ ...
@@ -294,11 +288,9 @@ $(IMGLIBNAME): $(IMGOBJECTS)
@@ -306,11 +300,9 @@ $(IMGLIBNAME): $(IMGOBJECTS)
$(LIBCOMMAND) $@ $(IMGOBJECTS)
$(RANLIB) $@
-libfltk_images.so.1.1: $(IMGOBJECTS)
+libfltk_images.so.3.0: $(IMGOBJECTS)
-libfltk_images.so.1.1: $(IMGOBJECTS) libfltk.so.1.1
+libfltk_images.so.4.0: $(IMGOBJECTS) libfltk.so.4.0
echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ $(IMGOBJECTS)
$(DSOCOMMAND) $@ $(IMGOBJECTS) $(IMAGELIBS) -L. -lfltk
- -$(RM) libfltk_images.so
- $(LN) libfltk_images.so.1.1 libfltk_images.so
libfltk_images.sl.1.1: $(IMGOBJECTS)
libfltk_images.sl.1.1: $(IMGOBJECTS) libfltk.sl.1.1
echo $(DSOCOMMAND) $@ ...
@@ -412,11 +404,10 @@ install: $(LIBNAME) $(DSONAME) \
@@ -428,11 +420,10 @@ install: $(LIBNAME) $(DSONAME) \
$(RANLIB) $(libdir)/$(GLLIBNAME); \
fi
$(RANLIB) $(libdir)/$(IMGLIBNAME)
- if test x$(DSONAME) = xlibfltk.so.1.1; then\
+ if test x$(DSONAME) = xlibfltk.so.3.0; then\
+ if test x$(DSONAME) = xlibfltk.so.4.0; 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.3.0 $(libdir); \
+ $(CHMOD) 755 $(libdir)/libfltk.so.3.0; \
+ $(CP) libfltk.so.4.0 $(libdir); \
+ $(CHMOD) 755 $(libdir)/libfltk.so.4.0; \
fi
if test x$(DSONAME) = xlibfltk.sl.1.1; then\
$(RM) $(libdir)/libfltk.sl*;\
@@ -435,11 +426,10 @@ install: $(LIBNAME) $(DSONAME) \
@@ -451,11 +442,10 @@ install: $(LIBNAME) $(DSONAME) \
$(CP) libfltk_s.a $(libdir); \
$(CHMOD) 755 $(libdir)/libfltk_s.a; \
fi
- if test x$(FLDSONAME) = xlibfltk_forms.so.1.1; then\
+ if test x$(FLDSONAME) = xlibfltk_forms.so.3.0; then\
+ if test x$(FLDSONAME) = xlibfltk_forms.so.4.0; 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.3.0 $(libdir); \
+ $(CHMOD) 755 $(libdir)/libfltk_forms.so.3.0; \
+ $(CP) libfltk_forms.so.4.0 $(libdir); \
+ $(CHMOD) 755 $(libdir)/libfltk_forms.so.4.0; \
fi
if test x$(FLDSONAME) = xlibfltk_forms.sl.1.1; then\
$(RM) $(libdir)/libfltk_forms.sl*;\
@@ -458,11 +448,10 @@ install: $(LIBNAME) $(DSONAME) \
@@ -474,11 +464,10 @@ install: $(LIBNAME) $(DSONAME) \
$(CP) libfltk_forms_s.a $(libdir); \
$(CHMOD) 755 $(libdir)/libfltk_forms.a; \
fi
- if test x$(GLDSONAME) = xlibfltk_gl.so.1.1; then\
+ if test x$(GLDSONAME) = xlibfltk_gl.so.3.0; then\
+ if test x$(GLDSONAME) = xlibfltk_gl.so.4.0; 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.3.0 $(libdir); \
+ $(CHMOD) 755 $(libdir)/libfltk_gl.so.3.0; \
+ $(CP) libfltk_gl.so.4.0 $(libdir); \
+ $(CHMOD) 755 $(libdir)/libfltk_gl.so.4.0; \
fi
if test x$(GLDSONAME) = xlibfltk_gl.sl.1.1; then\
$(RM) $(libdir)/libfltk_gl.sl*;\
@@ -481,11 +470,10 @@ install: $(LIBNAME) $(DSONAME) \
@@ -497,11 +486,10 @@ install: $(LIBNAME) $(DSONAME) \
$(CP) libfltk_gl_s.a $(libdir); \
$(CHMOD) 755 $(libdir)/libfltk_gl.a; \
fi
- if test x$(IMGDSONAME) = xlibfltk_images.so.1.1; then\
+ if test x$(IMGDSONAME) = xlibfltk_images.so.3.0; then\
+ if test x$(IMGDSONAME) = xlibfltk_images.so.4.0; 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.3.0 $(libdir); \
+ $(CHMOD) 755 $(libdir)/libfltk_images.so.3.0; \
+ $(CP) libfltk_images.so.4.0 $(libdir); \
+ $(CHMOD) 755 $(libdir)/libfltk_images.so.4.0; \
fi
if test x$(IMGDSONAME) = xlibfltk_images.sl.1.1; then\
$(RM) $(libdir)/libfltk_images.sl*;\

12
x11/fltk/patches/patch-src_forms_fselect_cxx
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_forms_fselect_cxx,v 1.1 2003/04/14 13:30:02 avsm Exp $
--- src/forms_fselect.cxx.orig Mon Apr 14 13:41:45 2003
+++ src/forms_fselect.cxx Mon Apr 14 13:42:13 2003
@@ -48,7 +48,7 @@ char* fl_show_file_selector(const char *
if (!q) return 0;
strlcpy(fl_directory, q, sizeof(fl_directory));
p = (char *)fl_filename_name(fl_directory);
- strlcpy(fl_filename, p, sizeof(fl_directory));
+ strlcpy(fl_filename, p, sizeof(fl_filename));
if (p > fl_directory+1) p--;
*p = 0;
return (char *)q;

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

@ -1,6 +1,6 @@
@comment $OpenBSD: PFRAG.shared,v 1.7 2003/04/02 12:58:43 wilfried Exp $
lib/libfltk.so.3.0
lib/libfltk_forms.so.3.0
lib/libfltk_gl.so.3.0
lib/libfltk_images.so.3.0
@comment $OpenBSD: PFRAG.shared,v 1.8 2003/12/26 14:18:30 wilfried Exp $
lib/libfltk.so.4.0
lib/libfltk_forms.so.4.0
lib/libfltk_gl.so.4.0
lib/libfltk_images.so.4.0
DYNLIBDIR(%B)