Date: Sun, 19 Jun 2005 11:14:16 +0200 From: Tijl Coosemans <tijl@ulyssis.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/82407: [update] comms/tilp comms/libticables devel/libticalcs devel/libtifiles Message-ID: <200506191114.16731.tijl@ulyssis.org> Resent-Message-ID: <200506190920.j5J9KMan004656@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 82407
>Category: ports
>Synopsis: [update] comms/tilp comms/libticables devel/libticalcs devel/libtifiles
>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: Sun Jun 19 09:20:22 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Tijl Coosemans
>Release: FreeBSD 5.4-STABLE i386
>Organization:
>Environment:
System: FreeBSD kalimero.kotnet.org 5.4-STABLE FreeBSD 5.4-STABLE #0: Sun May 22
13:07:36 CEST 2005 tijl@kalimero.kotnet.org:/usr/obj/usr/src/sys/KALIMERO i386
>Description:
updates to:
* comms/tilp
* comms/libticables
* devel/libticalcs
* devel/libtifiles
(with thanks to Brian Rogers)
>How-To-Repeat:
>Fix:
In addition to the following patches, the files/ subdirectory in
devel/libticalcs and devel/libtifiles can be removed.
--- libticalcs.update begins here ---
diff -urN libticalcs.orig/Makefile libticalcs/Makefile
--- libticalcs.orig/Makefile Mon May 30 15:49:27 2005
+++ libticalcs/Makefile Mon May 30 15:53:00 2005
@@ -6,8 +6,7 @@
#
PORTNAME= libticalcs
-PORTVERSION= 4.5.1
-PORTREVISION= 3
+PORTVERSION= 4.5.9
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= tilp
@@ -15,19 +14,14 @@
MAINTAINER= tijl@ulyssis.org
COMMENT= TI calculator library
-LIB_DEPENDS= ticables.10:${PORTSDIR}/comms/libticables \
- tifiles.5:${PORTSDIR}/devel/libtifiles
+LIB_DEPENDS= ticables.12:${PORTSDIR}/comms/libticables \
+ tifiles.6:${PORTSDIR}/devel/libtifiles
USE_GETTEXT= yes
-USE_GNOME= glib20 pkgconfig
+USE_GNOME= gnomehack pkgconfig
GNU_CONFIGURE= yes
-USE_LIBTOOL_VER= 13
+USE_LIBTOOL_VER= 15
USE_GMAKE= yes
INSTALLS_SHLIB= yes
-
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include"\
- LDFLAGS="-L${LOCALBASE}/lib"
-
-MAN1= ticalcs-config.1
.include <bsd.port.mk>
diff -urN libticalcs.orig/distinfo libticalcs/distinfo
--- libticalcs.orig/distinfo Mon May 30 15:49:27 2005
+++ libticalcs/distinfo Mon May 30 14:36:06 2005
@@ -1,2 +1,2 @@
-MD5 (libticalcs-4.5.1.tar.gz) = 3fb8a76fc681f6e7067bac8a98e54ba8
-SIZE (libticalcs-4.5.1.tar.gz) = 563303
+MD5 (libticalcs-4.5.9.tar.gz) = 8e93f2a4f4e67a9558d97166b4a4155f
+SIZE (libticalcs-4.5.9.tar.gz) = 541221
diff -urN libticalcs.orig/files/patch-configure libticalcs/files/patch-configure
--- libticalcs.orig/files/patch-configure Mon May 30 15:49:27 2005
+++ libticalcs/files/patch-configure Thu Jan 1 01:00:00 1970
@@ -1,10 +0,0 @@
---- configure.orig Tue Mar 23 17:19:45 2004
-+++ configure Tue Mar 23 17:20:06 2004
-@@ -1946,6 +1946,7 @@
- ACLOCALDIR=`aclocal --print-ac-dir`
-
- fi
-+ACLOCALDIR=""
-
-
- if test x$ACLOCALDIR != x ; then
diff -urN libticalcs.orig/pkg-plist libticalcs/pkg-plist
--- libticalcs.orig/pkg-plist Mon May 30 15:49:27 2005
+++ libticalcs/pkg-plist Mon Feb 14 17:52:21 2005
@@ -3,7 +3,6 @@
include/tilp/calc_int.h
include/tilp/calc_ver.h
include/tilp/headers.h
-include/tilp/intl2.h
include/tilp/keys73.h
include/tilp/keys83p.h
include/tilp/keys89.h
@@ -11,11 +10,11 @@
include/tilp/pause.h
include/tilp/ticalcs.h
include/tilp/tikeys.h
+include/tilp/tnode.h
include/tilp/update.h
-lib/libticalcs-4.a
-lib/libticalcs-4.la
-lib/libticalcs-4.so
-lib/libticalcs-4.so.5
-libdata/pkgconfig/ticalcs-4.pc
+lib/libticalcs.a
+lib/libticalcs.so
+lib/libticalcs.so.9
+libdata/pkgconfig/ticalcs.pc
share/locale/fr/LC_MESSAGES/libticalcs.mo
@unexec rmdir %D/include/tilp 2>/dev/null || true
--- libticalcs.update ends here ---
--- libtifiles.update begins here ---
diff -urN libtifiles.orig/Makefile libtifiles/Makefile
--- libtifiles.orig/Makefile Mon May 30 15:49:38 2005
+++ libtifiles/Makefile Mon May 30 14:22:37 2005
@@ -6,8 +6,7 @@
#
PORTNAME= libtifiles
-PORTVERSION= 0.5.7
-PORTREVISION= 1
+PORTVERSION= 0.6.5
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= tilp
@@ -17,14 +16,9 @@
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= tifiles-config.1
.include <bsd.port.mk>
diff -urN libtifiles.orig/distinfo libtifiles/distinfo
--- libtifiles.orig/distinfo Mon May 30 15:49:38 2005
+++ libtifiles/distinfo Mon May 30 14:25:03 2005
@@ -1,2 +1,2 @@
-MD5 (libtifiles-0.5.7.tar.gz) = b368e11b9a0f5ec9abab5ab312a44e55
-SIZE (libtifiles-0.5.7.tar.gz) = 509723
+MD5 (libtifiles-0.6.5.tar.gz) = cfac4188328b888e80995f0ef3f6e0bf
+SIZE (libtifiles-0.6.5.tar.gz) = 512310
diff -urN libtifiles.orig/files/patch-configure libtifiles/files/patch-configure
--- libtifiles.orig/files/patch-configure Mon May 30 15:49:38 2005
+++ libtifiles/files/patch-configure Thu Jan 1 01:00:00 1970
@@ -1,10 +0,0 @@
---- configure.orig Tue Mar 23 16:43:40 2004
-+++ configure Tue Mar 23 16:44:02 2004
-@@ -1934,6 +1934,7 @@
- ACLOCALDIR=`aclocal --print-ac-dir`
-
- fi
-+ACLOCALDIR=""
-
-
- if test x$ACLOCALDIR != x ; then
diff -urN libtifiles.orig/pkg-plist libtifiles/pkg-plist
--- libtifiles.orig/pkg-plist Mon May 30 15:49:38 2005
+++ libtifiles/pkg-plist Mon Feb 14 16:19:30 2005
@@ -1,4 +1,3 @@
-bin/tifiles-config
include/tilp/file_def.h
include/tilp/file_err.h
include/tilp/file_int.h
@@ -22,9 +21,8 @@
include/tilp/typesv2.h
include/tilp/typesxx.h
lib/libtifiles.a
-lib/libtifiles.la
lib/libtifiles.so
-lib/libtifiles.so.5
+lib/libtifiles.so.6
libdata/pkgconfig/tifiles.pc
share/locale/fr/LC_MESSAGES/libtifiles.mo
@unexec rmdir %D/include/tilp 2>/dev/null || true
--- libtifiles.update ends here ---
--- libticables.update begins here ---
diff -urN libticables.orig/Makefile libticables/Makefile
--- libticables.orig/Makefile Mon May 30 15:39:07 2005
+++ libticables/Makefile Mon May 30 15:41:19 2005
@@ -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 @@
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 -urN libticables.orig/distinfo libticables/distinfo
--- libticables.orig/distinfo Mon May 30 15:39:07 2005
+++ libticables/distinfo Mon May 30 12:35:50 2005
@@ -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 -urN libticables.orig/files/patch-configure libticables/files/patch-configure
--- libticables.orig/files/patch-configure Mon May 30 15:39:07 2005
+++ libticables/files/patch-configure Thu Jan 1 01:00:00 1970
@@ -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 -urN libticables.orig/files/patch-src-bsd-bsd_mapping.c libticables/files/patch-src-bsd-bsd_mapping.c
--- libticables.orig/files/patch-src-bsd-bsd_mapping.c Thu Jan 1 01:00:00 1970
+++ libticables/files/patch-src-bsd-bsd_mapping.c Mon May 30 14:13:27 2005
@@ -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 -urN libticables.orig/files/patch-src-intrface.c libticables/files/patch-src-intrface.c
--- libticables.orig/files/patch-src-intrface.c Mon May 30 15:39:07 2005
+++ libticables/files/patch-src-intrface.c Thu Jan 1 01:00:00 1970
@@ -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 -urN libticables.orig/files/patch-src-ioports.c libticables/files/patch-src-ioports.c
--- libticables.orig/files/patch-src-ioports.c Mon May 30 15:39:07 2005
+++ libticables/files/patch-src-ioports.c Thu Jan 1 01:00:00 1970
@@ -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 -urN libticables.orig/files/patch-src-linux-slv_link2.c libticables/files/patch-src-linux-slv_link2.c
--- libticables.orig/files/patch-src-linux-slv_link2.c Thu Jan 1 01:00:00 1970
+++ libticables/files/patch-src-linux-slv_link2.c Mon May 30 15:32:43 2005
@@ -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 -urN libticables.orig/files/patch-src-slv_link.c libticables/files/patch-src-slv_link.c
--- libticables.orig/files/patch-src-slv_link.c Mon May 30 15:39:07 2005
+++ libticables/files/patch-src-slv_link.c Thu Jan 1 01:00:00 1970
@@ -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 -urN libticables.orig/pkg-plist libticables/pkg-plist
--- libticables.orig/pkg-plist Mon May 30 15:39:07 2005
+++ libticables/pkg-plist Mon May 30 14:17:08 2005
@@ -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
--- libticables.update ends here ---
--- tilp.update begins here ---
diff -urN tilp.orig/Makefile tilp/Makefile
--- tilp.orig/Makefile Fri Jun 17 10:46:45 2005
+++ tilp/Makefile Fri Jun 17 10:32:02 2005
@@ -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,35 +15,23 @@
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 -urN tilp.orig/distinfo tilp/distinfo
--- tilp.orig/distinfo Fri Jun 17 10:46:45 2005
+++ tilp/distinfo Mon May 30 14:51:31 2005
@@ -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 -urN tilp.orig/files/patch-Makefile.in tilp/files/patch-Makefile.in
--- tilp.orig/files/patch-Makefile.in Fri Jun 17 10:46:45 2005
+++ tilp/files/patch-Makefile.in Thu Jun 16 20:21:49 2005
@@ -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 -urN tilp.orig/files/patch-man-Makefile.in tilp/files/patch-man-Makefile.in
--- tilp.orig/files/patch-man-Makefile.in Fri Jun 17 10:46:45 2005
+++ tilp/files/patch-man-Makefile.in Thu Jan 1 01:00:00 1970
@@ -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 -urN tilp.orig/files/patch-src-Makefile.in tilp/files/patch-src-Makefile.in
--- tilp.orig/files/patch-src-Makefile.in Fri Jun 17 10:46:45 2005
+++ tilp/files/patch-src-Makefile.in Thu Jan 1 01:00:00 1970
@@ -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 -urN tilp.orig/files/patch-src-action.c tilp/files/patch-src-action.c
--- tilp.orig/files/patch-src-action.c Fri Jun 17 10:46:45 2005
+++ tilp/files/patch-src-action.c Thu Jan 1 01:00:00 1970
@@ -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 -urN tilp.orig/files/patch-src-tilp_misc.c tilp/files/patch-src-tilp_misc.c
--- tilp.orig/files/patch-src-tilp_misc.c Fri Jun 17 10:46:45 2005
+++ tilp/files/patch-src-tilp_misc.c Thu Jan 1 01:00:00 1970
@@ -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 -urN tilp.orig/files/patch-src-tilp_plugin.c tilp/files/patch-src-tilp_plugin.c
--- tilp.orig/files/patch-src-tilp_plugin.c Fri Jun 17 10:46:45 2005
+++ tilp/files/patch-src-tilp_plugin.c Mon Feb 14 18:54:43 2005
@@ -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 -urN tilp.orig/files/patch-src-tilp_printl.c tilp/files/patch-src-tilp_printl.c
--- tilp.orig/files/patch-src-tilp_printl.c Thu Jan 1 01:00:00 1970
+++ tilp/files/patch-src-tilp_printl.c Fri Jun 17 15:29:26 2005
@@ -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 -urN tilp.orig/pkg-plist tilp/pkg-plist
--- tilp.orig/pkg-plist Fri Jun 17 10:46:45 2005
+++ tilp/pkg-plist Mon Feb 14 18:48:45 2005
@@ -19,6 +19,8 @@
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/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
--- tilp.update ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200506191114.16731.tijl>