Revert removal of pilot-link and jpilot; we still have one user of these...

This commit is contained in:
ajacoutot 2015-09-21 08:46:50 +00:00
parent 29a1af46fd
commit e18d7ebea1
24 changed files with 1363 additions and 11 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.63 2015/09/19 22:21:20 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.64 2015/09/21 08:46:50 ajacoutot Exp $
SUBDIR =
SUBDIR += amtterm
@ -20,6 +20,7 @@
SUBDIR += hamlib
SUBDIR += hylafax
SUBDIR += hylafax,a4
SUBDIR += jpilot
SUBDIR += kermit
SUBDIR += lcdproc
SUBDIR += lrzsz
@ -34,6 +35,7 @@
SUBDIR += p5-Device-SerialPort
SUBDIR += p5-SendPage
SUBDIR += picocom
SUBDIR += pilot-link
SUBDIR += qpage
SUBDIR += rtl-sdr
SUBDIR += scmxx

47
comms/jpilot/Makefile Normal file
View File

@ -0,0 +1,47 @@
# $OpenBSD: Makefile,v 1.69 2015/09/21 08:46:50 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT= desktop organizer software for the palm pilot
DISTNAME= jpilot-1.8.2
CATEGORIES= comms
HOMEPAGE= http://www.jpilot.org/
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
WANTLIB += Xrandr Xrender atk-1.0 c cairo expat ffi fontconfig
WANTLIB += freetype gcrypt gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0
WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 gpg-error graphite2
WANTLIB += gthread-2.0 gtk-x11-2.0 harfbuzz m pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pcre pisock pixman-1 png pthread pthread-stubs
WANTLIB += xcb xcb-render xcb-shm z
MASTER_SITES= http://www.jpilot.org/
LIB_DEPENDS= comms/pilot-link \
security/libgcrypt \
x11/gtk+2
RUN_DEPENDS= devel/desktop-file-utils
MODULES= devel/gettext \
textproc/intltool
USE_GMAKE= Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--with-pilot-prefix=${LOCALBASE}
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
${INSTALL_DATA} ${WRKSRC}/jpilot.xpm ${PREFIX}/share/pixmaps
rm ${PREFIX}/lib/jpilot/plugins/*.{a,la}
.include <bsd.port.mk>

2
comms/jpilot/distinfo Normal file
View File

@ -0,0 +1,2 @@
SHA256 (jpilot-1.8.2.tar.gz) = LCjtes6ieuPVQQNvLiyl7X4BIbrfR348+l7I0oIzfiM=
SIZE (jpilot-1.8.2.tar.gz) = 1740735

4
comms/jpilot/pkg/DESCR Normal file
View File

@ -0,0 +1,4 @@
J-Pilot is a desktop organizer application for the palm pilot that
runs under Linux and Unix. It is similar in functionality to the
one that 3Com distributes and has many features not found in the 3Com
desktop.

91
comms/jpilot/pkg/PLIST Normal file
View File

@ -0,0 +1,91 @@
@comment $OpenBSD: PLIST,v 1.18 2015/09/21 08:46:50 ajacoutot Exp $
@bin bin/jpilot
@bin bin/jpilot-dump
@bin bin/jpilot-merge
@bin bin/jpilot-sync
lib/jpilot/
lib/jpilot/plugins/
lib/jpilot/plugins/libexpense.so
lib/jpilot/plugins/libkeyring.so
lib/jpilot/plugins/libsynctime.so
@comment @man man/man1/jpilot-dial.1
@man man/man1/jpilot-dump.1
@man man/man1/jpilot-merge.1
@man man/man1/jpilot-sync.1
@man man/man1/jpilot.1
share/applications/jpilot.desktop
share/doc/jpilot/
share/doc/jpilot/AUTHORS
share/doc/jpilot/BUGS
share/doc/jpilot/COPYING
share/doc/jpilot/ChangeLog
share/doc/jpilot/INSTALL
share/doc/jpilot/README
share/doc/jpilot/TODO
share/doc/jpilot/icons/
share/doc/jpilot/icons/README
share/doc/jpilot/icons/jpilot-icon1.xpm
share/doc/jpilot/icons/jpilot-icon2.xpm
share/doc/jpilot/icons/jpilot-icon3.xpm
share/doc/jpilot/icons/jpilot-icon4.xpm
share/doc/jpilot/manual/
share/doc/jpilot/manual/jpilot-address.png
share/doc/jpilot/manual/jpilot-datebook.png
share/doc/jpilot/manual/jpilot-expense.png
share/doc/jpilot/manual/jpilot-install.png
share/doc/jpilot/manual/jpilot-memo.png
share/doc/jpilot/manual/jpilot-prefs-1.png
share/doc/jpilot/manual/jpilot-prefs-2.png
share/doc/jpilot/manual/jpilot-prefs-3.png
share/doc/jpilot/manual/jpilot-prefs-4.png
share/doc/jpilot/manual/jpilot-prefs-5.png
share/doc/jpilot/manual/jpilot-prefs-6.png
share/doc/jpilot/manual/jpilot-prefs-7.png
share/doc/jpilot/manual/jpilot-prefs-8.png
share/doc/jpilot/manual/jpilot-print.png
share/doc/jpilot/manual/jpilot-search.png
share/doc/jpilot/manual/jpilot-todo.png
share/doc/jpilot/manual/jpilot-toplogo.jpg
share/doc/jpilot/manual/manual.html
share/doc/jpilot/manual/plugin.html
share/jpilot/
share/jpilot/AddressDB.pdb
share/jpilot/CalendarDB-PDat.pdb
share/jpilot/ContactsDB-PAdd.pdb
share/jpilot/DatebookDB.pdb
share/jpilot/ExpenseDB.pdb
share/jpilot/MananaDB.pdb
share/jpilot/Memo32DB.pdb
share/jpilot/MemoDB.pdb
share/jpilot/MemosDB-PMem.pdb
share/jpilot/TasksDB-PTod.pdb
share/jpilot/ToDoDB.pdb
share/jpilot/jpilotrc.blue
share/jpilot/jpilotrc.default
share/jpilot/jpilotrc.green
share/jpilot/jpilotrc.purple
share/jpilot/jpilotrc.steel
share/locale/ca/LC_MESSAGES/jpilot.mo
share/locale/cs/LC_MESSAGES/jpilot.mo
share/locale/da/LC_MESSAGES/jpilot.mo
share/locale/de/LC_MESSAGES/jpilot.mo
share/locale/es/LC_MESSAGES/jpilot.mo
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/nb/LC_MESSAGES/jpilot.mo
share/locale/nl/LC_MESSAGES/jpilot.mo
share/locale/pt_BR/LC_MESSAGES/jpilot.mo
share/locale/ru/LC_MESSAGES/jpilot.mo
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
share/pixmaps/
share/pixmaps/jpilot.xpm
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database

68
comms/pilot-link/Makefile Normal file
View File

@ -0,0 +1,68 @@
# $OpenBSD: Makefile,v 1.78 2015/09/21 08:46:50 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT= tools to connect your PalmOS(R) compatible handheld
DISTNAME= pilot-link-0.12.5
REVISION= 8
SHARED_LIBS += pisock 11.0 # 9.2
SHARED_LIBS += pisync 2.0 # 1.3
CATEGORIES= comms
MASTER_SITES= http://downloads.pilot-link.org/ \
http://ftp.belnet.be/mirror/rsync.gentoo.org/gentoo/distfiles/ \
http://gentoo.oregonstate.edu/distfiles/
HOMEPAGE= http://www.pilot-link.org/
EXTRACT_SUFX= .tar.bz2
# GPLv2 - LGPLv2
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += c m png popt pthread readline termcap z
MODULES= devel/gettext
LIB_DEPENDS= graphics/png \
devel/popt
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
ac_cv_lib_png_main=yes
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--with-libiconv=${LOCALBASE} \
--with-libpng=${LOCALBASE} \
--with-perl=/usr/bin/perl \
--with-readline \
--enable-conduits \
--enable-threads \
--without-bluez \
--without-efence \
--without-java \
--without-python \
--without-tcl
post-extract:
rm ${WRKSRC}/bindings/Perl/Pilot.xs.orig
pre-configure:
sed -i "s,!!CFLAGS!!,${CFLAGS},g" ${WRKSRC}/bindings/Perl/Makefile.PL.in
sed -i "s,Libs: ,Libs: -pthread ,g" \
${WRKSRC}/pilot-link.pc.in ${WRKSRC}/pilot-link-pp.pc.in
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
${INSTALL_MAN} ${WRKSRC}/doc/man/*.1 ${PREFIX}/man/man1
${INSTALL_MAN} ${WRKSRC}/doc/man/*.7 ${PREFIX}/man/man7
rm -rf ${PREFIX}/share/pilot-link/udev/
.include <bsd.port.mk>

View File

@ -0,0 +1,2 @@
SHA256 (pilot-link-0.12.5.tar.bz2) = 0/mewEAWs4mV+zcCZSACVHEDGBBceSwBfTqsz7l6hLI=
SIZE (pilot-link-0.12.5.tar.bz2) = 1578735

View File

@ -0,0 +1,21 @@
$OpenBSD: patch-bindings_Perl_Makefile_PL_in,v 1.5 2015/09/21 08:46:50 ajacoutot Exp $
PERL_POLLUTE removal :-
Allow pilot-link's perl bindings to build with newer Perl.
From Debian ticket 628510
--- bindings/Perl/Makefile.PL.in.orig Sat Mar 17 19:03:45 2007
+++ bindings/Perl/Makefile.PL.in Mon Mar 18 22:07:45 2013
@@ -39,10 +39,10 @@ WriteMakefile(
'VERSION' => '@PILOT_LINK_VERS@.@PILOT_LINK_MAJOR@.@PILOT_LINK_MINOR@@PILOT_LINK_PATCH@',
'XSPROTOARG' => '-noprototypes',
'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'},
+ 'OPTIMIZE' => "!!CFLAGS!!",
);

View File

@ -0,0 +1,577 @@
$OpenBSD: patch-bindings_Perl_Pilot_xs,v 1.3 2015/09/21 08:46:50 ajacoutot Exp $
Allow pilot-link's perl bindings to build with newer Perl.
From Debian ticket 628510
--- bindings/Perl/Pilot.xs.orig Mon Nov 12 17:49:54 2007
+++ bindings/Perl/Pilot.xs Mon Mar 18 22:07:45 2013
@@ -160,7 +160,7 @@ SvChar4(arg)
#define pack_dbinfo(arg, var, failure) { \
if (failure < 0) { \
- arg = &sv_undef; \
+ arg = &PL_sv_undef; \
self->errnop = failure; \
} else { \
HV * i = newHV(); \
@@ -214,15 +214,15 @@ SvChar4(arg)
var.createDate = (s = hv_fetch(i, "createDate", 10, 0)) ? SvIV(*s) : 0;\
var.modifyDate = (s = hv_fetch(i, "modifyDate", 10, 0)) ? SvIV(*s) : 0;\
var.backupDate = (s = hv_fetch(i, "backupDate", 10, 0)) ? SvIV(*s) : 0;\
- if ((s = hv_fetch(i, "name", 4, 0)) ? SvPV(*s,na) : 0) \
- strncpy(var.name, SvPV(*s, na), sizeof(var.name)); \
+ if ((s = hv_fetch(i, "name", 4, 0)) ? SvPV(*s,PL_na) : 0) \
+ strncpy(var.name, SvPV(*s, PL_na), sizeof(var.name)); \
} else {\
croak("argument is not a hash reference"); \
}
#define pack_userinfo(arg, var, failure) { \
if (failure < 0) { \
- arg = &sv_undef; \
+ arg = &PL_sv_undef; \
self->errnop = failure; \
} else { \
HV * i = newHV(); \
@@ -246,8 +246,8 @@ SvChar4(arg)
var.lastSyncPC = (s = hv_fetch(i, "lastSyncPC", 10, 0)) ? SvIV(*s) : 0;\
var.lastSyncDate = (s = hv_fetch(i, "lastSyncDate", 12, 0)) ? SvIV(*s) : 0;\
var.successfulSyncDate = (s = hv_fetch(i, "successfulSyncDate", 18, 0)) ? SvIV(*s) : 0;\
- if ((s = hv_fetch(i, "name", 4, 0)) ? SvPV(*s,na) : 0)\
- strncpy(var.username, SvPV(*s, na), sizeof(var.username));\
+ if ((s = hv_fetch(i, "name", 4, 0)) ? SvPV(*s,PL_na) : 0)\
+ strncpy(var.username, SvPV(*s, PL_na), sizeof(var.username));\
} else {\
croak("argument is not a hash reference");\
}
@@ -287,7 +287,7 @@ SvChar4(arg)
}\
} else {\
self->errnop = result;\
- PUSHs(&sv_undef);\
+ PUSHs(&PL_sv_undef);\
}
#define PackSI\
@@ -329,7 +329,7 @@ SvChar4(arg)
}\
} else {\
self->errnop = result;\
- PUSHs(&sv_undef);\
+ PUSHs(&PL_sv_undef);\
}
#define PackRecord {\
@@ -421,7 +421,7 @@ SvChar4(arg)
}\
} else {\
self->errnop = result;\
- PUSHs(&sv_undef);\
+ PUSHs(&PL_sv_undef);\
}
#define PackResource\
@@ -473,7 +473,7 @@ SvChar4(arg)
}\
} else {\
self->errnop = result;\
- PUSHs(&sv_undef);\
+ PUSHs(&PL_sv_undef);\
}
#define PackPref\
@@ -536,7 +536,7 @@ SvChar4(arg)
croak("Unable to create resource");\
} else {\
self->errnop = result;\
- PUSHs(&sv_undef);\
+ PUSHs(&PL_sv_undef);\
}
void doUnpackCategory(HV * self, struct CategoryAppInfo * c)
@@ -576,7 +576,7 @@ void doPackCategory(HV * self, struct CategoryAppInfo
if ((s = hv_fetch(self, "categoryName", 12, 0)) && SvOK(*s) && SvRV(*s) && (SvTYPE(av=(AV*)SvRV(*s))==SVt_PVAV))
for (i=0;i<16;i++)
- strncpy(c->name[i], (s=av_fetch(av, i, 0)) ? SvPV(*s,na) : "", 16);
+ strncpy(c->name[i], (s=av_fetch(av, i, 0)) ? SvPV(*s,PL_na) : "", 16);
else
for (i=0;i<16;i++)
strcpy(c->name[i], "");
@@ -602,7 +602,7 @@ void doPackCategory(HV * self, struct CategoryAppInfo
int SvList(SV * arg, char **list)
{
int i;
- char * str = SvPV(arg, na);
+ char * str = SvPV(arg, PL_na);
for (i=0;list[i];i++)
if (strcasecmp(list[i], str)==0)
return i;
@@ -781,11 +781,11 @@ Pack(record)
croak("Invalid advance unit %d encountered", u);
}
} else {
- if (strEQ(SvPV(*s, na), "minutes"))
+ if (strEQ(SvPV(*s, PL_na), "minutes"))
u = 0;
- else if (strEQ(SvPV(*s, na), "hours"))
+ else if (strEQ(SvPV(*s, PL_na), "hours"))
u = 1;
- else if (strEQ(SvPV(*s, na), "days"))
+ else if (strEQ(SvPV(*s, PL_na), "days"))
u = 2;
else
croak("Invalid advance unit %d encountered", u);
@@ -850,10 +850,10 @@ Pack(record)
}
}
- a.description = (s = hv_fetch(h, "description", 11, 0)) ? SvPV(*s,na) : 0;
+ a.description = (s = hv_fetch(h, "description", 11, 0)) ? SvPV(*s,PL_na) : 0;
if (!a.description)
croak("appointments must contain a description");
- a.note = (s = hv_fetch(h, "note", 4, 0)) ? SvPV(*s,na) : 0;
+ a.note = (s = hv_fetch(h, "note", 4, 0)) ? SvPV(*s,PL_na) : 0;
if (pack_Appointment(&a, &pibuf, datebook_v1) < 0) {
croak("pack_Appointment failed");
@@ -897,7 +897,7 @@ UnpackAppBlock(record)
}
SvPV(record,len);
- if (unpack_AppointmentAppInfo(&a, (CPTR)SvPV(record, na), len)>0) {
+ if (unpack_AppointmentAppInfo(&a, (CPTR)SvPV(record, PL_na), len)>0) {
doUnpackCategory(ret, &a.category);
@@ -1023,8 +1023,8 @@ Pack(record)
a.indefinite = 1;
}
- a.description = (s = hv_fetch(h, "description", 11, 0)) ? SvPV(*s,na) : 0;
- a.note = (s = hv_fetch(h, "note", 4, 0)) ? SvPV(*s,na) : 0;
+ a.description = (s = hv_fetch(h, "description", 11, 0)) ? SvPV(*s,PL_na) : 0;
+ a.note = (s = hv_fetch(h, "note", 4, 0)) ? SvPV(*s,PL_na) : 0;
if (pack_ToDo(&a, &pibuf, todo_v1) < 0) {
croak("pack_ToDo failed");
@@ -1065,7 +1065,7 @@ UnpackAppBlock(record)
}
SvPV(record,len);
- if (unpack_ToDoAppInfo(&a, (CPTR)SvPV(record, na), len)>0) {
+ if (unpack_ToDoAppInfo(&a, (CPTR)SvPV(record, PL_na), len)>0) {
doUnpackCategory(ret, &a.category);
@@ -1160,7 +1160,7 @@ Unpack(record)
hv_store(ret, "entry", 5, newRV_noinc((SV*)e), 0);
for (i=0;i<19;i++) {
- av_push(e, a.entry[i] ? newSVpv(a.entry[i],0) : &sv_undef);
+ av_push(e, a.entry[i] ? newSVpv(a.entry[i],0) : &PL_sv_undef);
}
hv_store(ret, "showPhone", 9, newSViv(a.showPhone), 0);
@@ -1200,7 +1200,7 @@ Pack(record)
if ((s = hv_fetch(h, "entry", 5, 0)) && SvOK(*s) && SvRV(*s) && (SvTYPE(av=(AV*)SvRV(*s))==SVt_PVAV))
for (i=0;i<19;i++)
- a.entry[i] = ((s=av_fetch(av, i, 0)) && SvOK(*s)) ? SvPV(*s,na) : 0;
+ a.entry[i] = ((s=av_fetch(av, i, 0)) && SvOK(*s)) ? SvPV(*s,PL_na) : 0;
else
for (i=0;i<19;i++)
a.entry[i] = 0;
@@ -1249,7 +1249,7 @@ UnpackAppBlock(record)
}
SvPV(record,len);
- if (unpack_AddressAppInfo(&a, (CPTR)SvPV(record, na), len)>0) {
+ if (unpack_AddressAppInfo(&a, (CPTR)SvPV(record, PL_na), len)>0) {
doUnpackCategory(ret, &a.category);
@@ -1309,13 +1309,13 @@ PackAppBlock(record)
a.sortByCompany = (s = hv_fetch(h, "sortByCompany", 13, 0)) ? SvIV(*s) : 0;
if ((s = hv_fetch(h, "label", 5, 0)) && SvOK(*s) && SvRV(*s) && (SvTYPE(av=(AV*)SvRV(*s))==SVt_PVAV))
- for (i=0;i<22;i++) strncpy(a.labels[i], (s=av_fetch(av, i, 0)) ? SvPV(*s,na) : "", 16);
+ for (i=0;i<22;i++) strncpy(a.labels[i], (s=av_fetch(av, i, 0)) ? SvPV(*s,PL_na) : "", 16);
else
for (i=0;i<22;i++) a.labels[i][0] = 0;
for (i=0;i<22;i++) a.labels[i][15] = 0;
if ((s = hv_fetch(h, "phoneLabel", 10, 0)) && SvOK(*s) && SvRV(*s) && (SvTYPE(av=(AV*)SvRV(*s))==SVt_PVAV))
- for (i=0;i<8;i++) strncpy(a.phoneLabels[i], (s=av_fetch(av, i, 0)) ? SvPV(*s,na) : "", 16);
+ for (i=0;i<8;i++) strncpy(a.phoneLabels[i], (s=av_fetch(av, i, 0)) ? SvPV(*s,PL_na) : "", 16);
else
for (i=0;i<8;i++) a.phoneLabels[i][0] = 0;
for (i=0;i<8;i++) a.phoneLabels[i][15] = 0;
@@ -1396,7 +1396,7 @@ Pack(record)
else {
if ((s = hv_fetch(h, "text", 4, 0)))
- a.text = SvPV(*s,na);
+ a.text = SvPV(*s,PL_na);
else
a.text = 0;
@@ -1438,7 +1438,7 @@ UnpackAppBlock(record)
}
SvPV(record,len);
- if (unpack_MemoAppInfo(&a, (CPTR)SvPV(record, na), len)>0) {
+ if (unpack_MemoAppInfo(&a, (CPTR)SvPV(record, PL_na), len)>0) {
doUnpackCategory(ret, &a.category);
@@ -1510,7 +1510,7 @@ Unpack(record)
SvPV(record,len);
if (len > 0) { /* len == 0 if deleted flag is set */
- if (unpack_Expense(&e, (CPTR)SvPV(record, na), len)>0) {
+ if (unpack_Expense(&e, (CPTR)SvPV(record, PL_na), len)>0) {
hv_store(ret, "date", 4, newRV_noinc((SV*)tmtoav(&e.date)), 0);
hv_store(ret, "type", 4, newSVlist(e.type,ExpenseTypeNames),0);
@@ -1570,15 +1570,15 @@ Pack(record)
avtotm((AV*)SvRV(*s), &e.date);
else
croak("expense record must contain date");
- if ((s = hv_fetch(h, "amount", 6, 0))) e.amount = SvPV(*s,na);
+ if ((s = hv_fetch(h, "amount", 6, 0))) e.amount = SvPV(*s,PL_na);
else e.amount = 0;
- if ((s = hv_fetch(h, "vendor", 6, 0))) e.vendor = SvPV(*s,na);
+ if ((s = hv_fetch(h, "vendor", 6, 0))) e.vendor = SvPV(*s,PL_na);
else e.vendor = 0;
- if ((s = hv_fetch(h, "city", 4, 0))) e.city = SvPV(*s,na);
+ if ((s = hv_fetch(h, "city", 4, 0))) e.city = SvPV(*s,PL_na);
else e.city = 0;
- if ((s = hv_fetch(h, "attendess", 9, 0))) e.attendees = SvPV(*s,na);
+ if ((s = hv_fetch(h, "attendess", 9, 0))) e.attendees = SvPV(*s,PL_na);
else e.attendees = 0;
- if ((s = hv_fetch(h, "note", 4, 0))) e.note = SvPV(*s,na);
+ if ((s = hv_fetch(h, "note", 4, 0))) e.note = SvPV(*s,PL_na);
else e.note = 0;
len = pack_Expense(&e, mybuf, 0xffff);
@@ -1619,7 +1619,7 @@ UnpackAppBlock(record)
}
SvPV(record,len);
- if (unpack_ExpenseAppInfo(&e, (CPTR)SvPV(record, na), len)>0) {
+ if (unpack_ExpenseAppInfo(&e, (CPTR)SvPV(record, PL_na), len)>0) {
hv_store(ret, "sortOrder", 9, newSVlist(e.sortOrder,ExpenseSortNames),0);
a = newAV();
@@ -1662,15 +1662,15 @@ PackAppBlock(record)
HV * hv;
if ((s=av_fetch(av, i, 0)) && SvOK(*s) && SvRV(*s) && (SvTYPE(hv=(HV*)SvRV(*s))==SVt_PVHV)) {
if (s = hv_fetch(hv, "name", 4, 0)) {
- strncpy(e.currencies[i].name, SvPV(*s, na), 16);
+ strncpy(e.currencies[i].name, SvPV(*s, PL_na), 16);
e.currencies[i].name[15] = 0;
}
if (s = hv_fetch(hv, "symbol", 6, 0)) {
- strncpy(e.currencies[i].symbol, SvPV(*s, na), 4);
+ strncpy(e.currencies[i].symbol, SvPV(*s, PL_na), 4);
e.currencies[i].symbol[3] = 0;
}
if (s = hv_fetch(hv, "rate", 4, 0)) {
- strncpy(e.currencies[i].rate, SvPV(*s, na), 8);
+ strncpy(e.currencies[i].rate, SvPV(*s, PL_na), 8);
e.currencies[i].rate[7] = 0;
}
}
@@ -1718,7 +1718,7 @@ UnpackPref(record)
}
SvPV(record,len);
- if (unpack_ExpensePref(&a, (CPTR)SvPV(record, na), len)>0) {
+ if (unpack_ExpensePref(&a, (CPTR)SvPV(record, PL_na), len)>0) {
hv_store(ret, "unitOfDistance", 14, newSVlist(a.unitOfDistance, ExpenseDistanceNames), 0);
hv_store(ret, "currentCategory", 15, newSViv(a.currentCategory), 0);
@@ -1811,7 +1811,7 @@ Unpack(record)
SvPV(record,len);
if (len > 0) { /* len == 0 if deleted flag is set */
- if (unpack_Mail(&a, (CPTR)SvPV(record, na), len)>0) {
+ if (unpack_Mail(&a, (CPTR)SvPV(record, PL_na), len)>0) {
if (a.subject) hv_store(ret, "subject", 7, newSVpv(a.subject,0), 0);
if (a.from) hv_store(ret, "from", 4, newSVpv(a.from,0), 0);
@@ -1858,14 +1858,14 @@ Pack(record)
}
else {
- a.subject = (s = hv_fetch(h, "subject", 7, 0)) ? SvPV(*s,na) : 0;
- a.from = (s = hv_fetch(h, "from", 4, 0)) ? SvPV(*s,na) : 0;
- a.to = (s = hv_fetch(h, "to", 2, 0)) ? SvPV(*s,na) : 0;
- a.cc = (s = hv_fetch(h, "cc", 2, 0)) ? SvPV(*s,na) : 0;
- a.bcc = (s = hv_fetch(h, "bcc", 3, 0)) ? SvPV(*s,na) : 0;
- a.replyTo = (s = hv_fetch(h, "replyTo", 7, 0)) ? SvPV(*s,na) : 0;
- a.sentTo = (s = hv_fetch(h, "sentTo", 6, 0)) ? SvPV(*s,na) : 0;
- a.body = (s = hv_fetch(h, "body", 4, 0)) ? SvPV(*s,na) : 0;
+ a.subject = (s = hv_fetch(h, "subject", 7, 0)) ? SvPV(*s,PL_na) : 0;
+ a.from = (s = hv_fetch(h, "from", 4, 0)) ? SvPV(*s,PL_na) : 0;
+ a.to = (s = hv_fetch(h, "to", 2, 0)) ? SvPV(*s,PL_na) : 0;
+ a.cc = (s = hv_fetch(h, "cc", 2, 0)) ? SvPV(*s,PL_na) : 0;
+ a.bcc = (s = hv_fetch(h, "bcc", 3, 0)) ? SvPV(*s,PL_na) : 0;
+ a.replyTo = (s = hv_fetch(h, "replyTo", 7, 0)) ? SvPV(*s,PL_na) : 0;
+ a.sentTo = (s = hv_fetch(h, "sentTo", 6, 0)) ? SvPV(*s,PL_na) : 0;
+ a.body = (s = hv_fetch(h, "body", 4, 0)) ? SvPV(*s,PL_na) : 0;
a.read = (s = hv_fetch(h, "read", 4, 0)) ? SvIV(*s) : 0;
a.signature = (s = hv_fetch(h, "signature", 9, 0)) ? SvIV(*s) : 0;
@@ -1913,7 +1913,7 @@ UnpackAppBlock(record)
}
SvPV(record,len);
- if (unpack_MailAppInfo(&a, (CPTR)SvPV(record, na), len)>0) {
+ if (unpack_MailAppInfo(&a, (CPTR)SvPV(record, PL_na), len)>0) {
doUnpackCategory(ret, &a.category);
@@ -1989,7 +1989,7 @@ UnpackSyncPref(record)
}
SvPV(record,len);
- if (unpack_MailSyncPref(&a, (CPTR)SvPV(record, na), len)>0) {
+ if (unpack_MailSyncPref(&a, (CPTR)SvPV(record, PL_na), len)>0) {
hv_store(ret, "syncType", 8, newSVlist(a.syncType, MailSyncTypeNames), 0);
hv_store(ret, "getHigh", 7, newSViv(a.getHigh), 0);
@@ -2033,9 +2033,9 @@ PackSyncPref(record, id)
a.getContaining = (s=hv_fetch(h,"getContaining",13,0)) ? SvIV(*s) : 0;
a.truncate = (s=hv_fetch(h,"truncate",8,0)) ? SvIV(*s) : 0;
- a.filterTo = (s=hv_fetch(h,"filterTo",8,0)) ? SvPV(*s,na) : 0;
- a.filterFrom = (s=hv_fetch(h,"filterFrom",10,0)) ? SvPV(*s,na) : 0;
- a.filterSubject = (s=hv_fetch(h,"filterSubject",13,0)) ? SvPV(*s,na) : 0;
+ a.filterTo = (s=hv_fetch(h,"filterTo",8,0)) ? SvPV(*s,PL_na) : 0;
+ a.filterFrom = (s=hv_fetch(h,"filterFrom",10,0)) ? SvPV(*s,PL_na) : 0;
+ a.filterSubject = (s=hv_fetch(h,"filterSubject",13,0)) ? SvPV(*s,PL_na) : 0;
len = pack_MailSyncPref(&a, mybuf, 0xffff);
@@ -2073,7 +2073,7 @@ UnpackSignaturePref(record)
}
SvPV(record,len);
- if (unpack_MailSignaturePref(&a, (CPTR)SvPV(record, na), len)>0) {
+ if (unpack_MailSignaturePref(&a, (CPTR)SvPV(record, PL_na), len)>0) {
if (a.signature)
hv_store(ret, "signature", 9, newSVpv(a.signature, 0), 0);
@@ -2099,7 +2099,7 @@ PackSignaturePref(record, id)
RETVAL = record;
else {
- a.signature = (s=hv_fetch(h,"signature",9,0)) ? SvPV(*s,na) : 0;
+ a.signature = (s=hv_fetch(h,"signature",9,0)) ? SvPV(*s,PL_na) : 0;
len = pack_MailSignaturePref(&a, mybuf, 0xffff);
@@ -2129,7 +2129,7 @@ write(socket, msg)
{
STRLEN len;
SvPV(msg, len);
- RETVAL = pi_write(socket,SvPV(msg,na),len);
+ RETVAL = pi_write(socket,SvPV(msg,PL_na),len);
}
SV *
@@ -2146,7 +2146,7 @@ read(socket, len)
if (result >=0)
RETVAL = newSVpvn((char *) pibuf.data, result);
else
- RETVAL = &sv_undef;
+ RETVAL = &PL_sv_undef;
}
OUTPUT:
RETVAL
@@ -2282,7 +2282,7 @@ class(self, name=0)
croak("DBClasses doesn't exist");
if (SvOK(name)) {
(void)SvPV(name,len);
- s = hv_fetch(h, SvPV(name,na), len, 0);
+ s = hv_fetch(h, SvPV(name,PL_na), len, 0);
}
if (!s)
s = hv_fetch(h, "", 0, 0);
@@ -2577,7 +2577,7 @@ getRecords(self)
{
int result = dlp_ReadOpenDBInfo(self->socket, self->handle, &RETVAL);
if (result < 0) {
- RETVAL = newSVsv(&sv_undef);
+ RETVAL = newSVsv(&PL_sv_undef);
self->errnop = result;
}
}
@@ -2745,7 +2745,7 @@ setResource(self, data)
result = dlp_WriteResource(self->socket, self->handle, type, id, c, len);
if (result < 0) {
self->errnop = result;
- RETVAL = newSVsv(&sv_undef);
+ RETVAL = newSVsv(&PL_sv_undef);
} else
RETVAL = newSViv(result);
}
@@ -2798,7 +2798,7 @@ getPref(self, id=0, backup=1)
r = dlp_CloseDB(self->socket, self->handle);
result = dlp_ReadAppPreference(self->socket, creator, id, backup, 0xFFFF, mybuf, &len, &version);
if (pi_version(self->socket)< 0x101)
- r = dlp_OpenDB(self->socket, self->dbcard, self->dbmode, SvPV(self->dbname,na), &self->handle);
+ r = dlp_OpenDB(self->socket, self->dbcard, self->dbmode, SvPV(self->dbname,PL_na), &self->handle);
ReturnReadPref(mybuf, len);
}
@@ -2822,10 +2822,10 @@ setPref(self, data)
r = dlp_CloseDB(self->socket, self->handle);
result = dlp_WriteAppPreference(self->socket, creator, id, backup, version, buf, len);
if (pi_version(self->socket)< 0x101)
- r = dlp_OpenDB(self->socket, self->dbcard, self->dbmode, SvPV(self->dbname,na), &self->handle);
+ r = dlp_OpenDB(self->socket, self->dbcard, self->dbmode, SvPV(self->dbname,PL_na), &self->handle);
if (result < 0) {
self->errnop = result;
- RETVAL = newSVsv(&sv_undef);
+ RETVAL = newSVsv(&PL_sv_undef);
} else {
RETVAL = newSViv(result);
}
@@ -2861,7 +2861,7 @@ setPrefRaw(self, data, number, version, backup=1)
result = dlp_WriteAppPreference(self->socket, creator, number, backup, version, buf, len);
if (result < 0) {
self->errnop = result;
- RETVAL = newSVsv(&sv_undef);
+ RETVAL = newSVsv(&PL_sv_undef);
} else {
RETVAL = newSViv(result);
}
@@ -2904,7 +2904,7 @@ getTime(self)
int result = dlp_GetSysDateTime(self->socket, &t);
if (result < 0) {
self->errnop = result;
- RETVAL = newSVsv(&sv_undef);
+ RETVAL = newSVsv(&PL_sv_undef);
} else
RETVAL = newSViv(t);
}
@@ -2929,7 +2929,7 @@ getSysInfo(self)
int result = dlp_ReadSysInfo(self->socket, &si);
if (result < 0) {
self->errnop = result;
- RETVAL = newSVsv(&sv_undef);
+ RETVAL = newSVsv(&PL_sv_undef);
} else {
HV * i = newHV();
hv_store(i, "romVersion", 10, newSViv(si.romVersion), 0);\
@@ -2951,7 +2951,7 @@ getCardInfo(self, cardno=0)
int result = dlp_ReadStorageInfo(self->socket, cardno, &c);
if (result < 0) {
self->errnop = result;
- RETVAL = newSVsv(&sv_undef);
+ RETVAL = newSVsv(&PL_sv_undef);
} else {
HV * i = newHV();
hv_store(i, "card", 6, newSViv(c.card), 0);\
@@ -3037,7 +3037,7 @@ newPref(self, creator, id=0, version=0, backup=0)
croak("Default PrefClass not defined");
PUSHMARK(sp);
XPUSHs(newSVsv(*s));
- XPUSHs(&sv_undef);
+ XPUSHs(&PL_sv_undef);
XPUSHs(sv_2mortal(newSVChar4(creator)));
if (id)
XPUSHs(id);
@@ -3107,7 +3107,7 @@ open(self, name, mode=0, cardno=0)
result = dlp_OpenDB(self->socket, cardno, nummode, name, &handle);
if (result<0) {
self->errnop = result;
- RETVAL = &sv_undef;
+ RETVAL = &PL_sv_undef;
} else {
int type;
PDA__Pilot__DLP__DB * x = malloc(sizeof(PDA__Pilot__DLP__DB));
@@ -3156,7 +3156,7 @@ create(self, name, creator, type, flags, version, card
int result = dlp_CreateDB(self->socket, creator, type, cardno, flags, version, name, &handle);
if (result<0) {
self->errnop = result;
- RETVAL = &sv_undef;
+ RETVAL = &PL_sv_undef;
} else {
PDA__Pilot__DLP__DB * x = malloc(sizeof(PDA__Pilot__DLP__DB));
SV * sv = newSViv((IV)(void*)x);
@@ -3224,7 +3224,7 @@ setPref(self, data)
result = dlp_WriteAppPreference(self->socket, creator, id, backup, version, buf, len);
if (result < 0) {
self->errnop = result;
- RETVAL = newSVsv(&sv_undef);
+ RETVAL = newSVsv(&PL_sv_undef);
} else {
RETVAL = newSViv(result);
}
@@ -3248,7 +3248,7 @@ setPrefRaw(self, data, creator, number, version, backu
result = dlp_WriteAppPreference(self->socket, creator, number, backup, version, buf, len);
if (result < 0) {
self->errnop = result;
- RETVAL = newSVsv(&sv_undef);
+ RETVAL = newSVsv(&PL_sv_undef);
} else {
RETVAL = newSViv(result);
}
@@ -3350,7 +3350,7 @@ findDBInfo(self, start, name, creator, type, cardno=0)
else
t = 0;
result = dlp_FindDBInfo(self->socket, cardno, start,
- SvOK(name) ? SvPV(name,na) : 0,
+ SvOK(name) ? SvPV(name,PL_na) : 0,
t, c, &info);
pack_dbinfo(RETVAL, info, result);
}
@@ -3367,7 +3367,7 @@ getFeature(self, creator, number)
unsigned long f;
int result;
if ((result = dlp_ReadFeature(self->socket, creator, number, &f))<0) {
- RETVAL = newSVsv(&sv_undef);
+ RETVAL = newSVsv(&PL_sv_undef);
self->errnop = result;
} else {
RETVAL = newSViv(f);
@@ -3397,7 +3397,7 @@ getROMToken(self,token)
}
void
-callApplication(self, creator, type, action, data=&sv_undef)
+callApplication(self, creator, type, action, data=&PL_sv_undef)
PDA::Pilot::DLP *self
Char4 creator
Char4 type
@@ -3410,7 +3410,7 @@ callApplication(self, creator, type, action, data=&sv_
int result;
(void)SvPV(data,len);
result = dlp_CallApplication(self->socket, creator,
- type, action, len, SvPV(data,na),
+ type, action, len, SvPV(data,PL_na),
&retcode, &pibuf);
EXTEND(sp, 2);
if (result >= 0) {
@@ -3419,7 +3419,7 @@ callApplication(self, creator, type, action, data=&sv_
PUSHs(sv_2mortal(newSViv(retcode)));
}
} else
- PUSHs(&sv_undef);
+ PUSHs(&PL_sv_undef);
}
int
@@ -3530,7 +3530,7 @@ class(self, name=0)
croak("DBClasses doesn't exist");
if (SvOK(name)) {
(void)SvPV(name, len);
- s = hv_fetch(h, SvPV(name, na), len, 0);
+ s = hv_fetch(h, SvPV(name, PL_na), len, 0);
}
if (!s)
s = hv_fetch(h, "", 0, 0);

View File

@ -0,0 +1,19 @@
$OpenBSD: patch-bindings_Perl_typemap,v 1.3 2015/09/21 08:46:50 ajacoutot Exp $
Allow pilot-link's perl bindings to build with newer Perl.
From Debian ticket 628510
--- bindings/Perl/typemap.orig Sat Oct 28 01:23:48 2000
+++ bindings/Perl/typemap Mon Mar 18 22:07:45 2013
@@ -50,9 +50,9 @@ T_CHAR4
T_RESULT
if ($var < 0) {
- sv_setsv($arg, &sv_no);
+ sv_setsv($arg, &PL_sv_no);
self->errnop = $var;
} else
- sv_setsv($arg, &sv_yes);
+ sv_setsv($arg, &PL_sv_yes);
T_PTROBJ
sv_setref_pv($arg, \"${ntype}\", (void*)$var);

View File

@ -0,0 +1,27 @@
$OpenBSD: patch-configure,v 1.9 2015/09/21 08:46:50 ajacoutot Exp $
--- configure.orig Sun Feb 7 04:42:29 2010
+++ configure Wed Mar 24 08:58:53 2010
@@ -4797,7 +4797,7 @@ fi
if test "${lt_cv_path_LD+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- if test -z "$LD"; then
+ if true; then
lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
for ac_dir in $PATH; do
IFS="$lt_save_ifs"
@@ -15081,12 +15081,12 @@ $as_echo "#define HAVE_USB 1" >>confdefs.h
usb_type=linux
msg_usb="yes, Linux"
;;
- *freebsd*)
+ *bsd*)
$as_echo "#define HAVE_USB 1" >>confdefs.h
usb_type=freebsd
- msg_usb="yes, FreeBSD"
+ msg_usb="yes, FreeBSD (OpenBSD)"
;;
*darwin*)

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-libpisock_freebsdusb_c,v 1.5 2015/09/21 08:46:50 ajacoutot Exp $
--- libpisock/freebsdusb.c.orig Thu Oct 12 16:21:22 2006
+++ libpisock/freebsdusb.c Thu Jan 17 09:00:40 2008
@@ -46,7 +46,7 @@
# define O_NONBLOCK 0
#endif
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__OpenBSD__)
/* freebsd usb header */
#include <dev/usb/usb.h>
#define MAX_BUF 256

View File

@ -0,0 +1,28 @@
$OpenBSD: patch-libpisock_unixserial_c,v 1.5 2015/09/21 08:46:50 ajacoutot Exp $
--- libpisock/unixserial.c.orig Thu Oct 12 16:21:23 2006
+++ libpisock/unixserial.c Thu Jan 17 09:00:40 2008
@@ -161,13 +161,23 @@ s_open(pi_socket_t *ps, struct pi_sockaddr *addr, size
struct pi_serial_data *data =
(struct pi_serial_data *)ps->device->data;
+#define maxretries 100
+ int retries;
#ifndef SGTTY
struct termios tcn;
#else
struct sgttyb tcn;
#endif
- if ((fd = open(tty, O_RDWR | O_NONBLOCK)) < 0) {
+
+ for (retries = 0 ; retries <= maxretries ; retries++ ) {
+ if ((fd = open(tty, O_RDWR | O_NONBLOCK)) != -1) {
+ break;
+ }
+ usleep(50000);
+ }
+
+ if (fd == -1) {
ps->last_error = PI_ERR_GENERIC_SYSTEM;
return PI_ERR_GENERIC_SYSTEM; /* errno already set */
}

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_Makefile_in,v 1.6 2015/09/21 08:46:50 ajacoutot Exp $
--- src/Makefile.in.orig Sun Feb 7 04:42:28 2010
+++ src/Makefile.in Wed Mar 24 08:56:19 2010
@@ -557,7 +557,7 @@ PISYNC_CURRENT = @PISYNC_CURRENT@
PISYNC_REVISION = @PISYNC_REVISION@
PKG_CONFIG = @PKG_CONFIG@
PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
+PNG_LIBS = @PNG_LIBS@ -lz -lm
POPT_INCLUDES = @POPT_INCLUDES@
POPT_LIBS = @POPT_LIBS@
PTHREAD_CC = @PTHREAD_CC@

View File

@ -0,0 +1,29 @@
$OpenBSD: patch-src_pilot-read-notepad_c,v 1.3 2015/09/21 08:46:50 ajacoutot Exp $
Fix build with png-1.5.
--- src/pilot-read-notepad.c.orig Thu Jun 4 07:26:19 2009
+++ src/pilot-read-notepad.c Mon Jul 4 15:46:34 2011
@@ -39,11 +39,7 @@
#ifdef HAVE_PNG
#include "png.h"
-#if (PNG_LIBPNG_VER < 10201)
- #define png_voidp_NULL (png_voidp)NULL
- #define png_error_ptr_NULL (png_error_ptr)NULL
#endif
-#endif
const char *progname;
@@ -166,8 +162,8 @@ void write_png( FILE *f, struct NotePad *n )
width = n->body.width + 8;
png_ptr = png_create_write_struct
- ( PNG_LIBPNG_VER_STRING, png_voidp_NULL,
- png_error_ptr_NULL, png_error_ptr_NULL);
+ ( PNG_LIBPNG_VER_STRING, NULL,
+ NULL, NULL);
if(!png_ptr)
return;

View File

@ -0,0 +1,29 @@
$OpenBSD: patch-src_pilot-read-palmpix_c,v 1.3 2015/09/21 08:46:50 ajacoutot Exp $
Fix build with png-1.5.
--- src/pilot-read-palmpix.c.orig Thu Jun 4 07:26:19 2009
+++ src/pilot-read-palmpix.c Mon Jul 4 15:50:37 2011
@@ -42,11 +42,7 @@
#ifdef HAVE_PNG
#include "png.h"
-#if (PNG_LIBPNG_VER < 10201)
- #define png_voidp_NULL (png_voidp)NULL
- #define png_error_ptr_NULL (png_error_ptr)NULL
#endif
-#endif
const char *progname;
@@ -223,8 +219,8 @@ void write_png( FILE *f, const struct PalmPixState *st
png_infop info_ptr;
png_ptr = png_create_write_struct
- ( PNG_LIBPNG_VER_STRING, png_voidp_NULL,
- png_error_ptr_NULL, png_error_ptr_NULL);
+ ( PNG_LIBPNG_VER_STRING, NULL,
+ NULL, NULL);
if(!png_ptr)
return;

View File

@ -0,0 +1,28 @@
$OpenBSD: patch-src_pilot-read-screenshot_c,v 1.3 2015/09/21 08:46:50 ajacoutot Exp $
Fix build with png-1.5.
--- src/pilot-read-screenshot.c.orig Thu Jun 4 07:26:19 2009
+++ src/pilot-read-screenshot.c Mon Jul 4 15:50:37 2011
@@ -40,10 +40,6 @@
#ifdef HAVE_PNG
# include "png.h"
-# if (PNG_LIBPNG_VER < 10201)
-# define png_voidp_NULL (png_voidp)NULL
-# define png_error_ptr_NULL (png_error_ptr)NULL
-# endif
#endif
#define pi_mktag(c1,c2,c3,c4) (((c1)<<24)|((c2)<<16)|((c3)<<8)|(c4))
@@ -87,8 +83,8 @@ void write_png ( char *fname, struct ss_state *state )
gray_buf = malloc( state->w );
png_ptr = png_create_write_struct
- (PNG_LIBPNG_VER_STRING, png_voidp_NULL,
- png_error_ptr_NULL, png_error_ptr_NULL);
+ (PNG_LIBPNG_VER_STRING, NULL,
+ NULL, NULL);
if (!png_ptr)
return;

View File

@ -0,0 +1,28 @@
$OpenBSD: patch-src_pilot-read-veo_c,v 1.3 2015/09/21 08:46:50 ajacoutot Exp $
Fix build with png-1.5.
--- src/pilot-read-veo.c.orig Thu Jun 4 07:26:19 2009
+++ src/pilot-read-veo.c Mon Jul 4 15:50:37 2011
@@ -41,10 +41,6 @@
#ifdef HAVE_PNG
# include "png.h"
-# if (PNG_LIBPNG_VER < 10201)
-# define png_voidp_NULL (png_voidp)NULL
-# define png_error_ptr_NULL (png_error_ptr)NULL
-# endif
#endif
#define pi_mktag(c1,c2,c3,c4) (((c1)<<24)|((c2)<<16)|((c3)<<8)|(c4))
@@ -856,8 +852,8 @@ void write_png (FILE * f, struct Veo *v, long flags)
png_infop info_ptr;
png_ptr = png_create_write_struct
- (PNG_LIBPNG_VER_STRING, png_voidp_NULL,
- png_error_ptr_NULL, png_error_ptr_NULL);
+ (PNG_LIBPNG_VER_STRING, NULL,
+ NULL, NULL);
if (!png_ptr)
return;

View File

@ -0,0 +1,13 @@
pilot-link is a suite of tools used to connect your Palm or PalmOS(R)
compatible handheld with Unix, Linux, and any other POSIX-compatible
machine. pilot-link works with all PalmOS(R) handhelds, including those
made by Handspring, Sony, and Palm, as well as others.
pilot-link includes userspace "conduits" that allow you to synchronize
information to and from your Palm device, as well as libraries of Palm-
compatible functions that allow other applications to take advantage
of the code included in pilot-link.
There are also several language "bindings" that allow you to use your
favorite development language with pilot-link, such as Java, Tcl, Perl,
and Python.

160
comms/pilot-link/pkg/PLIST Normal file
View File

@ -0,0 +1,160 @@
@comment $OpenBSD: PLIST,v 1.22 2015/09/21 08:46:50 ajacoutot Exp $
@bin bin/pilot-addresses
@bin bin/pilot-clip
@bin bin/pilot-csd
@bin bin/pilot-debugsh
@bin bin/pilot-dedupe
@bin bin/pilot-dlpsh
@bin bin/pilot-file
@bin bin/pilot-foto
@bin bin/pilot-foto-treo600
@bin bin/pilot-foto-treo650
@bin bin/pilot-getram
@bin bin/pilot-getrom
@bin bin/pilot-getromtoken
@bin bin/pilot-hinotes
bin/pilot-ietf2datebook
@bin bin/pilot-install-datebook
@bin bin/pilot-install-expenses
@bin bin/pilot-install-hinote
@bin bin/pilot-install-memo
@bin bin/pilot-install-netsync
@bin bin/pilot-install-todo
@bin bin/pilot-install-todos
@bin bin/pilot-install-user
@bin bin/pilot-memos
@bin bin/pilot-nredir
@bin bin/pilot-read-expenses
@bin bin/pilot-read-ical
@bin bin/pilot-read-notepad
@bin bin/pilot-read-palmpix
@bin bin/pilot-read-screenshot
@bin bin/pilot-read-todos
@bin bin/pilot-read-veo
@bin bin/pilot-reminders
@bin bin/pilot-schlep
bin/pilot-sync-plan
bin/pilot-undelete
@bin bin/pilot-wav
@bin bin/pilot-xfer
include/pi-address.h
include/pi-appinfo.h
include/pi-args.h
include/pi-blob.h
include/pi-bluetooth.h
include/pi-buffer.h
include/pi-calendar.h
include/pi-cmp.h
include/pi-contact.h
include/pi-datebook.h
include/pi-debug.h
include/pi-dlp.h
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
include/pi-location.h
include/pi-macros.h
include/pi-mail.h
include/pi-md5.h
include/pi-memo.h
include/pi-money.h
include/pi-net.h
include/pi-notepad.h
include/pi-padp.h
include/pi-palmpix.h
include/pi-serial.h
include/pi-slp.h
include/pi-sockaddr.h
include/pi-socket.h
include/pi-source.h
include/pi-sync.h
include/pi-sys.h
include/pi-syspkt.h
include/pi-threadsafe.h
include/pi-todo.h
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 lib/libpisock.so.${LIBpisock_VERSION}
lib/libpisync.a
lib/libpisync.la
@lib lib/libpisync.so.${LIBpisync_VERSION}
lib/pkgconfig/pilot-link.pc
@comment libdata/perl5/${MACHINE_ARCH}-openbsd/
@comment libdata/perl5/${MACHINE_ARCH}-openbsd/5.12.2/
@comment libdata/perl5/${MACHINE_ARCH}-openbsd/5.12.2/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
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/PDA/dump.pl
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/PDA/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/PDA/Pilot/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/PDA/Pilot/Pilot.so
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/PDA/Pilot/autosplit.ix
@man man/man1/ietf2datebook.1
@man man/man1/pilot-addresses.1
@man man/man1/pilot-clip.1
@man man/man1/pilot-csd.1
@man man/man1/pilot-debugsh.1
@man man/man1/pilot-dedupe.1
@man man/man1/pilot-dlpsh.1
@man man/man1/pilot-file.1
@man man/man1/pilot-foto-treo600.1
@man man/man1/pilot-foto-treo650.1
@man man/man1/pilot-foto.1
@man man/man1/pilot-getram.1
@man man/man1/pilot-getrom.1
@man man/man1/pilot-getromtoken.1
@man man/man1/pilot-hinotes.1
@man man/man1/pilot-install-datebook.1
@man man/man1/pilot-install-expenses.1
@man man/man1/pilot-install-hinote.1
@man man/man1/pilot-install-memo.1
@man man/man1/pilot-install-netsync.1
@man man/man1/pilot-install-todo.1
@man man/man1/pilot-install-todos.1
@man man/man1/pilot-install-user.1
@man man/man1/pilot-memos.1
@man man/man1/pilot-nredir.1
@man man/man1/pilot-read-expenses.1
@man man/man1/pilot-read-ical.1
@man man/man1/pilot-read-notepad.1
@man man/man1/pilot-read-palmpix.1
@man man/man1/pilot-read-screenshot.1
@man man/man1/pilot-read-todos.1
@man man/man1/pilot-read-veo.1
@man man/man1/pilot-reminders.1
@man man/man1/pilot-schlep.1
@man man/man1/pilot-wav.1
@man man/man1/pilot-xfer.1
@man man/man3p/PDA::Pilot.3p
@man man/man3p/PDA::Pilot.3pm
@man man/man7/pilot-link.7
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/pix/
share/pilot-link/pix/b1.gif
share/pilot-link/pix/b2.gif
share/pilot-link/pix/b3.gif
share/pilot-link/pix/b4.gif
share/pilot-link/pix/b5.gif
share/pilot-link/pix/b6.gif
share/pilot-link/pix/b7.gif
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

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.285 2015/09/21 08:42:27 kili Exp $
# $OpenBSD: Makefile,v 1.286 2015/09/21 08:46:50 ajacoutot Exp $
COMMENT = exceptions to pkg_add rules
CATEGORIES = devel databases
DISTFILES =
# API.rev
PKGNAME = quirks-2.130
PKGNAME = quirks-2.131
PKG_ARCH = *
MAINTAINER = Marc Espie <espie@openbsd.org>

View File

@ -1,7 +1,7 @@
#! /usr/bin/perl
# ex:ts=8 sw=4:
# $OpenBSD: Quirks.pm,v 1.295 2015/09/21 08:42:27 kili Exp $
# $OpenBSD: Quirks.pm,v 1.296 2015/09/21 08:46:50 ajacoutot Exp $
#
# Copyright (c) 2009 Marc Espie <espie@openbsd.org>
#
@ -610,8 +610,6 @@ my $obsolete_reason = {
'xorp' => 5,
'faac' => 6,
'god' => 5,
'jpilot' => 6,
'pilot-link' => 6,
'ivan' => 3,
'hs-xhtml-combinators' => 5,
};

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.88 2015/09/19 22:22:13 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.89 2015/09/21 08:46:50 ajacoutot Exp $
COMMENT = KDE personal information applications
CATEGORIES = x11 x11/kde productivity
VERSION = 3.5.10
DISTNAME = kdepim-${VERSION}
PKGSPEC = kdepim->=3,<4
REVISION = 21
REVISION = 22
MODKDE_VERSION = 3.5.8
@ -23,6 +23,7 @@ SHARED_LIBS += mimelib 2.1 # .1.1
SHARED_LIBS += kcal 4.0 # .2.0
SHARED_LIBS += kleopatra 2.0 # .1.0
SHARED_LIBS += kdepim 2.0 # .1.0
SHARED_LIBS += kpilot 1.0 # .0.0
SHARED_LIBS += kpimidentities 2.0 # .1.0
SHARED_LIBS += kpimexchange 2.0 # .1.0
SHARED_LIBS += knodecommon 0.0 # .3.0
@ -75,12 +76,13 @@ WANTLIB += ${KDE}/kwalletclient ${KDE}/mcop ${KDE}/qtmcop
WANTLIB += ${KDE}/soundserver_idl ${KDE}/vcard
WANTLIB += FLAC art_lgpl_2 assuan audiofile fam glib-2.0 gmodule-2.0 gnokii
WANTLIB += gpg-error gpgme gthread-2.0 ical idn jpeg lcms mad mng ogg
WANTLIB += pcre pcreposix png qui sasl2 usb usb-1.0 vorbis
WANTLIB += pcre pcreposix pisock png qui sasl2 usb usb-1.0 vorbis
WANTLIB += vorbisenc vorbisfile
LIB_DEPENDS = x11/kde/libs3 \
security/gpgme>=0.4.5 \
security/cyrus-sasl2 \
comms/pilot-link \
comms/gnokii
RUN_DEPENDS = x11/kde/base3 \

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.42 2015/09/19 22:22:13 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.43 2015/09/21 08:46:50 ajacoutot Exp $
@conflict kdelibs-<3.4
@conflict kdebase-<3.4
@conflict kpilot-*
@ -32,6 +32,9 @@ bin/kmail_sav.sh
@bin bin/korgac
@bin bin/korganizer
@bin bin/korn
@bin bin/kpalmdoc
@bin bin/kpilot
@bin bin/kpilotDaemon
@bin bin/ktnef
@bin bin/kwatchgnupg
@bin bin/kxml_compiler
@ -157,6 +160,19 @@ include/kde/korganizer/corehelper.h
include/kde/korganizer/mainwindow.h
include/kde/korganizer/part.h
include/kde/korganizer/printplugin.h
include/kde/kpilot/
include/kde/kpilot/kpilotdevicelink.h
include/kde/kpilot/kpilotlink.h
include/kde/kpilot/kpilotlocallink.h
include/kde/kpilot/pilot.h
include/kde/kpilot/pilotDatabase.h
include/kde/kpilot/pilotLinkVersion.h
include/kde/kpilot/pilotLocalDatabase.h
include/kde/kpilot/pilotRecord.h
include/kde/kpilot/pilotSerialDatabase.h
include/kde/kpilot/plugin.h
include/kde/kpilot/pluginfactory.h
include/kde/kpilot/syncAction.h
include/kde/ksieve/
include/kde/ksieve/error.h
include/kde/ksieve/lexer.h
@ -258,6 +274,26 @@ include/kde/qgpgme/
include/kde/qgpgme/dataprovider.h
include/kde/qgpgme/eventloopinteractor.h
@bin lib/kconf_update_bin/korn-3-4-config_change
${KDE}/conduit_address.la
${KDE}/conduit_address.so
${KDE}/conduit_doc.la
${KDE}/conduit_doc.so
${KDE}/conduit_knotes.la
${KDE}/conduit_knotes.so
${KDE}/conduit_memofile.la
${KDE}/conduit_memofile.so
${KDE}/conduit_notepad.la
${KDE}/conduit_notepad.so
${KDE}/conduit_popmail.la
${KDE}/conduit_popmail.so
${KDE}/conduit_sysinfo.la
${KDE}/conduit_sysinfo.so
${KDE}/conduit_time.la
${KDE}/conduit_time.so
${KDE}/conduit_todo.la
${KDE}/conduit_todo.so
${KDE}/conduit_vcal.la
${KDE}/conduit_vcal.so
${KDE}/kabc_groupdav.la
${KDE}/kabc_groupdav.so
${KDE}/kabc_groupwise.la
@ -320,12 +356,16 @@ ${KDE}/kcm_korganizer.la
${KDE}/kcm_korganizer.so
${KDE}/kcm_korgsummary.la
${KDE}/kcm_korgsummary.so
${KDE}/kcm_kpilot.la
${KDE}/kcm_kpilot.so
${KDE}/kcm_sdsummary.la
${KDE}/kcm_sdsummary.so
${KDE}/kded_networkstatus.la
${KDE}/kded_networkstatus.so
${KDE}/kfile_ics.la
${KDE}/kfile_ics.so
${KDE}/kfile_palm.la
${KDE}/kfile_palm.so
${KDE}/kfile_vcf.la
${KDE}/kfile_vcf.so
${KDE}/kio_groupwise.la
@ -458,6 +498,8 @@ ${KDE}/libkontact_knotesplugin.la
${KDE}/libkontact_knotesplugin.so
${KDE}/libkontact_korganizerplugin.la
${KDE}/libkontact_korganizerplugin.so
${KDE}/libkontact_kpilotplugin.la
${KDE}/libkontact_kpilotplugin.so
${KDE}/libkontact_newstickerplugin.la
${KDE}/libkontact_newstickerplugin.so
${KDE}/libkontact_specialdatesplugin.la
@ -485,6 +527,7 @@ ${KDE}/libkorg_yearlyprint.so
${KDE}/libkorganizerpart.la
${KDE}/libkorganizerpart.so
@lib ${KDE}/libkpgp.so.${LIBkpgp_VERSION}
@lib ${KDE}/libkpilot.so.${LIBkpilot_VERSION}
@lib ${KDE}/libkpimexchange.so.${LIBkpimexchange_VERSION}
@lib ${KDE}/libkpimidentities.so.${LIBkpimidentities_VERSION}
@lib ${KDE}/libkpinterfaces.so.${LIBkpinterfaces_VERSION}
@ -589,6 +632,8 @@ lib/libkorganizer_eventviewer.la
@lib lib/libkorganizer_eventviewer.so.${LIBkorganizer_eventviewer_VERSION}
lib/libkpgp.la
@lib lib/libkpgp.so.${LIBkpgp_VERSION}
lib/libkpilot.la
@lib lib/libkpilot.so.${LIBkpilot_VERSION}
lib/libkpimexchange.la
@lib lib/libkpimexchange.so.${LIBkpimexchange_VERSION}
lib/libkpimidentities.la
@ -621,6 +666,9 @@ share/applications/kde/knotes.desktop
share/applications/kde/konsolekalendar.desktop
share/applications/kde/kontactdcop.desktop
share/applications/kde/korganizer.desktop
share/applications/kde/kpalmdoc.desktop
share/applications/kde/kpilot.desktop
share/applications/kde/kpilotdaemon.desktop
share/applications/kde/ktnef.desktop
share/applnk/.hidden/kalarmd.desktop
share/applnk/Applications/
@ -645,6 +693,8 @@ share/apps.kde3/akregator/pics/kmmsgnew.png
share/apps.kde3/akregator/pics/kmmsgunseen.png
share/apps.kde3/kaddressbook/
share/apps.kde3/kaddressbook/bookmark_xxportui.rc
share/apps.kde3/kaddressbook/contacteditorpages/
share/apps.kde3/kaddressbook/contacteditorpages/KPilotCustomFieldEditor.ui
share/apps.kde3/kaddressbook/csv-templates/
share/apps.kde3/kaddressbook/csv-templates/kaddressbook.desktop
share/apps.kde3/kaddressbook/csv-templates/outlook2000.desktop
@ -766,8 +816,10 @@ share/apps.kde3/kconf_update/korn-3-4-config_change.upd
share/apps.kde3/kconf_update/korn-3-5-metadata-update.pl
share/apps.kde3/kconf_update/korn-3-5-ssl-update.pl
share/apps.kde3/kconf_update/korn-3-5-update.upd
share/apps.kde3/kconf_update/kpalmdoc.upd
share/apps.kde3/kconf_update/kpgp-3.1-upgrade-address-data.pl
share/apps.kde3/kconf_update/kpgp.upd
share/apps.kde3/kconf_update/kpilot.upd
share/apps.kde3/kconf_update/upgrade-resourcetype.pl
share/apps.kde3/kconf_update/upgrade-signature.pl
share/apps.kde3/kconf_update/upgrade-transport.pl
@ -1103,6 +1155,64 @@ share/apps.kde3/korganizer/sounds/lightmag.wav
share/apps.kde3/korganizer/sounds/onscreen.wav
share/apps.kde3/korganizer/sounds/spinout.wav
share/apps.kde3/korganizer/tips
share/apps.kde3/kpilot/
share/apps.kde3/kpilot/icons/
share/apps.kde3/kpilot/icons/crystalsvg/
share/apps.kde3/kpilot/icons/crystalsvg/16x16/
share/apps.kde3/kpilot/icons/crystalsvg/16x16/actions/
share/apps.kde3/kpilot/icons/crystalsvg/16x16/actions/backup.png
share/apps.kde3/kpilot/icons/crystalsvg/16x16/actions/busysync.png
share/apps.kde3/kpilot/icons/crystalsvg/16x16/actions/fastsync.png
share/apps.kde3/kpilot/icons/crystalsvg/16x16/actions/fullsync.png
share/apps.kde3/kpilot/icons/crystalsvg/16x16/actions/hotsync.png
share/apps.kde3/kpilot/icons/crystalsvg/16x16/actions/listsync.png
share/apps.kde3/kpilot/icons/crystalsvg/16x16/actions/nosync.png
share/apps.kde3/kpilot/icons/crystalsvg/16x16/actions/restore.png
share/apps.kde3/kpilot/icons/crystalsvg/16x16/apps/
share/apps.kde3/kpilot/icons/crystalsvg/16x16/apps/kpalmdoc.png
share/apps.kde3/kpilot/icons/crystalsvg/22x22/
share/apps.kde3/kpilot/icons/crystalsvg/22x22/actions/
share/apps.kde3/kpilot/icons/crystalsvg/22x22/actions/backup.png
share/apps.kde3/kpilot/icons/crystalsvg/22x22/actions/busysync.png
share/apps.kde3/kpilot/icons/crystalsvg/22x22/actions/fastsync.png
share/apps.kde3/kpilot/icons/crystalsvg/22x22/actions/fullsync.png
share/apps.kde3/kpilot/icons/crystalsvg/22x22/actions/hotsync.png
share/apps.kde3/kpilot/icons/crystalsvg/22x22/actions/listsync.png
share/apps.kde3/kpilot/icons/crystalsvg/22x22/actions/nosync.png
share/apps.kde3/kpilot/icons/crystalsvg/22x22/actions/restore.png
share/apps.kde3/kpilot/icons/crystalsvg/22x22/apps/
share/apps.kde3/kpilot/icons/crystalsvg/22x22/apps/kpalmdoc.png
share/apps.kde3/kpilot/icons/crystalsvg/32x32/
share/apps.kde3/kpilot/icons/crystalsvg/32x32/actions/
share/apps.kde3/kpilot/icons/crystalsvg/32x32/actions/fastsync.png
share/apps.kde3/kpilot/icons/crystalsvg/32x32/actions/fullsync.png
share/apps.kde3/kpilot/icons/crystalsvg/32x32/actions/hotsync.png
share/apps.kde3/kpilot/icons/crystalsvg/32x32/actions/listsync.png
share/apps.kde3/kpilot/icons/crystalsvg/32x32/apps/
share/apps.kde3/kpilot/icons/crystalsvg/32x32/apps/kpalmdoc.png
share/apps.kde3/kpilot/icons/crystalsvg/48x48/
share/apps.kde3/kpilot/icons/crystalsvg/48x48/actions/
share/apps.kde3/kpilot/icons/crystalsvg/48x48/actions/fastsync.png
share/apps.kde3/kpilot/icons/crystalsvg/48x48/actions/fullsync.png
share/apps.kde3/kpilot/icons/crystalsvg/48x48/actions/hotsync.png
share/apps.kde3/kpilot/icons/crystalsvg/48x48/actions/listsync.png
share/apps.kde3/kpilot/icons/crystalsvg/48x48/apps/
share/apps.kde3/kpilot/icons/crystalsvg/48x48/apps/kpalmdoc.png
share/apps.kde3/kpilot/icons/crystalsvg/64x64/
share/apps.kde3/kpilot/icons/crystalsvg/64x64/actions/
share/apps.kde3/kpilot/icons/crystalsvg/64x64/actions/kpilotaddress.png
share/apps.kde3/kpilot/icons/crystalsvg/64x64/actions/kpilotbhotsync.png
share/apps.kde3/kpilot/icons/crystalsvg/64x64/actions/kpilotcalendar.png
share/apps.kde3/kpilot/icons/crystalsvg/64x64/actions/kpilotdb.png
share/apps.kde3/kpilot/icons/crystalsvg/64x64/actions/kpilotfileinstaller.png
share/apps.kde3/kpilot/icons/crystalsvg/64x64/actions/kpilotknotes.png
share/apps.kde3/kpilot/icons/crystalsvg/64x64/actions/kpilottodo.png
share/apps.kde3/kpilot/kpilotui.rc
share/apps.kde3/kpilot/pics/
share/apps.kde3/kpilot/pics/kpilot-splash.png
share/apps.kde3/kpilot/sysinfoconduit/
share/apps.kde3/kpilot/sysinfoconduit/Template.html
share/apps.kde3/kpilot/sysinfoconduit/Template.txt
share/apps.kde3/ktnef/
share/apps.kde3/ktnef/icons/
share/apps.kde3/ktnef/icons/hicolor/
@ -1626,25 +1736,35 @@ share/apps.kde3/libkleopatra/pics/key_unknown.png
share/autostart/kalarm.tray.desktop
share/autostart/kalarmd.autostart.desktop
share/autostart/korgac.desktop
share/config.kcfg.kde3/abbrowserconduit.kcfg
share/config.kcfg.kde3/akregator.kcfg
share/config.kcfg.kde3/custommimeheader.kcfg
share/config.kcfg.kde3/customtemplates_kfg.kcfg
share/config.kcfg.kde3/docconduit.kcfg
share/config.kcfg.kde3/egroupware.kcfg
share/config.kcfg.kde3/groupwise.kcfg
share/config.kcfg.kde3/kandy.kcfg
share/config.kcfg.kde3/kmail.kcfg
share/config.kcfg.kde3/knoteconfig.kcfg
share/config.kcfg.kde3/knotesconduit.kcfg
share/config.kcfg.kde3/knotesglobalconfig.kcfg
share/config.kcfg.kde3/kolab.kcfg
share/config.kcfg.kde3/kontact.kcfg
share/config.kcfg.kde3/korganizer.kcfg
share/config.kcfg.kde3/kpalmdoc.kcfg
share/config.kcfg.kde3/kpilot.kcfg
share/config.kcfg.kde3/kpilotlib.kcfg
share/config.kcfg.kde3/memofileconduit.kcfg
share/config.kcfg.kde3/mk4config.kcfg
share/config.kcfg.kde3/pimemoticons.kcfg
share/config.kcfg.kde3/popmail.kcfg
share/config.kcfg.kde3/replyphrases.kcfg
share/config.kcfg.kde3/scalix.kcfg
share/config.kcfg.kde3/slox.kcfg
share/config.kcfg.kde3/sysinfoconduit.kcfg
share/config.kcfg.kde3/templatesconfiguration_kfg.kcfg
share/config.kde3/
share/config.kcfg.kde3/timeconduit.kcfg
share/config.kcfg.kde3/vcalconduitbase.kcfg
share/config.kde3/kmail.antispamrc
share/config.kde3/kmail.antivirusrc
share/config.kde3/libkleopatrarc
@ -1749,6 +1869,12 @@ share/doc/HTML.kde3/en/kdepim-apidocs/kontact/
share/doc/HTML.kde3/en/kdepim-apidocs/kontact/html/
share/doc/HTML.kde3/en/kdepim-apidocs/korganizer/
share/doc/HTML.kde3/en/kdepim-apidocs/korganizer/html/
share/doc/HTML.kde3/en/kdepim-apidocs/kpilot/
share/doc/HTML.kde3/en/kdepim-apidocs/kpilot/html/
share/doc/HTML.kde3/en/kdepim-apidocs/kpilot/kpilot/
share/doc/HTML.kde3/en/kdepim-apidocs/kpilot/kpilot/html/
share/doc/HTML.kde3/en/kdepim-apidocs/kpilot/lib/
share/doc/HTML.kde3/en/kdepim-apidocs/kpilot/lib/html/
share/doc/HTML.kde3/en/kdepim-apidocs/libemailfunctions/
share/doc/HTML.kde3/en/kdepim-apidocs/libemailfunctions/html/
share/doc/HTML.kde3/en/kdepim-apidocs/libkcal/
@ -1978,6 +2104,8 @@ share/icons/crystalsvg/16x16/apps/gpg.png
share/icons/crystalsvg/16x16/apps/gpgsm.png
share/icons/crystalsvg/16x16/apps/kmailcvt.png
share/icons/crystalsvg/16x16/apps/konsolekalendar.png
share/icons/crystalsvg/16x16/apps/kpalmdoc.png
share/icons/crystalsvg/16x16/apps/kpilotDaemon.png
share/icons/crystalsvg/22x22/actions/button_fewer.png
share/icons/crystalsvg/22x22/actions/button_more.png
share/icons/crystalsvg/22x22/actions/kalarm.png
@ -1995,6 +2123,8 @@ share/icons/crystalsvg/22x22/apps/gpg.png
share/icons/crystalsvg/22x22/apps/gpgsm.png
share/icons/crystalsvg/22x22/apps/kmaillight.png
share/icons/crystalsvg/22x22/apps/konsolekalendar.png
share/icons/crystalsvg/22x22/apps/kpalmdoc.png
share/icons/crystalsvg/22x22/apps/kpilotDaemon.png
share/icons/crystalsvg/32x32/actions/kontact_contacts.png
share/icons/crystalsvg/32x32/actions/kontact_date.png
share/icons/crystalsvg/32x32/actions/kontact_journal.png
@ -2010,6 +2140,8 @@ share/icons/crystalsvg/32x32/apps/gpgsm.png
share/icons/crystalsvg/32x32/apps/kmailcvt.png
share/icons/crystalsvg/32x32/apps/kmaillight.png
share/icons/crystalsvg/32x32/apps/konsolekalendar.png
share/icons/crystalsvg/32x32/apps/kpalmdoc.png
share/icons/crystalsvg/32x32/apps/kpilotDaemon.png
share/icons/crystalsvg/48x48/actions/kontact_contacts.png
share/icons/crystalsvg/48x48/actions/kontact_date.png
share/icons/crystalsvg/48x48/actions/kontact_journal.png
@ -2021,6 +2153,8 @@ share/icons/crystalsvg/48x48/actions/kontact_summary_green.png
share/icons/crystalsvg/48x48/actions/kontact_todo.png
share/icons/crystalsvg/48x48/actions/rss_tag.png
share/icons/crystalsvg/48x48/apps/kmailcvt.png
share/icons/crystalsvg/48x48/apps/kpalmdoc.png
share/icons/crystalsvg/48x48/apps/kpilotDaemon.png
share/icons/crystalsvg/64x64/actions/kontact_contacts.png
share/icons/crystalsvg/64x64/actions/kontact_date.png
share/icons/crystalsvg/64x64/actions/kontact_journal.png
@ -2051,11 +2185,13 @@ share/icons/hicolor/16x16/apps/knotes.png
share/icons/hicolor/16x16/apps/kontact.png
share/icons/hicolor/16x16/apps/korganizer.png
share/icons/hicolor/16x16/apps/korn.png
share/icons/hicolor/16x16/apps/kpilot.png
share/icons/hicolor/22x22/apps/akregator.png
share/icons/hicolor/22x22/apps/karm.png
share/icons/hicolor/22x22/apps/kmail.png
share/icons/hicolor/22x22/apps/knotes.png
share/icons/hicolor/22x22/apps/kontact.png
share/icons/hicolor/22x22/apps/kpilot.png
share/icons/hicolor/32x32/apps/akregator.png
share/icons/hicolor/32x32/apps/kaddressbook.png
share/icons/hicolor/32x32/apps/kalarm.png
@ -2067,6 +2203,7 @@ share/icons/hicolor/32x32/apps/knotes.png
share/icons/hicolor/32x32/apps/kontact.png
share/icons/hicolor/32x32/apps/korganizer.png
share/icons/hicolor/32x32/apps/korn.png
share/icons/hicolor/32x32/apps/kpilot.png
share/icons/hicolor/48x48/apps/akregator.png
share/icons/hicolor/48x48/apps/kaddressbook.png
share/icons/hicolor/48x48/apps/kalarm.png
@ -2078,6 +2215,7 @@ share/icons/hicolor/48x48/apps/knotes.png
share/icons/hicolor/48x48/apps/kontact.png
share/icons/hicolor/48x48/apps/korganizer.png
share/icons/hicolor/48x48/apps/korn.png
share/icons/hicolor/48x48/apps/kpilot.png
share/icons/hicolor/48x48/apps/ktnef.png
share/icons/hicolor/64x64/apps/akregator.png
share/icons/hicolor/64x64/apps/kaddressbook.png
@ -2093,13 +2231,16 @@ share/icons/hicolor/scalable/apps/kmail.svgz
share/icons/locolor/
share/icons/locolor/16x16/
share/icons/locolor/16x16/apps/
share/icons/locolor/16x16/apps/kpilot.png
share/icons/locolor/16x16/apps/ktnef.png
share/icons/locolor/32x32/
share/icons/locolor/32x32/apps/
share/icons/locolor/32x32/apps/ktnef.png
share/mimelnk/application/ms-tnef.desktop
share/services/abbrowser_conduit.desktop
share/services/akregator_mk4storage_plugin.desktop
share/services/akregator_part.desktop
share/services/doc_conduit.desktop
share/services/feed.protocol
share/services/groupwise.protocol
share/services/groupwises.protocol
@ -2143,6 +2284,7 @@ share/services/kcmkorgsummary.desktop
share/services/kcmsdsummary.desktop
share/services/kded/networkstatus.desktop
share/services/kfile_ics.desktop
share/services/kfile_palm.desktop
share/services/kfile_vcf.desktop
share/services/kleopatra_config_appear.desktop
share/services/kleopatra_config_dirserv.desktop
@ -2161,6 +2303,7 @@ share/services/knode_config_identity.desktop
share/services/knode_config_post_news.desktop
share/services/knode_config_privacy.desktop
share/services/knode_config_read_news.desktop
share/services/knotes-conduit.desktop
share/services/kontact/
share/services/kontact/akregatorplugin.desktop
share/services/kontact/akregatorplugin3.2.desktop
@ -2171,6 +2314,7 @@ share/services/kontact/kmailplugin.desktop
share/services/kontact/knodeplugin.desktop
share/services/kontact/knotesplugin.desktop
share/services/kontact/korganizerplugin.desktop
share/services/kontact/kpilotplugin.desktop
share/services/kontact/newstickerplugin.desktop
share/services/kontact/specialdatesplugin.desktop
share/services/kontact/summaryplugin.desktop
@ -2195,6 +2339,7 @@ share/services/korganizer_configmain.desktop
share/services/korganizer_configplugins.desktop
share/services/korganizer_configtime.desktop
share/services/korganizer_configviews.desktop
share/services/kpilot_config.desktop
share/services/kresources/kabc/imap.desktop
share/services/kresources/kabc/kabc_groupdav.desktop
share/services/kresources/kabc/kabc_groupwise.desktop
@ -2232,9 +2377,16 @@ share/services/kresources/knotes/scalix.desktop
share/services/kresources/knotes_manager.desktop
share/services/ldifvcardthumbnail.desktop
share/services/mbox.protocol
share/services/memofile-conduit.desktop
share/services/notepad-conduit.desktop
share/services/popmail-conduit.desktop
share/services/scalix.protocol
share/services/scalixs.protocol
share/services/sieve.protocol
share/services/sysinfo_conduit.desktop
share/services/time_conduit.desktop
share/services/todo-conduit.desktop
share/services/vcal-conduit.desktop
share/services/webcal.protocol
share/servicetypes/akregator_plugin.desktop
share/servicetypes/calendardecoration.desktop
@ -2251,6 +2403,7 @@ share/servicetypes/kaddressbookimprotocol.desktop
share/servicetypes/kontactplugin.desktop
share/servicetypes/korganizerpart.desktop
share/servicetypes/korgprintplugin.desktop
share/servicetypes/kpilotconduit.desktop
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database
@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor