Update to version 1.0.1

PR:		11142
Submitted by:	Chris Piazza cpiazza@home.net

4 files changed, 188 insertions, 29 deletions

diff --git a/x11-toolkits/fltk/Makefile b/x11-toolkits/fltk/Makefile
index 3afc1d2cb18b..8ac04e100780 100644
--- a/x11-toolkits/fltk/Makefile
+++ b/x11-toolkits/fltk/Makefile
@@ -1,35 +1,50 @@
 # New ports collection makefile for:   	fltk
-# Version required:			19990127
+# Version required:			1.0.1
 # Date created:				11 February 1999
 # Whom:                			Dima Sivachenko <dima@Chg.RU>
 #
-# $Id: Makefile,v 1.2 1999/03/15 21:26:38 billf Exp $
+# $Id: Makefile,v 1.3 1999/04/09 19:26:49 billf Exp $
 #
 
-DISTNAME=	fltk-19990127
-PKGNAME=	fltk-1999.01.27
+DISTNAME=	fltk-1.0.1-source
+PKGNAME=	fltk-1.0.1
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	ftp://ftp.easysw.com/pub/fltk/ \
-		ftp://ftp.northamerica.net/pub/ESP/fltk/ \
-		ftp://ftp.funet.fi/mirrors/ftp.easysw.com/pub/fltk/ \
-		ftp://ftp.kddlabs.co.jp/pub/lang/fltk/ \
-		ftp://ftp.c-com.net/pub/LinuxBerg/files/x11/dev/
+MASTER_SITES=	ftp://ftp.fltk.org/pub/fltk/${VERSION}/ \
+		ftp://ftp.easysw.com/pub/fltk/${VERSION}/ \
+		ftp://ftp2.easysw.com/pub/fltk/${VERSION}/ \
+		ftp://ftp.northamerica.net/pub/ESP/fltk/${VERSION}/ \
+		ftp://ftp.funet.fi/mirrors/ftp.easysw.com/pub/fltk/${VERSION}/ \
+		ftp://ftp.kddlabs.co.jp/pub/lang/fltk/${VERSION}/
 
 MAINTAINER=	dima@chg.ru
 
 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.1
 
-post-install:
+.if defined(NOPORTDOCS)
+PLIST=	${PKGDIR}/PLIST.nodocs
+.endif
 
-		@ ${INSTALL_DATA} ${WRKSRC}/lib/libfltk.so.1 ${PREFIX}/lib
-		@ ${LDCONFIG} -m
+post-install:
+	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+	${INSTALL_MAN} ${WRKSRC}/documentation/fluid.1 \
+		${PREFIX}/man/man1
 .if !defined(NOPORTDOCS)
-		@ ${MKDIR} ${PREFIX}/share/doc/fltk
-		@ ${INSTALL_DATA} ${WRKSRC}/documentation/* ${PREFIX}/share/doc/fltk
+	@ ${MKDIR} ${PREFIX}/share/doc/fltk
+	@ ${INSTALL_DATA} ${WRKSRC}/documentation/*.html \
+		 ${PREFIX}/share/doc/fltk
+	@ ${INSTALL_DATA} ${WRKSRC}/documentation/*.gif \
+		${PREFIX}/share/doc/fltk
+	@ ${INSTALL_DATA} ${WRKSRC}/documentation/*.jpg \
+		${PREFIX}/share/doc/fltk
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/fltk/distinfo b/x11-toolkits/fltk/distinfo
index acec679bd827..251f654d5719 100644
--- a/x11-toolkits/fltk/distinfo
+++ b/x11-toolkits/fltk/distinfo
@@ -1 +1 @@
-MD5 (fltk-19990127.tar.gz) = bba5eb56d853d94b9bd4ad4be1ccecde
+MD5 (fltk-1.0.1-source.tar.bz2) = 0604cf4e6c53802dda52035ccc97c631
diff --git a/x11-toolkits/fltk/files/patch-ab b/x11-toolkits/fltk/files/patch-ab
new file mode 100644
index 000000000000..d75a39385982
--- /dev/null
+++ b/x11-toolkits/fltk/files/patch-ab
@@ -0,0 +1,48 @@
+--- 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
+-    CFLAGS="-g -O2"
++    CFLAGS="-g"
+   else
+-    CFLAGS="-O2"
++    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
+-    CXXFLAGS="-g -O2"
++    CXXFLAGS="-g"
+   else
+-    CXXFLAGS="-O2"
++    CXXFLAGS=""
+   fi
+ else
+   GXX=
+@@ -2621,8 +2621,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"
+     fi
+     if test $PICFLAG = 1; then
+     	CFLAGS="-fPIC $CFLAGS"
+@@ -2649,8 +2649,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 f6e7a7e5b26b..dfeac46ef98b 100644
--- a/x11-toolkits/fltk/pkg-plist
+++ b/x11-toolkits/fltk/pkg-plist
@@ -1,105 +1,196 @@
-lib/libfltk.so.1
-@exec /sbin/ldconfig -m %D/lib
-@unexec /sbin/ldconfig -R
 bin/fluid
-include/FL/Fl_Image.H
 include/FL/Enumerations.H
+include/FL/Enumerations.h
 include/FL/Fl.H
+include/FL/Fl.h
 include/FL/Fl_Adjuster.H
+include/FL/Fl_Adjuster.h
 include/FL/Fl_Bitmap.H
+include/FL/Fl_Bitmap.h
 include/FL/Fl_Box.H
+include/FL/Fl_Box.h
 include/FL/Fl_Browser.H
+include/FL/Fl_Browser.h
 include/FL/Fl_Browser_.H
+include/FL/Fl_Browser_.h
 include/FL/Fl_Button.H
+include/FL/Fl_Button.h
 include/FL/Fl_Chart.H
+include/FL/Fl_Chart.h
 include/FL/Fl_Check_Button.H
+include/FL/Fl_Check_Button.h
 include/FL/Fl_Choice.H
+include/FL/Fl_Choice.h
 include/FL/Fl_Clock.H
+include/FL/Fl_Clock.h
 include/FL/Fl_Color_Chooser.H
+include/FL/Fl_Color_Chooser.h
 include/FL/Fl_Counter.H
+include/FL/Fl_Counter.h
 include/FL/Fl_Dial.H
+include/FL/Fl_Dial.h
 include/FL/Fl_Double_Window.H
+include/FL/Fl_Double_Window.h
 include/FL/Fl_Fill_Dial.H
+include/FL/Fl_Fill_Dial.h
 include/FL/Fl_Fill_Slider.H
+include/FL/Fl_Fill_Slider.h
 include/FL/Fl_Float_Input.H
+include/FL/Fl_Float_Input.h
 include/FL/Fl_FormsBitmap.H
+include/FL/Fl_FormsBitmap.h
 include/FL/Fl_FormsPixmap.H
+include/FL/Fl_FormsPixmap.h
 include/FL/Fl_Free.H
+include/FL/Fl_Free.h
 include/FL/Fl_Gl_Window.H
+include/FL/Fl_Gl_Window.h
 include/FL/Fl_Group.H
-include/FL/Fl_Positioner.H
+include/FL/Fl_Group.h
 include/FL/Fl_Hold_Browser.H
+include/FL/Fl_Hold_Browser.h
 include/FL/Fl_Hor_Fill_Slider.H
+include/FL/Fl_Hor_Fill_Slider.h
 include/FL/Fl_Hor_Nice_Slider.H
+include/FL/Fl_Hor_Nice_Slider.h
 include/FL/Fl_Hor_Slider.H
+include/FL/Fl_Hor_Slider.h
 include/FL/Fl_Hor_Value_Slider.H
+include/FL/Fl_Hor_Value_Slider.h
+include/FL/Fl_Image.H
+include/FL/Fl_Image.h
 include/FL/Fl_Input.H
+include/FL/Fl_Input.h
 include/FL/Fl_Input_.H
+include/FL/Fl_Input_.h
 include/FL/Fl_Int_Input.H
+include/FL/Fl_Int_Input.h
 include/FL/Fl_Light_Button.H
+include/FL/Fl_Light_Button.h
 include/FL/Fl_Line_Dial.H
+include/FL/Fl_Line_Dial.h
 include/FL/Fl_Menu.H
+include/FL/Fl_Menu.h
 include/FL/Fl_Menu_.H
+include/FL/Fl_Menu_.h
 include/FL/Fl_Menu_Bar.H
+include/FL/Fl_Menu_Bar.h
 include/FL/Fl_Menu_Button.H
+include/FL/Fl_Menu_Button.h
 include/FL/Fl_Menu_Item.H
-include/FL/forms.H
+include/FL/Fl_Menu_Item.h
 include/FL/Fl_Menu_Window.H
+include/FL/Fl_Menu_Window.h
 include/FL/Fl_Multi_Browser.H
+include/FL/Fl_Multi_Browser.h
 include/FL/Fl_Multi_Label.H
+include/FL/Fl_Multi_Label.h
 include/FL/Fl_Multiline_Input.H
+include/FL/Fl_Multiline_Input.h
 include/FL/Fl_Multiline_Output.H
+include/FL/Fl_Multiline_Output.h
 include/FL/Fl_Nice_Slider.H
+include/FL/Fl_Nice_Slider.h
 include/FL/Fl_Object.H
+include/FL/Fl_Object.h
 include/FL/Fl_Output.H
-include/FL/Fl_Pack.H
+include/FL/Fl_Output.h
 include/FL/Fl_Overlay_Window.H
+include/FL/Fl_Overlay_Window.h
+include/FL/Fl_Pack.H
+include/FL/Fl_Pack.h
 include/FL/Fl_Pixmap.H
-include/FL/Fl_Window.H
+include/FL/Fl_Pixmap.h
+include/FL/Fl_Positioner.H
+include/FL/Fl_Positioner.h
 include/FL/Fl_Radio_Button.H
+include/FL/Fl_Radio_Button.h
 include/FL/Fl_Radio_Light_Button.H
+include/FL/Fl_Radio_Light_Button.h
 include/FL/Fl_Radio_Round_Button.H
+include/FL/Fl_Radio_Round_Button.h
 include/FL/Fl_Repeat_Button.H
+include/FL/Fl_Repeat_Button.h
 include/FL/Fl_Return_Button.H
+include/FL/Fl_Return_Button.h
 include/FL/Fl_Roller.H
+include/FL/Fl_Roller.h
 include/FL/Fl_Round_Button.H
-include/FL/x.H
+include/FL/Fl_Round_Button.h
 include/FL/Fl_Round_Clock.H
+include/FL/Fl_Round_Clock.h
 include/FL/Fl_Scroll.H
+include/FL/Fl_Scroll.h
 include/FL/Fl_Scrollbar.H
+include/FL/Fl_Scrollbar.h
 include/FL/Fl_Secret_Input.H
+include/FL/Fl_Secret_Input.h
 include/FL/Fl_Select_Browser.H
+include/FL/Fl_Select_Browser.h
 include/FL/Fl_Simple_Counter.H
+include/FL/Fl_Simple_Counter.h
 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_Tabs.H
+include/FL/Fl_Tabs.h
 include/FL/Fl_Tile.H
+include/FL/Fl_Tile.h
 include/FL/Fl_Timer.H
-include/FL/Fl_Widget.H
+include/FL/Fl_Timer.h
 include/FL/Fl_Toggle_Button.H
+include/FL/Fl_Toggle_Button.h
 include/FL/Fl_Toggle_Light_Button.H
+include/FL/Fl_Toggle_Light_Button.h
 include/FL/Fl_Toggle_Round_Button.H
+include/FL/Fl_Toggle_Round_Button.h
 include/FL/Fl_Valuator.H
+include/FL/Fl_Valuator.h
 include/FL/Fl_Value_Input.H
+include/FL/Fl_Value_Input.h
 include/FL/Fl_Value_Output.H
+include/FL/Fl_Value_Output.h
 include/FL/Fl_Value_Slider.H
+include/FL/Fl_Value_Slider.h
+include/FL/Fl_Widget.H
+include/FL/Fl_Widget.h
+include/FL/Fl_Window.H
+include/FL/Fl_Window.h
 include/FL/dirent.h
 include/FL/filename.H
+include/FL/filename.h
 include/FL/fl_ask.H
+include/FL/fl_ask.h
 include/FL/fl_draw.H
+include/FL/fl_draw.h
 include/FL/fl_file_chooser.H
+include/FL/fl_file_chooser.h
 include/FL/fl_message.H
+include/FL/fl_message.h
 include/FL/fl_show_colormap.H
+include/FL/fl_show_colormap.h
 include/FL/fl_show_input.H
+include/FL/fl_show_input.h
+include/FL/forms.H
+include/FL/forms.h
 include/FL/gl.h
 include/FL/gl2opengl.h
 include/FL/gl_draw.H
+include/FL/gl_draw.h
 include/FL/glut.H
+include/FL/glut.h
 include/FL/math.h
 include/FL/menubar.h
 include/FL/win32.H
-@dirrm include/FL
-include/Fl
+include/FL/win32.h
+include/FL/x.H
+include/FL/x.h
+lib/libfltk.a
+lib/libfltk.so
+lib/libfltk.so.1
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@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
@@ -176,6 +267,7 @@ share/doc/fltk/choice.gif
 share/doc/fltk/clock.gif
 share/doc/fltk/common.html
 share/doc/fltk/counter.gif
+share/doc/fltk/cubeview.gif
 share/doc/fltk/dial.gif
 share/doc/fltk/drawing.html
 share/doc/fltk/editor-replace.gif
@@ -195,6 +287,10 @@ share/doc/fltk/fl_show_colormap.gif
 share/doc/fltk/fluid-org.gif
 share/doc/fltk/fluid.gif
 share/doc/fltk/fluid.html
+share/doc/fltk/fluid1.gif
+share/doc/fltk/fluid2.gif
+share/doc/fltk/fluid3.gif
+share/doc/fltk/fluid4.gif
 share/doc/fltk/fluid_main.gif
 share/doc/fltk/fluid_prefs.gif
 share/doc/fltk/fluid_widget.gif
@@ -225,6 +321,6 @@ share/doc/fltk/text.gif
 share/doc/fltk/valuators.gif
 share/doc/fltk/value_slider.gif
 share/doc/fltk/widgets.html
-share/doc/fltk/README
-share/doc/fltk/Makefile
+@dirrm include/FL
+@unexec rmdir %D/include/Fl 2>/dev/null || true
 @dirrm share/doc/fltk