Update to 0.4.5 and fix build.

PR:		47860
Submitted by:	Cyrille Lefevre <cyrille.lefevre@laposte.net>

6 files changed, 7 insertions, 210 deletions

diff --git a/x11-toolkits/fl_editor/Makefile b/x11-toolkits/fl_editor/Makefile
index e126922a77aa..1e2f7fccfd5d 100644
--- a/x11-toolkits/fl_editor/Makefile
+++ b/x11-toolkits/fl_editor/Makefile
@@ -6,13 +6,10 @@
 #
 
 PORTNAME=	fl_editor
-PORTVERSION=	0.4
+PORTVERSION=	0.4.5
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	http://www.mysql.com/Downloads/%SUBDIR%/ \
-		ftp://mysql.nixc.net/pub/mysql/Downloads/%SUBDIR%/ \
-		ftp://sunsite.dk/ftp/mirrors/mysql/Downloads/%SUBDIR%/ \
-		ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/%SUBDIR%/
-MASTER_SITE_SUBDIR=	mysqlgui
+MASTER_SITES=	http://robertk.com/source/fl_editor/
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	cyrille.lefevre@laposte.net
 
@@ -26,8 +23,8 @@ CONFIGURE_ARGS=	--enable-shared --with-fltk=${PREFIX}
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 
+WRKSRC=		${WRKDIR}/${PORTNAME}
 DOC_FILES=	documentation/*.html documentation/*.jpg
-DOC_SUBDIR=	share/doc/${PKGBASE}
 INC1_FILES=	Fl_Editor.H Fl_FancyEditor.H Fl_FancyMultiEditor.H \
 		Fl_MultiEditor.H Fl_ProgressBox.H Fl_StatusPanel.H
 INC2_FILES=	editengine.h editvars.h lists.h stringsup.h wstring.h
@@ -52,9 +49,9 @@ symlink-lib:
 
 install-doc:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/${DOC_SUBDIR}
+	@${MKDIR} ${DOCSDIR}
 .for file in ${DOC_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/${DOC_SUBDIR}
+	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/x11-toolkits/fl_editor/distinfo b/x11-toolkits/fl_editor/distinfo
index 2fe97053b8b0..fe3041c353b4 100644
--- a/x11-toolkits/fl_editor/distinfo
+++ b/x11-toolkits/fl_editor/distinfo
@@ -1 +1 @@
-MD5 (fl_editor-0.4.tar.gz) = 56b06f1351c33f4f5a147cad22bfb68b
+MD5 (fl_editor-0.4.5.tgz) = 42f93c74caf6d4bf82ec07f0b72815cd
diff --git a/x11-toolkits/fl_editor/files/patch-Makefile.in b/x11-toolkits/fl_editor/files/patch-Makefile.in
index 8573293ea63f..a143488cd077 100644
--- a/x11-toolkits/fl_editor/files/patch-Makefile.in
+++ b/x11-toolkits/fl_editor/files/patch-Makefile.in
@@ -1,16 +1,5 @@
 --- Makefile.in.orig	Wed Jan 10 00:11:24 2001
 +++ Makefile.in	Sat Aug 18 09:03:39 2001
-@@ -30,8 +30,8 @@
- #
- 
- ARFLAGS	=	crvs
--CFLAGS	=	-I. -I$(FLTKROOT) @CFLAGS@ @ac_fltk2@
--CXXFLAGS =	-I. -I$(FLTKROOT) @CXXFLAGS@ @ac_fltk2@
-+CFLAGS	=	-I. @CFLAGS@ @ac_fltk2@
-+CXXFLAGS =	-I. @CXXFLAGS@ @ac_fltk2@
- LIBS	=	@ac_fltk_static@ -L$(FLTKROOT)/lib @LIBS@ -lXext -lX11 -lm @ac_fltk_dso@ $(GLLIB)
- LDFLAGS	=	@LDFLAGS@
- 
 @@ -40,14 +40,19 @@
  #
  
diff --git a/x11-toolkits/fl_editor/files/patch-configure b/x11-toolkits/fl_editor/files/patch-configure
deleted file mode 100644
index fa4e1a8b6d0d..000000000000
--- a/x11-toolkits/fl_editor/files/patch-configure
+++ /dev/null
@@ -1,167 +0,0 @@
---- configure.orig	Sat Aug 18 07:28:57 2001
-+++ configure	Sat Aug 18 07:30:32 2001
-@@ -1406,27 +1406,31 @@
- fi
- 
- 
--echo $ac_n "checking for numericsort in -lfltk""... $ac_c" 1>&6
--echo "configure:1411: checking for numericsort in -lfltk" >&5
--ac_lib_var=`echo fltk'_'numericsort | sed 'y%./+-%__p_%'`
-+
-+
-+GLLIB=
-+echo $ac_n "checking for glXMakeCurrent in -lGL""... $ac_c" 1>&6
-+echo "configure:1460: checking for glXMakeCurrent in -lGL" >&5
-+ac_lib_var=`echo GL'_'glXMakeCurrent | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lfltk  $LIBS"
-+LIBS="-lGL \
-+    -lX11 -lXext $X_EXTRA_LIBS -lm $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1419 "configure"
-+#line 1469 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
--char numericsort();
-+char glXMakeCurrent();
- 
- int main() {
--numericsort()
-+glXMakeCurrent()
- ; return 0; }
- EOF
--if { (eval echo configure:1430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -1441,31 +1445,24 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--    ac_tr_lib=HAVE_LIB`echo fltk | sed -e 's/[^a-zA-Z0-9_]/_/g' \
--    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
--  cat >> confdefs.h <<EOF
--#define $ac_tr_lib 1
-+  cat >> confdefs.h <<\EOF
-+#define HAVE_GL 1
- EOF
--
--  LIBS="-lfltk $LIBS"
--
-+ GLLIB=" -lGLU -lGL"
- else
-   echo "$ac_t""no" 1>&6
--fi
--
--
--GLLIB=
--echo $ac_n "checking for glXMakeCurrent in -lGL""... $ac_c" 1>&6
--echo "configure:1460: checking for glXMakeCurrent in -lGL" >&5
--ac_lib_var=`echo GL'_'glXMakeCurrent | sed 'y%./+-%__p_%'`
-+\
-+    echo $ac_n "checking for glXMakeCurrent in -lMesaGL""... $ac_c" 1>&6
-+echo "configure:1503: checking for glXMakeCurrent in -lMesaGL" >&5
-+ac_lib_var=`echo MesaGL'_'glXMakeCurrent | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lGL \
--    -lX11 -lXext $X_EXTRA_LIBS -lm $LIBS"
-+LIBS="-lMesaGL \
-+	-lX11 -lXext $X_EXTRA_LIBS -lm $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1469 "configure"
-+#line 1512 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -1476,7 +1473,7 @@
- glXMakeCurrent()
- ; return 0; }
- EOF
--if { (eval echo configure:1480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -1494,32 +1491,36 @@
-   cat >> confdefs.h <<\EOF
- #define HAVE_GL 1
- EOF
-- GLLIB=" -lGLU -lGL"
-+ GLLIB=" -lMesaGLU -lMesaGL"
- else
-   echo "$ac_t""no" 1>&6
--\
--    echo $ac_n "checking for glXMakeCurrent in -lMesaGL""... $ac_c" 1>&6
--echo "configure:1503: checking for glXMakeCurrent in -lMesaGL" >&5
--ac_lib_var=`echo MesaGL'_'glXMakeCurrent | sed 'y%./+-%__p_%'`
-+fi
-+
-+fi
-+
-+
-+
-+echo $ac_n "checking for numericsort in -lfltk""... $ac_c" 1>&6
-+echo "configure:1411: checking for numericsort in -lfltk" >&5
-+ac_lib_var=`echo fltk'_'numericsort | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lMesaGL \
--	-lX11 -lXext $X_EXTRA_LIBS -lm $LIBS"
-+LIBS="-lfltk $GLLIB $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1512 "configure"
-+#line 1419 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
--char glXMakeCurrent();
-+char numericsort();
- 
- int main() {
--glXMakeCurrent()
-+numericsort()
- ; return 0; }
- EOF
--if { (eval echo configure:1523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -1534,18 +1535,17 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  cat >> confdefs.h <<\EOF
--#define HAVE_GL 1
-+    ac_tr_lib=HAVE_LIB`echo fltk | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_lib 1
- EOF
-- GLLIB=" -lMesaGLU -lMesaGL"
-+
-+  LIBS="-lfltk $LIBS"
-+
- else
-   echo "$ac_t""no" 1>&6
- fi
--
--fi
--
--
--
- 
- 
- 
diff --git a/x11-toolkits/fl_editor/files/patch-src-Fl_MultiEditor.cxx b/x11-toolkits/fl_editor/files/patch-src-Fl_MultiEditor.cxx
deleted file mode 100644
index 753ffcca7148..000000000000
--- a/x11-toolkits/fl_editor/files/patch-src-Fl_MultiEditor.cxx
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/Fl_MultiEditor.cxx.orig	Thu Jan 23 12:35:36 2003
-+++ src/Fl_MultiEditor.cxx	Thu Jan 23 12:35:56 2003
-@@ -102,7 +102,7 @@
- 		sinf->Caption = new wString;
- 		sinf->SessionName = new wString;
- 		sinf->SessionNumber = ++SessionCount;
--		const char *temp = name ? filename_name(name) : NULL;
-+		const char *temp = name ? fl_filename_name(name) : NULL;
- 		if(temp)
-             *sinf->SessionName = temp;
- 		else
-@@ -243,7 +243,7 @@
- 			fclose(out);
- 		}
- 		*CurrentSession->FileName = filename;
--		const char *temp = filename_name(fn);
-+		const char *temp = fl_filename_name(fn);
- 		if(!temp)
- 			temp = fn;
- 		if(temp)
diff --git a/x11-toolkits/fl_editor/pkg-plist b/x11-toolkits/fl_editor/pkg-plist
index 9441324ddc2f..72f4f042d5d9 100644
--- a/x11-toolkits/fl_editor/pkg-plist
+++ b/x11-toolkits/fl_editor/pkg-plist
@@ -42,8 +42,6 @@ lib/libfleditor.so.1
 %%PORTDOCS%%share/doc/fl_editor/Fl_FancyEditor.jpg
 %%PORTDOCS%%share/doc/fl_editor/Fl_FancyMultiEditor.html
 %%PORTDOCS%%share/doc/fl_editor/Fl_MultiEditor.html
-%%PORTDOCS%%share/doc/fl_editor/Fl_ProgressBox.html
-%%PORTDOCS%%share/doc/fl_editor/Fl_ProgressBox.jpg
 %%PORTDOCS%%share/doc/fl_editor/Fl_StatusPanel.html
 %%PORTDOCS%%share/doc/fl_editor/Fl_StatusPanel.jpg
 %%PORTDOCS%%share/doc/fl_editor/index.html