From 8f4409db57ef407c213cbc3effd1e753bc212839 Mon Sep 17 00:00:00 2001
From: Steve Price <steve@FreeBSD.org>
Date: Fri, 7 Jul 2000 19:33:57 +0000
Subject: Update to version 1.0.9.

PR:		19671
Submitted by:	maintainer
---
 x11-toolkits/fltk/Makefile       | 11 +++--------
 x11-toolkits/fltk/distinfo       |  2 +-
 x11-toolkits/fltk/files/patch-ab | 29 +++++++++--------------------
 x11-toolkits/fltk/pkg-plist      |  2 ++
 4 files changed, 15 insertions(+), 29 deletions(-)

(limited to 'x11-toolkits/fltk')

diff --git a/x11-toolkits/fltk/Makefile b/x11-toolkits/fltk/Makefile
index c2a10e8bd598..20eeb7a5ccbf 100644
--- a/x11-toolkits/fltk/Makefile
+++ b/x11-toolkits/fltk/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fltk
-PORTVERSION= 	1.0.7
+PORTVERSION= 	1.0.9
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.fltk.org/pub/fltk/${VERSION}/ \
 		ftp://ftp.chg.ru/pub/X11/fltk/${VERSION}/ \
@@ -20,7 +20,7 @@ MAINTAINER=	dima@chg.ru
 
 LIB_DEPENDS=	GL.14:${PORTSDIR}/graphics/Mesa3
 
-VERSION=	1.0.7
+VERSION=	1.0.9
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
@@ -29,11 +29,6 @@ WRKSRC=		${WRKDIR}/${PKGNAME}
 USE_X_PREFIX=	yes
 MAN1=		fluid.1
 
-.include <bsd.port.pre.mk>
-.if (${PORTOBJFORMAT} == "aout")
-BROKEN=	requires ELF library format
-.endif
-
 post-install:
 	@ ${INSTALL_MAN} ${WRKSRC}/documentation/fluid.1 \
 		${PREFIX}/man/man1
@@ -47,4 +42,4 @@ post-install:
 		${PREFIX}/share/doc/fltk
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/fltk/distinfo b/x11-toolkits/fltk/distinfo
index 4d3b178fd442..f976e1ebd711 100644
--- a/x11-toolkits/fltk/distinfo
+++ b/x11-toolkits/fltk/distinfo
@@ -1 +1 @@
-MD5 (fltk-1.0.7-source.tar.bz2) = 7fc6d2a02f4619a217b9a76afa2384ad
+MD5 (fltk-1.0.9-source.tar.bz2) = 139c134098128754f706b4f3a905cbc5
diff --git a/x11-toolkits/fltk/files/patch-ab b/x11-toolkits/fltk/files/patch-ab
index 0392bb6b084e..52ee08048451 100644
--- a/x11-toolkits/fltk/files/patch-ab
+++ b/x11-toolkits/fltk/files/patch-ab
@@ -1,6 +1,6 @@
---- configure.orig	Sat May  8 08:04:02 1999
-+++ configure	Sat May  8 08:04:31 1999
-@@ -833,13 +833,13 @@
+--- configure.orig	Mon Jul  3 17:10:35 2000
++++ configure	Mon Jul  3 17:12:16 2000
+@@ -837,13 +837,13 @@
    CFLAGS="$ac_save_CFLAGS"
  elif test $ac_cv_prog_cc_g = yes; then
    if test "$GCC" = yes; then
@@ -16,7 +16,7 @@
    else
      CFLAGS=
    fi
-@@ -976,13 +976,13 @@
+@@ -980,13 +980,13 @@
    CXXFLAGS="$ac_save_CXXFLAGS"
  elif test $ac_cv_prog_cxx_g = yes; then
    if test "$GXX" = yes; then
@@ -32,25 +32,14 @@
    else
      CXXFLAGS=
    fi
-@@ -2701,8 +2701,8 @@
+@@ -2691,8 +2691,8 @@
      CFLAGS="-Wall $CFLAGS"
      CXXFLAGS="-Wall -Wno-return-type $CXXFLAGS"
      if test -z "$DEBUGFLAG"; then
--        CFLAGS="-O2 $CFLAGS"
--        CXXFLAGS="-O2 $CXXFLAGS"
-+        CFLAGS="$CFLAGS"
-+        CXXFLAGS="$CXXFLAGS"
+-        CFLAGS="-O2 -fforce-mem -fforce-addr -fcaller-saves $CFLAGS"
+-        CXXFLAGS="-O2 -fforce-mem -fforce-addr -fcaller-saves $CXXFLAGS"
++        CFLAGS="-fforce-mem -fforce-addr -fcaller-saves $CFLAGS"
++        CXXFLAGS="-fforce-mem -fforce-addr -fcaller-saves $CXXFLAGS"
      fi
      if test $PICFLAG = 1; then
      	CFLAGS="-fPIC $CFLAGS"
-@@ -2729,8 +2729,8 @@
-         	CXXFLAGS="+w +pp $CXXFLAGS"
- 	    fi
- 	    if test -z "$DEBUGFLAG"; then
--        	CFLAGS="-O2 $CFLAGS"
--        	CXXFLAGS="-O2 $CXXFLAGS"
-+        	CFLAGS="$CFLAGS"
-+        	CXXFLAGS="$CXXFLAGS"
- 	    fi
- 	    ;;
- 	HP-UX*)
diff --git a/x11-toolkits/fltk/pkg-plist b/x11-toolkits/fltk/pkg-plist
index 308a68a3ac22..b13409ee48ae 100644
--- a/x11-toolkits/fltk/pkg-plist
+++ b/x11-toolkits/fltk/pkg-plist
@@ -283,6 +283,8 @@ share/doc/fltk/fl_message.gif
 share/doc/fltk/fl_password.gif
 share/doc/fltk/fl_show_colormap.gif
 share/doc/fltk/fluid-org.gif
+share/doc/fltk/fluid-gettext.gif
+share/doc/fltk/fluid-catgets.gif
 share/doc/fltk/fluid.gif
 share/doc/fltk/fluid.html
 share/doc/fltk/fluid1.gif
-- 
cgit v1.2.3