diff options
author | knu <knu@FreeBSD.org> | 2001-09-03 18:46:33 +0000 |
---|---|---|
committer | knu <knu@FreeBSD.org> | 2001-09-03 18:46:33 +0000 |
commit | c34e81afc0a995a48636825511df0f1bcaa44d79 (patch) | |
tree | 24717152eb6577ced4fd566c2e41e98b04b034a2 /x11-toolkits/fl_editor/files | |
parent | 0efe592ac90e350acf15f233d39d51a8aefd61b4 (diff) | |
download | FreeBSD-ports-c34e81afc0a995a48636825511df0f1bcaa44d79.zip FreeBSD-ports-c34e81afc0a995a48636825511df0f1bcaa44d79.tar.gz |
Add fl_editor, a word-wrapping text editor widget for FLTK (Fast Light
ToolKit).
PR: ports/29861
Submitted by: Cyrille Lefevre <clefevre@citeweb.net>
Diffstat (limited to 'x11-toolkits/fl_editor/files')
-rw-r--r-- | x11-toolkits/fl_editor/files/patch-Makefile.in | 84 | ||||
-rw-r--r-- | x11-toolkits/fl_editor/files/patch-configure | 167 |
2 files changed, 251 insertions, 0 deletions
diff --git a/x11-toolkits/fl_editor/files/patch-Makefile.in b/x11-toolkits/fl_editor/files/patch-Makefile.in new file mode 100644 index 0000000..8573293 --- /dev/null +++ b/x11-toolkits/fl_editor/files/patch-Makefile.in @@ -0,0 +1,84 @@ +--- 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 @@ + # + + .SILENT: +-.SUFFIXES: .c .cxx .h .o ++.SUFFIXES: .c .cxx .h .o .lo + .c.o: + echo Compiling $<... + $(CC) $(CFLAGS) -c $< -o $(<D)/$(basename $(<F)).o + .cxx.o: + echo Compiling $<... +- echo $(CXX) $(CXXFLAGS) -c $< -o $(<D)/$(basename $(<F)).o + $(CXX) $(CXXFLAGS) -c $< -o $(<D)/$(basename $(<F)).o ++.c.lo: ++ echo Compiling $<... ++ $(CC) $(CFLAGS) -fPIC -c $< -o $(<D)/$(basename $(<F)).lo ++.cxx.lo: ++ echo Compiling $<... ++ $(CXX) $(CXXFLAGS) -fPIC -c $< -o $(<D)/$(basename $(<F)).lo + + + # +@@ -62,7 +67,7 @@ + # Make all targets... + # + +-all: libfleditor.a $(DSONAME) test ++all: libfleditor.a $(DSONAME) + + # + # Remove object and target files... +@@ -86,7 +91,10 @@ + + install: libfleditor.a + echo "Installing library to $(FLTKLIBDIR)" +- cp libfleditor.a $(FLTKLIBDIR) ++ rm -f $(FLTKLIBDIR)/libfleditor.* ++ cp libfleditor.a $(DSONAME) $(FLTKLIBDIR) ++ echo "Installing headers to $(FLTKROOT)/include/FL" ++ cp FL/*.[Hh] $(FLTKROOT)/include/FL + + # + # Make the test programs. +@@ -122,6 +130,7 @@ + EDITOR_OBJS = src/Fl_Editor.o src/Fl_FancyEditor.o src/Fl_FancyMultiEditor.o \ + src/Fl_MultiEditor.o src/Fl_ProgressBox.o src/Fl_StatusPanel.o \ + src/editengine.o src/lists.o src/wstring.o ++EDITOR_SHOBJS = $(EDITOR_OBJS:.o=.lo) + + libfleditor.a: $(EDITOR_OBJS) + echo Building library $@... +@@ -129,15 +138,14 @@ + $(AR) $(ARFLAGS) libfleditor.a $(EDITOR_OBJS) + $(RANLIB) libfleditor.a + +-libfleditor.so: $(EDITOR_OBJS) ++$(DSONAME): $(EDITOR_SHOBJS) + echo Building library $@... +- $(RM) libfleditor.so +- @DSOCOMMAND@ @DSOLIBNAME@@DSOEXT@ $(EDITOR_OBJS) +-# echo $(DSOCOMMAND) $(DSONAME) +-# $(LD) -shared $(LDFLAGS) -o $@ $^ ++ $(RM) $(DSONAME) ++ @DSOCOMMAND@ $(DSONAME) $(EDITOR_SHOBJS) + + + $(EDITOR_OBJS): $(INCLUDEDEPS) ++$(EDITOR_SHOBJS): $(INCLUDEDEPS) + + # + # End of Makefile. diff --git a/x11-toolkits/fl_editor/files/patch-configure b/x11-toolkits/fl_editor/files/patch-configure new file mode 100644 index 0000000..fa4e1a8 --- /dev/null +++ b/x11-toolkits/fl_editor/files/patch-configure @@ -0,0 +1,167 @@ +--- 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 +- +- +- + + + |