diff --git a/comms/pilot-link/Makefile b/comms/pilot-link/Makefile index 6ed244b4f17..f5d2eb48fbf 100644 --- a/comms/pilot-link/Makefile +++ b/comms/pilot-link/Makefile @@ -1,11 +1,16 @@ -# $OpenBSD: Makefile,v 1.23 2001/06/02 23:41:45 pvalchev Exp $ +# $OpenBSD: Makefile,v 1.24 2001/06/03 23:58:35 brad Exp $ COMMENT= "PalmPilot communication utilities" -DISTNAME= pilot-link.0.9.3 -PKGNAME= pilot-link-0.9.3 +VERSION= 0.9.3 +DISTNAME= pilot-link.${VERSION} +PKGNAME= pilot-link-${VERSION} CATEGORIES= comms palm NEED_VERSION= 1.406 +MASTER_SITES= ftp://ryeham.ee.ryerson.ca/pub/PalmOS/ \ + ftp://ftp.forth.org/pub/PalmOS/ryerson/ + +LIB_DEPENDS= tk83::x11/tk/8.3 MAINTAINER= Angelos D. Keromytis @@ -14,13 +19,13 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MASTER_SITES= ftp://ryeham.ee.ryerson.ca/pub/PalmOS/ - -LIB_DEPENDS= tk80::x11/tk/8.0 - -CONFIGURE_STYLE= gnu -CONFIGURE_ARGS= --with-perl5=/usr/bin/perl \ - --with-readline21=no \ - --with-readline20=no +USE_GMAKE= Yes +CONFIGURE_STYLE= gnu +CONFIGURE_ARGS+= ${CONFIGURE_SHARED} +CONFIGURE_ARGS= --enable-static \ + --with-perl5="/usr/bin/perl" \ + --without-itcl \ + --without-python \ + --without-java .include diff --git a/comms/pilot-link/patches/patch-aa b/comms/pilot-link/patches/patch-Makefile_in similarity index 84% rename from comms/pilot-link/patches/patch-aa rename to comms/pilot-link/patches/patch-Makefile_in index 2e2e38014f4..26422dd5bdf 100644 --- a/comms/pilot-link/patches/patch-aa +++ b/comms/pilot-link/patches/patch-Makefile_in @@ -1,6 +1,7 @@ +$OpenBSD: patch-Makefile_in,v 1.1 2001/06/03 23:58:36 brad Exp $ --- Makefile.in.orig Fri May 14 02:55:33 1999 -+++ Makefile.in Sun Jun 4 11:54:32 2000 -@@ -15,11 +15,11 @@ ++++ Makefile.in Sun Jun 3 18:32:13 2001 +@@ -15,11 +15,11 @@ PURELINK = PURIFY = # Libraries needed to link with Tcl & (optionally) Tk @@ -14,7 +15,7 @@ # Libraries needed to link with GNU readline RLLIBS = @RLLIBS@ -@@ -109,29 +109,32 @@ +@@ -109,29 +109,30 @@ libcc/libpicc.a: FORCE $(SUBMAKE_COMM_CC) libpicc.a installdirs: @@ -26,11 +27,11 @@ install: $(EXECS) installdirs $(PILIB) $(PICCLIB) - $(INSTALL_DATA) $(PILIB) $(libdir)/libpisock.la -+ $(INSTALL_DATA) $(PILIB) ${DESTDIR}/$(libdir)/libpisock.la - if test -n "$(PICCLIB)"; then \ +- if test -n "$(PICCLIB)"; then \ - $(INSTALL_DATA) $(PICCLIB) $(libdir)/libpicc.la; \ -+ $(INSTALL_DATA) $(PICCLIB) ${DESTDIR}/$(libdir)/libpicc.la; \ - fi +- fi ++ $(LIBTOOL) $(INSTALL_DATA) $(PILIB) ${DESTDIR}/$(libdir)/libpisock.la ++ $(LIBTOOL) $(INSTALL_DATA) $(PICCLIB) ${DESTDIR}/$(libdir)/libpicc.la for p in $(EXECS); do \ - $(INSTALL_PROGRAM) $$p $(bindir)/$$p; \ + $(INSTALL_PROGRAM) $$p ${DESTDIR}/$(bindir)/$$p; \ diff --git a/comms/pilot-link/patches/patch-ab b/comms/pilot-link/patches/patch-ab deleted file mode 100644 index 2b95052f36a..00000000000 --- a/comms/pilot-link/patches/patch-ab +++ /dev/null @@ -1,167 +0,0 @@ -*** configure.orig Fri May 14 08:52:43 1999 ---- configure Wed Jun 9 16:04:15 1999 -*************** -*** 875,885 **** - - # Use test -z because SunOS4 sh mishandles braces in ${var-val}. - # It thinks the first close brace ends the variable substitution. -! test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -! test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' - -! test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - - # Extract the first word of "ranlib", so it can be a program name with args. - set dummy ranlib; ac_word=$2 ---- 875,885 ---- - - # Use test -z because SunOS4 sh mishandles braces in ${var-val}. - # It thinks the first close brace ends the variable substitution. -! INSTALL_PROGRAM='${INSTALL}' - -! INSTALL_SCRIPT='${INSTALL_PROGRAM}' - -! INSTALL_DATA='${INSTALL} -m 644' - - # Extract the first word of "ranlib", so it can be a program name with args. - set dummy ranlib; ac_word=$2 -*************** -*** 2642,2648 **** - itcl='' - if test "x$with_tcl" = "xyes" || test "x$with_tcl" = "x" ; then - for tcl_path in /usr/local/tcl8.0 /usr/local/tcl7.6 /usr/local/tcl7.5 /usr/local /usr /usr/local/tcl7.4; do -! if test -f $tcl_path/lib/tclConfig.sh; then - with_tcl=$tcl_path; break - elif test -f $tcl_path/lib/itcl/tclConfig.sh; then - itcl='/itcl' ---- 2642,2650 ---- - itcl='' - if test "x$with_tcl" = "xyes" || test "x$with_tcl" = "x" ; then - for tcl_path in /usr/local/tcl8.0 /usr/local/tcl7.6 /usr/local/tcl7.5 /usr/local /usr /usr/local/tcl7.4; do -! if test -f $tcl_path/lib/tcl8.0/tclConfig.sh; then -! with_tcl=$tcl_path; break -! elif test -f $tcl_path/lib/tclConfig.sh; then - with_tcl=$tcl_path; break - elif test -f $tcl_path/lib/itcl/tclConfig.sh; then - itcl='/itcl' -*************** -*** 2683,2695 **** - elif test "x$with_tcl" = "xno"; then - echo "$ac_t""not used" 1>&6 - else -! tclConfig="$with_tcl/lib$itcl/tclConfig.sh" - if test ! -f $tclConfig; then - echo "$ac_t""Unable to find tclConfig.sh" 1>&6 - else - . $tclConfig - echo "$ac_t""version $TCL_VERSION from $tclConfig" 1>&6 -! TCL_INC="-I$TCL_PREFIX/include$itcl" - TCL_BIN="$TCL_EXEC_PREFIX/bin" - TCLLIBS="$TCL_LIB_SPEC $TCL_LIBS" - TCLTKLIBS="$TCLLIBS" ---- 2685,2697 ---- - elif test "x$with_tcl" = "xno"; then - echo "$ac_t""not used" 1>&6 - else -! tclConfig="$with_tcl/lib/tcl8.0$itcl/tclConfig.sh" - if test ! -f $tclConfig; then - echo "$ac_t""Unable to find tclConfig.sh" 1>&6 - else - . $tclConfig - echo "$ac_t""version $TCL_VERSION from $tclConfig" 1>&6 -! TCL_INC="-I$TCL_PREFIX/include/tcl8.0$itcl" - TCL_BIN="$TCL_EXEC_PREFIX/bin" - TCLLIBS="$TCL_LIB_SPEC $TCL_LIBS" - TCLTKLIBS="$TCLLIBS" -*************** -*** 2700,2706 **** - - if test "x$with_itcl" = "xyes" || test "x$with_itcl" = "x"; then - for itcl_path in $with_tcl; do -! if test -f $itcl_path/lib$itcl/itclConfig.sh; then - with_itcl=$itcl_path; break - fi - done ---- 2702,2708 ---- - - if test "x$with_itcl" = "xyes" || test "x$with_itcl" = "x"; then - for itcl_path in $with_tcl; do -! if test -f $itcl_path/lib/tcl8.0$itcl/itclConfig.sh; then - with_itcl=$itcl_path; break - fi - done -*************** -*** 2718,2730 **** - elif test "x$with_itcl" = "xno"; then - echo "$ac_t""not used" 1>&6 - else -! itclConfig="$with_itcl/lib$itcl/itclConfig.sh" - if test ! -f $itclConfig; then - echo "$ac_t""Unable to find itclConfig.sh" 1>&6 - else - . $itclConfig - echo "$ac_t""version $ITCL_VERSION from $itclConfig" 1>&6 -! ITCL_INC="-I$TK_PREFIX/include$itcl" - #TK_BIN="$TK_EXEC_PREFIX/bin" - #TKLIBS="$TK_LIB_SPEC $TCL_LIB_SPEC $TK_LIBS" - #TCLTK_LIBS="\$(TK_LIB_SPEC) \$(TCL_LIB_SPEC) \$(TK_LIBS)" ---- 2720,2732 ---- - elif test "x$with_itcl" = "xno"; then - echo "$ac_t""not used" 1>&6 - else -! itclConfig="$with_itcl/lib/tcl8.0$itcl/itclConfig.sh" - if test ! -f $itclConfig; then - echo "$ac_t""Unable to find itclConfig.sh" 1>&6 - else - . $itclConfig - echo "$ac_t""version $ITCL_VERSION from $itclConfig" 1>&6 -! ITCL_INC="-I$TK_PREFIX/include/tcl8.0$itcl" - #TK_BIN="$TK_EXEC_PREFIX/bin" - #TKLIBS="$TK_LIB_SPEC $TCL_LIB_SPEC $TK_LIBS" - #TCLTK_LIBS="\$(TK_LIB_SPEC) \$(TCL_LIB_SPEC) \$(TK_LIBS)" -*************** -*** 2742,2748 **** - - if test "x$with_tk" = "xyes" || test "x$with_tk" = "x"; then - for tk_path in $with_tcl; do -! if test -f $tk_path/lib$itcl/tkConfig.sh; then - with_tk=$tk_path; break - fi - done ---- 2744,2750 ---- - - if test "x$with_tk" = "xyes" || test "x$with_tk" = "x"; then - for tk_path in $with_tcl; do -! if test -f $tk_path/lib/tk8.0$itcl/tkConfig.sh; then - with_tk=$tk_path; break - fi - done -*************** -*** 2760,2772 **** - elif test "x$with_tk" = "xno"; then - echo "$ac_t""not used" 1>&6 - else -! tkConfig="$with_tk/lib$itcl/tkConfig.sh" - if test ! -f $tkConfig; then - echo "$ac_t""Unable to find tkConfig.sh" 1>&6 - else - . $tkConfig - echo "$ac_t""version $TK_VERSION from $tkConfig" 1>&6 -! TK_INC="-I$TK_PREFIX/include$itcl" - TK_BIN="$TK_EXEC_PREFIX/bin" - TKLIBS="$TK_LIB_SPEC $TCL_LIB_SPEC $TK_LIBS" - TCLTK_LIBS="\$(TK_LIB_SPEC) \$(TCL_LIB_SPEC) \$(TK_LIBS)" ---- 2762,2774 ---- - elif test "x$with_tk" = "xno"; then - echo "$ac_t""not used" 1>&6 - else -! tkConfig="$with_tk/lib/tk8.0$itcl/tkConfig.sh" - if test ! -f $tkConfig; then - echo "$ac_t""Unable to find tkConfig.sh" 1>&6 - else - . $tkConfig - echo "$ac_t""version $TK_VERSION from $tkConfig" 1>&6 -! TK_INC="-I$TK_PREFIX/include/tk8.0$itcl" - TK_BIN="$TK_EXEC_PREFIX/bin" - TKLIBS="$TK_LIB_SPEC $TCL_LIB_SPEC $TK_LIBS" - TCLTK_LIBS="\$(TK_LIB_SPEC) \$(TCL_LIB_SPEC) \$(TK_LIBS)" diff --git a/comms/pilot-link/patches/patch-configure b/comms/pilot-link/patches/patch-configure new file mode 100644 index 00000000000..c2f42b394d4 --- /dev/null +++ b/comms/pilot-link/patches/patch-configure @@ -0,0 +1,98 @@ +$OpenBSD: patch-configure,v 1.1 2001/06/03 23:58:36 brad Exp $ +--- configure.orig Fri May 14 02:52:43 1999 ++++ configure Sun Jun 3 19:36:17 2001 +@@ -1538,7 +1538,7 @@ fi + + + ac_save_LIBS="$LIBS" +-LIBS="$LIBS -lreadline" ++LIBS="$LIBS -lreadline -lcurses" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* +- RLLIBS="-lreadline" ++ RLLIBS="-lreadline -lcurses" + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +@@ -2642,7 +2642,9 @@ fi + itcl='' + if test "x$with_tcl" = "xyes" || test "x$with_tcl" = "x" ; then + for tcl_path in /usr/local/tcl8.0 /usr/local/tcl7.6 /usr/local/tcl7.5 /usr/local /usr /usr/local/tcl7.4; do +- if test -f $tcl_path/lib/tclConfig.sh; then ++ if test -f $tcl_path/lib/tcl8.3/tclConfig.sh; then ++ with_tcl=$tcl_path; break ++ elif test -f $tcl_path/lib/tclConfig.sh; then + with_tcl=$tcl_path; break + elif test -f $tcl_path/lib/itcl/tclConfig.sh; then + itcl='/itcl' +@@ -2683,13 +2685,13 @@ if test "x$with_tcl" = "x"; then + elif test "x$with_tcl" = "xno"; then + echo "$ac_t""not used" 1>&6 + else +- tclConfig="$with_tcl/lib$itcl/tclConfig.sh" ++ tclConfig="$with_tcl/lib/tcl8.3$itcl/tclConfig.sh" + if test ! -f $tclConfig; then + echo "$ac_t""Unable to find tclConfig.sh" 1>&6 + else + . $tclConfig + echo "$ac_t""version $TCL_VERSION from $tclConfig" 1>&6 +- TCL_INC="-I$TCL_PREFIX/include$itcl" ++ TCL_INC="-I$TCL_PREFIX/include/tcl8.3$itcl" + TCL_BIN="$TCL_EXEC_PREFIX/bin" + TCLLIBS="$TCL_LIB_SPEC $TCL_LIBS" + TCLTKLIBS="$TCLLIBS" +@@ -2700,7 +2702,7 @@ else + + if test "x$with_itcl" = "xyes" || test "x$with_itcl" = "x"; then + for itcl_path in $with_tcl; do +- if test -f $itcl_path/lib$itcl/itclConfig.sh; then ++ if test -f $itcl_path/lib/tcl8.3$itcl/itclConfig.sh; then + with_itcl=$itcl_path; break + fi + done +@@ -2718,13 +2720,13 @@ echo "configure:2716: checking for Itcl" + elif test "x$with_itcl" = "xno"; then + echo "$ac_t""not used" 1>&6 + else +- itclConfig="$with_itcl/lib$itcl/itclConfig.sh" ++ itclConfig="$with_itcl/lib/tcl8.3$itcl/itclConfig.sh" + if test ! -f $itclConfig; then + echo "$ac_t""Unable to find itclConfig.sh" 1>&6 + else + . $itclConfig + echo "$ac_t""version $ITCL_VERSION from $itclConfig" 1>&6 +- ITCL_INC="-I$TK_PREFIX/include$itcl" ++ ITCL_INC="-I$TK_PREFIX/include/tcl8.3$itcl" + #TK_BIN="$TK_EXEC_PREFIX/bin" + #TKLIBS="$TK_LIB_SPEC $TCL_LIB_SPEC $TK_LIBS" + #TCLTK_LIBS="\$(TK_LIB_SPEC) \$(TCL_LIB_SPEC) \$(TK_LIBS)" +@@ -2742,7 +2744,7 @@ echo "configure:2716: checking for Itcl" + + if test "x$with_tk" = "xyes" || test "x$with_tk" = "x"; then + for tk_path in $with_tcl; do +- if test -f $tk_path/lib$itcl/tkConfig.sh; then ++ if test -f $tk_path/lib/tk8.3$itcl/tkConfig.sh; then + with_tk=$tk_path; break + fi + done +@@ -2760,13 +2762,13 @@ echo "configure:2758: checking for Tk" > + elif test "x$with_tk" = "xno"; then + echo "$ac_t""not used" 1>&6 + else +- tkConfig="$with_tk/lib$itcl/tkConfig.sh" ++ tkConfig="$with_tk/lib/tk8.3$itcl/tkConfig.sh" + if test ! -f $tkConfig; then + echo "$ac_t""Unable to find tkConfig.sh" 1>&6 + else + . $tkConfig + echo "$ac_t""version $TK_VERSION from $tkConfig" 1>&6 +- TK_INC="-I$TK_PREFIX/include$itcl" ++ TK_INC="-I$TK_PREFIX/include/tk8.3$itcl" + TK_BIN="$TK_EXEC_PREFIX/bin" + TKLIBS="$TK_LIB_SPEC $TCL_LIB_SPEC $TK_LIBS" + TCLTK_LIBS="\$(TK_LIB_SPEC) \$(TCL_LIB_SPEC) \$(TK_LIBS)"