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

update to use fltk 1.1

Browse Source
This commit is contained in:
wilfried 2002-08-10 19:58:52 +00:00
parent 84389bc1ec
commit cfe38f9339
6 changed files with 101 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
x11/flvw/Makefile
View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.6 2002/05/15 09:30:22 wilfried Exp $
# $OpenBSD: Makefile,v 1.7 2002/08/10 19:58:52 wilfried Exp $
COMMENT= 'FLTK Virtual Styles, List, Table, and Complex Table Widgets'
DISTNAME= flvw-20000224
PKGNAME= flvw-1.0
CATEGORIES= devel
NEED_VERSION= 1.528
HOMEPAGE= http://flvw.sourceforge.net/
@ -21,11 +20,11 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=flvw/}
EXTRACT_SUFX= .tgz
LIB_DEPENDS= fltk.::x11/fltk
LIB_DEPENDS= fltk.1::x11/fltk
USE_X11= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS} -DFLTK_1_0_COMPAT -I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
# This regression test wants an X11 display
@ -36,8 +35,15 @@ REGRESS_IS_INTERACTIVE= Yes
WRKDIST= ${WRKDIR}/flvw
WRKSRC= ${WRKDIST}/1.0
pre-regress:
.for t in DISPLAY XAUTHORITY
.if !defined($t)
@echo "$t needs to be set to run regress"; exit 1
.endif
.endfor
do-regress:
@cd ${WRKBUILD}/test && exec ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${REGRESS_FLAGS} -f ${MAKE_FILE} ${REGRESS_TARGET}
@cd ${WRKBUILD}/test && exec ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${REGRESS_FLAGS} -f ${MAKE_FILE} ${REGRESS_TARGET}
do-install:
${INSTALL_DATA} ${WRKBUILD}/lib/libflvw.a ${PREFIX}/lib

4
x11/flvw/patches/patch-1_0_Makefile
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-1_0_Makefile,v 1.2 2001/04/06 08:38:55 wilfried Exp $
$OpenBSD: patch-1_0_Makefile,v 1.3 2002/08/10 19:58:52 wilfried Exp $
--- 1.0/Makefile.orig Sat Jan 22 14:16:06 2000
+++ 1.0/Makefile Fri Apr 6 10:34:32 2001
@@ -26,7 +26,7 @@
@ -37,5 +37,5 @@ $OpenBSD: patch-1_0_Makefile,v 1.2 2001/04/06 08:38:55 wilfried Exp $
-configure: configure.in
- autoconf
#
# End of "$Id: patch-1_0_Makefile,v 1.2 2001/04/06 08:38:55 wilfried Exp $".
# End of "$Id: patch-1_0_Makefile,v 1.3 2002/08/10 19:58:52 wilfried Exp $".
#

30
x11/flvw/patches/patch-1_0_configure
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-1_0_configure,v 1.1.1.1 2001/04/02 15:10:26 wilfried Exp $
$OpenBSD: patch-1_0_configure,v 1.2 2002/08/10 19:58:52 wilfried Exp $
--- 1.0/configure.orig Sun Feb 20 15:14:52 2000
+++ 1.0/configure Mon Apr 2 15:35:23 2001
+++ 1.0/configure Sat Aug 10 18:16:17 2002
@@ -990,7 +990,7 @@ else
fi
@ -10,3 +10,29 @@ $OpenBSD: patch-1_0_configure,v 1.1.1.1 2001/04/02 15:10:26 wilfried Exp $
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
@@ -1325,9 +1325,9 @@ if test ! "$x_includes" = "NONE" -a ! "$
CFLAGS="$CFLAGS -I$x_includes"
CXXFLAGS="$CXXFLAGS -I$x_includes"
fi
-echo $ac_n "checking for numericsort in -lfltk""... $ac_c" 1>&6
-echo "configure:1330: checking for numericsort in -lfltk" >&5
-ac_lib_var=`echo fltk'_'numericsort | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for fl_numericsort in -lfltk""... $ac_c" 1>&6
+echo "configure:1330: checking for fl_numericsort in -lfltk" >&5
+ac_lib_var=`echo fltk'_'fl_numericsort | sed 'y%./+-%__p_%'`
if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1339,10 +1339,10 @@ cat > conftest.$ac_ext <<EOF
/* 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 fl_numericsort();
int main() {
-numericsort()
+fl_numericsort()
; return 0; }
EOF
if { (eval echo configure:1349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

13
x11/flvw/patches/patch-1_0_configure_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-1_0_configure_in,v 1.1.1.1 2001/04/02 15:10:26 wilfried Exp $
$OpenBSD: patch-1_0_configure_in,v 1.2 2002/08/10 19:58:52 wilfried Exp $
--- 1.0/configure.in.orig Sat Jan 22 14:18:28 2000
+++ 1.0/configure.in Wed Mar 21 17:18:12 2001
+++ 1.0/configure.in Sat Aug 10 18:16:09 2002
@@ -18,7 +18,7 @@ AC_PATH_PROG(AR,ar)
AC_PATH_PROG(RM,rm)
@ -10,3 +10,12 @@ $OpenBSD: patch-1_0_configure_in,v 1.1.1.1 2001/04/02 15:10:26 wilfried Exp $
AC_SUBST(LDFLAGS)
AC_PATH_X
@@ -40,7 +40,7 @@ if test ! "$x_includes" = "NONE" -a ! "$
CFLAGS="$CFLAGS -I$x_includes"
CXXFLAGS="$CXXFLAGS -I$x_includes"
fi
-AC_CHECK_LIB(fltk,numericsort)
+AC_CHECK_LIB(fltk,fl_numericsort)
dnl Output the makefile...
AC_OUTPUT(makeinclude)

6
x11/flvw/patches/patch-1_0_makeinclude_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-1_0_makeinclude_in,v 1.1.1.1 2001/04/02 15:10:26 wilfried Exp $
$OpenBSD: patch-1_0_makeinclude_in,v 1.2 2002/08/10 19:58:52 wilfried Exp $
--- 1.0/makeinclude.in.orig Sat Jan 22 14:18:28 2000
+++ 1.0/makeinclude.in Wed Mar 21 17:21:25 2001
+++ 1.0/makeinclude.in Sat Aug 10 18:24:25 2002
@@ -30,27 +30,27 @@ CXX = @CXX@
RANLIB = @RANLIB@
RM = @RM@ -f
@ -35,7 +35,7 @@ $OpenBSD: patch-1_0_makeinclude_in,v 1.1.1.1 2001/04/02 15:10:26 wilfried Exp $
+ARFLAGS = r
+CFLAGS = @CFLAGS@ $(DEFVER)
+CXXFLAGS = @CXXFLAGS@ $(DEFVER)
+LIBS = -lflvw @LIBS@ -lX11 -lXext -lm
+LIBS = -L ../lib -lflvw @LIBS@ -lX11 -lXext -lm
+LDFLAGS = @LDFLAGS@
#

49
x11/flvw/patches/patch-1_0_test_Makefile
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-1_0_test_Makefile,v 1.1 2001/10/25 22:34:50 wilfried Exp $
$OpenBSD: patch-1_0_test_Makefile,v 1.2 2002/08/10 19:58:52 wilfried Exp $
--- 1.0/test/Makefile.orig Sat Jan 22 14:34:26 2000
+++ 1.0/test/Makefile Fri Oct 26 00:15:00 2001
@@ -15,6 +15,14 @@ include ../makeinclude
+++ 1.0/test/Makefile Sat Aug 10 18:13:00 2002
@@ -15,13 +15,20 @@ include ../makeinclude
all: testlist testtable testtable2 basiclist exercise testedit
@ -16,3 +16,46 @@ $OpenBSD: patch-1_0_test_Makefile,v 1.1 2001/10/25 22:34:50 wilfried Exp $
#
# Remove object and target files...
#
clean:
- @echo Cleaning test programs
- @$(RM) -f core *~ *.o testlist testtable testtable2 basiclist exercise testedit
+ $(RM) -f core *~ *.o testlist testtable testtable2 basiclist exercise testedit
distclean: clean
@$(RM) -f makedepend
@@ -33,28 +40,22 @@ install: all
#
testlist: ../lib/libflvw.a testlist.o
- @echo Linking $@...
- @$(CXX) $(LDFLAGS) -o testlist testlist.o $(LIBS)
+ $(CXX) $(LDFLAGS) -o testlist testlist.o $(LIBS)
testtable: ../lib/libflvw.a testtable.o
- @echo Linking $@...
- @$(CXX) $(LDFLAGS) -o testtable testtable.o $(LIBS)
+ $(CXX) $(LDFLAGS) -o testtable testtable.o $(LIBS)
testtable2: ../lib/libflvw.a testtable2.o
- @echo Linking $@...
- @$(CXX) $(LDFLAGS) -o testtable2 testtable2.o $(LIBS)
+ $(CXX) $(LDFLAGS) -o testtable2 testtable2.o $(LIBS)
basiclist: ../lib/libflvw.a basiclist.o
- @echo Linking $@...
- @$(CXX) $(LDFLAGS) -o basiclist basiclist.o $(LIBS)
+ $(CXX) $(LDFLAGS) -o basiclist basiclist.o $(LIBS)
exercise: ../lib/libflvw.a exercise.o
- @echo Linking $@
- @$(CXX) $(LDFLAGS) -o exercise exercise.o $(LIBS)
+ $(CXX) $(LDFLAGS) -o exercise exercise.o $(LIBS)
testedit: ../lib/libflvw.a testedit.o
- @echo Linking $@...
- @$(CXX) $(LDFLAGS) -o testedit testedit.o $(LIBS)
+ $(CXX) $(LDFLAGS) -o testedit testedit.o $(LIBS)
testlist.o: ../FL/Flv_Style.H ../FL/Flv_List.H
testtable.o: ../FL/Flv_Style.H ../FL/Flv_List.H ../FL/Flv_Table.H