I'm working on a new diff though so wait a bit as some conduits break when
Allright.
This new diff should make everything works. I finally removed the libusb
flavor as it does not look like it is ready for prime time yet. It's
better to make sure what use to work with earlier pilot-link versions
still does.
Also included are diffs to bring jpilot up to date with the latest stable
version 0.99.9 (using the updated pilot-link) and malsync to version
2.2.0.
Please test USB sync intensively as it is the only thing I cannot test
right now.
Thanks!
--
Antoine
diff -ruN --exclude CVS /usr/ports/comms/malsync/Makefile malsync/Makefile
--- /usr/ports/comms/malsync/Makefile Mon Sep 18 19:07:31 2006
+++ malsync/Makefile Tue Sep 19 18:22:20 2006
@@ -2,11 +2,15 @@
COMMENT= "command line tool to synchronize Palm pilot to AvantGo"
-VERSION= 2.1.1
+VERSION= 2.2.0
DISTNAME= malsync_${VERSION}.src
-PKGNAME= malsync-${VERSION}p0
+PKGNAME= malsync-${VERSION}
CATEGORIES= comms palm
+MASTER_SITES= http://ftp.belnet.be/mirror/rsync.gentoo.org/gentoo/distfiles/ \
+ http://gentoo.oregonstate.edu/distfiles/ \
+ ftp://ftp.fr.freebsd.org/pub/FreeBSD/distfiles/
+
MAINTAINER= Antoine Jacoutot <[EMAIL PROTECTED]>
# MPL
@@ -16,7 +20,7 @@
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c
-LIB_DEPENDS= pisock.>=8::comms/pilot-link
+LIB_DEPENDS= pisock.>=9::comms/pilot-link
USE_GMAKE= Yes
WRKSRC= ${WRKDIR}/malsync
diff -ruN --exclude CVS /usr/ports/comms/malsync/distinfo malsync/distinfo
--- /usr/ports/comms/malsync/distinfo Wed Jan 5 16:58:29 2005
+++ malsync/distinfo Tue Sep 19 16:45:37 2006
@@ -1,4 +1,4 @@
-MD5 (malsync_2.1.1.src.tar.gz) = b6342df8559a53a51cf3294ac06ed992
-RMD160 (malsync_2.1.1.src.tar.gz) = 59f17609ec30fa156a604e476852f6bed393f9f3
-SHA1 (malsync_2.1.1.src.tar.gz) = c2746f25cd7a10409c342f34675dd072b6ea1cdd
-SIZE (malsync_2.1.1.src.tar.gz) = 171745
+MD5 (malsync_2.2.0.src.tar.gz) = d1c41526b91bb38c21a4ced01d26328c
+RMD160 (malsync_2.2.0.src.tar.gz) = 14be8ba01c20969eed8d7b718284880e0bbd424f
+SHA1 (malsync_2.2.0.src.tar.gz) = c8400205b3f8770c105c9f62afdba20c94b85c26
+SIZE (malsync_2.2.0.src.tar.gz) = 173851
diff -ruN --exclude CVS /usr/ports/comms/malsync/patches/patch-Makefile
malsync/patches/patch-Makefile
--- /usr/ports/comms/malsync/patches/patch-Makefile Wed Dec 29 05:57:15 2004
+++ malsync/patches/patch-Makefile Tue Sep 19 16:48:13 2006
@@ -1,6 +1,6 @@
-$OpenBSD: patch-Makefile,v 1.3 2004/12/29 04:57:15 pvalchev Exp $
---- Makefile.orig Sun Nov 17 11:52:53 2002
-+++ Makefile Tue Dec 28 21:48:50 2004
+$OpenBSD$
+--- Makefile.orig Tue Sep 19 16:46:31 2006
++++ Makefile Tue Sep 19 16:48:06 2006
@@ -1,5 +1,7 @@
TARGET = malsync
@@ -13,7 +13,7 @@
endif
TREETOP = .
--PILOT_LINK_DIR = $(TREETOP)/pilot-link-0.11.5
+-PILOT_LINK_DIR = $(TREETOP)/pilot-link-0.11.7
+PILOT_LINK_DIR = $(PREFIX)
-CFLAGS = -Wall -g -DMALSYNC -I$(TREETOP)/mal/common \
@@ -26,7 +26,7 @@
$(TARGET): $(OBJS)
- $(CC) $(DYNLINK) $(CFLAGS) -o $@ $(OBJS) \
-- -L${PILOT_LINK_DIR}/libpisock/.libs -lpisock $(LINKLIBS)
+- ${PILOT_LINK_DIR}/libpisock/.libs/libpisock.a $(LINKLIBS)
+ $(CC) $(DYNLINK) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) \
+ -L${PILOT_LINK_DIR}/lib -lpisock $(LINKLIBS)
clean:
diff -ruN --exclude CVS
/usr/ports/comms/malsync/patches/patch-mal_client_unix_MAL31DBConfig_c
malsync/patches/patch-mal_client_unix_MAL31DBConfig_c
--- /usr/ports/comms/malsync/patches/patch-mal_client_unix_MAL31DBConfig_c
Thu Jan 1 01:00:00 1970
+++ malsync/patches/patch-mal_client_unix_MAL31DBConfig_c Tue Sep 19
18:04:53 2006
@@ -0,0 +1,15 @@
+$OpenBSD$
+--- mal/client/unix/MAL31DBConfig.c.orig Tue Sep 19 18:04:26 2006
++++ mal/client/unix/MAL31DBConfig.c Tue Sep 19 18:04:45 2006
+@@ -20,11 +20,7 @@
+ */
+
+ #include <MAL31DBConfig.h>
+-#ifdef DARWIN
+ #include <stdlib.h>
+-#else
+-#include <malloc.h>
+-#endif
+
+
/*---------------------------------------------------------------------------*/
+ void
diff -ruN --exclude CVS /usr/ports/comms/malsync/patches/patch-malsync_c
malsync/patches/patch-malsync_c
--- /usr/ports/comms/malsync/patches/patch-malsync_c Thu Jan 1 01:00:00 1970
+++ malsync/patches/patch-malsync_c Tue Sep 19 18:14:58 2006
@@ -0,0 +1,246 @@
+$OpenBSD$
+--- malsync.c.orig Wed Jul 23 22:02:30 2003
++++ malsync.c Tue Sep 19 18:14:16 2006
+@@ -100,8 +100,7 @@ typedef struct {
+ int pilot_rHandle;
+ int pilot_RecIndex;
+ recordid_t id;
+- uint8 *pilot_buffer;
+- int pilot_buffer_size;
++ pi_buffer_t *pi_buf;
+
+ /* Secure Network Library Stuff */
+ AGBool hasseclib;
+@@ -266,8 +265,8 @@ syncInfoFree(PalmSyncInfo * pInfo)
+ if (NULL != pInfo->userConfig)
+ AGUserConfigFree(pInfo->userConfig);
+
+- if (NULL != pInfo->pilot_buffer)
+- free(pInfo->pilot_buffer);
++ if (NULL != pInfo->pi_buf)
++ pi_buffer_free (pInfo->pi_buf);
+
+ if (NULL != pInfo->commandProcessor)
+ AGCommandProcessorFree(pInfo->commandProcessor);
+@@ -290,9 +289,8 @@ syncInfoNew()
+
+ bzero(pInfo, sizeof(PalmSyncInfo));
+
+- pInfo->pilot_buffer_size = pbs;
+- pInfo->pilot_buffer = (uint8 *)malloc(pbs);
+- if (NULL == pInfo->pilot_buffer)
++ pInfo->pi_buf = pi_buffer_new (pbs);
++ if (NULL == pInfo->pi_buf)
+ goto fail;
+
+ /* Allocate the platform calls record. */
+@@ -341,8 +339,7 @@ int16 readInt16(uint8 * p)
+
/*---------------------------------------------------------------------------*/
+ static void
+ readAndUseDeviceInfoDatabase(AGDeviceInfo * devInfo,
+- uint8 *dev_db_info_buffer,
+- uint32 dev_db_info_buffer_size)
++ pi_buffer_t *pi_buf)
+ {
+ int database_id = 0;
+ long result;
+@@ -373,13 +370,13 @@ readAndUseDeviceInfoDatabase(AGDeviceInf
+ int rc;
+
+ rc = dlp_ReadRecordByIndex(sd, database_id, 0,
+- (void *)dev_db_info_buffer,
+- &id, &dev_db_info_buffer_size,
++ pi_buf,
++ &id,
+ &attr, &cat);
+
+
+ if (rc >= 0) {
+- uint8 *p = dev_db_info_buffer;
++ uint8 *p = pi_buf->data;
+ int16 dev_db_info_version = readInt16(p);
+ p+=sizeof(int16);
+ devInfo->colorDepth = readInt32(p);
+@@ -472,8 +469,7 @@ readDeviceInfo(PalmSyncInfo * pInfo)
+ }
+
+ readAndUseDeviceInfoDatabase(devInfo,
+- pInfo->pilot_buffer,
+- pInfo->pilot_buffer_size);
++ pInfo->pi_buf);
+
+ /* Override the color depth if the user wants low res images. */
+ if (lowres) {
+@@ -663,31 +659,36 @@ static int32
+ readDeviceUserConfig32(int userConfigDBHandle, AGUserConfig
**deviceUserConfig)
+ {
+ recordid_t id;
+- int bufferSize = BUFFERSIZE;
++ pi_buffer_t *pi_buf;
+ int attr = 0;
+ int cat = 0;
+ int rc;
+- uint8 buffer[BUFFERSIZE];
+ AGBufferReader * r = NULL;
+
+- rc = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, (void *)buffer,
+- &id, &bufferSize, &attr, &cat);
++ pi_buf = pi_buffer_new (BUFFERSIZE);
++
++ rc = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, pi_buf,
++ &id, &attr, &cat);
+
+ if (rc < 0) {
+ if (verbose)
+ printf("readDeviceUserConfig: dlp_ReadRecordByIndex , err = %d\n",
+ rc);
++ pi_buffer_free (pi_buf);
+ return 0;
+ }
+
+- r = AGBufferReaderNew(buffer);
++ r = AGBufferReaderNew(pi_buf->data);
+ if (r) {
+ *deviceUserConfig = AGUserConfigNew();
+ AGUserConfigReadData(*deviceUserConfig, (AGReader*)r);
+ AGBufferReaderFree(r);
++ pi_buffer_free (pi_buf);
+ return id;
+- } else
++ } else {
++ pi_buffer_free (pi_buf);
+ return 0;
++ }
+ }
+ #define BUFFERSIZE 0xFFFF
+
/*---------------------------------------------------------------------------*/
+@@ -695,31 +696,36 @@ static int32 readDeviceUserConfig31(int
+ AGUserConfig **deviceUserConfig)
+ {
+ recordid_t id;
+- int bufferSize = BUFFERSIZE;
+ int attr = 0;
+ int cat = 0;
+ int rc;
+- uint8 buffer[BUFFERSIZE];
++ pi_buffer_t *pi_buf;
+ AGBufferReader * r = NULL;
+
+- rc = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, (void *)buffer,
+- &id, &bufferSize, &attr, &cat);
++ pi_buf = pi_buffer_new (BUFFERSIZE);
++
++ rc = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, pi_buf,
++ &id, &attr, &cat);
+
+ if (rc < 0) {
+ if (verbose)
+ printf("readDeviceUserConfig: dlp_ReadRecordByIndex , err = %d\n",
+ rc);
++ pi_buffer_free (pi_buf);
+ return 0;
+ }
+
+- r = AGBufferReaderNew(buffer);
++ r = AGBufferReaderNew(pi_buf->data);
+ if (r) {
+ *deviceUserConfig = AGUserConfigNew();
+ MAL31ReadUserData(*deviceUserConfig, (AGReader*)r);
+ AGBufferReaderFree(r);
++ pi_buffer_free (pi_buf);
+ return id;
+- } else
++ } else {
++ pi_buffer_free (pi_buf);
+ return 0;
++ }
+ }
+
/*---------------------------------------------------------------------------*/
+ static int32 readDeviceUserConfig(int userConfigDBHandle,
+@@ -740,23 +746,25 @@ static void writeDeviceUserConfig(int us
+ {
+
+ recordid_t id;
+- int bufferSize = BUFFERSIZE;
+ int attr = 0;
+ int cat = 0;
+- uint8 buffer[BUFFERSIZE];
+ AGBufferWriter * w = NULL;
++
+ w = AGBufferWriterNew(0);
+ if (w) {
+ long result;
++ pi_buffer_t *pi_buf;
+
++ pi_buf = pi_buffer_new (BUFFERSIZE);
++
+ if (threeone) {
+ MAL31WriteUserData(deviceUserConfig, (AGWriter*)w);
+ } else {
+ AGUserConfigWriteData(deviceUserConfig, (AGWriter*)w);
+ }
+
+- result = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, (void
*)buffer,
+- &id, &bufferSize, &attr, &cat);
++ result = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, pi_buf,
++ &id, &attr, &cat);
+
+ if (result < 0)
+ id = 0;
+@@ -766,7 +774,7 @@ static void writeDeviceUserConfig(int us
+ AGBufferWriterGetBufferSize(w),
+ &id);
+ AGBufferWriterFree(w);
+-
++ pi_buffer_free (pi_buf);
+ }
+ }
+
+@@ -1044,17 +1052,17 @@ getRecordBase(PalmSyncInfo * pInfo, AGBo
+ int32 result;
+ int att = 0;
+ int cat = 0;
+- int size = pInfo->pilot_buffer_size;
++ //int size = pInfo->pi_buf->allocated;
+ int idx = pInfo->pilot_RecIndex++;
+
+ result = (modonly) ?
+- dlp_ReadNextModifiedRec (sd, pInfo->pilot_rHandle,
pInfo->pilot_buffer,
++ dlp_ReadNextModifiedRec (sd, pInfo->pilot_rHandle, pInfo->pi_buf,
+ &pInfo->id, &idx,
+- &size, &att, &cat)
++ &att, &cat)
+ :
+ dlp_ReadRecordByIndex(sd, pInfo->pilot_rHandle, idx,
+- pInfo->pilot_buffer, &pInfo->id,
+- &size, &att, &cat);
++ pInfo->pi_buf, &pInfo->id,
++ &att, &cat);
+
+ if (result < 0) {
+ closeDatabase(pInfo);
+@@ -1070,7 +1078,7 @@ getRecordBase(PalmSyncInfo * pInfo, AGBo
+ }
+ pInfo->record = AGRecordInit(pInfo->record, pInfo->id,
+ AGPalmPilotAttribsToMALMod((uint8)att),
+- size, pInfo->pilot_buffer, 0, NULL);
++ pInfo->pi_buf->used, pInfo->pi_buf->data, 0,
NULL);
+
+ *record = pInfo->record;
+ return AGCLIENT_CONTINUE;
+@@ -1363,7 +1371,6 @@ main(int argc, char *argv[])
+ static void
+ Connect(PalmSyncInfo *pi)
+ {
+- struct pi_sockaddr addr;
+ int ret;
+
+ if (sd != 0)
+@@ -1609,7 +1616,6 @@ fill_in_versioninfo(int sd, AGExpansionV
+ 0,
+ (void *)version_buffer,
+ &id,
+- &version_buffer_size,
+ &attr,
+ &cat);
+
diff -ruN --exclude CVS /usr/ports/comms/pilot-link/Makefile pilot-link/Makefile
--- /usr/ports/comms/pilot-link/Makefile Wed Aug 2 11:48:41 2006
+++ pilot-link/Makefile Sun Oct 1 11:08:47 2006
@@ -3,17 +3,15 @@
COMMENT= "tools to connect your PalmOS® compatible handheld"
-DISTNAME= pilot-link-0.11.8
-PKGNAME= ${DISTNAME}p0
-SHARED_LIBS= pisock++ 1.0 \
- pisock 8.5 \
- pisync 0.1
+DISTNAME= pilot-link-0.12.1
+SHARED_LIBS= pisock 9.1 \
+ pisync 0.2
CATEGORIES= comms
-MASTER_SITES= http://gentoo.oregonstate.edu/distfiles/ \
+MASTER_SITES= http://downloads.pilot-link.org/ \
http://www.slackware.at/data/slackware-10.2/source/l/pilot-link/ \
http://ftp.belnet.be/mirror/rsync.gentoo.org/gentoo/distfiles/ \
- http://downloads.pilot-link.org/
+ http://gentoo.oregonstate.edu/distfiles/
HOMEPAGE= http://www.pilot-link.org/
@@ -27,10 +25,11 @@
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= c m ncurses readline stdc++ z
+WANTLIB= c m readline termcap z
MODULES= converters/libiconv
-LIB_DEPENDS= png.>=4::graphics/png
+LIB_DEPENDS= png.>=4::graphics/png \
+ popt::devel/popt
USE_GMAKE= Yes
USE_LIBTOOL= Yes
@@ -43,9 +42,29 @@
--with-libiconv=${LOCALBASE} \
--with-libpng=${LOCALBASE} \
--with-perl=/usr/bin/perl \
+ --with-readline \
+ --enable-conduits \
--without-efence \
--without-java \
--without-python \
--without-tcl
+
+pre-configure:
+ @if pkg_info -e 'pilot-link-0.11.*'; then \
+ echo 1>&2 "+-------------------"; \
+ echo 1>&2 "| Error: you must remove the existing pilot-link
installation"; \
+ echo 1>&2 "| before compiling this version. To fully remove
run"; \
+ echo 1>&2 "| these commands as user root"; \
+ echo 1>&2 "|"; \
+ echo 1>&2 "| pkg_delete `pkg_info -e 'pilot-link-*'`"; \
+ echo 1>&2 "|"; \
+ echo 1>&2 "+-------------------"; \
+ exit 1; \
+ fi
+
+post-install:
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pilot-link
+ ${INSTALL_DATA} ${WRKSRC}/doc/README.debugging
${PREFIX}/share/doc/pilot-link
+ ${INSTALL_DATA} ${WRKSRC}/doc/README.usb ${PREFIX}/share/doc/pilot-link
.include <bsd.port.mk>
diff -ruN --exclude CVS /usr/ports/comms/pilot-link/distinfo pilot-link/distinfo
--- /usr/ports/comms/pilot-link/distinfo Wed Jan 5 16:58:29 2005
+++ pilot-link/distinfo Sat Sep 30 19:11:42 2006
@@ -1,4 +1,4 @@
-MD5 (pilot-link-0.11.8.tar.bz2) = 586f84add601e8b86da3093ab784e997
-RMD160 (pilot-link-0.11.8.tar.bz2) = c51c069810edff6c2e38e4c81f2daa959c902ad4
-SHA1 (pilot-link-0.11.8.tar.bz2) = 645d4bc49dd4dc4793d13b6e04dd61f24c2bf717
-SIZE (pilot-link-0.11.8.tar.bz2) = 649034
+MD5 (pilot-link-0.12.1.tar.bz2) = 80579c6f68eb583f54294d5651c4632b
+RMD160 (pilot-link-0.12.1.tar.bz2) = a43e1069b490d0b28b5a17fdcab17b8636d8f56a
+SHA1 (pilot-link-0.12.1.tar.bz2) = b776aa4467f254b1f0c9fe76bd54afc9860c3e88
+SIZE (pilot-link-0.12.1.tar.bz2) = 931338
diff -ruN --exclude CVS
/usr/ports/comms/pilot-link/patches/patch-bindings_Makefile_in
pilot-link/patches/patch-bindings_Makefile_in
--- /usr/ports/comms/pilot-link/patches/patch-bindings_Makefile_in Sat Dec
11 05:59:46 2004
+++ pilot-link/patches/patch-bindings_Makefile_in Thu Jan 1 01:00:00 1970
@@ -1,12 +0,0 @@
-$OpenBSD: patch-bindings_Makefile_in,v 1.1 2004/12/11 04:59:46 pvalchev Exp $
---- bindings/Makefile.in.orig Tue Jul 1 13:09:05 2003
-+++ bindings/Makefile.in Fri Dec 10 21:51:33 2004
-@@ -355,7 +355,7 @@ python-clean: Python/setup.py
- #
-
- Perl/Makefile: Perl/Makefile.PL
-- cd Perl && $(PERL) Makefile.PL INSTALLDIRS=vendor
-+ cd Perl && $(PERL) Makefile.PL INSTALLDIRS=site
-
- perl-build: Perl/Makefile
- cd Perl && $(MAKE) PREFIX=$(DESTDIR)$(prefix)
diff -ruN --exclude CVS
/usr/ports/comms/pilot-link/patches/patch-bindings_Perl_Makefile_PL_in
pilot-link/patches/patch-bindings_Perl_Makefile_PL_in
--- /usr/ports/comms/pilot-link/patches/patch-bindings_Perl_Makefile_PL_in
Thu Jan 1 01:00:00 1970
+++ pilot-link/patches/patch-bindings_Perl_Makefile_PL_in Sat Sep 30
19:11:42 2006
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- bindings/Perl/Makefile.PL.in.orig Mon Sep 18 11:06:16 2006
++++ bindings/Perl/Makefile.PL.in Mon Sep 18 11:06:27 2006
+@@ -41,7 +41,7 @@ WriteMakefile(
+ 'INC' => "-I$plincdir",
+ 'DEFINE' => '-DPERL_POLLUTE',
+ 'PREFIX' => "$prefix",
+- 'INSTALLDIRS'=> 'vendor',
++ 'INSTALLDIRS'=> 'site',
+ 'dynamic_lib'=> {'OTHERLDFLAGS' => $lib},
+ 'depend' => {'Pilot.c' => 'const-c.inc const-xs.inc'},
+ 'clean' => {'FILES' => 'const-c.inc const-xs.inc'},
diff -ruN --exclude CVS /usr/ports/comms/pilot-link/patches/patch-configure
pilot-link/patches/patch-configure
--- /usr/ports/comms/pilot-link/patches/patch-configure Sat Dec 11 05:59:46 2004
+++ pilot-link/patches/patch-configure Sat Sep 30 19:11:42 2006
@@ -1,29 +1,29 @@
-$OpenBSD: patch-configure,v 1.4 2004/12/11 04:59:46 pvalchev Exp $
---- configure.orig Tue Jul 1 13:08:40 2003
-+++ configure Fri Dec 10 21:51:33 2004
-@@ -3010,7 +3010,7 @@ fi
+$OpenBSD$
+--- configure.orig Mon Sep 18 10:34:12 2006
++++ configure Mon Sep 18 10:33:58 2006
+@@ -4578,7 +4578,7 @@ fi
if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test -z "$LD"; then
+ if true; then
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
for ac_dir in $PATH; do
- test -z "$ac_dir" && ac_dir=.
-@@ -9259,14 +9259,14 @@ _ACEOF
- usb_type=linux
- msg_usb="yes, Linux"
- ;;
-- *freebsd*)
-+ *bsd*)
+ IFS="$lt_save_ifs"
+@@ -23224,14 +23224,14 @@ _ACEOF
+ usb_type=linux
+ msg_usb="yes, Linux"
+ ;;
+- *freebsd*)
++ *bsd*)
cat >>confdefs.h <<\_ACEOF
#define HAVE_USB 1
_ACEOF
- usb_type=freebsd
-- msg_usb="yes, FreeBSD"
-+ msg_usb="yes, FreeBSD (OpenBSD)"
- ;;
- esac
+ usb_type=freebsd
+- msg_usb="yes, FreeBSD"
++ msg_usb="yes, FreeBSD (OpenBSD)"
+ ;;
+ *darwin*)
diff -ruN --exclude CVS
/usr/ports/comms/pilot-link/patches/patch-libpisock_unixserial_c
pilot-link/patches/patch-libpisock_unixserial_c
--- /usr/ports/comms/pilot-link/patches/patch-libpisock_unixserial_c Sat Dec
11 05:59:46 2004
+++ pilot-link/patches/patch-libpisock_unixserial_c Sat Sep 30 19:11:42 2006
@@ -1,10 +1,10 @@
-$OpenBSD: patch-libpisock_unixserial_c,v 1.1 2004/12/11 04:59:46 pvalchev Exp $
---- libpisock/unixserial.c.orig Tue Jul 30 09:52:24 2002
-+++ libpisock/unixserial.c Fri Dec 10 21:51:33 2004
-@@ -178,13 +178,23 @@ s_open(struct pi_socket *ps, struct pi_s
- i;
- char *tty = addr->pi_device;
- struct pi_serial_data *data = (struct pi_serial_data *)ps->device->data;
+$OpenBSD$
+--- libpisock/unixserial.c.orig Sun Aug 27 18:08:10 2006
++++ libpisock/unixserial.c Mon Sep 18 10:49:10 2006
+@@ -159,13 +159,23 @@ s_open(pi_socket_t *ps, struct pi_sockad
+
+ struct pi_serial_data *data =
+ (struct pi_serial_data *)ps->device->data;
+#define maxretries 100
+ int retries;
@@ -13,7 +13,7 @@
#else
struct sgttyb tcn;
#endif
-- if ((fd = open(tty, O_RDWR | O_NONBLOCK)) == -1) {
+- if ((fd = open(tty, O_RDWR | O_NONBLOCK)) < 0) {
+
+ for (retries = 0 ; retries <= maxretries ; retries++ ) {
+ if ((fd = open(tty, O_RDWR | O_NONBLOCK)) != -1) {
@@ -23,6 +23,6 @@
+ }
+
+ if (fd == -1) {
- return -1; /* errno already set */
+ ps->last_error = PI_ERR_GENERIC_SYSTEM;
+ return PI_ERR_GENERIC_SYSTEM; /* errno already set */
}
-
diff -ruN --exclude CVS
/usr/ports/comms/pilot-link/patches/patch-src_Makefile_in
pilot-link/patches/patch-src_Makefile_in
--- /usr/ports/comms/pilot-link/patches/patch-src_Makefile_in Sat Dec 11
05:59:46 2004
+++ pilot-link/patches/patch-src_Makefile_in Sat Sep 30 19:11:42 2006
@@ -1,12 +1,12 @@
-$OpenBSD: patch-src_Makefile_in,v 1.1 2004/12/11 04:59:46 pvalchev Exp $
---- src/Makefile.in.orig Tue Jul 1 13:09:01 2003
-+++ src/Makefile.in Fri Dec 10 21:51:33 2004
-@@ -100,7 +100,7 @@ PISYNC_AGE = @PISYNC_AGE@
+$OpenBSD$
+--- src/Makefile.in.orig Mon Sep 18 10:42:17 2006
++++ src/Makefile.in Mon Sep 18 10:42:30 2006
+@@ -480,7 +480,7 @@ PISYNC_AGE = @PISYNC_AGE@
PISYNC_CURRENT = @PISYNC_CURRENT@
PISYNC_REVISION = @PISYNC_REVISION@
PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
+PNG_LIBS = @PNG_LIBS@ -lz -lm
- PYTHON = @PYTHON@
- RANLIB = @RANLIB@
- RL_CFLAGS = @RL_CFLAGS@
+ POPT_INCLUDES = @POPT_INCLUDES@
+ POPT_LIBS = @POPT_LIBS@
+ PTHREAD_CC = @PTHREAD_CC@
diff -ruN --exclude CVS
/usr/ports/comms/pilot-link/patches/patch-src_read-todos_c
pilot-link/patches/patch-src_read-todos_c
--- /usr/ports/comms/pilot-link/patches/patch-src_read-todos_c Sat Dec 11
05:59:46 2004
+++ pilot-link/patches/patch-src_read-todos_c Thu Jan 1 01:00:00 1970
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_read-todos_c,v 1.1 2004/12/11 04:59:46 pvalchev Exp $
---- src/read-todos.c.orig Tue Jul 1 12:28:30 2003
-+++ src/read-todos.c Fri Dec 10 21:51:33 2004
-@@ -184,7 +184,7 @@ int main(int argc, char *argv[])
- printf("Priority: %d\n", t.priority);
- printf("Completed: %s\n", t.complete ? "Yes" : "No");
- if (t.indefinite)
-- printf("Due: No Date");
-+ printf("Due: No Date\n");
- else
- printf("Due: %s", asctime(&t.due));
- if (t.description)
diff -ruN --exclude CVS /usr/ports/comms/pilot-link/pkg/PFRAG.shared
pilot-link/pkg/PFRAG.shared
--- /usr/ports/comms/pilot-link/pkg/PFRAG.shared Fri Dec 23 17:45:52 2005
+++ pilot-link/pkg/PFRAG.shared Sat Sep 30 19:11:42 2006
@@ -1,5 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.5 2005/12/23 14:16:01 bernd Exp $
[EMAIL PROTECTED] lib/libpisock++.so.${LIBpisock++_VERSION}
@lib lib/libpisock.so.${LIBpisock_VERSION}
@lib lib/libpisync.so.${LIBpisync_VERSION}
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/PDA/Pilot/Pilot.so
diff -ruN --exclude CVS /usr/ports/comms/pilot-link/pkg/PLIST
pilot-link/pkg/PLIST
--- /usr/ports/comms/pilot-link/pkg/PLIST Sat Dec 11 05:59:46 2004
+++ pilot-link/pkg/PLIST Sun Oct 1 10:52:41 2006
@@ -1,9 +1,4 @@
@comment $OpenBSD: PLIST,v 1.11 2004/12/11 04:59:46 pvalchev Exp $
-bin/addresses
-bin/ccexample
-bin/debugsh
-bin/dlpsh
-bin/hinotes
bin/ietf2datebook
bin/install-datebook
bin/install-expenses
@@ -13,44 +8,47 @@
bin/install-todo
bin/install-todos
bin/install-user
-bin/memos
-bin/money2qif
-bin/pi-csd
-bin/pi-getram
-bin/pi-getrom
-bin/pi-getromtoken
-bin/pi-nredir
bin/pilot-addresses
-bin/pilot-archive
bin/pilot-clip
-bin/pilot-datebook
+bin/pilot-csd
+bin/pilot-debugsh
bin/pilot-dedupe
+bin/pilot-dlpsh
bin/pilot-file
bin/pilot-foto
-bin/pilot-prc
+bin/pilot-getram
+bin/pilot-getrom
+bin/pilot-getromtoken
+bin/pilot-hinotes
+bin/pilot-memos
+bin/pilot-nredir
+bin/pilot-reminders
bin/pilot-schlep
+bin/pilot-treofoto
bin/pilot-undelete
+bin/pilot-wav
bin/pilot-xfer
bin/read-expenses
bin/read-ical
bin/read-notepad
bin/read-palmpix
+bin/read-screenshot
bin/read-todos
-bin/reminders
+bin/read-veo
bin/sync-plan
include/pi-address.h
-include/pi-address.hxx
include/pi-appinfo.h
-include/pi-appinfo.hxx
include/pi-args.h
+include/pi-buffer.h
include/pi-cmp.h
+include/pi-contact.h
include/pi-datebook.h
-include/pi-datebook.hxx
include/pi-debug.h
include/pi-dlp.h
-include/pi-dlp.hxx
+include/pi-error.h
include/pi-expense.h
include/pi-file.h
+include/pi-foto.h
include/pi-header.h
include/pi-hinote.h
include/pi-inet.h
@@ -58,7 +56,6 @@
include/pi-mail.h
include/pi-md5.h
include/pi-memo.h
-include/pi-memo.hxx
include/pi-money.h
include/pi-net.h
include/pi-notepad.h
@@ -72,17 +69,22 @@
include/pi-sync.h
include/pi-sys.h
include/pi-syspkt.h
+include/pi-threadsafe.h
include/pi-todo.h
-include/pi-todo.hxx
include/pi-usb.h
include/pi-util.h
+include/pi-veo.h
+include/pi-versamail.h
include/pi-version.h
-lib/libpisock++.a
-lib/libpisock++.la
lib/libpisock.a
lib/libpisock.la
lib/libpisync.a
lib/libpisync.la
+lib/pkgconfig/
+lib/pkgconfig/pilot-link.pc
[EMAIL PROTECTED] libdata/perl5/${MACHINE_ARCH}-openbsd/
[EMAIL PROTECTED] libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/
[EMAIL PROTECTED] libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/perllocal.pod
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/PDA/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/PDA/Pilot.pm
@@ -92,9 +94,6 @@
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/PDA/Pilot/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/PDA/Pilot/Pilot.bs
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/PDA/Pilot/autosplit.ix
[EMAIL PROTECTED] man/man1/addresses.1
[EMAIL PROTECTED] man/man1/dlpsh.1
[EMAIL PROTECTED] man/man1/hinotes.1
@man man/man1/ietf2datebook.1
@man man/man1/install-datebook.1
@man man/man1/install-expenses.1
@@ -102,24 +101,41 @@
@man man/man1/install-memo.1
@man man/man1/install-netsync.1
@man man/man1/install-todo.1
[EMAIL PROTECTED] man/man1/install-todos.1
@man man/man1/install-user.1
[EMAIL PROTECTED] man/man1/memos.1
[EMAIL PROTECTED] man/man1/pi-getram.1
[EMAIL PROTECTED] man/man1/pi-getrom.1
@man man/man1/pilot-addresses.1
[EMAIL PROTECTED] man/man1/pilot-clip.1
[EMAIL PROTECTED] man/man1/pilot-csd.1
[EMAIL PROTECTED] man/man1/pilot-debugsh.1
[EMAIL PROTECTED] man/man1/pilot-dedupe.1
[EMAIL PROTECTED] man/man1/pilot-dlpsh.1
[EMAIL PROTECTED] man/man1/pilot-file.1
@man man/man1/pilot-foto.1
[EMAIL PROTECTED] man/man1/pilot-getram.1
[EMAIL PROTECTED] man/man1/pilot-getrom.1
[EMAIL PROTECTED] man/man1/pilot-getromtoken.1
[EMAIL PROTECTED] man/man1/pilot-hinotes.1
[EMAIL PROTECTED] man/man1/pilot-memos.1
[EMAIL PROTECTED] man/man1/pilot-nredir.1
[EMAIL PROTECTED] man/man1/pilot-reminders.1
[EMAIL PROTECTED] man/man1/pilot-schlep.1
[EMAIL PROTECTED] man/man1/pilot-treofoto.1
[EMAIL PROTECTED] man/man1/pilot-wav.1
@man man/man1/pilot-xfer.1
@man man/man1/read-expenses.1
@man man/man1/read-ical.1
@man man/man1/read-notepad.1
@man man/man1/read-palmpix.1
[EMAIL PROTECTED] man/man1/read-screenshot.1
@man man/man1/read-todos.1
[EMAIL PROTECTED] man/man1/read-veo.1
@man man/man7/pilot-link.7
share/aclocal/
share/aclocal/pilot-link.m4
+share/doc/pilot-link/
+share/doc/pilot-link/README.debugging
+share/doc/pilot-link/README.usb
share/pilot-link/
-share/pilot-link/getrom.prc
-share/pilot-link/getrom2.prc
share/pilot-link/pix/
share/pilot-link/pix/b1.gif
share/pilot-link/pix/b2.gif
@@ -131,4 +147,9 @@
share/pilot-link/pix/case.gif
share/pilot-link/pix/case.xbm
share/pilot-link/pix/casemask.xbm
+share/pilot-link/prc/
+share/pilot-link/prc/getrom.prc
+share/pilot-link/prc/getrom2.prc
%%SHARED%%
[EMAIL PROTECTED] share/pilot-link/udev/
[EMAIL PROTECTED] share/pilot-link/udev/60-libpisock.rules
diff -ruN --exclude CVS /usr/ports/comms/jpilot/Makefile jpilot/Makefile
--- /usr/ports/comms/jpilot/Makefile Mon Sep 18 19:07:31 2006
+++ jpilot/Makefile Sun Oct 1 12:05:05 2006
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.36 2006/09/18 11:40:07 espie Exp $
+# $OpenBSD: Makefile,v 1.35 2006/08/01 22:19:46 espie Exp $
COMMENT= "desktop organizer software for the palm pilot"
-DISTNAME= jpilot-0.99.8
-PKGNAME= ${DISTNAME}p3
+DISTNAME= jpilot-0.99.9
CATEGORIES= comms palm
MASTER_SITES= ${HOMEPAGE}
@@ -18,14 +17,14 @@
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= c readline crypto m ncurses X11 Xext \
- Xrender fontconfig freetype atk-1.0.>=800.0 \
- gdk_pixbuf-2.0.>=400.14 glib-2.0.>=400.8 gmodule-2.0.>=400.8 \
- gobject-2.0.>=400.8 pango-1.0.>=600.0 pangoft2-1.0.>=600.0 \
- pangocairo-1.0 cairo glitz png z
+WANTLIB= c crypto m X11 Xext Xrender fontconfig freetype png.>=5 \
+ atk-1.0.>=800.0 gdk_pixbuf-2.0.>=400.14 cairo glitz z \
+ glib-2.0.>=400.8 gmodule-2.0.>=400.8 pangocairo-1.0 \
+ gobject-2.0.>=400.8 pango-1.0.>=600.0 \
+ pangoft2-1.0.>=600.0
BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig
-LIB_DEPENDS= pisock.>=8::comms/pilot-link \
+LIB_DEPENDS= pisock.>=9::comms/pilot-link \
gtk-x11-2.0.>=400.13,gdk-x11-2.0.>=400.13,gdk_pixbuf-2.0.>=400.13::x11/gtk+2
MODULES= devel/gettext
@@ -37,11 +36,10 @@
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
- --enable-gtk2 \
--with-pilot-prefix=${LOCALBASE} \
--with-gtk-prefix=${LOCALBASE}
-MAN1= jpilot-dump.1 jpilot-sync.1 jpilot-upgrade-99.1 jpilot.1
+MAN1= jpilot-dump.1 jpilot-sync.1 jpilot.1
pre-build:
.for i in ${MAN1}
diff -ruN --exclude CVS /usr/ports/comms/jpilot/distinfo jpilot/distinfo
--- /usr/ports/comms/jpilot/distinfo Mon Oct 31 23:47:22 2005
+++ jpilot/distinfo Mon Aug 28 11:13:17 2006
@@ -1,4 +1,4 @@
-MD5 (jpilot-0.99.8.tar.gz) = 4bdb200367e691e64d02bd6dfcdec604
-RMD160 (jpilot-0.99.8.tar.gz) = 9d19e41a8d73f1dbfc5107e0ee1657ac09b55189
-SHA1 (jpilot-0.99.8.tar.gz) = 5ad7c15f4583a15afb7acd96db2c4e8e58311b29
-SIZE (jpilot-0.99.8.tar.gz) = 1589217
+MD5 (jpilot-0.99.9.tar.gz) = c39df29aeed57b84a674524856ebc290
+RMD160 (jpilot-0.99.9.tar.gz) = 0286b9f9579dbbdb8e9bd207384561814bab5114
+SHA1 (jpilot-0.99.9.tar.gz) = 19a76f8815188a1b7993fbff81624e852a3bbc5c
+SIZE (jpilot-0.99.9.tar.gz) = 1671351
diff -ruN --exclude CVS
/usr/ports/comms/jpilot/patches/patch-Expense_Makefile_in
jpilot/patches/patch-Expense_Makefile_in
--- /usr/ports/comms/jpilot/patches/patch-Expense_Makefile_in Mon Oct 31
23:47:22 2005
+++ jpilot/patches/patch-Expense_Makefile_in Mon Aug 28 11:21:12 2006
@@ -1,7 +1,7 @@
$OpenBSD: patch-Expense_Makefile_in,v 1.7 2005/10/31 21:08:15 naddy Exp $
---- Expense/Makefile.in.orig Mon Oct 31 19:48:02 2005
-+++ Expense/Makefile.in Mon Oct 31 19:48:19 2005
-@@ -247,7 +247,7 @@ target_alias = @target_alias@
+--- Expense/Makefile.in.orig Thu Aug 24 01:22:09 2006
++++ Expense/Makefile.in Mon Aug 28 11:19:49 2006
+@@ -248,7 +248,7 @@ target_alias = @target_alias@
@[EMAIL PROTECTED] = libexpense.la
@[EMAIL PROTECTED] = expense.c
@[EMAIL PROTECTED] = -Wall @PILOT_FLAGS@ @GTK_CFLAGS@ -I$(top_srcdir)
diff -ruN --exclude CVS
/usr/ports/comms/jpilot/patches/patch-KeyRing_Makefile_in
jpilot/patches/patch-KeyRing_Makefile_in
--- /usr/ports/comms/jpilot/patches/patch-KeyRing_Makefile_in Mon Oct 31
23:47:22 2005
+++ jpilot/patches/patch-KeyRing_Makefile_in Mon Aug 28 11:21:12 2006
@@ -1,7 +1,7 @@
$OpenBSD: patch-KeyRing_Makefile_in,v 1.3 2005/10/31 21:08:15 naddy Exp $
---- KeyRing/Makefile.in.orig Mon Oct 31 19:47:32 2005
-+++ KeyRing/Makefile.in Mon Oct 31 19:47:50 2005
-@@ -248,7 +248,7 @@ EXTRA_DIST = README.txt
+--- KeyRing/Makefile.in.orig Thu Aug 24 01:22:09 2006
++++ KeyRing/Makefile.in Mon Aug 28 11:19:49 2006
+@@ -249,7 +249,7 @@ EXTRA_DIST = README.txt
@[EMAIL PROTECTED] = libkeyring.la
@[EMAIL PROTECTED] = keyring.c
@[EMAIL PROTECTED] = -Wall @PILOT_FLAGS@ @GTK_CFLAGS@ -I$(top_srcdir)
diff -ruN --exclude CVS
/usr/ports/comms/jpilot/patches/patch-SyncTime_Makefile_in
jpilot/patches/patch-SyncTime_Makefile_in
--- /usr/ports/comms/jpilot/patches/patch-SyncTime_Makefile_in Mon Oct 31
23:47:22 2005
+++ jpilot/patches/patch-SyncTime_Makefile_in Mon Aug 28 11:21:12 2006
@@ -1,7 +1,7 @@
$OpenBSD: patch-SyncTime_Makefile_in,v 1.7 2005/10/31 21:08:15 naddy Exp $
---- SyncTime/Makefile.in.orig Mon Oct 31 19:46:59 2005
-+++ SyncTime/Makefile.in Mon Oct 31 19:47:17 2005
-@@ -247,7 +247,7 @@ target_alias = @target_alias@
+--- SyncTime/Makefile.in.orig Thu Aug 24 01:22:10 2006
++++ SyncTime/Makefile.in Mon Aug 28 11:19:49 2006
+@@ -248,7 +248,7 @@ target_alias = @target_alias@
@[EMAIL PROTECTED] = libsynctime.la
@[EMAIL PROTECTED] = synctime.c
@[EMAIL PROTECTED] = -Wall @PILOT_FLAGS@ @GTK_CFLAGS@ -I$(top_srcdir)
diff -ruN --exclude CVS /usr/ports/comms/jpilot/patches/patch-docs_Makefile_in
jpilot/patches/patch-docs_Makefile_in
--- /usr/ports/comms/jpilot/patches/patch-docs_Makefile_in Mon Oct 31
23:47:22 2005
+++ jpilot/patches/patch-docs_Makefile_in Mon Aug 28 11:21:12 2006
@@ -1,7 +1,7 @@
$OpenBSD: patch-docs_Makefile_in,v 1.2 2005/10/31 21:08:15 naddy Exp $
---- docs/Makefile.in.orig Mon Oct 31 18:58:28 2005
-+++ docs/Makefile.in Mon Oct 31 19:05:36 2005
-@@ -231,7 +231,7 @@ target_alias = @target_alias@
+--- docs/Makefile.in.orig Thu Aug 24 01:22:10 2006
++++ docs/Makefile.in Mon Aug 28 11:19:49 2006
+@@ -232,7 +232,7 @@ target_alias = @target_alias@
# install the man pages
man_MANS = jpilot.1 jpilot-dial.1 jpilot-sync.1 jpilot-dump.1
diff -ruN --exclude CVS /usr/ports/comms/jpilot/patches/patch-icons_Makefile_in
jpilot/patches/patch-icons_Makefile_in
--- /usr/ports/comms/jpilot/patches/patch-icons_Makefile_in Mon Oct 31
23:47:22 2005
+++ jpilot/patches/patch-icons_Makefile_in Mon Aug 28 11:21:12 2006
@@ -1,7 +1,7 @@
$OpenBSD: patch-icons_Makefile_in,v 1.2 2005/10/31 21:08:15 naddy Exp $
---- icons/Makefile.in.orig Mon Oct 31 19:27:50 2005
-+++ icons/Makefile.in Mon Oct 31 19:28:04 2005
-@@ -223,7 +223,7 @@ sbindir = @sbindir@
+--- icons/Makefile.in.orig Thu Aug 24 01:22:10 2006
++++ icons/Makefile.in Mon Aug 28 11:19:49 2006
+@@ -224,7 +224,7 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
diff -ruN --exclude CVS /usr/ports/comms/jpilot/patches/patch-jpilot-sync_c
jpilot/patches/patch-jpilot-sync_c
--- /usr/ports/comms/jpilot/patches/patch-jpilot-sync_c Sun Dec 4 23:19:24 2005
+++ jpilot/patches/patch-jpilot-sync_c Thu Jan 1 01:00:00 1970
@@ -1,11 +0,0 @@
-$OpenBSD: patch-jpilot-sync_c,v 1.1 2005/12/04 22:19:24 steven Exp $
---- jpilot-sync.c.orig Sun Dec 4 16:09:12 2005
-+++ jpilot-sync.c Sun Dec 4 16:09:31 2005
-@@ -44,6 +44,7 @@ int pipe_to_parent, pipe_from_parent;
- pid_t glob_child_pid;
- GtkWidget *glob_dialog;
- pid_t glob_child_pid;
-+GtkTooltips *glob_tooltips;
-
- unsigned char skip_plugins;
-
diff -ruN --exclude CVS /usr/ports/comms/jpilot/patches/patch-jpilot_c
jpilot/patches/patch-jpilot_c
--- /usr/ports/comms/jpilot/patches/patch-jpilot_c Tue Jun 13 09:38:01 2006
+++ jpilot/patches/patch-jpilot_c Wed Sep 27 09:30:30 2006
@@ -1,19 +1,69 @@
-$OpenBSD: patch-jpilot_c,v 1.1 2006/06/13 07:38:01 bernd Exp $
-
-Fixes a startup crash. From jpilot CVS. Will be fixed in 0.99.9.
-
-Log Message:
-get_inline_pixbuf_data(): use g_object_unref() instead of g_free() since
-gdk_pixbuf_new_from_xpm_data() returns an object.
-
---- jpilot.c.orig Tue Jun 13 08:51:31 2006
-+++ jpilot.c Tue Jun 13 08:51:51 2006
-@@ -1371,7 +1371,7 @@ guint8 *get_inline_pixbuf_data(const cha
- gdk_pixdata_from_pixbuf(pixdata, pixbuf, FALSE);
- data = gdk_pixdata_serialize(pixdata, &len);
+$OpenBSD$
+--- jpilot.c.orig Fri Jun 9 22:42:57 2006
++++ jpilot.c Wed Sep 27 09:30:26 2006
+@@ -1,4 +1,4 @@
+-/* $Id: jpilot.c,v 1.140 2006/06/09 20:42:57 judd Exp $ */
++/* $Id: jpilot.c,v 1.141 2006/09/26 21:03:40 rikster5 Exp $ */
-- g_free(pixbuf);
-+ g_object_unref(pixbuf);
- g_free(pixdata);
+
/*******************************************************************************
+ * jpilot.c
+@@ -1953,11 +1953,21 @@ int main(int argc, char *argv[])
+ GtkWidget *menubar;
+ #ifdef ENABLE_GTK2
+ GtkWidget *scrolled_window;
+- char *week_start;
+- int pref_fdow = 0;
+ #else
+ GtkWidget *vscrollbar;
+ #endif
++/* Extract first day of week preference from locale in GTK2 */
++#ifdef ENABLE_GTK2
++ int pref_fdow = 0;
++# ifdef HAVE__NL_TIME_FIRST_WEEKDAY
++ char *langinfo;
++ int week_1stday = 0;
++ int first_weekday = 1;
++ unsigned int week_origin;
++# else
++ char *week_start;
++# endif
++#endif
+ unsigned char skip_past_alarms;
+ unsigned char skip_all_alarms;
+ int filedesc[2];
+@@ -2179,18 +2189,31 @@ char * xpm_backup[] = {
+ pref_read_rc_file();
- return data;
+ /* Extract first day of week preference from locale in GTK2 */
++
+ # ifdef ENABLE_GTK2
+-# ifdef HAVE_LANGINFO_H
++# ifdef HAVE__NL_TIME_FIRST_WEEKDAY
+ /* GTK 2.8 libraries */
+- week_start = nl_langinfo (_NL_TIME_FIRST_WEEKDAY);
+- pref_fdow = *((unsigned char *) week_start) - 1;
++ langinfo = nl_langinfo(_NL_TIME_FIRST_WEEKDAY);
++ first_weekday = langinfo[0];
++ langinfo = nl_langinfo(_NL_TIME_WEEK_1STDAY);
++ week_origin = GPOINTER_TO_INT(langinfo);
++ if (week_origin == 19971130) /* Sunday */
++ week_1stday = 0;
++ else if (week_origin == 19971201) /* Monday */
++ week_1stday = 1;
++ else
++ g_warning ("Unknown value of _NL_TIME_WEEK_1STDAY.\n");
++
++ pref_fdow = (week_1stday + first_weekday - 1) % 7;
+ # else
+ /* GTK 2.6 libraries */
+ # if defined(ENABLE_NLS)
+ week_start = dgettext("gtk20", "calendar:week_start:0");
+ if (strncmp("calendar:week_start:", week_start, 20) == 0) {
+ pref_fdow = *(week_start + 20) - '0';
+- }
++ } else {
++ pref_fdow = -1;
++ }
+ # endif
+ # endif
+ if (pref_fdow > 1)
diff -ruN --exclude CVS /usr/ports/comms/jpilot/pkg/PLIST jpilot/pkg/PLIST
--- /usr/ports/comms/jpilot/pkg/PLIST Wed Dec 7 20:03:48 2005
+++ jpilot/pkg/PLIST Mon Aug 28 11:49:31 2006
@@ -25,7 +25,6 @@
share/doc/jpilot/INSTALL
share/doc/jpilot/README
share/doc/jpilot/TODO
-share/doc/jpilot/UPGRADING
share/doc/jpilot/icons/
share/doc/jpilot/icons/README
share/doc/jpilot/icons/jpilot-icon1.xpm
@@ -72,6 +71,7 @@
share/locale/fr/LC_MESSAGES/jpilot.mo
share/locale/it/LC_MESSAGES/jpilot.mo
share/locale/ja/LC_MESSAGES/jpilot.mo
+share/locale/ko/LC_MESSAGES/jpilot.mo
share/locale/nl/LC_MESSAGES/jpilot.mo
share/locale/no/LC_MESSAGES/jpilot.mo
share/locale/ru/LC_MESSAGES/jpilot.mo
@@ -80,6 +80,7 @@
share/locale/rw/LC_MESSAGES/jpilot.mo
share/locale/sv/LC_MESSAGES/jpilot.mo
share/locale/tr/LC_MESSAGES/jpilot.mo
+share/locale/uk/LC_MESSAGES/jpilot.mo
share/locale/vi/LC_MESSAGES/jpilot.mo
share/locale/zh_CN/LC_MESSAGES/jpilot.mo
share/locale/zh_TW/LC_MESSAGES/jpilot.mo
