aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormi <mi@FreeBSD.org>2002-04-09 10:00:19 +0800
committermi <mi@FreeBSD.org>2002-04-09 10:00:19 +0800
commitc1563cc2a1f0143532aff5671d9ab5efb198a585 (patch)
tree84e787a8c916744b44807c884b8a63468c8d747f
parent2599b76c408d187a21bce9f638469800007159cf (diff)
downloadfreebsd-ports-graphics-c1563cc2a1f0143532aff5671d9ab5efb198a585.tar.gz
freebsd-ports-graphics-c1563cc2a1f0143532aff5671d9ab5efb198a585.tar.zst
freebsd-ports-graphics-c1563cc2a1f0143532aff5671d9ab5efb198a585.zip
Patch to use the new names of some of the usb.h's structures' fields if
the OSVERSION is above 450000. Add a maintainer submitted patch to recognize the Palm's vendor-id (not just Handspring). Update pkg-descr accordingly and bump PORTREVISION. Approved by: maintainer
-rw-r--r--palm/coldsync/Makefile8
-rw-r--r--palm/coldsync/files/patch-palm27
-rw-r--r--palm/coldsync/pkg-descr4
3 files changed, 36 insertions, 3 deletions
diff --git a/palm/coldsync/Makefile b/palm/coldsync/Makefile
index dd30935b870..089410648f1 100644
--- a/palm/coldsync/Makefile
+++ b/palm/coldsync/Makefile
@@ -7,7 +7,7 @@
PORTNAME= coldsync
PORTVERSION= 2.1.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= palm comms
MASTER_SITES= http://www.ooblick.com/software/coldsync/
@@ -35,6 +35,12 @@ CONFIGURE_ARGS+= --with-i18n
# I don't know how to test for a version of {Net,Open}BSD that supports USB.
.if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 400000
CONFIGURE_ARGS+= --with-usb
+.if ${OSVERSION} >= 450000
+post-patch:
+ ${PERL} -pi -e 's,udi\.(\S+),udi.udi_\1,g;' \
+ -e 's,ur\.(\S+),ur.ucr_\1,g;' \
+ ${WRKSRC}/configure ${WRKSRC}/libpconn/PConnection_usb.c
+.endif
.endif
post-install:
diff --git a/palm/coldsync/files/patch-palm b/palm/coldsync/files/patch-palm
new file mode 100644
index 00000000000..1e63f83b2bc
--- /dev/null
+++ b/palm/coldsync/files/patch-palm
@@ -0,0 +1,27 @@
+Index: libpconn/PConnection_usb.c
+===================================================================
+RCS file: /var/lib/cvs/coldsync/libpconn/PConnection_usb.c,v
+retrieving revision 1.26
+retrieving revision 1.27
+diff -u -r1.26 -r1.27
+--- libpconn/PConnection_usb.c 30 Jul 2001 07:23:56 -0000 1.26
++++ libpconn/PConnection_usb.c 20 Aug 2001 09:13:00 -0000 1.27
+@@ -94,6 +94,7 @@
+ #define hs_usbfun_MAX 4
+
+ #define HANDSPRING_VENDOR_ID 0x082d
++#define PALM_VENDOR_ID 0x0830
+
+ static char *hs_usb_functions[] = {
+ "Generic",
+@@ -505,7 +506,9 @@
+
+ }
+
+- if (udi.vendorNo != HANDSPRING_VENDOR_ID) {
++ if ((udi.vendorNo != HANDSPRING_VENDOR_ID) &&
++ (udi.vendorNo != PALM_VENDOR_ID))
++ {
+ fprintf(stderr,
+ _("%s: Warning: Unexpected USB vendor ID %#x.\n"),
+ "pconn_usb_open", udi.vendorNo);
diff --git a/palm/coldsync/pkg-descr b/palm/coldsync/pkg-descr
index 9e6d08c8bf2..faa2ee4057c 100644
--- a/palm/coldsync/pkg-descr
+++ b/palm/coldsync/pkg-descr
@@ -1,7 +1,7 @@
ColdSync is a robust, extensible, portable tool for
synchronizing PalmOS devices (PalmPilot et al.) with a Unix
-workstation. It also supports USB connections to a Visor, under
-FreeBSD 4.0.
+workstation. It also supports USB connections, under FreeBSD 4.0
+and higher.
It runs without a GUI, and therefore allows you to sync
without running X.
ColdSync is extensible through the use of conduits, which