1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00

Fix build with new pilot-link.

This commit is contained in:
Joe Marcus Clarke 2002-09-17 17:58:29 +00:00
parent 50554cfe56
commit efdf4ca65e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=66525
9 changed files with 282 additions and 15 deletions

View File

@ -1,8 +1,5 @@
$FreeBSD$
--- configure.orig Thu Apr 25 19:15:48 2002
+++ configure Thu Apr 25 19:17:00 2002
--- configure.orig Mon Apr 22 16:21:27 2002
+++ configure Tue Sep 17 13:44:51 2002
@@ -5388,6 +5388,7 @@
# This can be used to rebuild libtool when needed
@ -33,6 +30,51 @@ $FreeBSD$
else
@@ -7531,7 +7532,7 @@
cat conftest.$ac_ext >&5
rm -rf conftest*
CATOBJEXT=.mo
- DATADIRNAME=lib
+ DATADIRNAME=share
fi
rm -f conftest*
INSTOBJEXT=.mo
@@ -7701,7 +7702,7 @@
# USE_INCLUDED_LIBINTL=yes
# CATOBJEXT=.cat
# INSTOBJEXT=.cat
-# DATADIRNAME=lib
+# DATADIRNAME=share
# INTLDEPS='$(top_builddir)/intl/libintl.a'
# INTLLIBS=$INTLDEPS
# LIBS=`echo $LIBS | sed -e 's/-lintl//'`
@@ -8268,7 +8269,7 @@
else
PISOCK_CFLAGS="-I$withval/include"
incdir="$withval/include"
- PISOCK_LIBS="-L$withval/lib -lpisock"
+ PISOCK_LIBS="-L$withval/lib -lpisync -lpisock"
echo $ac_n "checking "for existance of $withval/lib/libpisock.so"""... $ac_c" 1>&6
echo "configure:8274: checking "for existance of $withval/lib/libpisock.so"" >&5
if test -r $withval/lib/libpisock.so; then
@@ -8381,7 +8382,7 @@
piversion_include="$prefix/include/pi-version.h"
if test x$PISOCK_LIBDIR = x; then
incdir="$prefix/include"
- PISOCK_LIBS="-L$prefix/lib -lpisock"
+ PISOCK_LIBS="-L$prefix/lib -lpisock -lpisock"
fi
else
echo "$ac_t""no" 1>&6
@@ -8432,7 +8433,7 @@
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- PISOCK_LIBS=-lpisock
+ PISOCK_LIBS=-lpisync -lpisock
else
echo "$ac_t""no" 1>&6
{ echo "configure: error: "Unable to find libpisock. Try ftp://ryeham.ee.ryerson.ca/pub/PalmOS/."" 1>&2; exit 1; }
@@ -9022,8 +9023,8 @@
fi

View File

@ -0,0 +1,26 @@
--- gpilotd/gpilotd.c.orig Tue Sep 17 13:37:40 2002
+++ gpilotd/gpilotd.c Tue Sep 17 13:38:32 2002
@@ -46,6 +46,7 @@
#include <signal.h>
#include <unistd.h>
#include <stdio.h>
+#include <fcntl.h>
#include <libgnome/libgnome.h>
@@ -125,13 +126,13 @@
pilot_set_baud_rate (device);
}
- if (!(sd = pi_socket (PI_AF_SLP, PI_SOCK_STREAM, PI_PF_PADP))) {
+ if (!(sd = pi_socket (PI_PF_SLP, PI_SOCK_STREAM, PI_PF_PADP))) {
g_warning ("pi_socket: %s",strerror (errno));
if (error) *error = 1;
return -1;
}
- addr.pi_family = PI_AF_SLP;
+ addr.pi_family = PI_PF_SLP;
/*
Most important for networking

View File

@ -0,0 +1,21 @@
--- utils/make-password.c.orig Tue Sep 17 13:46:08 2002
+++ utils/make-password.c Tue Sep 17 13:54:13 2002
@@ -34,15 +34,15 @@
char salt[3];
if (argc < 2) {
- fprintf(stderr,"usage:%s %s\n",argv[0],TTYPrompt);
+ fprintf(stderr,"usage:%s %s\n",argv[0],"/dev/cua[<0..n>]");
exit(2);
}
- if (!(sd = pi_socket(PI_AF_SLP, PI_SOCK_STREAM, PI_PF_PADP))) {
+ if (!(sd = pi_socket(PI_PF_SLP, PI_SOCK_STREAM, PI_PF_PADP))) {
perror("pi_socket");
exit(1);
}
- addr.pi_family = PI_AF_SLP;
+ addr.pi_family = PI_PF_SLP;
strcpy(addr.pi_device,argv[1]);
ret = pi_bind(sd, (struct sockaddr*)&addr, sizeof(addr));

View File

@ -1,8 +1,5 @@
$FreeBSD$
--- configure.orig Thu Apr 25 19:15:48 2002
+++ configure Thu Apr 25 19:17:00 2002
--- configure.orig Mon Apr 22 16:21:27 2002
+++ configure Tue Sep 17 13:44:51 2002
@@ -5388,6 +5388,7 @@
# This can be used to rebuild libtool when needed
@ -33,6 +30,51 @@ $FreeBSD$
else
@@ -7531,7 +7532,7 @@
cat conftest.$ac_ext >&5
rm -rf conftest*
CATOBJEXT=.mo
- DATADIRNAME=lib
+ DATADIRNAME=share
fi
rm -f conftest*
INSTOBJEXT=.mo
@@ -7701,7 +7702,7 @@
# USE_INCLUDED_LIBINTL=yes
# CATOBJEXT=.cat
# INSTOBJEXT=.cat
-# DATADIRNAME=lib
+# DATADIRNAME=share
# INTLDEPS='$(top_builddir)/intl/libintl.a'
# INTLLIBS=$INTLDEPS
# LIBS=`echo $LIBS | sed -e 's/-lintl//'`
@@ -8268,7 +8269,7 @@
else
PISOCK_CFLAGS="-I$withval/include"
incdir="$withval/include"
- PISOCK_LIBS="-L$withval/lib -lpisock"
+ PISOCK_LIBS="-L$withval/lib -lpisync -lpisock"
echo $ac_n "checking "for existance of $withval/lib/libpisock.so"""... $ac_c" 1>&6
echo "configure:8274: checking "for existance of $withval/lib/libpisock.so"" >&5
if test -r $withval/lib/libpisock.so; then
@@ -8381,7 +8382,7 @@
piversion_include="$prefix/include/pi-version.h"
if test x$PISOCK_LIBDIR = x; then
incdir="$prefix/include"
- PISOCK_LIBS="-L$prefix/lib -lpisock"
+ PISOCK_LIBS="-L$prefix/lib -lpisock -lpisock"
fi
else
echo "$ac_t""no" 1>&6
@@ -8432,7 +8433,7 @@
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- PISOCK_LIBS=-lpisock
+ PISOCK_LIBS=-lpisync -lpisock
else
echo "$ac_t""no" 1>&6
{ echo "configure: error: "Unable to find libpisock. Try ftp://ryeham.ee.ryerson.ca/pub/PalmOS/."" 1>&2; exit 1; }
@@ -9022,8 +9023,8 @@
fi

View File

@ -0,0 +1,26 @@
--- gpilotd/gpilotd.c.orig Tue Sep 17 13:37:40 2002
+++ gpilotd/gpilotd.c Tue Sep 17 13:38:32 2002
@@ -46,6 +46,7 @@
#include <signal.h>
#include <unistd.h>
#include <stdio.h>
+#include <fcntl.h>
#include <libgnome/libgnome.h>
@@ -125,13 +126,13 @@
pilot_set_baud_rate (device);
}
- if (!(sd = pi_socket (PI_AF_SLP, PI_SOCK_STREAM, PI_PF_PADP))) {
+ if (!(sd = pi_socket (PI_PF_SLP, PI_SOCK_STREAM, PI_PF_PADP))) {
g_warning ("pi_socket: %s",strerror (errno));
if (error) *error = 1;
return -1;
}
- addr.pi_family = PI_AF_SLP;
+ addr.pi_family = PI_PF_SLP;
/*
Most important for networking

View File

@ -0,0 +1,21 @@
--- utils/make-password.c.orig Tue Sep 17 13:46:08 2002
+++ utils/make-password.c Tue Sep 17 13:54:13 2002
@@ -34,15 +34,15 @@
char salt[3];
if (argc < 2) {
- fprintf(stderr,"usage:%s %s\n",argv[0],TTYPrompt);
+ fprintf(stderr,"usage:%s %s\n",argv[0],"/dev/cua[<0..n>]");
exit(2);
}
- if (!(sd = pi_socket(PI_AF_SLP, PI_SOCK_STREAM, PI_PF_PADP))) {
+ if (!(sd = pi_socket(PI_PF_SLP, PI_SOCK_STREAM, PI_PF_PADP))) {
perror("pi_socket");
exit(1);
}
- addr.pi_family = PI_AF_SLP;
+ addr.pi_family = PI_PF_SLP;
strcpy(addr.pi_device,argv[1]);
ret = pi_bind(sd, (struct sockaddr*)&addr, sizeof(addr));

View File

@ -1,8 +1,5 @@
$FreeBSD$
--- configure.orig Thu Apr 25 19:15:48 2002
+++ configure Thu Apr 25 19:17:00 2002
--- configure.orig Mon Apr 22 16:21:27 2002
+++ configure Tue Sep 17 13:44:51 2002
@@ -5388,6 +5388,7 @@
# This can be used to rebuild libtool when needed
@ -33,6 +30,51 @@ $FreeBSD$
else
@@ -7531,7 +7532,7 @@
cat conftest.$ac_ext >&5
rm -rf conftest*
CATOBJEXT=.mo
- DATADIRNAME=lib
+ DATADIRNAME=share
fi
rm -f conftest*
INSTOBJEXT=.mo
@@ -7701,7 +7702,7 @@
# USE_INCLUDED_LIBINTL=yes
# CATOBJEXT=.cat
# INSTOBJEXT=.cat
-# DATADIRNAME=lib
+# DATADIRNAME=share
# INTLDEPS='$(top_builddir)/intl/libintl.a'
# INTLLIBS=$INTLDEPS
# LIBS=`echo $LIBS | sed -e 's/-lintl//'`
@@ -8268,7 +8269,7 @@
else
PISOCK_CFLAGS="-I$withval/include"
incdir="$withval/include"
- PISOCK_LIBS="-L$withval/lib -lpisock"
+ PISOCK_LIBS="-L$withval/lib -lpisync -lpisock"
echo $ac_n "checking "for existance of $withval/lib/libpisock.so"""... $ac_c" 1>&6
echo "configure:8274: checking "for existance of $withval/lib/libpisock.so"" >&5
if test -r $withval/lib/libpisock.so; then
@@ -8381,7 +8382,7 @@
piversion_include="$prefix/include/pi-version.h"
if test x$PISOCK_LIBDIR = x; then
incdir="$prefix/include"
- PISOCK_LIBS="-L$prefix/lib -lpisock"
+ PISOCK_LIBS="-L$prefix/lib -lpisock -lpisock"
fi
else
echo "$ac_t""no" 1>&6
@@ -8432,7 +8433,7 @@
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- PISOCK_LIBS=-lpisock
+ PISOCK_LIBS=-lpisync -lpisock
else
echo "$ac_t""no" 1>&6
{ echo "configure: error: "Unable to find libpisock. Try ftp://ryeham.ee.ryerson.ca/pub/PalmOS/."" 1>&2; exit 1; }
@@ -9022,8 +9023,8 @@
fi

View File

@ -0,0 +1,26 @@
--- gpilotd/gpilotd.c.orig Tue Sep 17 13:37:40 2002
+++ gpilotd/gpilotd.c Tue Sep 17 13:38:32 2002
@@ -46,6 +46,7 @@
#include <signal.h>
#include <unistd.h>
#include <stdio.h>
+#include <fcntl.h>
#include <libgnome/libgnome.h>
@@ -125,13 +126,13 @@
pilot_set_baud_rate (device);
}
- if (!(sd = pi_socket (PI_AF_SLP, PI_SOCK_STREAM, PI_PF_PADP))) {
+ if (!(sd = pi_socket (PI_PF_SLP, PI_SOCK_STREAM, PI_PF_PADP))) {
g_warning ("pi_socket: %s",strerror (errno));
if (error) *error = 1;
return -1;
}
- addr.pi_family = PI_AF_SLP;
+ addr.pi_family = PI_PF_SLP;
/*
Most important for networking

View File

@ -0,0 +1,21 @@
--- utils/make-password.c.orig Tue Sep 17 13:46:08 2002
+++ utils/make-password.c Tue Sep 17 13:54:13 2002
@@ -34,15 +34,15 @@
char salt[3];
if (argc < 2) {
- fprintf(stderr,"usage:%s %s\n",argv[0],TTYPrompt);
+ fprintf(stderr,"usage:%s %s\n",argv[0],"/dev/cua[<0..n>]");
exit(2);
}
- if (!(sd = pi_socket(PI_AF_SLP, PI_SOCK_STREAM, PI_PF_PADP))) {
+ if (!(sd = pi_socket(PI_PF_SLP, PI_SOCK_STREAM, PI_PF_PADP))) {
perror("pi_socket");
exit(1);
}
- addr.pi_family = PI_AF_SLP;
+ addr.pi_family = PI_PF_SLP;
strcpy(addr.pi_device,argv[1]);
ret = pi_bind(sd, (struct sockaddr*)&addr, sizeof(addr));