Update to version 1.1.4.

3 files changed, 24 insertions, 24 deletions

diff --git a/x11-toolkits/fltk/Makefile b/x11-toolkits/fltk/Makefile
index 4e224fd2d764..782f75ec9785 100644
--- a/x11-toolkits/fltk/Makefile
+++ b/x11-toolkits/fltk/Makefile
@@ -44,7 +44,7 @@ _PORTVERSION+=	${VERSION}
 CONFIGURE_ARGS+=--enable-threads
 .endif
 
-VERSION=	1.1.3
+VERSION=	1.1.4
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11-toolkits/fltk/distinfo b/x11-toolkits/fltk/distinfo
index b2c9c2eecb9b..8c58a0f00817 100644
--- a/x11-toolkits/fltk/distinfo
+++ b/x11-toolkits/fltk/distinfo
@@ -1 +1 @@
-MD5 (fltk-1.1.3-source.tar.bz2) = f32b4acc456d567a6bd554ac03c24055
+MD5 (fltk-1.1.4-source.tar.bz2) = 06ce1d3def2df35525592746faccbf98
diff --git a/x11-toolkits/fltk/files/patch-src-Makefile b/x11-toolkits/fltk/files/patch-src-Makefile
index cd71693cbf75..4ebcf5e60aa9 100644
--- a/x11-toolkits/fltk/files/patch-src-Makefile
+++ b/x11-toolkits/fltk/files/patch-src-Makefile
@@ -1,5 +1,5 @@
---- src/Makefile.orig	Sun Jan  5 15:08:13 2003
-+++ src/Makefile	Sun Jan  5 15:11:01 2003
+--- src/Makefile.orig	Tue Sep  9 11:31:56 2003
++++ src/Makefile	Tue Sep  9 11:34:37 2003
 @@ -198,11 +198,11 @@
  	$(LIBCOMMAND) $@ $(OBJECTS)
  	$(RANLIB) $@
@@ -7,56 +7,56 @@
 -libfltk.so.1.1: $(OBJECTS)
 +libfltk.so.1: $(OBJECTS)
  	echo $(DSOCOMMAND) $@ ...
- 	$(DSOCOMMAND) $@ $(OBJECTS) $(IMAGELIBS)
+ 	$(DSOCOMMAND) $@ $(OBJECTS)
  	-$(RM) libfltk.so
 -	$(LN) libfltk.so.1.1 libfltk.so
 +	$(LN) libfltk.so.1 libfltk.so
  
  libfltk.sl.1.1: $(OBJECTS)
  	echo $(DSOCOMMAND) $@ ...
-@@ -230,11 +230,11 @@
+@@ -234,11 +234,11 @@
  	$(LIBCOMMAND) $@ $(FLOBJECTS)
  	$(RANLIB) $@
  
--libfltk_forms.so.1.1: $(FLOBJECTS)
-+libfltk_forms.so.1: $(FLOBJECTS)
+-libfltk_forms.so.1.1: $(FLOBJECTS) libfltk.so.1.1
++libfltk_forms.so.1: $(FLOBJECTS) libfltk.so.1
  	echo $(DSOCOMMAND) $@ ...
- 	$(DSOCOMMAND) $@ $(FLOBJECTS)
+ 	$(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk
  	-$(RM) libfltk_forms.so
 -	$(LN) libfltk_forms.so.1.1 libfltk_forms.so
 +	$(LN) libfltk_forms.so.1 libfltk_forms.so
  
- libfltk_forms.sl.1.1: $(FLOBJECTS)
+ libfltk_forms.sl.1.1: $(FLOBJECTS) libfltk.sl.1.1
  	echo $(DSOCOMMAND) $@ ...
-@@ -262,11 +262,11 @@
+@@ -270,11 +270,11 @@
  	$(LIBCOMMAND) $@ $(GLOBJECTS)
  	$(RANLIB) $@
  
--libfltk_gl.so.1.1: $(GLOBJECTS)
-+libfltk_gl.so.1: $(GLOBJECTS)
+-libfltk_gl.so.1.1: $(GLOBJECTS) libfltk.so.1.1
++libfltk_gl.so.1: $(GLOBJECTS) libfltk.so.1
  	echo $(DSOCOMMAND) $@ ...
- 	$(DSOCOMMAND) $@ $(GLOBJECTS)
+ 	$(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk
  	-$(RM) libfltk_gl.so
 -	$(LN) libfltk_gl.so.1.1 libfltk_gl.so
 +	$(LN) libfltk_gl.so.1 libfltk_gl.so
  
- libfltk_gl.sl.1.1: $(GLOBJECTS)
+ libfltk_gl.sl.1.1: $(GLOBJECTS) libfltk.sl.1.1
  	echo $(DSOCOMMAND) $@ ...
-@@ -294,11 +294,11 @@
+@@ -306,11 +306,11 @@
  	$(LIBCOMMAND) $@ $(IMGOBJECTS)
  	$(RANLIB) $@
  
--libfltk_images.so.1.1: $(IMGOBJECTS)
-+libfltk_images.so.1: $(IMGOBJECTS)
+-libfltk_images.so.1.1: $(IMGOBJECTS) libfltk.so.1.1
++libfltk_images.so.1: $(IMGOBJECTS) libfltk.so.1
  	echo $(DSOCOMMAND) $@ ...
- 	$(DSOCOMMAND) $@ $(IMGOBJECTS)
+ 	$(DSOCOMMAND) $@ $(IMGOBJECTS) $(IMAGELIBS) -L. -lfltk
  	-$(RM) libfltk_images.so
 -	$(LN) libfltk_images.so.1.1 libfltk_images.so
 +	$(LN) libfltk_images.so.1 libfltk_images.so
  
- libfltk_images.sl.1.1: $(IMGOBJECTS)
+ libfltk_images.sl.1.1: $(IMGOBJECTS) libfltk.sl.1.1
  	echo $(DSOCOMMAND) $@ ...
-@@ -411,11 +411,11 @@
+@@ -428,11 +428,11 @@
  		$(RANLIB) $(libdir)/$(GLLIBNAME); \
  	fi
  	$(RANLIB) $(libdir)/$(IMGLIBNAME)
@@ -72,7 +72,7 @@
  	fi
  	if test x$(DSONAME) = xlibfltk.sl.1.1; then\
  		$(RM) $(libdir)/libfltk.sl*;\
-@@ -434,11 +434,11 @@
+@@ -451,11 +451,11 @@
  		$(CP) libfltk_s.a $(libdir); \
  		$(CHMOD) 755 $(libdir)/libfltk_s.a; \
  	fi
@@ -88,7 +88,7 @@
  	fi
  	if test x$(FLDSONAME) = xlibfltk_forms.sl.1.1; then\
  		$(RM) $(libdir)/libfltk_forms.sl*;\
-@@ -457,11 +457,11 @@
+@@ -474,11 +474,11 @@
  		$(CP) libfltk_forms_s.a $(libdir); \
  		$(CHMOD) 755 $(libdir)/libfltk_forms.a; \
  	fi
@@ -104,7 +104,7 @@
  	fi
  	if test x$(GLDSONAME) = xlibfltk_gl.sl.1.1; then\
  		$(RM) $(libdir)/libfltk_gl.sl*;\
-@@ -480,11 +480,11 @@
+@@ -497,11 +497,11 @@
  		$(CP) libfltk_gl_s.a $(libdir); \
  		$(CHMOD) 755 $(libdir)/libfltk_gl.a; \
  	fi