Attachment #41252 for bug #64627

View | Details | Raw Unified | Return to bug 64627
Collapse All | Expand All





PORTNAME=	libticables
PORTVERSION=	3.7.7
PORTREVISION=	2
CATEGORIES=	comms
MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
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


MAN1=	ticables-config.1

.include <bsd.port.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>

Lines 1-6 Link Here

(-)libticables/files/patch-configure (-4 / +12 lines)
1	--- configure.orig Wed Aug 27 12:17:39 2003	1	--- configure.orig Wed Aug 27 12:17:39 2003
2	+++ configure Mon Nov 17 19:41:58 2003	2	+++ configure Tue Mar 23 16:08:32 2004
3	@@ -6257,7 +6257,8 @@	3	@@ -1934,6 +1934,7 @@
		4	ACLOCALDIR=`aclocal --print-ac-dir`
		5
		6	fi
		7	+ACLOCALDIR=""
		8
		9
		10	if test x$ACLOCALDIR != x ; then
		11	@@ -6257,7 +6258,8 @@
4		12
5	# detect system type	13	# detect system type
6	case "$host" in	14	case "$host" in
Lines 10-16 Link Here
10	alpha--linux-*) ARCH="-D__ALPHA__ -D__LINUX__" ;;	18	alpha--linux-*) ARCH="-D__ALPHA__ -D__LINUX__" ;;
11	alpha---) ARCH="-D__ALPHA__ -D__LINUX__" ;;	19	alpha---) ARCH="-D__ALPHA__ -D__LINUX__" ;;
12	arm--linux-*) ARCH="-D__ARM__ -D__LINUX__" ;;	20	arm--linux-*) ARCH="-D__ARM__ -D__LINUX__" ;;
13	@@ -6266,7 +6267,6 @@	21	@@ -6266,7 +6268,6 @@
14	i[3456]86--hurd-) ARCH="-D__LINUX__" ;;	22	i[3456]86--hurd-) ARCH="-D__LINUX__" ;;
15	i[3456]86--mingw) ARCH="-D__WIN32__ -D__MINGW32__ -Os -s" ;;	23	i[3456]86--mingw) ARCH="-D__WIN32__ -D__MINGW32__ -Os -s" ;;
16	i[3456]86-*-cygwin) ARCH="-D__WIN32__ -D__CYGWIN__ -mno-cygwin" ;;	24	i[3456]86-*-cygwin) ARCH="-D__WIN32__ -D__CYGWIN__ -mno-cygwin" ;;
Lines 18-24 Link Here
18	ia64--linux-) ARCH="-D__LINUX__" ;;	26	ia64--linux-) ARCH="-D__LINUX__" ;;
19	m68k--linux-) ARCH="-D__M68K__ -D__LINUX__" ;;	27	m68k--linux-) ARCH="-D__M68K__ -D__LINUX__" ;;
20	mips--linux-) ARCH="-D__MIPS__ -D__LINUX__" ;;	28	mips--linux-) ARCH="-D__MIPS__ -D__LINUX__" ;;
21	@@ -24767,6 +24767,7 @@	29	@@ -24767,6 +24768,7 @@
22		30
23		31
24		32

Lines 1-11 Link Here

(-)libticables/files/patch-macros-Makefile.in (-11 lines)
1	--- macros/Makefile.in.orig Sat Sep 20 12:42:11 2003
2	+++ macros/Makefile.in Sat Sep 20 12:42:36 2003
3	@@ -189,7 +189,7 @@
4	done
5
6
7	-aclocaldir = @ACLOCALDIR@
8	+aclocaldir = ${datadir}/aclocal
9
10	@Aclocal_TRUE@aclocal_DATA = ticables.m4
11	subdir = macros




--- 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;

Lines 11-16 Link Here

(-)libticables/pkg-plist (-1 lines)
11	lib/libticables.so	11	lib/libticables.so
12	lib/libticables.so.10	12	lib/libticables.so.10
13	libdata/pkgconfig/ticables.pc	13	libdata/pkgconfig/ticables.pc
14	share/aclocal/ticables.m4
15	share/locale/fr/LC_MESSAGES/libticables.mo	14	share/locale/fr/LC_MESSAGES/libticables.mo
16	@unexec rmdir %D/include/tilp 2>/dev/null \|\| true	15	@unexec rmdir %D/include/tilp 2>/dev/null \|\| true

Return to bug 64627

Lines 7-13 Link Here

(-)libticables/Makefile (-17 / +3 lines)
7		7
8	PORTNAME= libticables	8	PORTNAME= libticables
9	PORTVERSION= 3.7.7	9	PORTVERSION= 3.7.7
10	PORTREVISION= 1	10	PORTREVISION= 2
11	CATEGORIES= comms	11	CATEGORIES= comms
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= tilp	13	MASTER_SITE_SUBDIR= tilp
Lines 15-24 Link Here
15	MAINTAINER= tijl@ulyssis.org	15	MAINTAINER= tijl@ulyssis.org
16	COMMENT= TI calculator link cables library	16	COMMENT= TI calculator link cables library
17		17
		18	LIB_DEPENDS= usb-0.1.7:${PORTSDIR}/devel/libusb
18	BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig	19	BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
19	RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig	20	RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
20		21
21	USE_AUTOMAKE_VER= 15
22	GNU_CONFIGURE= yes	22	GNU_CONFIGURE= yes
23	USE_GETTEXT= yes	23	USE_GETTEXT= yes
24	USE_LIBTOOL_VER= 13	24	USE_LIBTOOL_VER= 13
Lines 30-47 Link Here
30		30
31	MAN1= ticables-config.1	31	MAN1= ticables-config.1
32		32
33	.include <bsd.port.pre.mk>	33	.include <bsd.port.mk>
34
35	.if defined(WITH_LIBUSB) \|\| exists(${LOCALBASE}/bin/libusb-config)
36	LIB_DEPENDS+= usb-0.1.7:${PORTSDIR}/devel/libusb
37	.else
38	pre-everything::
39	@${ECHO_MSG}
40	@${ECHO_MSG} "======================================================="
41	@${ECHO_MSG} "If you want to compile with USB support, hit Ctrl-C"
42	@${ECHO_MSG} "right now and use \"make WITH_LIBUSB=yes\""
43	@${ECHO_MSG} "======================================================="
44	@${ECHO_MSG}
45	.endif #WITH_LIBUSB
46
47	.include <bsd.port.post.mk>

Line 0 Link Here

(-)libticables/files/patch-src-slv_link.c (+18 lines)
	1	--- src/slv_link.c.orig Wed Aug 27 11:34:38 2003
	2	+++ src/slv_link.c Tue Mar 23 16:09:02 2004
	3	@@ -1423,6 +1423,7 @@
	4	MAX_PACKET_SIZE, (time_out * 10));
	5	*/
	6
	7	+#ifndef __BSD__
	8	/* Reset endpoints */
	9	ret = usb_clear_halt(tigl_han, TIGL_BULK_OUT);
	10	if (ret < 0) {
	11	@@ -1455,6 +1456,7 @@
	12	}
	13	}
	14	}
	15	+#endif
	16
	17	/* Reset buffers */
	18	nBytesRead = 0;