5 files changed, 33 insertions, 33 deletions

diff --git a/comms/libticables/Makefile b/comms/libticables/Makefile
index 657f01daf45d..385a2e6a6bb2 100644
--- a/comms/libticables/Makefile
+++ b/comms/libticables/Makefile
@@ -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 @@ MASTER_SITE_SUBDIR=	tilp
 MAINTAINER=	tijl@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 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"\
 
 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 --git a/comms/libticables/files/patch-configure b/comms/libticables/files/patch-configure
index 44b3ad136fe6..1091e940ad38 100644
--- a/comms/libticables/files/patch-configure
+++ b/comms/libticables/files/patch-configure
@@ -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 --git a/comms/libticables/files/patch-macros-Makefile.in b/comms/libticables/files/patch-macros-Makefile.in
deleted file mode 100644
index 45f25c8bce39..000000000000
--- a/comms/libticables/files/patch-macros-Makefile.in
+++ /dev/null
@@ -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@aclocal_DATA = ticables.m4
- subdir = macros
diff --git a/comms/libticables/files/patch-src-slv_link.c b/comms/libticables/files/patch-src-slv_link.c
new file mode 100644
index 000000000000..824d7fe28ef4
--- /dev/null
+++ b/comms/libticables/files/patch-src-slv_link.c
@@ -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 --git a/comms/libticables/pkg-plist b/comms/libticables/pkg-plist
index 19ad697c496e..133e8e924a1a 100644
--- a/comms/libticables/pkg-plist
+++ b/comms/libticables/pkg-plist
@@ -11,6 +11,5 @@ lib/libticables.la
 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