Update to version 1.0.3 and cleanup a few nits.

PR:		11583
Submitted by:	Chris Piazza <cpiazza@home.net>

4 files changed, 31 insertions, 25 deletions

diff --git a/x11-toolkits/fltk/Makefile b/x11-toolkits/fltk/Makefile
index 5282105795e2..9d937efb1f76 100644
--- a/x11-toolkits/fltk/Makefile
+++ b/x11-toolkits/fltk/Makefile
@@ -3,11 +3,11 @@
 # Date created:				11 February 1999
 # Whom:                			Dima Sivachenko <dima@Chg.RU>
 #
-# $Id: Makefile,v 1.6 1999/05/01 02:03:09 steve Exp $
+# $Id: Makefile,v 1.7 1999/05/01 16:56:12 mharo Exp $
 #
 
-DISTNAME=	fltk-1.0.2-source
-PKGNAME=	fltk-1.0.2
+DISTNAME=	fltk-1.0.3-source
+PKGNAME=	fltk-1.0.3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.fltk.org/pub/fltk/${VERSION}/ \
 		ftp://ftp.chg.ru/pub/X11/fltk/${VERSION}/ \
@@ -23,11 +23,10 @@ LIB_DEPENDS=	MesaGL.14:${PORTSDIR}/graphics/Mesa3
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--enable-shared
-CONFIGURE_ENV=	CXXFLAGS="${CFLAGS}"
 WRKSRC=		${WRKDIR}/${PKGNAME}
 USE_X_PREFIX=	yes
 MAN1=		fluid.1
-VERSION=	1.0.2
+VERSION=	1.0.3
 
 .include <bsd.port.pre.mk>
 .if (${OBJFORMAT} == "aout")
diff --git a/x11-toolkits/fltk/distinfo b/x11-toolkits/fltk/distinfo
index bdc886e506d2..c5ee06f919f9 100644
--- a/x11-toolkits/fltk/distinfo
+++ b/x11-toolkits/fltk/distinfo
@@ -1 +1 @@
-MD5 (fltk-1.0.2-source.tar.bz2) = da05fc3adbf0ecffcfe79a3ed3c2ec98
+MD5 (fltk-1.0.3-source.tar.bz2) = f787a1e30edfcae08e17a1220afd0475
diff --git a/x11-toolkits/fltk/files/patch-ab b/x11-toolkits/fltk/files/patch-ab
index d75a39385982..0392bb6b084e 100644
--- a/x11-toolkits/fltk/files/patch-ab
+++ b/x11-toolkits/fltk/files/patch-ab
@@ -1,30 +1,38 @@
---- configure.orig	Wed Apr 14 18:16:08 1999
-+++ configure	Wed Apr 14 18:16:44 1999
-@@ -780,9 +780,9 @@
-   if test "$ac_test_CFLAGS" = set; then
-     CFLAGS="$ac_save_CFLAGS"
-   elif test $ac_cv_prog_cc_g = yes; then
+--- configure.orig	Sat May  8 08:04:02 1999
++++ configure	Sat May  8 08:04:31 1999
+@@ -833,13 +833,13 @@
+   CFLAGS="$ac_save_CFLAGS"
+ elif test $ac_cv_prog_cc_g = yes; then
+   if test "$GCC" = yes; then
 -    CFLAGS="-g -O2"
 +    CFLAGS="-g"
    else
+     CFLAGS="-g"
+   fi
+ else
+   if test "$GCC" = yes; then
 -    CFLAGS="-O2"
 +    CFLAGS=""
+   else
+     CFLAGS=
    fi
- else
-   GCC=
-@@ -912,9 +912,9 @@
-   if test "$ac_test_CXXFLAGS" = set; then
-     CXXFLAGS="$ac_save_CXXFLAGS"
-   elif test $ac_cv_prog_cxx_g = yes; then
+@@ -976,13 +976,13 @@
+   CXXFLAGS="$ac_save_CXXFLAGS"
+ elif test $ac_cv_prog_cxx_g = yes; then
+   if test "$GXX" = yes; then
 -    CXXFLAGS="-g -O2"
 +    CXXFLAGS="-g"
    else
+     CXXFLAGS="-g"
+   fi
+ else
+   if test "$GXX" = yes; then
 -    CXXFLAGS="-O2"
 +    CXXFLAGS=""
+   else
+     CXXFLAGS=
    fi
- else
-   GXX=
-@@ -2621,8 +2621,8 @@
+@@ -2701,8 +2701,8 @@
      CFLAGS="-Wall $CFLAGS"
      CXXFLAGS="-Wall -Wno-return-type $CXXFLAGS"
      if test -z "$DEBUGFLAG"; then
@@ -35,7 +43,7 @@
      fi
      if test $PICFLAG = 1; then
      	CFLAGS="-fPIC $CFLAGS"
-@@ -2649,8 +2649,8 @@
+@@ -2729,8 +2729,8 @@
          	CXXFLAGS="+w +pp $CXXFLAGS"
  	    fi
  	    if test -z "$DEBUGFLAG"; then
diff --git a/x11-toolkits/fltk/pkg-plist b/x11-toolkits/fltk/pkg-plist
index 2055027f0392..af9c04335f4b 100644
--- a/x11-toolkits/fltk/pkg-plist
+++ b/x11-toolkits/fltk/pkg-plist
@@ -189,8 +189,8 @@ include/FL/x.h
 lib/libfltk.a
 lib/libfltk.so
 lib/libfltk.so.1
-@exec /sbin/ldconfig -m %D/lib
-@unexec /sbin/ldconfig -R
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 share/doc/fltk/FL.gif
 share/doc/fltk/Fl_Adjuster.html
 share/doc/fltk/Fl_Box.html
@@ -322,5 +322,4 @@ share/doc/fltk/valuators.gif
 share/doc/fltk/value_slider.gif
 share/doc/fltk/widgets.html
 @dirrm include/FL
-include/Fl
 @dirrm share/doc/fltk