cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update to 0.4.1

Browse Source 
- change fltk depending
- create shared library
- remove unused opengl test
This commit is contained in:
wilfried 2001-04-15 10:32:06 +00:00
parent db200c61de
commit c39c01e95e
7 changed files with 245 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
x11/fleditor/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.1.1.1 2001/04/02 15:11:46 wilfried Exp $
# $OpenBSD: Makefile,v 1.2 2001/04/15 10:32:06 wilfried Exp $
COMMENT= 'Text Editor for FLTK'
DISTNAME= fl_editor-0.4
PKGNAME= fleditor-0.4
DISTNAME= fl_editor-0.4.1
PKGNAME= fleditor-0.4.1
CATEGORIES= x11
NEED_VERSION= 1.380
@ -19,18 +19,23 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ftp://ftp.robertk.com/pub/Source/fl_editor/
EXTRACT_SUFX= .tgz
BUILD_DEPENDS= ${LOCALBASE}/lib/libfltk.a::x11/fltk \
${LOCALBASE}/lib/libflvw.a::x11/flvw
LIB_DEPENDS= fltk::x11/fltk
BUILD_DEPENDS= ${LOCALBASE}/lib/libflvw.a::x11/flvw
USE_X11= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--with-fltk=${LOCALBASE}
post-patch:
@rmdir ${WRKSRC}/obj
do-install:
${INSTALL_DATA} ${WRKBUILD}/libfleditor.a ${PREFIX}/lib
.if !defined(NO_SHARED_LIBS)
${INSTALL_DATA} ${WRKBUILD}/libfleditor.so* ${PREFIX}/lib
.endif
${INSTALL_DATA_DIR} ${PREFIX}/include/FL
${INSTALL_DATA} ${WRKSRC}/FL/*.[Hh] ${PREFIX}/include/FL

6
x11/fleditor/files/md5
View File

@ -1,3 +1,3 @@
MD5 (fl_editor-0.4.tgz) = 56b06f1351c33f4f5a147cad22bfb68b
RMD160 (fl_editor-0.4.tgz) = ff6b9889b834d00e3e76fcbbe01c3e6eef955086
SHA1 (fl_editor-0.4.tgz) = de039593728a14115b8f07515884f6043d4eb581
MD5 (fl_editor-0.4.1.tgz) = 9a38632c602ec1b657a1ca961bc7fc28
RMD160 (fl_editor-0.4.1.tgz) = a2cb0f975b5d9b03c0b7815c47ce06b6cd444952
SHA1 (fl_editor-0.4.1.tgz) = da173b1be5d37d1485689217396136cb4e613cb7

21
x11/fleditor/patches/patch-Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2001/04/02 15:11:46 wilfried Exp $
$OpenBSD: patch-Makefile_in,v 1.2 2001/04/15 10:32:09 wilfried Exp $
--- Makefile.in.orig Wed Jan 10 00:11:24 2001
+++ Makefile.in Mon Apr 2 17:05:28 2001
+++ Makefile.in Sun Apr 15 12:04:55 2001
@@ -29,9 +29,9 @@ FLTKLIBDIR = @ac_fltk_libraries@
# Program options...
#
@ -46,17 +46,7 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 2001/04/02 15:11:46 wilfried Exp $
#
# Remove object and target files...
@@ -85,8 +85,7 @@ distclean: clean
$(RM) config.status
install: libfleditor.a
- echo "Installing library to $(FLTKLIBDIR)"
- cp libfleditor.a $(FLTKLIBDIR)
+ ${BSD_INSTALL_DATA} libfleditor.a $(PREFIX)/lib
#
# Make the test programs.
@@ -124,8 +123,6 @@ EDITOR_OBJS = src/Fl_Editor.o src/Fl_Fan
@@ -124,12 +124,10 @@ EDITOR_OBJS = src/Fl_Editor.o src/Fl_Fan
src/editengine.o src/lists.o src/wstring.o
libfleditor.a: $(EDITOR_OBJS)
@ -65,3 +55,8 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 2001/04/02 15:11:46 wilfried Exp $
$(AR) $(ARFLAGS) libfleditor.a $(EDITOR_OBJS)
$(RANLIB) libfleditor.a
-libfleditor.so: $(EDITOR_OBJS)
+libfleditor.so.1.0: $(EDITOR_OBJS)
echo Building library $@...
$(RM) libfleditor.so
@DSOCOMMAND@ @DSOLIBNAME@@DSOEXT@ $(EDITOR_OBJS)

167
x11/fleditor/patches/patch-configure
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.1.1.1 2001/04/02 15:11:46 wilfried Exp $
$OpenBSD: patch-configure,v 1.2 2001/04/15 10:32:10 wilfried Exp $
--- configure.orig Wed Jan 10 00:11:24 2001
+++ configure Mon Apr 2 15:57:59 2001
+++ configure Sun Apr 15 12:03:26 2001
@@ -998,7 +998,7 @@ else
fi
@ -10,3 +10,166 @@ $OpenBSD: patch-configure,v 1.1.1.1 2001/04/02 15:11:46 wilfried Exp $
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
@@ -1348,33 +1348,12 @@ if test "${enable_shared+set}" = set; th
enableval="$enable_shared"
if eval "test x$enable_shared = xyes"; then
- PICFLAG=1
+ CFLAGS="$CFLAGS -fPIC"
+ CXXFLAGS="$CXXFLAGS -fPIC"
ac_fltk_dso="-lfltk"
DSOLIBNAME="libfleditor"
- case $uname in
- SunOS* | UNIX_S*)
- DSOEXT=".so.1"
- DSOCOMMAND="\$(CXX) -Wl,-h,\$@ \$(LDLIBS) -G $DEBUGFLAG -o"
- ;;
- HP-UX*)
- DSOEXT=".s1.1"
- DSOCOMMAND="ld -b -z +h \$@ $DEBUGFLAG -o"
- ;;
- OSF1*)
- DSOEXT=".so.1"
- DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ \$(LDLIBS) -shared $DEBUGFLAG -o"
-cd ;;
- IRIX*)
- DSOEXT=".so.1"
- DSOCOMMAND="\$(CXX) -soname \$@ \$(LDLIBS) -shared $DEBUGFLAG -o"
- ;;
- *)
- echo "Warning: shared libraries may not be supported. Trying -shared"
- echo " option with compiler."
- DSOEXT=".so.1"
- DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ -shared $DEBUGFLAG -o"
- ;;
- esac
+ DSOEXT=".so.1.0"
+ DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ \$(LDLIBS) -fPIC -shared $DEBUGFLAG -o"
fi
else
@@ -1407,7 +1386,7 @@ fi
echo $ac_n "checking for numericsort in -lfltk""... $ac_c" 1>&6
-echo "configure:1411: checking for numericsort in -lfltk" >&5
+echo "configure:1390: 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
@@ -1415,7 +1394,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lfltk $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1419 "configure"
+#line 1398 "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
@@ -1426,7 +1405,7 @@ int main() {
numericsort()
; 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:1409: \"$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
@@ -1451,97 +1430,6 @@ EOF
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_%'`
-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"
-cat > conftest.$ac_ext <<EOF
-#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 glXMakeCurrent();
-
-int main() {
-glXMakeCurrent()
-; return 0; }
-EOF
-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
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-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
-EOF
- GLLIB=" -lGLU -lGL"
-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_%'`
-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"
-cat > conftest.$ac_ext <<EOF
-#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
- builtin and then its argument prototype would still apply. */
-char glXMakeCurrent();
-
-int main() {
-glXMakeCurrent()
-; return 0; }
-EOF
-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
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-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
-EOF
- GLLIB=" -lMesaGLU -lMesaGL"
-else
- echo "$ac_t""no" 1>&6
-fi
-
fi

56
x11/fleditor/patches/patch-configure_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure_in,v 1.1.1.1 2001/04/02 15:11:46 wilfried Exp $
$OpenBSD: patch-configure_in,v 1.2 2001/04/15 10:32:10 wilfried Exp $
--- configure.in.orig Wed Jan 10 00:11:24 2001
+++ configure.in Mon Apr 2 15:54:00 2001
+++ configure.in Sun Apr 15 12:03:21 2001
@@ -18,7 +18,7 @@ AC_PATH_PROG(AR,ar)
AC_PATH_PROG(RM,rm)
@ -10,3 +10,55 @@ $OpenBSD: patch-configure_in,v 1.1.1.1 2001/04/02 15:11:46 wilfried Exp $
AC_SUBST(LDFLAGS)
AC_PATH_X
@@ -47,33 +47,12 @@ fi])
AC_ARG_ENABLE(shared, [ --enable-shared turn on shared libraries [default=no]],[
if eval "test x$enable_shared = xyes"; then
- PICFLAG=1
+ CFLAGS="$CFLAGS -fPIC"
+ CXXFLAGS="$CXXFLAGS -fPIC"
ac_fltk_dso="-lfltk"
DSOLIBNAME="libfleditor"
- case $uname in
- SunOS* | UNIX_S*)
- DSOEXT=".so.1"
- DSOCOMMAND="\$(CXX) -Wl,-h,\$@ \$(LDLIBS) -G $DEBUGFLAG -o"
- ;;
- HP-UX*)
- DSOEXT=".s1.1"
- DSOCOMMAND="ld -b -z +h \$@ $DEBUGFLAG -o"
- ;;
- OSF1*)
- DSOEXT=".so.1"
- DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ \$(LDLIBS) -shared $DEBUGFLAG -o"
-cd ;;
- IRIX*)
- DSOEXT=".so.1"
- DSOCOMMAND="\$(CXX) -soname \$@ \$(LDLIBS) -shared $DEBUGFLAG -o"
- ;;
- *)
- echo "Warning: shared libraries may not be supported. Trying -shared"
- echo " option with compiler."
- DSOEXT=".so.1"
- DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ -shared $DEBUGFLAG -o"
- ;;
- esac
+ DSOEXT=".so.1.0"
+ DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ \$(LDLIBS) -fPIC -shared $DEBUGFLAG -o"
fi],
[
ac_fltk_static="\$(FLTKLIBDIR)/libfltk.a"
@@ -96,13 +75,6 @@ AC_ARG_WITH(fltk2,
[ if test " x$withval = xyes"; then ac_fltk2="-DFLTK2"; fi ])
AC_CHECK_LIB(fltk,numericsort)
-
-dnl# test to see if OpenGL is on this machine:
-GLLIB=
-AC_CHECK_LIB(GL, glXMakeCurrent, AC_DEFINE(HAVE_GL) GLLIB=" -lGLU -lGL", \
- AC_CHECK_LIB(MesaGL,glXMakeCurrent, AC_DEFINE(HAVE_GL) GLLIB=" -lMesaGLU -lMesaGL",,\
- -lX11 -lXext $X_EXTRA_LIBS -lm), \
- -lX11 -lXext $X_EXTRA_LIBS -lm)
AC_SUBST(GLLIB)
AC_SUBST(DSOCOMMAND)

3
x11/fleditor/pkg/PFRAG.shared Normal file
View File

@ -0,0 +1,3 @@
@comment $OpenBSD: PFRAG.shared,v 1.1 2001/04/15 10:32:11 wilfried Exp $
lib/libfleditor.so.1.0
DYNLIBDIR(%B)

3
x11/fleditor/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2001/04/02 15:11:46 wilfried Exp $
@comment $OpenBSD: PLIST,v 1.2 2001/04/15 10:32:12 wilfried Exp $
include/FL/Fl_Editor.H
include/FL/Fl_FancyEditor.H
include/FL/Fl_FancyMultiEditor.H
@ -11,3 +11,4 @@ include/FL/lists.h
include/FL/stringsup.h
include/FL/wstring.h
lib/libfleditor.a
%%SHARED%%