ports/64627: [update] comms/libticables: fix broken build and add support for usb cable
Tijl Coosemans
tijl at ulyssis.org
Tue Mar 23 19:10:14 UTC 2004
>Number: 64627
>Category: ports
>Synopsis: [update] comms/libticables: add support for usb cable
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Mar 23 11:10:14 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Tijl Coosemans
>Release: FreeBSD 4.9-STABLE i386
>Organization:
>Environment:
System: FreeBSD kalimero.kotnet.org 4.9-STABLE FreeBSD 4.9-STABLE #0: Mon Mar 1 17:42:40 CET 2004
root at kalimero.kotnet.org:/usr/obj/usr/src/sys/TIJL i386
>Description:
- add support for TI-Graph Link USB
- remove dependency on automake, which after the recent changes to all ports using autotools
(http://lists.freebsd.org/pipermail/freebsd-ports/2004-March/010330.html), breaks the port
>How-To-Repeat:
>Fix:
"files/patch-macros-Makefile.in" can be deleted.
--- patch begins here ---
diff -urN libticables.orig/Makefile libticables/Makefile
--- libticables.orig/Makefile Tue Mar 23 15:16:15 2004
+++ libticables/Makefile Tue Mar 23 16:13:28 2004
@@ -7,7 +7,7 @@
PORTNAME= libticables
PORTVERSION= 3.7.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= comms
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= tilp
@@ -15,10 +15,10 @@
MAINTAINER= tijl at ulyssis.org
COMMENT= TI calculator link cables library
+LIB_DEPENDS= usb-0.1.7:${PORTSDIR}/devel/libusb
BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
-USE_AUTOMAKE_VER= 15
GNU_CONFIGURE= yes
USE_GETTEXT= yes
USE_LIBTOOL_VER= 13
@@ -30,18 +30,4 @@
MAN1= ticables-config.1
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_LIBUSB) || exists(${LOCALBASE}/bin/libusb-config)
-LIB_DEPENDS+= usb-0.1.7:${PORTSDIR}/devel/libusb
-.else
-pre-everything::
- @${ECHO_MSG}
- @${ECHO_MSG} "======================================================="
- @${ECHO_MSG} "If you want to compile with USB support, hit Ctrl-C"
- @${ECHO_MSG} "right now and use \"make WITH_LIBUSB=yes\""
- @${ECHO_MSG} "======================================================="
- @${ECHO_MSG}
-.endif #WITH_LIBUSB
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -urN libticables.orig/files/patch-configure libticables/files/patch-configure
--- libticables.orig/files/patch-configure Tue Mar 23 15:16:15 2004
+++ libticables/files/patch-configure Tue Mar 23 16:08:40 2004
@@ -1,6 +1,14 @@
--- configure.orig Wed Aug 27 12:17:39 2003
-+++ configure Mon Nov 17 19:41:58 2003
-@@ -6257,7 +6257,8 @@
++++ configure Tue Mar 23 16:08:32 2004
+@@ -1934,6 +1934,7 @@
+ ACLOCALDIR=`aclocal --print-ac-dir`
+
+ fi
++ACLOCALDIR=""
+
+
+ if test x$ACLOCALDIR != x ; then
+@@ -6257,7 +6258,8 @@
# detect system type
case "$host" in
@@ -10,7 +18,7 @@
alpha*-*-linux-*) ARCH="-D__ALPHA__ -D__LINUX__" ;;
alpha*-*-*-*) ARCH="-D__ALPHA__ -D__LINUX__" ;;
arm*-*-linux-*) ARCH="-D__ARM__ -D__LINUX__" ;;
-@@ -6266,7 +6267,6 @@
+@@ -6266,7 +6268,6 @@
i[3456]86-*-hurd-*) ARCH="-D__LINUX__" ;;
i[3456]86-*-mingw*) ARCH="-D__WIN32__ -D__MINGW32__ -Os -s" ;;
i[3456]86-*-cygwin) ARCH="-D__WIN32__ -D__CYGWIN__ -mno-cygwin" ;;
@@ -18,7 +26,7 @@
ia64-*-linux-*) ARCH="-D__LINUX__" ;;
m68k-*-linux-*) ARCH="-D__M68K__ -D__LINUX__" ;;
mips-*-linux-*) ARCH="-D__MIPS__ -D__LINUX__" ;;
-@@ -24767,6 +24767,7 @@
+@@ -24767,6 +24768,7 @@
diff -urN libticables.orig/files/patch-macros-Makefile.in libticables/files/patch-macros-Makefile.in
--- libticables.orig/files/patch-macros-Makefile.in Tue Mar 23 15:16:15 2004
+++ libticables/files/patch-macros-Makefile.in Thu Jan 1 01:00:00 1970
@@ -1,11 +0,0 @@
---- macros/Makefile.in.orig Sat Sep 20 12:42:11 2003
-+++ macros/Makefile.in Sat Sep 20 12:42:36 2003
-@@ -189,7 +189,7 @@
- done
-
-
--aclocaldir = @ACLOCALDIR@
-+aclocaldir = ${datadir}/aclocal
-
- @Aclocal_TRUE at aclocal_DATA = ticables.m4
- subdir = macros
diff -urN libticables.orig/files/patch-src-slv_link.c libticables/files/patch-src-slv_link.c
--- libticables.orig/files/patch-src-slv_link.c Thu Jan 1 01:00:00 1970
+++ libticables/files/patch-src-slv_link.c Tue Mar 23 16:09:07 2004
@@ -0,0 +1,18 @@
+--- src/slv_link.c.orig Wed Aug 27 11:34:38 2003
++++ src/slv_link.c Tue Mar 23 16:09:02 2004
+@@ -1423,6 +1423,7 @@
+ MAX_PACKET_SIZE, (time_out * 10));
+ */
+
++#ifndef __BSD__
+ /* Reset endpoints */
+ ret = usb_clear_halt(tigl_han, TIGL_BULK_OUT);
+ if (ret < 0) {
+@@ -1455,6 +1456,7 @@
+ }
+ }
+ }
++#endif
+
+ /* Reset buffers */
+ nBytesRead = 0;
diff -urN libticables.orig/pkg-plist libticables/pkg-plist
--- libticables.orig/pkg-plist Tue Mar 23 15:16:15 2004
+++ libticables/pkg-plist Tue Mar 23 15:46:43 2004
@@ -11,6 +11,5 @@
lib/libticables.so
lib/libticables.so.10
libdata/pkgconfig/ticables.pc
-share/aclocal/ticables.m4
share/locale/fr/LC_MESSAGES/libticables.mo
@unexec rmdir %D/include/tilp 2>/dev/null || true
--- patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list