aboutsummaryrefslogtreecommitdiff
path: root/comms
diff options
context:
space:
mode:
authorPav Lucistnik <pav@FreeBSD.org>2005-06-23 16:29:05 +0000
committerPav Lucistnik <pav@FreeBSD.org>2005-06-23 16:29:05 +0000
commita8203f58cca31de743520d6d0ba5d43d9b2318af (patch)
tree700bb634a94a67869f1571a6f5d599dc351b8ce9 /comms
parent8831aedb0ec13d38a86d3d9978744661529bbe1c (diff)
downloadports-a8203f58cca31de743520d6d0ba5d43d9b2318af.tar.gz
ports-a8203f58cca31de743520d6d0ba5d43d9b2318af.zip
Notes
Diffstat (limited to 'comms')
-rw-r--r--comms/libticables/Makefile12
-rw-r--r--comms/libticables/distinfo4
-rw-r--r--comms/libticables/files/patch-configure36
-rw-r--r--comms/libticables/files/patch-src-bsd-bsd_mapping.c50
-rw-r--r--comms/libticables/files/patch-src-intrface.c10
-rw-r--r--comms/libticables/files/patch-src-ioports.c38
-rw-r--r--comms/libticables/files/patch-src-linux-slv_link2.c11
-rw-r--r--comms/libticables/files/patch-src-slv_link.c18
-rw-r--r--comms/libticables/pkg-plist5
-rw-r--r--comms/tilp/Makefile25
-rw-r--r--comms/tilp/distinfo4
-rw-r--r--comms/tilp/files/patch-Makefile.in19
-rw-r--r--comms/tilp/files/patch-man-Makefile.in11
-rw-r--r--comms/tilp/files/patch-src-Makefile.in11
-rw-r--r--comms/tilp/files/patch-src-action.c10
-rw-r--r--comms/tilp/files/patch-src-tilp_misc.c11
-rw-r--r--comms/tilp/files/patch-src-tilp_plugin.c21
-rw-r--r--comms/tilp/files/patch-src-tilp_printl.c18
-rw-r--r--comms/tilp/pkg-plist5
19 files changed, 118 insertions, 201 deletions
diff --git a/comms/libticables/Makefile b/comms/libticables/Makefile
index f3e9d9125ff0..8027b036b1a3 100644
--- a/comms/libticables/Makefile
+++ b/comms/libticables/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= libticables
-PORTVERSION= 3.7.7
-PORTREVISION= 2
+PORTVERSION= 3.9.2
CATEGORIES= comms
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= tilp
@@ -19,14 +18,9 @@ LIB_DEPENDS= usb-0.1.8:${PORTSDIR}/devel/libusb
GNU_CONFIGURE= yes
USE_GETTEXT= yes
-USE_GNOME= pkgconfig
-USE_LIBTOOL_VER= 13
+USE_GNOME= gnomehack pkgconfig
+USE_LIBTOOL_VER= 15
USE_GMAKE= yes
INSTALLS_SHLIB= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include"\
- LDFLAGS="-L${LOCALBASE}/lib"
-
-MAN1= ticables-config.1
-
.include <bsd.port.mk>
diff --git a/comms/libticables/distinfo b/comms/libticables/distinfo
index 91994f75b0f7..d94bae5152e7 100644
--- a/comms/libticables/distinfo
+++ b/comms/libticables/distinfo
@@ -1,2 +1,2 @@
-MD5 (libticables-3.7.7.tar.gz) = d47c54228fb883a3cf1d5f779a926471
-SIZE (libticables-3.7.7.tar.gz) = 548323
+MD5 (libticables-3.9.2.tar.gz) = 354675bfbd881082a9447efde9935226
+SIZE (libticables-3.9.2.tar.gz) = 575639
diff --git a/comms/libticables/files/patch-configure b/comms/libticables/files/patch-configure
deleted file mode 100644
index 1091e940ad38..000000000000
--- a/comms/libticables/files/patch-configure
+++ /dev/null
@@ -1,36 +0,0 @@
---- configure.orig Wed Aug 27 12:17:39 2003
-+++ 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
--# alpha-*-*bsd*) ARCH="-D__FBSD__" ;;
-+ i386-*-*bsd*) ARCH="-D__BSD__ -D__I386__" ;;
-+ *-*-*bsd*) ARCH="-D__BSD__" ;;
- alpha*-*-linux-*) ARCH="-D__ALPHA__ -D__LINUX__" ;;
- alpha*-*-*-*) ARCH="-D__ALPHA__ -D__LINUX__" ;;
- arm*-*-linux-*) ARCH="-D__ARM__ -D__LINUX__" ;;
-@@ -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" ;;
-- i[3456]86-*-*bsd*) ARCH="-D__BSD__" ;;
- ia64-*-linux-*) ARCH="-D__LINUX__" ;;
- m68k-*-linux-*) ARCH="-D__M68K__ -D__LINUX__" ;;
- mips-*-linux-*) ARCH="-D__MIPS__ -D__LINUX__" ;;
-@@ -24767,6 +24768,7 @@
-
-
-
-+LDFLAGS="$LDFLAGS $INTLLIBS"
-
-
-
diff --git a/comms/libticables/files/patch-src-bsd-bsd_mapping.c b/comms/libticables/files/patch-src-bsd-bsd_mapping.c
new file mode 100644
index 000000000000..95f40b2168da
--- /dev/null
+++ b/comms/libticables/files/patch-src-bsd-bsd_mapping.c
@@ -0,0 +1,50 @@
+--- src/bsd/bsd_mapping.c.orig Mon May 30 14:01:58 2005
++++ src/bsd/bsd_mapping.c Mon May 30 14:09:38 2005
+@@ -74,9 +74,7 @@
+ break;
+
+ case LINK_AVR:
+- if(resources & IO_API) {
+- *method |= IOM_API | IOM_OK;
+- }
++ printl1(2, "AVR link support has been removed !\n");
+ break;
+
+ case LINK_SER:
+@@ -114,6 +112,7 @@
+
+ case LINK_TIE:
+ case LINK_VTI:
++ case LINK_VTL:
+ *method |= IOM_API | IOM_OK;
+ break;
+
+@@ -212,7 +211,10 @@
+ ret = bsd_map_io((TicableMethod)method, port);
+ if(ret)
+ return ret;
+-
++
++ // set fields to default values
++ nul_register_cable(lc);
++
+ // set the link cable
+ printl1(0, _("registering cable...\n"));
+ switch (type) {
+@@ -242,16 +244,6 @@
+ ser_register_cable_1(lc);
+ else if(method & IOM_IOCTL)
+ ser_register_cable_2(lc);
+- break;
+-
+- case LINK_AVR:
+- if ((port != SERIAL_PORT_1) &&
+- (port != SERIAL_PORT_2) &&
+- (port != SERIAL_PORT_3) &&
+- (port != SERIAL_PORT_4) && (port != USER_PORT))
+- return ERR_INVALID_PORT;
+-
+- avr_register_cable(lc);
+ break;
+
+ case LINK_VTL:
diff --git a/comms/libticables/files/patch-src-intrface.c b/comms/libticables/files/patch-src-intrface.c
deleted file mode 100644
index 48bef61ee817..000000000000
--- a/comms/libticables/files/patch-src-intrface.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/intrface.c.orig Sat Sep 13 18:45:17 2003
-+++ src/intrface.c Sat Sep 13 19:56:41 2003
-@@ -722,6 +722,7 @@
- /*********************/
-
- extern const char *search_for_tipar_node(int minor);
-+extern const char *search_for_tiser_node(int minor);
-
- static int convert_port_into_device(void)
- {
diff --git a/comms/libticables/files/patch-src-ioports.c b/comms/libticables/files/patch-src-ioports.c
deleted file mode 100644
index 5208e4a33c8e..000000000000
--- a/comms/libticables/files/patch-src-ioports.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- src/ioports.c.orig Wed Aug 27 11:34:39 2003
-+++ src/ioports.c Wed May 12 17:56:00 2004
-@@ -41,7 +41,7 @@
- #if defined(__I386__) && defined(HAVE_ASM_IO_H) && defined(HAVE_SYS_PERM_H)
- # include <sys/perm.h>
- # include <asm/io.h>
--#elif defined(__BSD__)
-+#elif defined(__BSD__) && defined(__I386__)
- # include <machine/sysarch.h>
- # include <machine/cpufunc.h>
- #elif defined(__WIN32__)
-@@ -107,7 +107,7 @@
- }
- #endif /* 0 */ /* __MACOSX__ */
-
--#if defined(__I386__) && defined(HAVE_ASM_IO_H) && defined(HAVE_SYS_PERM_H) || defined(__ALPHA__) || defined(__BSD__)
-+#if defined(__I386__) && defined(HAVE_ASM_IO_H) && defined(HAVE_SYS_PERM_H) || defined(__ALPHA__) || (defined(__BSD__) && defined(__I386__))
- static int linux_asm_read_io(unsigned int addr)
- {
- return inb(addr);
-@@ -208,7 +208,7 @@
- {
- #if defined(__I386__) && defined(HAVE_ASM_IO_H) && defined(HAVE_SYS_PERM_H) || defined(__ALPHA__) || defined(__BSD__) || defined(__MACOSX__)
-
--#ifndef __MACOSX__
-+#if !(defined(__MACOSX__) || (defined(__BSD__) && !defined(__I386__)))
- if (method & IOM_ASM) {
- io_rd = linux_asm_read_io;
- io_wr = linux_asm_write_io;
-@@ -417,7 +417,7 @@
- int io_close(unsigned long from, unsigned long num)
- {
- #if defined(__I386__) && defined(HAVE_ASM_IO_H) && defined(HAVE_SYS_PERM_H) || defined(__ALPHA__) || defined(__BSD__) || defined(__MACOSX__)
--#ifndef __MACOSX__
-+#if !(defined(__MACOSX__) || (defined(__BSD__) && !defined(__I386__)))
- if (method & IOM_ASM)
- #ifndef __BSD__
- return (ioperm(from, num, 0) ? ERR_ROOT : 0);
diff --git a/comms/libticables/files/patch-src-linux-slv_link2.c b/comms/libticables/files/patch-src-linux-slv_link2.c
new file mode 100644
index 000000000000..0fb5f99a1b49
--- /dev/null
+++ b/comms/libticables/files/patch-src-linux-slv_link2.c
@@ -0,0 +1,11 @@
+--- src/linux/slv_link2.c.orig Sun Sep 26 13:11:20 2004
++++ src/linux/slv_link2.c Mon May 30 15:27:12 2005
+@@ -111,7 +111,7 @@
+ {}
+ };
+
+-//static int max_ps = 32; // max packet size (32 ot 64)
++static int max_ps = 32; // max packet size (32 ot 64)
+
+ static int nBytesWrite2 = 0;
+ static uint8_t *wBuf2 = NULL;
diff --git a/comms/libticables/files/patch-src-slv_link.c b/comms/libticables/files/patch-src-slv_link.c
deleted file mode 100644
index 824d7fe28ef4..000000000000
--- a/comms/libticables/files/patch-src-slv_link.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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 d8d406ecaeab..14b9fd88f771 100644
--- a/comms/libticables/pkg-plist
+++ b/comms/libticables/pkg-plist
@@ -1,16 +1,13 @@
-bin/ticables-config
include/tilp/cabl_def.h
include/tilp/cabl_err.h
include/tilp/cabl_int.h
include/tilp/cabl_ver.h
include/tilp/export.h
-include/tilp/intl.h
include/tilp/ticables.h
include/tilp/timeout.h
lib/libticables.a
-lib/libticables.la
lib/libticables.so
-lib/libticables.so.10
+lib/libticables.so.12
libdata/pkgconfig/ticables.pc
share/locale/fr/LC_MESSAGES/libticables.mo
@unexec rmdir %D/include/tilp 2>/dev/null || true
diff --git a/comms/tilp/Makefile b/comms/tilp/Makefile
index 1b70f3682a77..ef13cd456c4c 100644
--- a/comms/tilp/Makefile
+++ b/comms/tilp/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= tilp
-PORTVERSION= 6.68
-PORTREVISION= 4
+PORTVERSION= 6.79
CATEGORIES= comms
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= tilp
@@ -16,36 +15,24 @@ MAINTAINER= tijl@ulyssis.org
COMMENT= TI Linking Program
BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
-LIB_DEPENDS= ticalcs-4.5:${PORTSDIR}/devel/libticalcs \
- ticables.10:${PORTSDIR}/comms/libticables \
- tifiles.5:${PORTSDIR}/devel/libtifiles
+LIB_DEPENDS= ticalcs.9:${PORTSDIR}/devel/libticalcs \
+ ticables.12:${PORTSDIR}/comms/libticables \
+ tifiles.6:${PORTSDIR}/devel/libtifiles
USE_GETTEXT= yes
USE_GNOME= gtk20 libglade2
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
-USE_LIBTOOL_VER= 13
+USE_LIBTOOL_VER= 15
USE_GMAKE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include"\
- LDFLAGS="-L${LOCALBASE}/lib"
+ LDFLAGS="-L${LOCALBASE}/lib -export-dynamic"
MAN1= tilp.1
.include <bsd.port.pre.mk>
-.if defined(WITH_JPEG) || exists(${LOCALBASE}/lib/libjpeg.so.9)
-LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg
-.else
-pre-everything::
- @${ECHO_MSG}
- @${ECHO_MSG} "======================================================="
- @${ECHO_MSG} "If you want to compile with JPEG support, hit Ctrl-C"
- @${ECHO_MSG} "right now and use \"make WITH_JPEG=yes\""
- @${ECHO_MSG} "======================================================="
- @${ECHO_MSG}
-.endif #WITH_JPEG
-
post-install:
${MKDIR} ${PREFIX}/lib/tilp
diff --git a/comms/tilp/distinfo b/comms/tilp/distinfo
index 056c909514bf..c0c6cb83002e 100644
--- a/comms/tilp/distinfo
+++ b/comms/tilp/distinfo
@@ -1,2 +1,2 @@
-MD5 (tilp-6.68.tar.gz) = 42ae4134fb486e12a38744a52ab773a6
-SIZE (tilp-6.68.tar.gz) = 1136145
+MD5 (tilp-6.79.tar.gz) = 859811ee87e0615e8370c71f8e3ba4ea
+SIZE (tilp-6.79.tar.gz) = 1195282
diff --git a/comms/tilp/files/patch-Makefile.in b/comms/tilp/files/patch-Makefile.in
index f93ccafb01d8..92098228b526 100644
--- a/comms/tilp/files/patch-Makefile.in
+++ b/comms/tilp/files/patch-Makefile.in
@@ -1,10 +1,17 @@
---- Makefile.in.orig Wed Aug 27 22:44:39 2003
-+++ Makefile.in Wed Aug 27 22:45:35 2003
-@@ -185,7 +185,6 @@
+--- Makefile.in.orig Thu May 26 17:00:53 2005
++++ Makefile.in Thu Jun 16 20:21:34 2005
+@@ -190,11 +190,11 @@
+
# subdirectories to scan
SUBDIRS = \
- glade help icons man misc pixmaps src win32 \
-- plugins registry \
- po intl
+- build desktop glade help icons intl \
+- pixmaps po src registry plugins\
++ build glade help icons intl \
++ pixmaps po src\
+ $(am__append_1)
+-dist_pkgdata_DATA = COPYING RELEASE ./registry/tilp.registry
++dist_pkgdata_DATA = COPYING RELEASE
+ EXTRA_DIST = README.* TODO po/TRANSLATORS
+ subdir = .
diff --git a/comms/tilp/files/patch-man-Makefile.in b/comms/tilp/files/patch-man-Makefile.in
deleted file mode 100644
index 724f8561685b..000000000000
--- a/comms/tilp/files/patch-man-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- man/Makefile.in.orig Wed Aug 27 23:02:13 2003
-+++ man/Makefile.in Wed Aug 27 23:03:09 2003
-@@ -393,7 +393,7 @@
- groff -Tascii -man $(man_MANS) > Manpage
- gcc cleaner.c -o cleaner
- ./cleaner Manpage
-- dos2unix Manpage.txt
-+# dos2unix Manpage.txt
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/comms/tilp/files/patch-src-Makefile.in b/comms/tilp/files/patch-src-Makefile.in
deleted file mode 100644
index e7377af06129..000000000000
--- a/comms/tilp/files/patch-src-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig Fri Apr 9 14:10:34 2004
-+++ src/Makefile.in Fri Apr 9 14:10:59 2004
-@@ -218,7 +218,7 @@
-
- # libtool stuff: set export symbols for resolving
- tilp_LDFLAGS = $(LDFLAGS) $(no_undefined) #-lefence
--tilp_CFLAGS = $(CLFAGS) -DGTK_DISABLE_DEPRECATED
-+tilp_CFLAGS = $(CLFAGS)
- subdir = src
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/comms/tilp/files/patch-src-action.c b/comms/tilp/files/patch-src-action.c
deleted file mode 100644
index 9b89e4f8f51c..000000000000
--- a/comms/tilp/files/patch-src-action.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/action.c.orig Mon Apr 21 15:44:39 2003
-+++ src/action.c Mon Apr 21 15:49:32 2003
-@@ -23,6 +23,7 @@
-
- #include <gtk/gtk.h>
- #include <glade/glade.h>
-+#include <stdlib.h>
- #include <string.h>
-
- #include "action.h"
diff --git a/comms/tilp/files/patch-src-tilp_misc.c b/comms/tilp/files/patch-src-tilp_misc.c
deleted file mode 100644
index eddd821ff083..000000000000
--- a/comms/tilp/files/patch-src-tilp_misc.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/tilp_misc.c.orig Mon Apr 21 14:30:31 2003
-+++ src/tilp_misc.c Mon Apr 21 12:44:08 2003
-@@ -78,7 +78,7 @@
- options.web_options = g_strdup("");
- strcpy(options.left_font_name, "");
- strcpy(options.right_font_name,
-- "-adobe-courier-medium-r-*-*-*-125-*-*-*-*-*-*");
-+ "-adobe-courier-medium-r-*-*-*-120-*-*-*-*-*-*");
- options.console_mode = !0;
- locale = setlocale(LC_ALL, NULL);
- strcpy(options.locale, locale);
diff --git a/comms/tilp/files/patch-src-tilp_plugin.c b/comms/tilp/files/patch-src-tilp_plugin.c
index 73c94e2548ae..4279f2ea1052 100644
--- a/comms/tilp/files/patch-src-tilp_plugin.c
+++ b/comms/tilp/files/patch-src-tilp_plugin.c
@@ -1,19 +1,18 @@
---- src/tilp_plugin.c.orig Wed Apr 23 20:51:57 2003
-+++ src/tilp_plugin.c Thu Apr 24 13:33:41 2003
-@@ -168,6 +168,7 @@
- g_dir_close(dir);
- DISPLAY(_("Done !\n"));
+--- src/tilp_plugin.c.orig Mon Feb 14 18:53:16 2005
++++ src/tilp_plugin.c Mon Feb 14 18:54:11 2005
+@@ -171,6 +171,7 @@
+ printl(0, _("Done !\n"));
-+#ifndef __BSD__
// Scan registry
- DISPLAY(_("Scanning registry... "));
++#ifndef __BSD__
+ printl(0, _("scanning registry... "));
#ifdef __WIN32__
-@@ -229,7 +230,7 @@
+ reg_fn = g_strconcat(inst_paths.base_dir, REG_FILE, NULL);
+@@ -231,6 +232,7 @@
}
fclose(reg);
- DISPLAY(_("Done !\n"));
--
+ printl(0, _("Done !\n"));
+#endif
+
return 0;
}
-
diff --git a/comms/tilp/files/patch-src-tilp_printl.c b/comms/tilp/files/patch-src-tilp_printl.c
new file mode 100644
index 000000000000..f73367b2fd0c
--- /dev/null
+++ b/comms/tilp/files/patch-src-tilp_printl.c
@@ -0,0 +1,18 @@
+--- src/tilp_printl.c.orig Fri Jun 17 15:14:20 2005
++++ src/tilp_printl.c Fri Jun 17 15:25:20 2005
+@@ -161,6 +161,7 @@
+ skip_console:
+ #endif
+
++/*
+ if (flog == NULL) {
+ flog = tilp_open_log("a");
+ }
+@@ -178,6 +179,7 @@
+
+ // print same stuffs in file
+ vfprintf(flog, format, log_ap);
++*/
+ va_end(log_ap);
+
+ // check for printing domain on next loop
diff --git a/comms/tilp/pkg-plist b/comms/tilp/pkg-plist
index 50d15b342ce6..40ee76faae03 100644
--- a/comms/tilp/pkg-plist
+++ b/comms/tilp/pkg-plist
@@ -19,6 +19,8 @@ share/tilp/glade/extprgms-2.glade
share/tilp/glade/extprgms-2.gladep
share/tilp/glade/general-2.glade
share/tilp/glade/general-2.gladep
+share/tilp/glade/logfile-2.glade
+share/tilp/glade/logfile-2.gladep
share/tilp/glade/manpage-2.glade
share/tilp/glade/manpage-2.gladep
share/tilp/glade/pbars-2.glade
@@ -40,9 +42,6 @@ share/tilp/help/Image15.png
share/tilp/help/Image17.png
share/tilp/help/Image18.png
share/tilp/help/Image20.png
-share/tilp/help/Makefile
-share/tilp/help/Makefile.am
-share/tilp/help/Makefile.in
share/tilp/help/Manual_en.html
share/tilp/help/Manual_fr.html
share/tilp/help/action.png